spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yh...@apache.org
Subject spark git commit: [SPARK-12833][HOT-FIX] Fix scala 2.11 compilation.
Date Fri, 15 Jan 2016 21:19:35 GMT
Repository: spark
Updated Branches:
  refs/heads/master ad1503f92 -> 513266c04


[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.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/513266c0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/513266c0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/513266c0

Branch: refs/heads/master
Commit: 513266c0426faf8b9cc7576963bb9a57d2fdbc54
Parents: ad1503f
Author: Yin Huai <yhuai@databricks.com>
Authored: Fri Jan 15 13:17:29 2016 -0800
Committer: Yin Huai <yhuai@databricks.com>
Committed: Fri Jan 15 13:17:29 2016 -0800

----------------------------------------------------------------------
 .../spark/sql/execution/datasources/csv/CSVParameters.scala    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/513266c0/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVParameters.scala
----------------------------------------------------------------------
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 ba44121..ec16bdb 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"
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message