Merge branch 'main' into issue-81

4paradigm · Mar 31, 2022 · 65d716f · 65d716f
2 parents 5c5c108 + e974846
commit 65d716f
Show file tree

Hide file tree

Showing 12 changed files with 197 additions and 153 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -61,6 +61,7 @@ jobs:
           sh steps/download_openmldb_spark.sh $SPARK_HOME
           cd onebox
           bash start_onebox.sh
+          sh start_onebox.sh standalone
 
       - name: Build and Coverage
         run: |

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
@@ -91,7 +91,7 @@ jobs:
         run: |
           sh steps/ut_zookeeper.sh start
           sh steps/download_openmldb_spark.sh $SPARK_HOME
-          cd onebox && sh start_onebox.sh && cd - || exit
+          cd onebox && sh start_onebox.sh && sh start_onebox.sh standalone && cd - || exit
 
       - name: run java modules smoke test
         working-directory: java

diff --git a/docs/cn/README.md b/docs/cn/README.md
@@ -0,0 +1,2 @@
+请访问 OpenMLDB 中文文档网站：[https://openmldb.ai/docs/zh](https://openmldb.ai/docs/zh)
+
diff --git a/docs/cn/index.html b/docs/cn/index.html
diff --git a/java/openmldb-jdbc/pom.xml b/java/openmldb-jdbc/pom.xml
@@ -18,6 +18,16 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.21</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -29,13 +39,6 @@
             <version>${variant.native.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/SdkOption.java b/java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/SdkOption.java
@@ -16,50 +16,20 @@
 
 package com._4paradigm.openmldb.sdk;
 
+import lombok.Data;
+
+
+@Data
 public class SdkOption {
+//    options for cluster mode
     private String zkCluster;
     private String zkPath;
+//    options for standalone mode
+    private String host;
+    private long port;
+
     private long sessionTimeout = 10000;
     private Boolean enableDebug = false;
     private long requestTimeout = 60000;
-
-    public String getZkCluster() {
-        return zkCluster;
-    }
-
-    public void setZkCluster(String zkCluster) {
-        this.zkCluster = zkCluster;
-    }
-
-    public String getZkPath() {
-        return zkPath;
-    }
-
-    public void setZkPath(String zkPath) {
-        this.zkPath = zkPath;
-    }
-
-    public long getSessionTimeout() {
-        return sessionTimeout;
-    }
-
-    public void setSessionTimeout(long sessionTimeout) {
-        this.sessionTimeout = sessionTimeout;
-    }
-
-    public Boolean getEnableDebug() {
-        return enableDebug;
-    }
-
-    public void setEnableDebug(Boolean enableDebug) {
-        this.enableDebug = enableDebug;
-    }
-
-    public long getRequestTimeout() {
-        return requestTimeout;
-    }
-
-    public void setRequestTimeout(long requestTimeout) {
-        this.requestTimeout = requestTimeout;
-    }
+    private boolean isClusterMode = true;
 }
diff --git a/java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/impl/SqlClusterExecutor.java b/java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/impl/SqlClusterExecutor.java
@@ -25,6 +25,7 @@
 import com._4paradigm.openmldb.SQLRequestRow;
 import com._4paradigm.openmldb.SQLRouter;
 import com._4paradigm.openmldb.SQLRouterOptions;
+import com._4paradigm.openmldb.StandaloneOptions;
 import com._4paradigm.openmldb.Status;
 import com._4paradigm.openmldb.TableColumnDescPair;
 import com._4paradigm.openmldb.TableColumnDescPairVector;
@@ -61,14 +62,25 @@ public class SqlClusterExecutor implements SqlExecutor {
     public SqlClusterExecutor(SdkOption option, String libraryPath) throws SqlException {
         initJavaSdkLibrary(libraryPath);
 
-        SQLRouterOptions sqlOpt = new SQLRouterOptions();
-        sqlOpt.setSession_timeout(option.getSessionTimeout());
-        sqlOpt.setZk_cluster(option.getZkCluster());
-        sqlOpt.setZk_path(option.getZkPath());
-        sqlOpt.setEnable_debug(option.getEnableDebug());
-        sqlOpt.setRequest_timeout(option.getRequestTimeout());
-        this.sqlRouter = sql_router_sdk.NewClusterSQLRouter(sqlOpt);
-        sqlOpt.delete();
+        if (option.isClusterMode()) {
+            SQLRouterOptions sqlOpt = new SQLRouterOptions();
+            sqlOpt.setSession_timeout(option.getSessionTimeout());
+            sqlOpt.setZk_cluster(option.getZkCluster());
+            sqlOpt.setZk_path(option.getZkPath());
+            sqlOpt.setEnable_debug(option.getEnableDebug());
+            sqlOpt.setRequest_timeout(option.getRequestTimeout());
+            this.sqlRouter = sql_router_sdk.NewClusterSQLRouter(sqlOpt);
+            sqlOpt.delete();
+        } else {
+            StandaloneOptions sqlOpt = new StandaloneOptions();
+            sqlOpt.setSession_timeout(option.getSessionTimeout());
+            sqlOpt.setEnable_debug(option.getEnableDebug());
+            sqlOpt.setRequest_timeout(option.getRequestTimeout());
+            sqlOpt.setHost(option.getHost());
+            sqlOpt.setPort(option.getPort());
+            this.sqlRouter = sql_router_sdk.NewStandaloneSQLRouter(sqlOpt);
+            sqlOpt.delete();
+        }
         if (sqlRouter == null) {
             throw new SqlException("fail to create sql executor");
         }

diff --git a/java/openmldb-jdbc/src/test/java/com/_4paradigm/openmldb/jdbc/SQLRouterSmokeTest.java b/java/openmldb-jdbc/src/test/java/com/_4paradigm/openmldb/jdbc/SQLRouterSmokeTest.java
@@ -26,6 +26,7 @@
 import com._4paradigm.openmldb.sdk.SqlExecutor;
 import com._4paradigm.openmldb.sdk.impl.SqlClusterExecutor;
 import org.testng.Assert;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.testng.collections.Maps;
 
@@ -42,25 +43,38 @@
 public class SQLRouterSmokeTest {
 
     private final Random random = new Random(System.currentTimeMillis());
-    public static SqlExecutor router;
+    public static SqlExecutor clusterExecutor;
+    public static SqlExecutor standaloneExecutor;
 
     static {
         try {
             SdkOption option = new SdkOption();
             option.setZkPath(TestConfig.ZK_PATH);
             option.setZkCluster(TestConfig.ZK_CLUSTER);
             option.setSessionTimeout(200000);
-            router = new SqlClusterExecutor(option);
-            java.sql.Statement state = router.getStatement();
+            clusterExecutor = new SqlClusterExecutor(option);
+            java.sql.Statement state = clusterExecutor.getStatement();
             state.execute("SET @@execute_mode='online';");
             state.close();
+            // create standalone router
+            SdkOption standaloneOption = new SdkOption();
+            standaloneOption.setHost(TestConfig.HOST);
+            standaloneOption.setPort(TestConfig.PORT);
+            standaloneOption.setClusterMode(false);
+            standaloneOption.setSessionTimeout(20000);
+            standaloneExecutor = new SqlClusterExecutor(standaloneOption);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    @Test
-    public void testSmoke() {
+    @DataProvider(name = "executor")
+    public Object[] executor() {
+        return new Object[] {clusterExecutor, standaloneExecutor};
+    }
+
+    @Test(dataProvider = "executor")
+    public void testSmoke(SqlExecutor router) {
         try {
             String dbname = "db" + random.nextInt(100000);
             // create db
@@ -234,8 +248,8 @@ public void testSmoke() {
         }
     }
 
-    @Test
-    public void testParameterizedQueryFail() {
+    @Test(dataProvider = "executor")
+    public void testParameterizedQueryFail(SqlExecutor router) {
         try {
             String dbname = "db" + random.nextInt(100000);
             // create db
@@ -261,8 +275,8 @@ public void testParameterizedQueryFail() {
         }
     }
 
-    @Test
-    public void testInsertMeta() {
+    @Test(dataProvider = "executor")
+    public void testInsertMeta(SqlExecutor router) {
         String dbname = "db" + random.nextInt(100000);
         // create db
         router.dropDB(dbname);
@@ -302,8 +316,8 @@ public void testInsertMeta() {
 
     }
 
-    @Test
-    public void testInsertPreparedState() {
+    @Test(dataProvider = "executor")
+    public void testInsertPreparedState(SqlExecutor router) {
         try {
             String dbname = "db" + random.nextInt(100000);
             // create db
@@ -429,8 +443,8 @@ public void testInsertPreparedState() {
         }
     }
 
-    @Test
-    public void testInsertPreparedStateBatch() {
+    @Test(dataProvider = "executor")
+    public void testInsertPreparedStateBatch(SqlExecutor router) {
         Object[][] batchData = new Object[][]{
                 {
                         "insert into tsql1010 values(?, ?, 'zhao', 1.0, null, 'z');",
@@ -563,8 +577,8 @@ public void testInsertPreparedStateBatch() {
         }
     }
 
-    @Test
-    public void testDDLParseMethods() throws SQLException {
+    @Test(dataProvider = "executor")
+    public void testDDLParseMethods(SqlExecutor router) throws SQLException {
         Map<String, Map<String, Schema>> schemaMaps = new HashMap<>();
         Schema sch = new Schema(Collections.singletonList(new Column("c1", Types.VARCHAR)));
         Map<String, Schema> dbSchema = new HashMap<>();

diff --git a/java/openmldb-jdbc/src/test/java/com/_4paradigm/openmldb/jdbc/TestConfig.java b/java/openmldb-jdbc/src/test/java/com/_4paradigm/openmldb/jdbc/TestConfig.java
@@ -17,8 +17,11 @@
 package com._4paradigm.openmldb.jdbc;
 
 public class TestConfig {
+//    config for cluster mode
     public static String ZK_CLUSTER="127.0.0.1:6181";
     public static String ZK_PATH="/onebox";
 
-
+//    config for standalone mode
+    public static String HOST="127.0.0.1";
+    public static long PORT=6527;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		请访问 OpenMLDB 中文文档网站：[https://openmldb.ai/docs/zh](https://openmldb.ai/docs/zh)