You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2017/01/24 07:55:29 UTC
spark git commit: [SPARK-16101][HOTFIX] Fix the build with Scala 2.10
by explicit typed argument
Repository: spark
Updated Branches:
refs/heads/master 60bd91a34 -> ec9493b44
[SPARK-16101][HOTFIX] Fix the build with Scala 2.10 by explicit typed argument
## What changes were proposed in this pull request?
I goofed in https://github.com/apache/spark/pull/16669 which introduces the break in scala 2.10.
This fixes
```bash
[error] /home/jenkins/workspace/spark-master-compile-sbt-scala-2.10/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala:65: polymorphic expression cannot be instantiated to expected type;
[error] found : [B >: org.apache.spark.sql.types.StructField](B, Int) => Int
[error] required: org.apache.spark.sql.types.StructField => ?
[error] fields.map(schema.indexOf).toArray
[error] ^
[error] one error found
[error] (sql/compile:compileIncremental) Compilation failed
```
## How was this patch tested?
Manually via
```bash
./dev/change-scala-version.sh 2.10
./build/mvn -Pyarn -Phadoop-2.4 -Dscala-2.10 -DskipTests clean package
```
```
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Spark Project Parent POM ........................... SUCCESS [ 2.719 s]
[INFO] Spark Project Tags ................................. SUCCESS [ 3.441 s]
[INFO] Spark Project Sketch ............................... SUCCESS [ 3.411 s]
[INFO] Spark Project Networking ........................... SUCCESS [ 5.088 s]
[INFO] Spark Project Shuffle Streaming Service ............ SUCCESS [ 5.131 s]
[INFO] Spark Project Unsafe ............................... SUCCESS [ 5.813 s]
[INFO] Spark Project Launcher ............................. SUCCESS [ 6.567 s]
[INFO] Spark Project Core ................................. SUCCESS [01:39 min]
[INFO] Spark Project ML Local Library ..................... SUCCESS [ 6.644 s]
[INFO] Spark Project GraphX ............................... SUCCESS [ 11.304 s]
[INFO] Spark Project Streaming ............................ SUCCESS [ 26.275 s]
[INFO] Spark Project Catalyst ............................. SUCCESS [01:04 min]
[INFO] Spark Project SQL .................................. SUCCESS [02:07 min]
[INFO] Spark Project ML Library ........................... SUCCESS [01:20 min]
[INFO] Spark Project Tools ................................ SUCCESS [ 8.755 s]
[INFO] Spark Project Hive ................................. SUCCESS [ 51.141 s]
[INFO] Spark Project REPL ................................. SUCCESS [ 13.688 s]
[INFO] Spark Project YARN Shuffle Service ................. SUCCESS [ 7.211 s]
[INFO] Spark Project YARN ................................. SUCCESS [ 10.908 s]
[INFO] Spark Project Assembly ............................. SUCCESS [ 2.940 s]
[INFO] Spark Project External Flume Sink .................. SUCCESS [ 4.386 s]
[INFO] Spark Project External Flume ....................... SUCCESS [ 8.589 s]
[INFO] Spark Project External Flume Assembly .............. SUCCESS [ 1.891 s]
[INFO] Spark Integration for Kafka 0.8 .................... SUCCESS [ 8.458 s]
[INFO] Spark Project Examples ............................. SUCCESS [ 17.706 s]
[INFO] Spark Project External Kafka Assembly .............. SUCCESS [ 3.070 s]
[INFO] Spark Integration for Kafka 0.10 ................... SUCCESS [ 11.227 s]
[INFO] Spark Integration for Kafka 0.10 Assembly .......... SUCCESS [ 2.982 s]
[INFO] Kafka 0.10 Source for Structured Streaming ......... SUCCESS [ 7.494 s]
[INFO] Spark Project Java 8 Tests ......................... SUCCESS [ 3.748 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
```
and manual test `CSVSuite` with Scala 2.11 with my IDE.
Author: hyukjinkwon <gu...@gmail.com>
Closes #16684 from HyukjinKwon/hot-fix-type-ensurance.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ec9493b4
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ec9493b4
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ec9493b4
Branch: refs/heads/master
Commit: ec9493b445cef512a3d64d6466ec7178cb01121f
Parents: 60bd91a
Author: hyukjinkwon <gu...@gmail.com>
Authored: Mon Jan 23 23:57:22 2017 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Mon Jan 23 23:57:22 2017 -0800
----------------------------------------------------------------------
.../spark/sql/execution/datasources/csv/UnivocityParser.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ec9493b4/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala
index 8bd1ba6..3b42aa6 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala
@@ -62,7 +62,7 @@ private[csv] class UnivocityParser(
} else {
requiredSchema
}
- fields.map(schema.indexOf).toArray
+ fields.map(schema.indexOf(_: StructField)).toArray
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org