Merge branch 'master' into release-2.3.0

byzer-org · Apr 27, 2022 · 9e58c6e · 9e58c6e
2 parents fc78c6b + a83410d
commit 9e58c6e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 22 deletions.
diff --git 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 ' ' ':')":$EXT_JARS"
 
     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/dev/check-1000-os.sh b/dev/check-1000-os.sh
diff --git a/streamingpro-assembly/src/main/assembly/assembly.xml b/streamingpro-assembly/src/main/assembly/assembly.xml
@@ -32,7 +32,8 @@
         <fileSet>
             <directory>${project.parent.basedir}/dev</directory>
             <includes>
-                <include>empty.json</include>
+                <include>ansj_seg-5.1.6.jar</include>
+                <include>nlp-lang-1.7.8.jar</include>
             </includes>
             <outputDirectory>libs</outputDirectory>
         </fileSet>
@@ -70,26 +71,9 @@
             <outputDirectory>plugin</outputDirectory>
         </fileSet>
 
-        <fileSet>
-            <!-- Examples -->
-            <directory>${project.parent.basedir}/examples</directory>
-            <outputDirectory>examples</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <!-- Data -->
-            <directory>${project.parent.basedir}/dev/</directory>
-            <!-- Include empty.json as a placeholder, to avoid every other files being copied -->
-            <includes>
-                <include>empty.json</include>
-            </includes>
-            <outputDirectory>data</outputDirectory>
-        </fileSet>
-
         <fileSet>
             <!-- Bylaws -->
             <directory>${project.parent.basedir}/</directory>
-            <!-- Include empty.json as a placeholder, to avoid every other files being copied -->
             <includes>
                 <include>RELEASES.md</include>
                 <include>README.md</include>

diff --git a/streamingpro-mlsql/src/main/resources-local/rest/index.vm b/streamingpro-mlsql/src/main/resources-local/rest/index.vm
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>MLSQL Web Console</title><link href=/static/css/app.547d5bbb0232849781c15d7a85c9dd4f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.e7043e827915bb862c3c.js></script><script type=text/javascript src=/static/js/app.44c1f54b7395cfee49fd.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Byzer Web Console</title><link href=/static/css/app.547d5bbb0232849781c15d7a85c9dd4f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.e7043e827915bb862c3c.js></script><script type=text/javascript src=/static/js/app.44c1f54b7395cfee49fd.js></script></body></html>
diff --git a/streamingpro-mlsql/src/main/resources-local/streamingpro/assets/index.html b/streamingpro-mlsql/src/main/resources-local/streamingpro/assets/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>MLSQL Web Console</title><link href=/static/css/app.61ee2da75fc002e22f47d5f70b881c8d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.227fabcc85b1148d80a7.js></script><script type=text/javascript src=/static/js/app.303d85c440faff98c47f.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Byzer Web Console</title><link href=/static/css/app.61ee2da75fc002e22f47d5f70b881c8d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.227fabcc85b1148d80a7.js></script><script type=text/javascript src=/static/js/app.303d85c440faff98c47f.js></script></body></html>
diff --git a/streamingpro-mlsql/src/main/resources-online/rest/index.vm b/streamingpro-mlsql/src/main/resources-online/rest/index.vm
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>MLSQL Web Console</title><link href=/static/css/app.547d5bbb0232849781c15d7a85c9dd4f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.e7043e827915bb862c3c.js></script><script type=text/javascript src=/static/js/app.44c1f54b7395cfee49fd.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Byzer Web Console</title><link href=/static/css/app.547d5bbb0232849781c15d7a85c9dd4f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.e7043e827915bb862c3c.js></script><script type=text/javascript src=/static/js/app.44c1f54b7395cfee49fd.js></script></body></html>
diff --git a/streamingpro-mlsql/src/main/resources-online/streamingpro/assets/index.html b/streamingpro-mlsql/src/main/resources-online/streamingpro/assets/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>MLSQL Web Console</title><link href=/static/css/app.61ee2da75fc002e22f47d5f70b881c8d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.227fabcc85b1148d80a7.js></script><script type=text/javascript src=/static/js/app.303d85c440faff98c47f.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Byzer Web Console</title><link href=/static/css/app.61ee2da75fc002e22f47d5f70b881c8d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.227fabcc85b1148d80a7.js></script><script type=text/javascript src=/static/js/app.303d85c440faff98c47f.js></script></body></html>