[CORE] Fix cannot find spark-xsql-shell. (#35)

**What changes were proposed in this pull request?** This PR is related to #20. The PR 20 replace prefix of artifactId from spark to xsql, but forgot to update `spark-xsql` and `spark-xsql-plugin-in`. At finally, XSQL can't find the `spark-xsql-shell.jar`. Because we rename it as `xsql-shell.jar`
Qihoo360 · Sep 17, 2019 · 2ce21b0 · 2ce21b0
1 parent 0aa4cba
commit 2ce21b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bin/spark-xsql b/bin/spark-xsql
@@ -11,7 +11,7 @@ DRIVER_MEM=5G
 
 # Export this as SPARK_HOME
 export SPARK_HOME="$FWDIR"
-SPARK_HIVE_SHELL_LIB="$SPARK_HOME/jars/$(cd ${SPARK_HOME}/jars; ls *spark-xsql-shell*)"
+SPARK_HIVE_SHELL_LIB="$SPARK_HOME/jars/$(cd ${SPARK_HOME}/jars; ls *xsql-shell*)"
 export SPARK_HIVE_MANCLASS_NAME="org.apache.spark.sql.xsql.shell.SparkXSQLShell"
 
 export SPARK_CLASSPATH=$DRIVER_CLASSPATH:$SPARK_CLASSPATH
@@ -178,4 +178,4 @@ fi
 
 #SPARK_CONFS=$SPARK_CONFS" --conf spark.dynamicAllocation.enabled=true "
 SPARK_CONFS=$SPARK_CONFS" --conf spark.app.fromshell=true "
-$SPARK_HOME/bin/spark-submit $SPARK_OPTS --class "$SPARK_HIVE_MANCLASS_NAME" $SPARK_CONFS  $SPARK_HIVE_SHELL_LIB
+$SPARK_HOME/bin/spark-submit $SPARK_OPTS --class "$SPARK_HIVE_MANCLASS_NAME" $SPARK_CONFS  $SPARK_HIVE_SHELL_LIB
diff --git a/bin/spark-xsql-plugin-in b/bin/spark-xsql-plugin-in
@@ -11,7 +11,7 @@ DRIVER_MEM=5G
 
 # Export this as SPARK_HOME
 export SPARK_HOME="$FWDIR"
-SPARK_HIVE_SHELL_LIB="$SPARK_HOME/xsql-jars/$(cd ${SPARK_HOME}/xsql-jars; ls *spark-xsql-shell*)"
+SPARK_HIVE_SHELL_LIB="$SPARK_HOME/xsql-jars/$(cd ${SPARK_HOME}/xsql-jars; ls *xsql-shell*)"
 export SPARK_HIVE_MANCLASS_NAME="org.apache.spark.sql.xsql.shell.SparkXSQLShell"
 
 export SPARK_CLASSPATH=$DRIVER_CLASSPATH:$SPARK_CLASSPATH
@@ -254,4 +254,4 @@ if [ $LAUNCHER_EXIT_CODE != 0 ]; then
 fi
 
 CMD=("${CMD[@]:0:$LAST}")
-exec "${CMD[@]}"
+exec "${CMD[@]}"