[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4759 Remove hbase command from scripts in build directory

[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 64fb515  KYLIN-4759 Remove hbase command from scripts in build 
directory
64fb515 is described below

commit 64fb5150559d245ffc73070775f2c76882ef8bad
Author: yaqian.zhang <598593...@qq.com>
AuthorDate: Mon Sep 21 17:21:53 2020 +0800

    KYLIN-4759 Remove hbase command from scripts in build directory
---
 build/bin/diag.sh          | 15 +++++++++------
 build/bin/set-java-home.sh |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build/bin/diag.sh b/build/bin/diag.sh
index 491f403..384bf99 100755
--- a/build/bin/diag.sh
+++ b/build/bin/diag.sh
@@ -20,7 +20,7 @@
 source ${KYLIN_HOME:-"$(cd -P -- "$(dirname -- "$0")" && pwd 
-P)/../"}/bin/header.sh
 
 mkdir -p ${KYLIN_HOME}/logs
-
+version=`cat ${KYLIN_HOME}/VERSION | awk '{print $3}'`
 tomcat_root=${dir}/../tomcat
 export tomcat_root
 
@@ -47,20 +47,22 @@ then
     fi
 
     mkdir -p ${KYLIN_HOME}/ext
-    export 
HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
-    export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}
+    # export 
HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
+    # export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}
 
     if [ ${#patient} -eq 36 ]; then
-        hbase ${KYLIN_EXTRA_START_OPTS} \
+        java ${KYLIN_EXTRA_START_OPTS} \
         
-Dlog4j.configuration=file:${KYLIN_HOME}/conf/kylin-tools-log4j.properties \
         -Dcatalina.home=${tomcat_root} \
+        -cp 
${KYLIN_HOME}/ext/*:${KYLIN_HOME}/tool/*:${SPARK_HOME}/jars/*:${KYLIN_HOME}/conf:${hive_dependency}
 \
         org.apache.kylin.tool.JobDiagnosisInfoCLI \
         -jobId $patient \
         -destDir $destDir || exit 1
     else
-        hbase ${KYLIN_EXTRA_START_OPTS} \
+        java ${KYLIN_EXTRA_START_OPTS} \
         
-Dlog4j.configuration=file:${KYLIN_HOME}/conf/kylin-tools-log4j.properties \
         -Dcatalina.home=${tomcat_root} \
+        -cp 
${KYLIN_HOME}/ext/*:${KYLIN_HOME}/tool/*:${SPARK_HOME}/jars/*:${KYLIN_HOME}/conf:${hive_dependency}
 \
         org.apache.kylin.tool.DiagnosisInfoCLI \
         -project -all \
         -destDir $destDir || exit 1
@@ -78,9 +80,10 @@ then
     export 
HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
     export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}
 
-    hbase ${KYLIN_EXTRA_START_OPTS} \
+    java ${KYLIN_EXTRA_START_OPTS} \
       
-Dlog4j.configuration=file:${KYLIN_HOME}/conf/kylin-tools-log4j.properties \
       -Dcatalina.home=${tomcat_root} \
+      -cp 
${KYLIN_HOME}/ext/*:${KYLIN_HOME}/tool/*:${SPARK_HOME}/jars/*:${KYLIN_HOME}/conf:${hive_dependency}
 \
       "$@"
 
      exit 0
diff --git a/build/bin/set-java-home.sh b/build/bin/set-java-home.sh
index 6a50525..52dfedb 100644
--- a/build/bin/set-java-home.sh
+++ b/build/bin/set-java-home.sh
@@ -28,7 +28,7 @@ then
 fi
 
 # Validate kylin JDK version
-JAVA_VERSION=$(hbase -version 2>&1  | awk -F '"' '/version/ {print $2}' | awk 
-F "." '{print $1$2}')
+JAVA_VERSION=$(java -version 2>&1  | awk -F '"' '/version/ {print $2}' | awk 
-F "." '{print $1$2}')
 if [ "$JAVA_VERSION" -lt 18 ]
 then
     quit "Kylin requires JDK 1.8+, please install or upgrade your JDK"