From 54ed13bc507529aed3923b70aa51b13e1a92e5bd Mon Sep 17 00:00:00 2001
From: Bo Meng <mengbo@bos-macbook-pro.usca.ibm.com>
Date: Mon, 7 Dec 2015 16:41:32 -0800
Subject: [PATCH 1/4] [SPARK-12136] fix rddToFileName issue

---
 .../spark/streaming/StreamingContext.scala       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
index cf843e3e8b8ee..c5b53f8963893 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
@@ -892,12 +892,14 @@ object StreamingContext extends Logging {
   }
 
   private[streaming] def rddToFileName[T](prefix: String, suffix: String, time: Time): String = {
-    if (prefix == null) {
-      time.milliseconds.toString
-    } else if (suffix == null || suffix.length ==0) {
-      prefix + "-" + time.milliseconds
-    } else {
-      prefix + "-" + time.milliseconds + "." + suffix
+    var result = new StringBuilder()
+    if (prefix != null && prefix.length > 0) {
+      result = result.append(prefix).append("-")
+    }
+    result = result.append(time.milliseconds)
+    if (suffix != null && suffix.length > 0) {
+      result = result.append(".").append(suffix)
     }
+    result.toString()
   }
-}
+}
\ No newline at end of file

From 21d7bcd6975140731a85204681829eaa827cc403 Mon Sep 17 00:00:00 2001
From: bomeng <bmeng@us.ibm.com>
Date: Mon, 7 Dec 2015 19:27:19 -0800
Subject: [PATCH 2/4] add newline to fix style check

---
 .../scala/org/apache/spark/streaming/StreamingContext.scala     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
index c5b53f8963893..953d66c82e99e 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
@@ -902,4 +902,4 @@ object StreamingContext extends Logging {
     }
     result.toString()
   }
-}
\ No newline at end of file
+}

From 3a088be0fbd9db7bb7c492caaf9b94772f3507a1 Mon Sep 17 00:00:00 2001
From: bomeng <bmeng@us.ibm.com>
Date: Tue, 8 Dec 2015 10:05:21 -0800
Subject: [PATCH 3/4] use String instead StingBuilder

---
 .../org/apache/spark/streaming/StreamingContext.scala    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
index 953d66c82e99e..789828fabcf84 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
@@ -892,14 +892,13 @@ object StreamingContext extends Logging {
   }
 
   private[streaming] def rddToFileName[T](prefix: String, suffix: String, time: Time): String = {
-    var result = new StringBuilder()
+    var result = time.milliseconds.toString
     if (prefix != null && prefix.length > 0) {
-      result = result.append(prefix).append("-")
+      result = prefix + "-" + result
     }
-    result = result.append(time.milliseconds)
     if (suffix != null && suffix.length > 0) {
-      result = result.append(".").append(suffix)
+      result = result + "." + suffix
     }
-    result.toString()
+    result
   }
 }

From 4d82c43725885050d16d6950451d5601d995f29c Mon Sep 17 00:00:00 2001
From: bomeng <bmeng@us.ibm.com>
Date: Tue, 8 Dec 2015 14:29:30 -0800
Subject: [PATCH 4/4] use string interpolation

---
 .../scala/org/apache/spark/streaming/StreamingContext.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
index 789828fabcf84..b24c0d067bb05 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
@@ -894,10 +894,10 @@ object StreamingContext extends Logging {
   private[streaming] def rddToFileName[T](prefix: String, suffix: String, time: Time): String = {
     var result = time.milliseconds.toString
     if (prefix != null && prefix.length > 0) {
-      result = prefix + "-" + result
+      result = s"$prefix-$result"
     }
     if (suffix != null && suffix.length > 0) {
-      result = result + "." + suffix
+      result = s"$result.$suffix"
     }
     result
   }