From b8e5487c3400060584bf54269a96c76b52178c40 Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Tue, 24 Aug 2021 10:16:18 +0800
Subject: [PATCH] change JNI method name

---
 .../com/taosdata/jdbc/TSDBJNIConnector.java   | 12 ++-
 .../jdbc/SetConfigurationInJNITest.java       | 74 ++++---------------
 2 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index e5676a4492..ec983f84cf 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -57,13 +57,17 @@ public class TSDBJNIConnector {
         }
     }
 
-    public static native void initImp(String configDir);
+    private static native void initImp(String configDir);
 
-    public static native int setOptions(int optionIndex, String optionValue);
+    private static native int setOptions(int optionIndex, String optionValue);
 
-    public static native String getTsCharset();
+    private static native String getTsCharset();
 
-    public static native int setConfig(String config);
+    public static void setConfig(String config) {
+        setConfigImp(config);
+    }
+
+    private static native int setConfigImp(String config);
 
     public boolean connect(String host, int port, String dbName, String user, String password) throws SQLException {
         if (this.taos != TSDBConstants.JNI_NULL_POINTER) {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SetConfigurationInJNITest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SetConfigurationInJNITest.java
index 09988a4c3a..cb7619c1f3 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SetConfigurationInJNITest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SetConfigurationInJNITest.java
@@ -1,82 +1,49 @@
 package com.taosdata.jdbc;
 
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Arrays;
-
-import static org.junit.Assert.*;
 
 
 public class SetConfigurationInJNITest {
 
     private String host = "127.0.0.1";
     private String dbname = "test_jni";
-    private long maxSQLLength = 1024000;
     private String debugFlagJSON = "{ \"debugFlag\": \"135\"}";
+
+    private long maxSQLLength = 1024000;
     private String maxSqlLengthJSON = "{ \"maxSQLLength\": " + maxSQLLength + "}";
 
     @Test
-    public void testDebugFlag() {
+    public void setConfigBeforeConnectIsValid() {
         try {
-            // when
             TSDBJNIConnector.setConfig(debugFlagJSON);
 
-            // init
-            TSDBJNIConnector.initImp(null);
-            TSDBJNIConnector.setOptions(0, null);
-            TSDBJNIConnector.setOptions(1, null);
-            TSDBJNIConnector.setOptions(2, null);
-            String tsCharset = TSDBJNIConnector.getTsCharset();
-            assertEquals("", tsCharset);
-
-            // connect
-            TSDBJNIConnector jniConnector = new TSDBJNIConnector();
-            boolean connected = jniConnector.connect(host, 0, null, "root", "taosdata");
-            assertTrue(connected);
-
-            String[] setupSqls = {
-                    "drop database if exists " + dbname,
-                    "create database if not exists " + dbname,
-                    "use " + dbname,
-                    "create table weather(ts timestamp, f1 int) tags(loc nchar(10))",
-                    "insert into t1 using weather tags('beijing') values(now, 1)",
-                    "drop database if exists " + dbname
-            };
+            Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata");
+            Statement stmt = conn.createStatement();
 
-            Arrays.asList(setupSqls).forEach(sql -> {
-                try {
-                    long setupSql = jniConnector.executeQuery(sql);
-                    if (jniConnector.isUpdateQuery(setupSql)) {
-                        jniConnector.freeResultSet(setupSql);
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            });
+            stmt.execute("drop database if exists " + dbname);
+            stmt.execute("create database if not exists " + dbname);
+            stmt.execute("use " + dbname);
+            stmt.execute("create table weather(ts timestamp, f1 int) tags(loc nchar(10))");
 
+            stmt.close();
+            conn.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
     }
 
     @Test
-    public void testMaxSQLLength() {
-
-    }
-
-    @Test
-    public void setConfigAfterConnect() {
+    public void setConfigAfterConnectIsInvalid() {
         try {
-            Connection conn = DriverManager.getConnection("jdbc:TAOS:/" + host + ":0/?user=root&password");
+            Connection conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata");
 
             TSDBJNIConnector.setConfig(debugFlagJSON);
-
             Statement stmt = conn.createStatement();
 
             stmt.execute("drop database if exists " + dbname);
@@ -90,19 +57,4 @@ public class SetConfigurationInJNITest {
             e.printStackTrace();
         }
     }
-
-    @After
-    public void after() {
-//        try {
-//            Connection conn = DriverManager.getConnection("jdbc:TAOS:/" + host + ":0/?user=root&password");
-//            Statement stmt = conn.createStatement();
-//
-////            stmt.execute("drop database if exists " + dbname);
-//
-//            stmt.close();
-//            conn.close();
-//        } catch (SQLException e) {
-//            e.printStackTrace();
-//        }
-    }
 }
\ No newline at end of file
-- 
GitLab