[SPARK-12136][STREAMING] rddToFileName does not properly handle prefix and suffix parameters

bomeng · srowen · commit b5e5812f9ef8 · 2015-12-10T12:54:08.000Z
The original code does not properly handle the cases where the prefix is null, but suffix is not null - the suffix should be used but is not. The fix is using StringBuilder to construct the proper file name. Author: bomeng <bmeng@us.ibm.com> Author: Bo Meng <mengbo@bos-macbook-pro.usca.ibm.com> Closes apache#10185 from bomeng/SPARK-12136. (cherry picked from commit e29704f) Signed-off-by: Sean Owen <sowen@cloudera.com>
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala b/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
@@ -887,12 +887,13 @@ 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 = time.milliseconds.toString
+    if (prefix != null && prefix.length > 0) {
+      result = s"$prefix-$result"
+    }
+    if (suffix != null && suffix.length > 0) {
+      result = s"$result.$suffix"
     }
+    result
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -887,12 +887,13 @@ object StreamingContext extends Logging {`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`private[streaming] def rddToFileName[T](prefix: String, suffix: String, time: Time): String = {`
`890`		`- if (prefix == null) {`
`891`		`- time.milliseconds.toString`
`892`		`- } else if (suffix == null \|\| suffix.length ==0) {`
`893`		`- prefix + "-" + time.milliseconds`
`894`		`- } else {`
`895`		`- prefix + "-" + time.milliseconds + "." + suffix`
	`890`	`+ var result = time.milliseconds.toString`
	`891`	`+ if (prefix != null && prefix.length > 0) {`
	`892`	`+ result = s"$prefix-$result"`
	`893`	`+ }`
	`894`	`+ if (suffix != null && suffix.length > 0) {`
	`895`	`+ result = s"$result.$suffix"`
`896`	`896`	`}`
	`897`	`+ result`
`897`	`898`	`}`
`898`	`899`	`}`