From ad57e8760bd7eae9842634b47715f464e79a28a1 Mon Sep 17 00:00:00 2001 From: Zhengshuai PENG Date: Tue, 26 Apr 2022 16:52:58 +0800 Subject: [PATCH 1/3] renaming mlsql web console to byzer web console --- streamingpro-mlsql/src/main/resources-local/rest/index.vm | 2 +- .../src/main/resources-local/streamingpro/assets/index.html | 2 +- streamingpro-mlsql/src/main/resources-online/rest/index.vm | 2 +- .../src/main/resources-online/streamingpro/assets/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/streamingpro-mlsql/src/main/resources-local/rest/index.vm b/streamingpro-mlsql/src/main/resources-local/rest/index.vm index 80f168c20..e98af763b 100644 --- a/streamingpro-mlsql/src/main/resources-local/rest/index.vm +++ b/streamingpro-mlsql/src/main/resources-local/rest/index.vm @@ -1 +1 @@ -MLSQL Web Console
\ No newline at end of file +Byzer Web Console
\ No newline at end of file diff --git a/streamingpro-mlsql/src/main/resources-local/streamingpro/assets/index.html b/streamingpro-mlsql/src/main/resources-local/streamingpro/assets/index.html index 46b29ff82..99585f4b4 100644 --- a/streamingpro-mlsql/src/main/resources-local/streamingpro/assets/index.html +++ b/streamingpro-mlsql/src/main/resources-local/streamingpro/assets/index.html @@ -1 +1 @@ -MLSQL Web Console
\ No newline at end of file +Byzer Web Console
\ No newline at end of file diff --git a/streamingpro-mlsql/src/main/resources-online/rest/index.vm b/streamingpro-mlsql/src/main/resources-online/rest/index.vm index 80f168c20..e98af763b 100644 --- a/streamingpro-mlsql/src/main/resources-online/rest/index.vm +++ b/streamingpro-mlsql/src/main/resources-online/rest/index.vm @@ -1 +1 @@ -MLSQL Web Console
\ No newline at end of file +Byzer Web Console
\ No newline at end of file diff --git a/streamingpro-mlsql/src/main/resources-online/streamingpro/assets/index.html b/streamingpro-mlsql/src/main/resources-online/streamingpro/assets/index.html index 46b29ff82..99585f4b4 100644 --- a/streamingpro-mlsql/src/main/resources-online/streamingpro/assets/index.html +++ b/streamingpro-mlsql/src/main/resources-online/streamingpro/assets/index.html @@ -1 +1 @@ -MLSQL Web Console
\ No newline at end of file +Byzer Web Console
\ No newline at end of file From 3b9a932034cd6c48ff89d60a426d0e586dec95db Mon Sep 17 00:00:00 2001 From: "jiachuan.zhu" Date: Wed, 27 Apr 2022 15:33:13 +0800 Subject: [PATCH 2/3] 1. Add nlp_seg and nlp-lang jars in libs/ directory 2. Add plugin/*.jar to driver & executor classpath --- dev/bootstrap.sh | 3 +++ streamingpro-assembly/src/main/assembly/assembly.xml | 9 ++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index cbd95efd0..5f516f2a9 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -83,6 +83,8 @@ function prepareProp() { JARS=$(echo ${BYZER_HOME}/libs/*.jar | tr ' ' ',')",$MAIN_JAR_PATH" EXT_JARS=$(echo ${BYZER_HOME}/libs/*.jar | tr ' ' ':')":$MAIN_JAR_PATH" + ## Put 3rd-third plugin jars in classpath + EXT_JARS=$(echo ${BYZER_HOME}/plugin/*.jar | tr ' ' ':')":$MAIN_JAR_PATH" BYZER_LOG_PATH="file:${BYZER_HOME}/conf/byzer-server-log4j.properties" @@ -149,6 +151,7 @@ function start(){ nohup $SPARK_HOME/bin/spark-submit --class streaming.core.StreamingApp \ --jars ${JARS} \ --conf "spark.driver.extraClassPath=${EXT_JARS}" \ + --conf "spark.executor.extraClassPath=${EXT_JARS}" \ --driver-java-options "-Dlog4j.configuration=${BYZER_LOG_PATH}" \ $SPARK_PROP \ $MAIN_JAR_PATH \ diff --git a/streamingpro-assembly/src/main/assembly/assembly.xml b/streamingpro-assembly/src/main/assembly/assembly.xml index f636167cb..7a7a260c2 100644 --- a/streamingpro-assembly/src/main/assembly/assembly.xml +++ b/streamingpro-assembly/src/main/assembly/assembly.xml @@ -32,7 +32,8 @@ ${project.parent.basedir}/dev - empty.json + ansj_seg-5.1.6.jar + nlp-lang-1.7.8.jar libs @@ -70,12 +71,6 @@ plugin - - - ${project.parent.basedir}/examples - examples - - ${project.parent.basedir}/dev/ From aa86928a78a219a7b5db3a62af319eaad61c525e Mon Sep 17 00:00:00 2001 From: "jiachuan.zhu" Date: Wed, 27 Apr 2022 17:01:27 +0800 Subject: [PATCH 3/3] 1. Add nlp_seg and nlp-lang jars in libs/ directory 2. Add plugin/*.jar to driver & executor classpath --- dev/bootstrap.sh | 2 +- dev/check-1000-os.sh | 0 streamingpro-assembly/src/main/assembly/assembly.xml | 11 ----------- 3 files changed, 1 insertion(+), 12 deletions(-) mode change 100644 => 100755 dev/check-1000-os.sh diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index 5f516f2a9..2a1eff37e 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -84,7 +84,7 @@ function prepareProp() { JARS=$(echo ${BYZER_HOME}/libs/*.jar | tr ' ' ',')",$MAIN_JAR_PATH" EXT_JARS=$(echo ${BYZER_HOME}/libs/*.jar | tr ' ' ':')":$MAIN_JAR_PATH" ## Put 3rd-third plugin jars in classpath - EXT_JARS=$(echo ${BYZER_HOME}/plugin/*.jar | tr ' ' ':')":$MAIN_JAR_PATH" + EXT_JARS=$(echo ${BYZER_HOME}/plugin/*.jar | tr ' ' ':')":$EXT_JARS" BYZER_LOG_PATH="file:${BYZER_HOME}/conf/byzer-server-log4j.properties" diff --git a/dev/check-1000-os.sh b/dev/check-1000-os.sh old mode 100644 new mode 100755 diff --git a/streamingpro-assembly/src/main/assembly/assembly.xml b/streamingpro-assembly/src/main/assembly/assembly.xml index 7a7a260c2..0a9151568 100644 --- a/streamingpro-assembly/src/main/assembly/assembly.xml +++ b/streamingpro-assembly/src/main/assembly/assembly.xml @@ -71,20 +71,9 @@ plugin - - - ${project.parent.basedir}/dev/ - - - empty.json - - data - - ${project.parent.basedir}/ - RELEASES.md README.md