[GitHub] shaofengshi closed pull request #284: KYLIN-3272 Upgrade Spark to 2.3.2

[GitBox]

shaofengshi closed pull request #284: KYLIN-3272 Upgrade Spark to 2.3.2
URL: https://github.com/apache/kylin/pull/284
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/build/script/download-spark.sh b/build/script/download-spark.sh
index ed904b54d4..1b61145180 100755
--- a/build/script/download-spark.sh
+++ b/build/script/download-spark.sh
@@ -27,8 +27,8 @@ if [[ `uname -a` =~ "Darwin" ]]; then
     alias md5cmd="md5 -q"
 fi
 
-spark_version="2.1.2"
-spark_pkg_md5="b47cf199bf78042a0471b9a5ae0ceeac"
+spark_version="2.3.2"
+spark_pkg_md5="01b3e6aef0ef574e066d15e035b9b2dd"
 
 if [ ! -f "build/spark-${spark_version}-bin-hadoop2.7.tgz" ]
 then
diff --git 
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
 
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
index a13f96ae4b..ed623d7bc7 100644
--- 
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
+++ 
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
@@ -111,6 +111,9 @@ public void registerClasses(Kryo kryo) {
         addClassQuitely(kyroClasses, 
"org.apache.spark.sql.catalyst.expressions.GenericInternalRow");
         addClassQuitely(kyroClasses, 
"org.apache.spark.unsafe.types.UTF8String");
 
+        addClassQuitely(kyroClasses, 
"org.apache.spark.internal.io.FileCommitProtocol$TaskCommitMessage");
+        addClassQuitely(kyroClasses, 
"scala.collection.immutable.Set$EmptySet$");
+
         for (Class kyroClass : kyroClasses) {
             kryo.register(kyroClass);
         }
diff --git a/pom.xml b/pom.xml
index c973d1abce..264583d048 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
     <kafka.version>1.0.0</kafka.version>
 
     <!-- Spark versions -->
-    <spark.version>2.1.2</spark.version>
+    <spark.version>2.3.2</spark.version>
     <kryo.version>4.0.0</kryo.version>
 
     <!-- mysql versions -->


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services