diff options
author | Yin Huai <yhuai@databricks.com> | 2016-01-15 13:17:29 -0800 |
---|---|---|
committer | Yin Huai <yhuai@databricks.com> | 2016-01-15 13:17:29 -0800 |
commit | 513266c0426faf8b9cc7576963bb9a57d2fdbc54 (patch) | |
tree | 678473a9e9e8aa0560e20c3db424967127e3ccd6 | |
parent | ad1503f92e1f6e960a24f9f5d36b1735d1f5073a (diff) | |
download | spark-513266c0426faf8b9cc7576963bb9a57d2fdbc54.tar.gz spark-513266c0426faf8b9cc7576963bb9a57d2fdbc54.tar.bz2 spark-513266c0426faf8b9cc7576963bb9a57d2fdbc54.zip |
[SPARK-12833][HOT-FIX] Fix scala 2.11 compilation.
Seems https://github.com/apache/spark/commit/5f83c6991c95616ecbc2878f8860c69b2826f56c breaks scala 2.11 compilation.
Author: Yin Huai <yhuai@databricks.com>
Closes #10774 from yhuai/fixScala211Compile.
-rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVParameters.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVParameters.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVParameters.scala index ba44121244..ec16bdbd8b 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVParameters.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVParameters.scala @@ -27,7 +27,7 @@ private[sql] case class CSVParameters(parameters: Map[String, String]) extends L val paramValue = parameters.get(paramName) paramValue match { case None => default - case Some(value) if value.length == 0 => '\0' + case Some(value) if value.length == 0 => '\u0000' case Some(value) if value.length == 1 => value.charAt(0) case _ => throw new RuntimeException(s"$paramName cannot be more than one character") } @@ -50,7 +50,7 @@ private[sql] case class CSVParameters(parameters: Map[String, String]) extends L val quote = getChar("quote", '\"') val escape = getChar("escape", '\\') - val comment = getChar("comment", '\0') + val comment = getChar("comment", '\u0000') val headerFlag = getBool("header") val inferSchemaFlag = getBool("inferSchema") @@ -77,7 +77,7 @@ private[sql] case class CSVParameters(parameters: Map[String, String]) extends L val inputBufferSize = 128 - val isCommentSet = this.comment != '\0' + val isCommentSet = this.comment != '\u0000' val rowSeparator = "\n" } |