[SPARK-12410][STREAMING] Fix places that use '.' and '|' directly in split

zsxwing · zsxwing · commit a8d14cc06232 · 2015-12-17T13:24:08.000-08:00
String.split accepts a regular expression, so we should escape "." and "|". Author: Shixiong Zhu <shixiong@databricks.com> Closes apache#10361 from zsxwing/reg-bug. (cherry picked from commit 540b5ae) Signed-off-by: Shixiong Zhu <shixiong@databricks.com>
diff --git a/examples/src/main/scala/org/apache/spark/examples/ml/MovieLensALS.scala b/examples/src/main/scala/org/apache/spark/examples/ml/MovieLensALS.scala
@@ -50,7 +50,7 @@ object MovieLensALS {
     def parseMovie(str: String): Movie = {
       val fields = str.split("::")
       assert(fields.size == 3)
-      Movie(fields(0).toInt, fields(1), fields(2).split("|"))
+      Movie(fields(0).toInt, fields(1), fields(2).split("\\|"))
     }
   }
 
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala b/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala
@@ -231,7 +231,7 @@ private[streaming] object FileBasedWriteAheadLog {
 
   def getCallerName(): Option[String] = {
     val stackTraceClasses = Thread.currentThread.getStackTrace().map(_.getClassName)
-    stackTraceClasses.find(!_.contains("WriteAheadLog")).flatMap(_.split(".").lastOption)
+    stackTraceClasses.find(!_.contains("WriteAheadLog")).flatMap(_.split("\\.").lastOption)
   }
 
   /** Convert a sequence of files to a sequence of sorted LogInfo objects */

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ object MovieLensALS {`
`50`	`50`	`def parseMovie(str: String): Movie = {`
`51`	`51`	`val fields = str.split("::")`
`52`	`52`	`assert(fields.size == 3)`
`53`		`- Movie(fields(0).toInt, fields(1), fields(2).split("\|"))`
	`53`	`+ Movie(fields(0).toInt, fields(1), fields(2).split("\\\|"))`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ private[streaming] object FileBasedWriteAheadLog {`
`231`	`231`
`232`	`232`	`def getCallerName(): Option[String] = {`
`233`	`233`	`val stackTraceClasses = Thread.currentThread.getStackTrace().map(_.getClassName)`
`234`		`- stackTraceClasses.find(!_.contains("WriteAheadLog")).flatMap(_.split(".").lastOption)`
	`234`	`+ stackTraceClasses.find(!_.contains("WriteAheadLog")).flatMap(_.split("\\.").lastOption)`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`/** Convert a sequence of files to a sequence of sorted LogInfo objects */`