From 0c33fcf41d97f7db01c32b3510c8d374a63f53e4 Mon Sep 17 00:00:00 2001 From: tobe Date: Fri, 26 Apr 2024 12:18:39 +0800 Subject: [PATCH 1/5] Set s3 and aws dependencies ad provided (#3897) --- java/openmldb-batch/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/java/openmldb-batch/pom.xml b/java/openmldb-batch/pom.xml index b69f58abc2b..b4de36a3122 100644 --- a/java/openmldb-batch/pom.xml +++ b/java/openmldb-batch/pom.xml @@ -241,6 +241,7 @@ org.apache.hadoop hadoop-aws ${hadoop.version} + provided From 208b4f947faa009f66b74fbf27a605b4dbd96ce2 Mon Sep 17 00:00:00 2001 From: aceforeverd Date: Fri, 26 Apr 2024 12:23:48 +0800 Subject: [PATCH 2/5] build: bump 0.9.0 --- CMakeLists.txt | 4 ++-- java/hybridse-native/pom.xml | 2 +- java/hybridse-proto/pom.xml | 2 +- java/hybridse-sdk/pom.xml | 2 +- java/openmldb-batch/pom.xml | 2 +- java/openmldb-batchjob/pom.xml | 2 +- java/openmldb-common/pom.xml | 2 +- java/openmldb-jdbc/pom.xml | 2 +- java/openmldb-native/pom.xml | 2 +- java/openmldb-spark-connector/pom.xml | 2 +- java/openmldb-synctool/pom.xml | 2 +- java/openmldb-taskmanager/pom.xml | 2 +- java/pom.xml | 4 ++-- python/openmldb_sdk/setup.py | 2 +- python/openmldb_tool/setup.py | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ac375c1d9e..81cd36a375a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ endif() message (STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") set(OPENMLDB_VERSION_MAJOR 0) -set(OPENMLDB_VERSION_MINOR 8) -set(OPENMLDB_VERSION_BUG 6) +set(OPENMLDB_VERSION_MINOR 9) +set(OPENMLDB_VERSION_BUG 0) function(get_commitid CODE_DIR COMMIT_ID) find_package(Git REQUIRED) diff --git a/java/hybridse-native/pom.xml b/java/hybridse-native/pom.xml index 632f3fe04a4..e6e786ce5ac 100644 --- a/java/hybridse-native/pom.xml +++ b/java/hybridse-native/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 ../pom.xml 4.0.0 diff --git a/java/hybridse-proto/pom.xml b/java/hybridse-proto/pom.xml index e179740a4ec..cbfebe70f4f 100644 --- a/java/hybridse-proto/pom.xml +++ b/java/hybridse-proto/pom.xml @@ -4,7 +4,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 ../pom.xml 4.0.0 diff --git a/java/hybridse-sdk/pom.xml b/java/hybridse-sdk/pom.xml index 34d9e34e37e..72ad352fb93 100644 --- a/java/hybridse-sdk/pom.xml +++ b/java/hybridse-sdk/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 ../pom.xml 4.0.0 diff --git a/java/openmldb-batch/pom.xml b/java/openmldb-batch/pom.xml index b4de36a3122..09ca222034c 100644 --- a/java/openmldb-batch/pom.xml +++ b/java/openmldb-batch/pom.xml @@ -7,7 +7,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 openmldb-batch diff --git a/java/openmldb-batchjob/pom.xml b/java/openmldb-batchjob/pom.xml index 101758c60dc..b6074cc648e 100644 --- a/java/openmldb-batchjob/pom.xml +++ b/java/openmldb-batchjob/pom.xml @@ -7,7 +7,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 openmldb-batchjob diff --git a/java/openmldb-common/pom.xml b/java/openmldb-common/pom.xml index d19b9cac681..c4ad2e2e6eb 100644 --- a/java/openmldb-common/pom.xml +++ b/java/openmldb-common/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 4.0.0 openmldb-common diff --git a/java/openmldb-jdbc/pom.xml b/java/openmldb-jdbc/pom.xml index dca8db69e79..456fa6ca5e7 100644 --- a/java/openmldb-jdbc/pom.xml +++ b/java/openmldb-jdbc/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 ../pom.xml 4.0.0 diff --git a/java/openmldb-native/pom.xml b/java/openmldb-native/pom.xml index 214a918f7b6..3906330d3f4 100644 --- a/java/openmldb-native/pom.xml +++ b/java/openmldb-native/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 ../pom.xml 4.0.0 diff --git a/java/openmldb-spark-connector/pom.xml b/java/openmldb-spark-connector/pom.xml index 574e8ddbf84..c7a9bda0348 100644 --- a/java/openmldb-spark-connector/pom.xml +++ b/java/openmldb-spark-connector/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 openmldb-spark-connector diff --git a/java/openmldb-synctool/pom.xml b/java/openmldb-synctool/pom.xml index d752ce6d41b..e1eadef191a 100644 --- a/java/openmldb-synctool/pom.xml +++ b/java/openmldb-synctool/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 openmldb-synctool openmldb-synctool diff --git a/java/openmldb-taskmanager/pom.xml b/java/openmldb-taskmanager/pom.xml index 34039fb642a..309b51224a4 100644 --- a/java/openmldb-taskmanager/pom.xml +++ b/java/openmldb-taskmanager/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.8.6-SNAPSHOT + 0.9.0 openmldb-taskmanager openmldb-taskmanager diff --git a/java/pom.xml b/java/pom.xml index 7435a8cdfee..2e10fb4910e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -7,7 +7,7 @@ openmldb-parent pom openmldb - 0.8.6-SNAPSHOT + 0.9.0 hybridse-sdk hybridse-native @@ -65,7 +65,7 @@ - 0.8.6-SNAPSHOT + 0.9.0 error 2.9.0 diff --git a/python/openmldb_sdk/setup.py b/python/openmldb_sdk/setup.py index fa92ff71911..aaf2025ee18 100644 --- a/python/openmldb_sdk/setup.py +++ b/python/openmldb_sdk/setup.py @@ -18,7 +18,7 @@ setup( name='openmldb', - version='0.8.6a0', + version='0.9.0', author='OpenMLDB Team', author_email=' ', url='https://github.com/4paradigm/OpenMLDB', diff --git a/python/openmldb_tool/setup.py b/python/openmldb_tool/setup.py index e36856f8d37..d5e361cd6a7 100644 --- a/python/openmldb_tool/setup.py +++ b/python/openmldb_tool/setup.py @@ -18,7 +18,7 @@ setup( name="openmldb-tool", - version='0.8.6a0', + version='0.9.0', author="OpenMLDB Team", author_email=" ", url="https://github.com/4paradigm/OpenMLDB", From 2bc38dd5e92097dee2d5eaeb42ac120df54f4462 Mon Sep 17 00:00:00 2001 From: tobe Date: Fri, 26 Apr 2024 19:46:33 +0800 Subject: [PATCH 3/5] feat: execlude zookeeper for curator (#3899) * Execlude zookeeper when using curator * Fix local build java --- java/openmldb-batch/pom.xml | 12 +++++++++- java/openmldb-common/pom.xml | 6 +++++ java/openmldb-taskmanager/pom.xml | 9 +++++--- .../taskmanager/server/JobResultSaver.java | 22 +++++++++---------- .../taskmanager/zk/RecoverableZooKeeper.java | 2 +- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/java/openmldb-batch/pom.xml b/java/openmldb-batch/pom.xml index 09ca222034c..9f38b8d86d8 100644 --- a/java/openmldb-batch/pom.xml +++ b/java/openmldb-batch/pom.xml @@ -167,7 +167,11 @@ - + + org.apache.zookeeper + zookeeper + 3.4.14 + org.apache.curator curator-framework @@ -182,6 +186,12 @@ org.apache.curator curator-recipes 4.2.0 + + + org.apache.zookeeper + zookeeper + + diff --git a/java/openmldb-common/pom.xml b/java/openmldb-common/pom.xml index c4ad2e2e6eb..da240a18783 100644 --- a/java/openmldb-common/pom.xml +++ b/java/openmldb-common/pom.xml @@ -40,6 +40,12 @@ org.apache.curator curator-recipes 4.2.0 + + + org.apache.zookeeper + zookeeper + + org.testng diff --git a/java/openmldb-taskmanager/pom.xml b/java/openmldb-taskmanager/pom.xml index 309b51224a4..59573b4320b 100644 --- a/java/openmldb-taskmanager/pom.xml +++ b/java/openmldb-taskmanager/pom.xml @@ -134,6 +134,12 @@ org.apache.curator curator-recipes 4.2.0 + + + org.apache.zookeeper + zookeeper + + org.projectlombok @@ -142,9 +148,6 @@ provided - - - io.fabric8 diff --git a/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/server/JobResultSaver.java b/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/server/JobResultSaver.java index 570bc035603..0e9825d0423 100644 --- a/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/server/JobResultSaver.java +++ b/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/server/JobResultSaver.java @@ -53,7 +53,7 @@ */ @Slf4j public class JobResultSaver { - private static final Log log = LogFactory.getLog(JobResultSaver.class); + private static final Log logger = LogFactory.getLog(JobResultSaver.class); // false: unused, true: using // 0: unused, 1: saving, 2: finished but still in use @@ -92,8 +92,8 @@ public String genUniqueFileName() { public boolean saveFile(int resultId, String jsonData) { // No need to wait, cuz id status must have been changed by genResultId before. // It's a check. - if (log.isDebugEnabled()) { - log.debug("save result " + resultId + ", data " + jsonData); + if (logger.isDebugEnabled()) { + logger.debug("save result " + resultId + ", data " + jsonData); } int status = idStatus.get(resultId); if (status != 1) { @@ -105,7 +105,7 @@ public boolean saveFile(int resultId, String jsonData) { idStatus.set(resultId, 2); idStatus.notifyAll(); } - log.info("saved all result of result " + resultId); + logger.info("saved all result of result " + resultId); return true; } // save to /tmp_result// @@ -114,7 +114,7 @@ public boolean saveFile(int resultId, String jsonData) { File saveP = new File(savePath); if (!saveP.exists()) { boolean res = saveP.mkdirs(); - log.info("create save path " + savePath + ", status " + res); + logger.info("create save path " + savePath + ", status " + res); } } String fileFullPath = String.format("%s/%s", savePath, genUniqueFileName()); @@ -125,7 +125,7 @@ public boolean saveFile(int resultId, String jsonData) { + fileFullPath); } } catch (IOException e) { - log.error("create file failed, path " + fileFullPath, e); + logger.error("create file failed, path " + fileFullPath, e); return false; } @@ -135,7 +135,7 @@ public boolean saveFile(int resultId, String jsonData) { } catch (IOException e) { // Write failed, we'll lost a part of result, but it's ok for show sync job // output. So we just log it, and response the http request. - log.error("write result to file failed, path " + fileFullPath, e); + logger.error("write result to file failed, path " + fileFullPath, e); return false; } return true; @@ -151,7 +151,7 @@ public String readResult(int resultId, long timeoutMs) throws InterruptedExcepti } } if (idStatus.get(resultId) != 2) { - log.warn("read result timeout, result saving may be still running, try read anyway, id " + resultId); + logger.warn("read result timeout, result saving may be still running, try read anyway, id " + resultId); } String output = ""; // all finished, read csv from savePath @@ -163,7 +163,7 @@ public String readResult(int resultId, long timeoutMs) throws InterruptedExcepti output = printFilesTostr(savePath); FileUtils.forceDelete(saveP); } else { - log.info("empty result for " + resultId + ", show empty string"); + logger.info("empty result for " + resultId + ", show empty string"); } // reset id synchronized (idStatus) { @@ -189,7 +189,7 @@ public String printFilesTostr(String fileDir) { } return stringWriter.toString(); } catch (Exception e) { - log.warn("read result met exception when read " + fileDir + ", " + e.getMessage()); + logger.warn("read result met exception when read " + fileDir + ", " + e.getMessage()); e.printStackTrace(); return "read met exception, check the taskmanager log"; } @@ -219,7 +219,7 @@ private void printFile(String file, StringWriter stringWriter, boolean printHead csvPrinter.printRecord(iter.next()); } } catch (Exception e) { - log.warn("error when print result file " + file + ", ignore it"); + logger.warn("error when print result file " + file + ", ignore it"); e.printStackTrace(); } } diff --git a/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/zk/RecoverableZooKeeper.java b/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/zk/RecoverableZooKeeper.java index 9ff2b9349b4..10bc226ef50 100644 --- a/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/zk/RecoverableZooKeeper.java +++ b/java/openmldb-taskmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/zk/RecoverableZooKeeper.java @@ -62,7 +62,7 @@ public class RecoverableZooKeeper { private final String quorumServers; private final int maxMultiSize; // unused now - @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DE_MIGHT_IGNORE", justification = "None. Its always been this way.") + //@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DE_MIGHT_IGNORE", justification = "None. Its always been this way.") public RecoverableZooKeeper(String quorumServers, int sessionTimeout, Watcher watcher) throws IOException { // TODO: Add support for zk 'chroot'; we don't add it to the quorumServers // String as we should. From d32131a0811dbeba4a32323bed23cfa439fbf519 Mon Sep 17 00:00:00 2001 From: tobe Date: Wed, 15 May 2024 14:58:04 +0800 Subject: [PATCH 4/5] Update version with steps/post_release.sh --- CMakeLists.txt | 2 +- demo/Dockerfile | 2 +- java/hybridse-native/pom.xml | 2 +- java/hybridse-proto/pom.xml | 2 +- java/hybridse-sdk/pom.xml | 2 +- java/openmldb-batch/pom.xml | 2 +- java/openmldb-batchjob/pom.xml | 2 +- java/openmldb-common/pom.xml | 2 +- java/openmldb-jdbc/pom.xml | 2 +- java/openmldb-native/pom.xml | 2 +- java/openmldb-spark-connector/pom.xml | 2 +- java/openmldb-synctool/pom.xml | 2 +- java/openmldb-taskmanager/pom.xml | 2 +- java/pom.xml | 4 ++-- python/openmldb_sdk/setup.py | 2 +- python/openmldb_tool/setup.py | 2 +- test/integration-test/openmldb-test-python/install.sh | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81cd36a375a..7fc334f8566 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ message (STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") set(OPENMLDB_VERSION_MAJOR 0) set(OPENMLDB_VERSION_MINOR 9) -set(OPENMLDB_VERSION_BUG 0) +set(OPENMLDB_VERSION_BUG 1) function(get_commitid CODE_DIR COMMIT_ID) find_package(Git REQUIRED) diff --git a/demo/Dockerfile b/demo/Dockerfile index 90e4317d5b2..356112f497c 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -25,7 +25,7 @@ COPY *_dist.yml /work/ ENV LANG=en_US.UTF-8 ENV SPARK_HOME=/work/openmldb/spark-3.2.1-bin-openmldbspark -ARG OPENMLDB_VERSION=0.8.5 +ARG OPENMLDB_VERSION=0.9.0 ENV OPENMLDB_VERSION="${OPENMLDB_VERSION}" RUN if [ "${USE_ADD_WHL}" = "true" ] ; then \ diff --git a/java/hybridse-native/pom.xml b/java/hybridse-native/pom.xml index e6e786ce5ac..ba85e0169a0 100644 --- a/java/hybridse-native/pom.xml +++ b/java/hybridse-native/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/hybridse-proto/pom.xml b/java/hybridse-proto/pom.xml index cbfebe70f4f..4bd333cb322 100644 --- a/java/hybridse-proto/pom.xml +++ b/java/hybridse-proto/pom.xml @@ -4,7 +4,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/hybridse-sdk/pom.xml b/java/hybridse-sdk/pom.xml index 72ad352fb93..ed8911fa572 100644 --- a/java/hybridse-sdk/pom.xml +++ b/java/hybridse-sdk/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/openmldb-batch/pom.xml b/java/openmldb-batch/pom.xml index 9f38b8d86d8..8c0371e227a 100644 --- a/java/openmldb-batch/pom.xml +++ b/java/openmldb-batch/pom.xml @@ -7,7 +7,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT openmldb-batch diff --git a/java/openmldb-batchjob/pom.xml b/java/openmldb-batchjob/pom.xml index b6074cc648e..e449320d012 100644 --- a/java/openmldb-batchjob/pom.xml +++ b/java/openmldb-batchjob/pom.xml @@ -7,7 +7,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT openmldb-batchjob diff --git a/java/openmldb-common/pom.xml b/java/openmldb-common/pom.xml index da240a18783..6be5746496c 100644 --- a/java/openmldb-common/pom.xml +++ b/java/openmldb-common/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT 4.0.0 openmldb-common diff --git a/java/openmldb-jdbc/pom.xml b/java/openmldb-jdbc/pom.xml index 456fa6ca5e7..f51395b9ac0 100644 --- a/java/openmldb-jdbc/pom.xml +++ b/java/openmldb-jdbc/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/openmldb-native/pom.xml b/java/openmldb-native/pom.xml index 3906330d3f4..ed3c45fae8b 100644 --- a/java/openmldb-native/pom.xml +++ b/java/openmldb-native/pom.xml @@ -5,7 +5,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/openmldb-spark-connector/pom.xml b/java/openmldb-spark-connector/pom.xml index c7a9bda0348..529618163e0 100644 --- a/java/openmldb-spark-connector/pom.xml +++ b/java/openmldb-spark-connector/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT openmldb-spark-connector diff --git a/java/openmldb-synctool/pom.xml b/java/openmldb-synctool/pom.xml index e1eadef191a..bbdb1aa1fa8 100644 --- a/java/openmldb-synctool/pom.xml +++ b/java/openmldb-synctool/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT openmldb-synctool openmldb-synctool diff --git a/java/openmldb-taskmanager/pom.xml b/java/openmldb-taskmanager/pom.xml index 59573b4320b..6fee727ff3e 100644 --- a/java/openmldb-taskmanager/pom.xml +++ b/java/openmldb-taskmanager/pom.xml @@ -6,7 +6,7 @@ openmldb-parent com.4paradigm.openmldb - 0.9.0 + 0.9.1-SNAPSHOT openmldb-taskmanager openmldb-taskmanager diff --git a/java/pom.xml b/java/pom.xml index 2e10fb4910e..999ae2b8bae 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -7,7 +7,7 @@ openmldb-parent pom openmldb - 0.9.0 + 0.9.1-SNAPSHOT hybridse-sdk hybridse-native @@ -65,7 +65,7 @@ - 0.9.0 + 0.9.1-SNAPSHOT error 2.9.0 diff --git a/python/openmldb_sdk/setup.py b/python/openmldb_sdk/setup.py index aaf2025ee18..c682cc0c49f 100644 --- a/python/openmldb_sdk/setup.py +++ b/python/openmldb_sdk/setup.py @@ -18,7 +18,7 @@ setup( name='openmldb', - version='0.9.0', + version='0.9.1a0', author='OpenMLDB Team', author_email=' ', url='https://github.com/4paradigm/OpenMLDB', diff --git a/python/openmldb_tool/setup.py b/python/openmldb_tool/setup.py index d5e361cd6a7..d43a21c1c70 100644 --- a/python/openmldb_tool/setup.py +++ b/python/openmldb_tool/setup.py @@ -18,7 +18,7 @@ setup( name="openmldb-tool", - version='0.9.0', + version='0.9.1a0', author="OpenMLDB Team", author_email=" ", url="https://github.com/4paradigm/OpenMLDB", diff --git a/test/integration-test/openmldb-test-python/install.sh b/test/integration-test/openmldb-test-python/install.sh index cedff8afcb6..2b0da3d28b9 100644 --- a/test/integration-test/openmldb-test-python/install.sh +++ b/test/integration-test/openmldb-test-python/install.sh @@ -17,7 +17,7 @@ set -eE -x CURRENT_DIR=$(dirname "$0") -SPARK_VERSION=0.8.5 +SPARK_VERSION=0.9.0 pushd "${CURRENT_DIR}" cp -r ../../../openmldb ./ sed -i"" -e "s/OPENMLDB_MODE:=standalone/OPENMLDB_MODE:=cluster/g" openmldb/conf/openmldb-env.sh From dc17e4a4cccfe69d6a17f873339640180f0d202f Mon Sep 17 00:00:00 2001 From: tobe Date: Wed, 15 May 2024 16:10:46 +0800 Subject: [PATCH 5/5] Reset openmldb version to 085 for openmldb test python --- test/integration-test/openmldb-test-python/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration-test/openmldb-test-python/install.sh b/test/integration-test/openmldb-test-python/install.sh index 2b0da3d28b9..cedff8afcb6 100644 --- a/test/integration-test/openmldb-test-python/install.sh +++ b/test/integration-test/openmldb-test-python/install.sh @@ -17,7 +17,7 @@ set -eE -x CURRENT_DIR=$(dirname "$0") -SPARK_VERSION=0.9.0 +SPARK_VERSION=0.8.5 pushd "${CURRENT_DIR}" cp -r ../../../openmldb ./ sed -i"" -e "s/OPENMLDB_MODE:=standalone/OPENMLDB_MODE:=cluster/g" openmldb/conf/openmldb-env.sh