[kylin] branch kylin-on-parquet-v2 updated: Minor, fix replace-jars-under-spark.sh

[xxyu]

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

xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this 
push:
     new 76492b5  Minor, fix replace-jars-under-spark.sh
76492b5 is described below

commit 76492b5b0eea24aba0665a5b9b76476abe547c40
Author: XiaoxiangYu <x...@apache.org>
AuthorDate: Thu Jan 21 14:36:59 2021 +0800

    Minor, fix replace-jars-under-spark.sh
---
 build/bin/replace-jars-under-spark.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/build/bin/replace-jars-under-spark.sh 
b/build/bin/replace-jars-under-spark.sh
index 0c5a8cc..01f9854 100644
--- a/build/bin/replace-jars-under-spark.sh
+++ b/build/bin/replace-jars-under-spark.sh
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+# check 
https://cwiki.apache.org/confluence/display/KYLIN/Deploy+Kylin+4+on+CDH+6
+
 BYPASS=${KYLIN_HOME}/spark/jars/replace-jars-bypass
 cdh_mapreduce_path="/opt/cloudera/parcels/CDH/lib/hadoop-mapreduce"
 hadoop_lib_path="/usr/lib/hadoop"
@@ -119,8 +121,15 @@ if [ $is_cdh6 == 1 ]; then
   find ${KYLIN_HOME}/spark/jars -name "hadoop-hdfs-*.jar" -exec rm -f {} \;
   find ${KYLIN_HOME}/spark/jars -name "hadoop-yarn-*.jar" -exec rm -f {} \;
   find ${KYLIN_HOME}/spark/jars -name "hadoop-mapreduce-*.jar" -exec rm -f {} 
\;
+  find ${KYLIN_HOME}/spark/jars -name "hadoop-annotations-*.jar" -exec rm -f 
{} \;
+  find ${KYLIN_HOME}/spark/jars -name "hadoop-auth-*.jar" -exec rm -f {} \;
+  find ${KYLIN_HOME}/spark/jars -name "hadoop-client-*.jar" -exec rm -f {} \;
+  find ${KYLIN_HOME}/spark/jars -name "hadoop-common-*.jar" -exec rm -f {} \;
   find ${KYLIN_HOME}/spark/jars -name "hive-exec-*.jar" -exec rm -f {} \;
-#  cp ${KYLIN_HOME}/bin/hadoop3_jars/cdh6/*.jar ${SPARK_HOME}/jars
+  if [ -d "${KYLIN_HOME}/bin/hadoop3_jars/cdh6" ]; then
+    echo "Copy jars from ${KYLIN_HOME}/bin/hadoop3_jars/cdh6"
+    cp ${KYLIN_HOME}/bin/hadoop3_jars/cdh6/*.jar ${SPARK_HOME}/jars
+  fi
 fi
 
 for jar_file in ${jar_list}; do