From 540b5aeadc84d1a5d61bda4414abd6bf35dc7ff9 Mon Sep 17 00:00:00 2001
From: Shixiong Zhu <shixiong@databricks.com>
Date: Thu, 17 Dec 2015 13:23:48 -0800
Subject: [PATCH] [SPARK-12410][STREAMING] Fix places that use '.' and '|'
directly in split
String.split accepts a regular expression, so we should escape "." and "|".
Author: Shixiong Zhu <shixiong@databricks.com>
Closes #10361 from zsxwing/reg-bug.
---
.../main/scala/org/apache/spark/examples/ml/MovieLensALS.scala | 2 +-
.../apache/spark/streaming/util/FileBasedWriteAheadLog.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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
index 3ae53e57db..02ed746954 100644
--- 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
index a99b570835..b946e0d8e9 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala
@@ -253,7 +253,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 */
--
GitLab