You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/12/10 13:54:02 UTC
spark git commit: [SPARK-12136][STREAMING] rddToFileName does not
properly handle prefix and suffix parameters
Repository: spark
Updated Branches:
refs/heads/master d8ec081c9 -> e29704f90
[SPARK-12136][STREAMING] rddToFileName does not properly handle prefix and suffix parameters
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 <bm...@us.ibm.com>
Author: Bo Meng <me...@bos-macbook-pro.usca.ibm.com>
Closes #10185 from bomeng/SPARK-12136.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e29704f9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e29704f9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e29704f9
Branch: refs/heads/master
Commit: e29704f90dfe67d9e276d242699ac0a00f64fb91
Parents: d8ec081
Author: bomeng <bm...@us.ibm.com>
Authored: Thu Dec 10 12:53:53 2015 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Thu Dec 10 12:53:53 2015 +0000
----------------------------------------------------------------------
.../org/apache/spark/streaming/StreamingContext.scala | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/e29704f9/streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala
----------------------------------------------------------------------
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 cf843e3..b24c0d0 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,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
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org