(kylin) branch kylin5 updated: KYLIN-5956 Download correct spark for download-spark-user.sh

[liyang]

This is an automated email from the ASF dual-hosted git repository.

liyang pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin5 by this push:
     new 928055a472 KYLIN-5956 Download correct spark for download-spark-user.sh
928055a472 is described below

commit 928055a472c0983fd153c1295b1a7df00751af45
Author: Pengfei Zhan <dethr...@gmail.com>
AuthorDate: Thu Aug 29 11:22:23 2024 +0800

    KYLIN-5956 Download correct spark for download-spark-user.sh
---
 .gitignore                        | 1 +
 build/release/compress.sh         | 2 +-
 build/release/download-spark.sh   | 1 +
 build/sbin/download-spark-user.sh | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index abae0072a8..c53cc1e7d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,6 +130,7 @@ tmp_war
 #exclusion
 !pathfinder*.jar
 VERSION
+SPARK_VERSION
 
 #hadoop files
 *.crc
diff --git a/build/release/compress.sh b/build/release/compress.sh
index 38b222cf4e..2552765bff 100755
--- a/build/release/compress.sh
+++ b/build/release/compress.sh
@@ -29,7 +29,7 @@ cd build/
 rm -rf ${package_name}
 mkdir ${package_name}
 
-cp -rf VERSION commit_SHA1 lib ${package_name}/
+cp -rf VERSION SPARK_VERSION commit_SHA1 lib ${package_name}/
 cp ../LICENSE ${package_name}/
 cp ../NOTICE ${package_name}/
 
diff --git a/build/release/download-spark.sh b/build/release/download-spark.sh
index b552e5d14c..d0cc6712a0 100755
--- a/build/release/download-spark.sh
+++ b/build/release/download-spark.sh
@@ -27,6 +27,7 @@ rm -rf build/spark
 spark_version_pom=`mvn -f pom.xml help:evaluate -Dexpression=spark.version | 
grep -E '^[0-9]+\.[0-9]+\.[0-9]+' `
 spark_pkg_name=spark-newten-"`echo ${spark_version_pom}| sed "s/-kylin//g"`"
 spark_pkg_file_name="${spark_pkg_name}.tgz"
+echo "$spark_version_pom" >  build/SPARK_VERSION
 
 echo "spark_pkg_file_name : "${spark_pkg_file_name}
 
diff --git a/build/sbin/download-spark-user.sh 
b/build/sbin/download-spark-user.sh
index 444fd70177..12a7e1bced 100755
--- a/build/sbin/download-spark-user.sh
+++ b/build/sbin/download-spark-user.sh
@@ -33,7 +33,7 @@ if [[ -d ${KYLIN_HOME}/spark ]]; then
     exit 1
 fi
 
-spark_version_in_binary=3.2.0-kylin-4.6.9.0
+spark_version_in_binary=$(cat ${KYLIN_HOME}/SPARK_VERSION)
 spark_pkg_name=spark-newten-"`echo ${spark_version_in_binary}| sed 
"s/-kylin//g"`"
 spark_pkg_file_name="${spark_pkg_name}.tgz"
 
@@ -52,7 +52,7 @@ rm -rf ${KYLIN_HOME}/spark/R
 rm -rf ${KYLIN_HOME}/spark/hive_1_2_2
 
 # Temp fix of "Cannot find catalog plugin class for catalog 'spark_catalog': 
org.apache.spark.sql.delta.catalog.DeltaCatalog"
-cp ${KYLIN_HOME}/server/jars/delta-core_2.12-2.0.2.jar 
${KYLIN_HOME}/spark/jars/
+cp ${KYLIN_HOME}/server/jars/delta-core_*.jar ${KYLIN_HOME}/spark/jars/
 cp -r ${KYLIN_HOME}/server/jars/alluxio-shaded-client-*.jar 
${KYLIN_HOME}/spark/jars/
 cp -r ${KYLIN_HOME}/server/jars/kylin-soft-affinity-cache-*.jar 
${KYLIN_HOME}/spark/jars/
 cp -r ${KYLIN_HOME}/server/jars/kylin-external-guava*.jar 
${KYLIN_HOME}/spark/jars/