Merge branch 'develop' of https://github.com/taosdata/TDengine into dvv

.travis.yml

@@ -270,19 +270,20 @@ matrix:
         fi
       - make > /dev/null
 
-#  - os: osx
-#    language: c
-#    compiler: clang
-#    env: DESC="mac/clang build"
-#    git:
-#      - depth: 1
-#    addons:
-#      homebrew:
-#        - cmake
-#
-#    script:
-#      - cd ${TRAVIS_BUILD_DIR}
-#      - mkdir debug
-#      - cd debug
-#      - cmake .. > /dev/null
-#      - make > /dev/null
+  - os: osx
+    osx_image: xcode11.4
+    language: c
+    compiler: clang
+    env: DESC="mac/clang build"
+    git:
+      - depth: 1
+    addons:
+      homebrew:
+        - cmake
+
+    script:
+      - cd ${TRAVIS_BUILD_DIR}
+      - mkdir debug
+      - cd debug
+      - cmake .. > /dev/null
+      - make > /dev/null

README.md

@@ -126,7 +126,7 @@ cmake .. -DCPUTYPE=aarch32 && cmake --build .
 
 If you use the Visual Studio 2013, please open a command window by executing "cmd.exe".
 Please specify "x86_amd64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
-```
+```cmd
 mkdir debug && cd debug
 "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" < x86_amd64 | x86 >
 cmake .. -G "NMake Makefiles"
@@ -137,7 +137,8 @@ If you use the Visual Studio 2019 or 2017:
 
 please open a command window by executing "cmd.exe".
 Please specify "x64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
-```
+
+```cmd
 mkdir debug && cd debug
 "c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" < x64 | x86 >
 cmake .. -G "NMake Makefiles"
@@ -145,27 +146,37 @@ nmake
 ```
 
 Or, you can simply open a command window by clicking Windows Start -> "Visual Studio < 2019 | 2017 >" folder -> "x64 Native Tools Command Prompt for VS < 2019 | 2017 >" or "x86 Native Tools Command Prompt for VS < 2019 | 2017 >" depends what architecture your Windows is, then execute commands as follows:
-```
+```cmd
 mkdir debug && cd debug
 cmake .. -G "NMake Makefiles"
 nmake
 ```
 
+### On Mac OS X platform
+
+Please install XCode command line tools and cmake. Verified with XCode 11.4+ on Catalina and Big Sur.
+
+```shell
+mkdir debug && cd debug
+cmake .. && cmake --build .
+```
+
 # Quick Run
+
 # Quick Run
 To quickly start a TDengine server after building, run the command below in terminal:
-```cmd
+```bash
 ./build/bin/taosd -c test/cfg
 ```
 In another terminal, use the TDengine shell to connect the server:
-```
+```bash
 ./build/bin/taos -c test/cfg
 ```
 option "-c test/cfg" specifies the system configuration file directory. 
 
 # Installing
 After building successfully, TDengine can be installed by:
-```cmd
+```bash
 make install
 ```
 Users can find more information about directories installed on the system in the [directory and files](https://www.taosdata.com/en/documentation/administrator/#Directory-and-Files) section. It should be noted that installing from source code does not configure service management for TDengine.

cmake/install.inc

@@ -32,7 +32,7 @@ ELSEIF (TD_WINDOWS)
   #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
   #INSTALL(TARGETS shell RUNTIME DESTINATION .)
   IF (TD_MVN_INSTALLED)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.17-dist.jar DESTINATION connector/jdbc)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.18-dist.jar DESTINATION connector/jdbc)
   ENDIF ()
 ELSEIF (TD_DARWIN)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")

documentation20/webdocs/markdowndocs/connector-java-ch.md

@@ -2,7 +2,7 @@
 
 TDengine 提供了遵循 JDBC 标准（3.0）API 规范的 `taos-jdbcdriver` 实现，可在 maven 的中央仓库 [Sonatype Repository][1] 搜索下载。
 
-`taos-jdbcdriver` 的实现包括 2 种形式： JDBC-JNI 和 JDBC-RESTful（taos-jdbcdriver-2.0.17 开始支持 JDBC-RESTful）。 JDBC-JNI 通过调用客户端 libtaos.so（或 taos.dll ）的本地方法实现， JDBC-RESTful 则在内部封装了 RESTful 接口实现。
+`taos-jdbcdriver` 的实现包括 2 种形式： JDBC-JNI 和 JDBC-RESTful（taos-jdbcdriver-2.0.18 开始支持 JDBC-RESTful）。 JDBC-JNI 通过调用客户端 libtaos.so（或 taos.dll ）的本地方法实现， JDBC-RESTful 则在内部封装了 RESTful 接口实现。
 
 ![tdengine-connector](../assets/tdengine-jdbc-connector.png)
 
@@ -67,7 +67,7 @@ maven 项目中使用如下 pom.xml 配置即可：
 <dependency>
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.17</version>
+  <version>2.0.18</version>
 </dependency>
 ```
 
@@ -334,16 +334,17 @@ conn.close();
 ```java
  public static void main(String[] args) throws SQLException {
     HikariConfig config = new HikariConfig();
+    // jdbc properties
     config.setJdbcUrl("jdbc:TAOS://127.0.0.1:6030/log");
     config.setUsername("root");
     config.setPassword("taosdata");
-
-    config.setMinimumIdle(3);           //minimum number of idle connection
+    // connection pool configurations
+    config.setMinimumIdle(10);           //minimum number of idle connection
     config.setMaximumPoolSize(10);      //maximum number of connection in the pool
-    config.setConnectionTimeout(10000); //maximum wait milliseconds for get connection from pool
-    config.setIdleTimeout(60000);       // max idle time for recycle idle connection
-    config.setConnectionTestQuery("describe log.dn"); //validation query
-    config.setValidationTimeout(3000);   //validation query timeout
+    config.setConnectionTimeout(30000); //maximum wait milliseconds for get connection from pool
+    config.setMaxLifetime(0);       // maximum life time for each connection
+    config.setIdleTimeout(0);       // max idle time for recycle idle connection
+    config.setConnectionTestQuery("select server_status()"); //validation query
 
     HikariDataSource ds = new HikariDataSource(config); //create datasource
 
@@ -375,32 +376,22 @@ conn.close();
 * 使用示例如下：
 ```java
 public static void main(String[] args) throws Exception {
-    Properties properties = new Properties();
-    properties.put("driverClassName","com.taosdata.jdbc.TSDBDriver");
-    properties.put("url","jdbc:TAOS://127.0.0.1:6030/log");
-    properties.put("username","root");
-    properties.put("password","taosdata");
-
-    properties.put("maxActive","10"); //maximum number of connection in the pool
-    properties.put("initialSize","3");//initial number of connection
-    properties.put("maxWait","10000");//maximum wait milliseconds for get connection from pool
-    properties.put("minIdle","3");//minimum number of connection in the pool
-
-    properties.put("timeBetweenEvictionRunsMillis","3000");// the interval milliseconds to test connection
-
-    properties.put("minEvictableIdleTimeMillis","60000");//the minimum milliseconds to keep idle
-    properties.put("maxEvictableIdleTimeMillis","90000");//the maximum milliseconds to keep idle
 
-    properties.put("validationQuery","describe log.dn"); //validation query
-    properties.put("testWhileIdle","true"); // test connection while idle
-    properties.put("testOnBorrow","false"); // don't need while testWhileIdle is true
-    properties.put("testOnReturn","false"); // don't need while testWhileIdle is true
-
-    //create druid datasource
-    DataSource ds = DruidDataSourceFactory.createDataSource(properties);
-    Connection  connection = ds.getConnection(); // get connection
+    DruidDataSource dataSource = new DruidDataSource();
+    // jdbc properties
+    dataSource.setDriverClassName("com.taosdata.jdbc.TSDBDriver");
+    dataSource.setUrl(url);
+    dataSource.setUsername("root");
+    dataSource.setPassword("taosdata");
+    // pool configurations
+    dataSource.setInitialSize(10);
+    dataSource.setMinIdle(10);
+    dataSource.setMaxActive(10);
+    dataSource.setMaxWait(30000);
+    dataSource.setValidationQuery("select server_status()");
+	
+    Connection  connection = dataSource.getConnection(); // get connection
     Statement statement = connection.createStatement(); // get statement
-
     //query or insert 
     // ...
 

src/client/src/tscParseInsert.c

@@ -905,6 +905,13 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       return tscInvalidSQLErrMsg(pCmd->payload, "keyword TAGS expected", sToken.z);
     }
 
+    index = 0;
+    sToken = tStrGetToken(sql, &index, false, 0, NULL);
+    sql += index;
+    if (sToken.type != TK_LP) {
+      return tscInvalidSQLErrMsg(pCmd->payload, NULL, sToken.z);
+    }
+    
     SKVRowBuilder kvRowBuilder = {0};
     if (tdInitKVRowBuilder(&kvRowBuilder) < 0) {
       return TSDB_CODE_TSC_OUT_OF_MEMORY;
@@ -1554,6 +1561,7 @@ void tscImportDataFromFile(SSqlObj *pSql) {
     tscError("%p failed to open file %s to load data from file, code:%s", pSql, pCmd->payload, tstrerror(pSql->res.code));
 
     tfree(pSupporter);
+    taos_free_result(pNew);
     tscAsyncResultOnError(pSql);
     return;
   }

src/common/src/tglobal.c

@@ -137,7 +137,7 @@ int32_t tsTableIncStepPerVnode = TSDB_TABLES_STEP;
 int8_t  tsEnableBalance = 1;
 int8_t  tsAlternativeRole = 0;
 int32_t tsBalanceInterval = 300;           // seconds
-int32_t tsOfflineThreshold = 86400 * 100;  // seconds 10days
+int32_t tsOfflineThreshold = 86400 * 100;  // seconds 100 days
 int32_t tsMnodeEqualVnodeNum = 4;
 int8_t  tsEnableFlowCtrl = 1;
 int8_t  tsEnableSlaveQuery = 1;
@@ -550,7 +550,7 @@ static void doInitGlobalConfig(void) {
   cfg.valType = TAOS_CFG_VTYPE_INT32;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
   cfg.minValue = 3;
-  cfg.maxValue = 7200000;
+  cfg.maxValue = 86400 * 365;
   cfg.ptrLength = 0;
   cfg.unitType = TAOS_CFG_UTYPE_SECOND;
   taosInitConfigOption(cfg);

src/connector/jdbc/CMakeLists.txt

@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.17-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.18-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})

src/connector/jdbc/deploy-pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.17</version>
+  <version>2.0.18</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>

src/connector/jdbc/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>2.0.17</version>
+    <version>2.0.18</version>
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
@@ -126,7 +126,7 @@
                         <include>**/*Test.java</include>
                     </includes>
                     <excludes>
-                        <exclude>**/BatchInsertTest.java</exclude>
+                        <exclude>**/AppMemoryLeakTest.java</exclude>
                         <exclude>**/FailOverTest.java</exclude>
                     </excludes>
                     <testFailureIgnore>true</testFailureIgnore>

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java

@@ -19,9 +19,12 @@ import java.util.Map;
 
 public abstract class TSDBConstants {
 
+    public static final String STATEMENT_CLOSED = "Statement already closed.";
     public static final String DEFAULT_PORT = "6200";
     public static final String UNSUPPORT_METHOD_EXCEPTIONZ_MSG = "this operation is NOT supported currently!";
     public static final String INVALID_VARIABLES = "invalid variables";
+    public static final String RESULT_SET_IS_CLOSED = "resultSet is closed.";
+
     public static Map<Integer, String> DATATYPE_MAP = null;
 
     public static final long JNI_NULL_POINTER = 0L;
@@ -74,7 +77,7 @@ public abstract class TSDBConstants {
     }
 
     static {
-        DATATYPE_MAP = new HashMap<Integer, String>();
+        DATATYPE_MAP = new HashMap<>();
         DATATYPE_MAP.put(1, "BOOL");
         DATATYPE_MAP.put(2, "TINYINT");
         DATATYPE_MAP.put(3, "SMALLINT");

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java

@@ -100,7 +100,6 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
      * order to process those supported SQLs.
      */
     private void preprocessSql() {
-
         /***** For processing some of Spark SQLs*****/
         // should replace it first
         this.rawSql = this.rawSql.replaceAll("or (.*) is null", "");
@@ -149,7 +148,6 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
             rawSql = rawSql.replace(matcher.group(1), tableFullName);
         }
         /***** for inner queries *****/
-
     }
 
     /**
@@ -196,7 +194,7 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
 
     @Override
     public void setNull(int parameterIndex, int sqlType) throws SQLException {
-        setObject(parameterIndex, new String("NULL"));
+        setObject(parameterIndex, "NULL");
     }
 
     @Override

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java

@@ -123,11 +123,21 @@ public class TSDBResultSet implements ResultSet {
     }
 
     public <T> T unwrap(Class<T> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+        if (isClosed())
+            throw new SQLException(TSDBConstants.WrapErrMsg(TSDBConstants.RESULT_SET_IS_CLOSED));
+
+        try {
+            return iface.cast(this);
+        } catch (ClassCastException cce) {
+            throw new SQLException("Unable to unwrap to " + iface.toString());
+        }
     }
 
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+        if (isClosed())
+            throw new SQLException(TSDBConstants.WrapErrMsg(TSDBConstants.RESULT_SET_IS_CLOSED));
+
+        return iface.isInstance(this);
     }
 
     public boolean next() throws SQLException {

src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java

@@ -52,12 +52,18 @@ public class TSDBStatement implements Statement {
         this.isClosed = false;
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
-        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+        try {
+            return iface.cast(this);
+        } catch (ClassCastException cce) {
+            throw new SQLException("Unable to unwrap to " + iface.toString());
+        }
     }
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
-        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+        return iface.isInstance(this);
     }
 
     public ResultSet executeQuery(String sql) throws SQLException {
@@ -130,10 +136,15 @@ public class TSDBStatement implements Statement {
     }
 
     public void setMaxFieldSize(int max) throws SQLException {
+        if (isClosed())
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
+
         throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
     }
 
     public int getMaxRows() throws SQLException {
+        if (isClosed())
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         // always set maxRows to zero, meaning unlimitted rows in a resultSet
         return 0;
     }

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java

 package com.taosdata.jdbc.rs;
 
+import com.taosdata.jdbc.TSDBConstants;
+
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 
 public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     private final String database;
     private ArrayList<RestfulResultSet.Field> fields;
+    private final RestfulResultSet resultSet;
 
-    public RestfulResultSetMetaData(String database, ArrayList<RestfulResultSet.Field> fields) {
+    public RestfulResultSetMetaData(String database, ArrayList<RestfulResultSet.Field> fields, RestfulResultSet resultSet) {
         this.database = database;
         this.fields = fields;
+        this.resultSet = resultSet;
     }
 
     @Override
@@ -26,13 +31,12 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public boolean isCaseSensitive(int column) throws SQLException {
-        //TODO
         return false;
     }
 
     @Override
     public boolean isSearchable(int column) throws SQLException {
-        return false;
+        return true;
     }
 
     @Override
@@ -42,17 +46,30 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public int isNullable(int column) throws SQLException {
+        if (column == 1)
+            return ResultSetMetaData.columnNoNulls;
         return ResultSetMetaData.columnNullable;
     }
 
     @Override
     public boolean isSigned(int column) throws SQLException {
+        String type = this.fields.get(column - 1).type.toUpperCase();
+        switch (type) {
+            case "TINYINT":
+            case "SMALLINT":
+            case "INT":
+            case "BIGINT":
+            case "FLOAT":
+            case "DOUBLE":
+                return true;
+            default:
                 return false;
         }
+    }
 
     @Override
     public int getColumnDisplaySize(int column) throws SQLException {
-        return 0;
+        return this.fields.get(column - 1).length;
     }
 
     @Override
@@ -62,27 +79,46 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public String getColumnName(int column) throws SQLException {
-        return null;
+        return fields.get(column - 1).name;
     }
 
     @Override
     public String getSchemaName(int column) throws SQLException {
-        return this.database;
+        return "";
     }
 
     @Override
     public int getPrecision(int column) throws SQLException {
+        String type = this.fields.get(column - 1).type.toUpperCase();
+        switch (type) {
+            case "FLOAT":
+                return 5;
+            case "DOUBLE":
+                return 9;
+            case "BINARY":
+            case "NCHAR":
+                return this.fields.get(column - 1).length;
+            default:
                 return 0;
         }
+    }
 
     @Override
     public int getScale(int column) throws SQLException {
+        String type = this.fields.get(column - 1).type.toUpperCase();
+        switch (type) {
+            case "FLOAT":
+                return 5;
+            case "DOUBLE":
+                return 9;
+            default:
                 return 0;
         }
+    }
 
     @Override
     public String getTableName(int column) throws SQLException {
-        return null;
+        return "";
     }
 
     @Override
@@ -92,17 +128,41 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public int getColumnType(int column) throws SQLException {
-        return 0;
+        String type = this.fields.get(column - 1).type.toUpperCase();
+        switch (type) {
+            case "BOOL":
+                return java.sql.Types.BOOLEAN;
+            case "TINYINT":
+                return java.sql.Types.TINYINT;
+            case "SMALLINT":
+                return java.sql.Types.SMALLINT;
+            case "INT":
+                return java.sql.Types.INTEGER;
+            case "BIGINT":
+                return java.sql.Types.BIGINT;
+            case "FLOAT":
+                return java.sql.Types.FLOAT;
+            case "DOUBLE":
+                return java.sql.Types.DOUBLE;
+            case "BINARY":
+                return java.sql.Types.BINARY;
+            case "TIMESTAMP":
+                return java.sql.Types.TIMESTAMP;
+            case "NCHAR":
+                return java.sql.Types.NCHAR;
+        }
+        throw new SQLException(TSDBConstants.INVALID_VARIABLES);
     }
 
     @Override
     public String getColumnTypeName(int column) throws SQLException {
-        return null;
+        String type = fields.get(column - 1).type;
+        return type.toUpperCase();
     }
 
     @Override
     public boolean isReadOnly(int column) throws SQLException {
-        return false;
+        return true;
     }
 
     @Override
@@ -117,16 +177,43 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public String getColumnClassName(int column) throws SQLException {
-        return null;
+        String type = this.fields.get(column - 1).type;
+        String columnClassName = "";
+        switch (type) {
+            case "BOOL":
+                return Boolean.class.getName();
+            case "TINYINT":
+            case "SMALLINT":
+                return Short.class.getName();
+            case "INT":
+                return Integer.class.getName();
+            case "BIGINT":
+                return Long.class.getName();
+            case "FLOAT":
+                return Float.class.getName();
+            case "DOUBLE":
+                return Double.class.getName();
+            case "TIMESTAMP":
+                return Timestamp.class.getName();
+            case "BINARY":
+            case "NCHAR":
+                return String.class.getName();
+        }
+        return columnClassName;
     }
 
     @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
-        return null;
+        try {
+            return iface.cast(this);
+        } catch (ClassCastException cce) {
+            throw new SQLException("Unable to unwrap to " + iface.toString());
+        }
     }
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
-        return false;
+        return iface.isInstance(this);
     }
+
 }

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java

@@ -14,7 +14,6 @@ import java.util.stream.Collectors;
 
 public class RestfulStatement implements Statement {
 
-    private static final String STATEMENT_CLOSED = "Statement already closed.";
     private boolean closed;
     private String database;
     private final RestfulConnection conn;
@@ -65,37 +64,18 @@ public class RestfulStatement implements Statement {
     public ResultSet executeQuery(String sql) throws SQLException {
         if (isClosed())
             throw new SQLException("statement already closed");
-        if (!SqlSyntaxValidator.isSelectSql(sql))
-            throw new SQLException("not a select sql for executeQuery: " + sql);
+        if (!SqlSyntaxValidator.isValidForExecuteQuery(sql))
+            throw new SQLException("not a valid sql for executeQuery: " + sql);
 
         final String url = "http://" + conn.getHost() + ":" + conn.getPort() + "/rest/sql";
-        // row data
-        String result = HttpClientPoolUtil.execute(url, sql);
-        JSONObject resultJson = JSON.parseObject(result);
-        if (resultJson.getString("status").equals("error")) {
-            throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + resultJson.getString("desc") + "\n" + "error code: " + resultJson.getString("code")));
-        }
-
-        // parse table name from sql
-        String[] tableIdentifiers = parseTableIdentifier(sql);
-        if (tableIdentifiers != null) {
-            List<JSONObject> fieldJsonList = new ArrayList<>();
-            for (String tableIdentifier : tableIdentifiers) {
-                // field meta
-                String fields = HttpClientPoolUtil.execute(url, "DESCRIBE " + tableIdentifier);
-                JSONObject fieldJson = JSON.parseObject(fields);
-                if (fieldJson.getString("status").equals("error")) {
-                    throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + fieldJson.getString("desc") + "\n" + "error code: " + fieldJson.getString("code")));
-                }
-                fieldJsonList.add(fieldJson);
-            }
-            this.resultSet = new RestfulResultSet(database, this, resultJson, fieldJsonList);
-        } else {
-            this.resultSet = new RestfulResultSet(database, this, resultJson);
+        if (SqlSyntaxValidator.isDatabaseUnspecifiedQuery(sql)) {
+            return executeOneQuery(url, sql);
         }
 
-        this.affectedRows = 0;
-        return resultSet;
+        if (this.database == null || this.database.isEmpty())
+            throw new SQLException("Database not specified or available");
+        HttpClientPoolUtil.execute(url, "use " + this.database);
+        return executeOneQuery(url, sql);
     }
 
     @Override
@@ -105,19 +85,15 @@ public class RestfulStatement implements Statement {
         if (!SqlSyntaxValidator.isValidForExecuteUpdate(sql))
             throw new SQLException("not a valid sql for executeUpdate: " + sql);
 
-        if (this.database == null)
-            throw new SQLException("Database not specified or available");
-
-        final String url = "http://" + conn.getHost().trim() + ":" + conn.getPort() + "/rest/sql";
-//        HttpClientPoolUtil.execute(url, "use " + conn.getDatabase());
-        String result = HttpClientPoolUtil.execute(url, sql);
-        JSONObject jsonObject = JSON.parseObject(result);
-        if (jsonObject.getString("status").equals("error")) {
-            throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + jsonObject.getString("desc") + "\n" + "error code: " + jsonObject.getString("code")));
+        final String url = "http://" + conn.getHost() + ":" + conn.getPort() + "/rest/sql";
+        if (SqlSyntaxValidator.isDatabaseUnspecifiedUpdate(sql)) {
+            return executeOneUpdate(url, sql);
         }
-        this.resultSet = null;
-        this.affectedRows = Integer.parseInt(jsonObject.getString("rows"));
-        return this.affectedRows;
+
+        if (this.database == null || this.database.isEmpty())
+            throw new SQLException("Database not specified or available");
+        HttpClientPoolUtil.execute(url, "use " + this.database);
+        return executeOneUpdate(url, sql);
     }
 
     @Override
@@ -131,14 +107,14 @@ public class RestfulStatement implements Statement {
     @Override
     public int getMaxFieldSize() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return TSDBConstants.maxFieldSize;
     }
 
     @Override
     public void setMaxFieldSize(int max) throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         if (max < 0)
             throw new SQLException(TSDBConstants.INVALID_VARIABLES);
         // nothing to do
@@ -147,14 +123,14 @@ public class RestfulStatement implements Statement {
     @Override
     public int getMaxRows() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return 0;
     }
 
     @Override
     public void setMaxRows(int max) throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         if (max < 0)
             throw new SQLException(TSDBConstants.INVALID_VARIABLES);
         // nothing to do
@@ -163,20 +139,20 @@ public class RestfulStatement implements Statement {
     @Override
     public void setEscapeProcessing(boolean enable) throws SQLException {
         if (isClosed())
-            throw new SQLException(RestfulStatement.STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
     }
 
     @Override
     public int getQueryTimeout() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return 0;
     }
 
     @Override
     public void setQueryTimeout(int seconds) throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         if (seconds < 0)
             throw new SQLException(TSDBConstants.INVALID_VARIABLES);
     }
@@ -189,7 +165,7 @@ public class RestfulStatement implements Statement {
     @Override
     public SQLWarning getWarnings() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return null;
     }
 
@@ -197,53 +173,93 @@ public class RestfulStatement implements Statement {
     public void clearWarnings() throws SQLException {
         // nothing to do
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
     }
 
     @Override
     public void setCursorName(String name) throws SQLException {
         if (isClosed())
-            throw new SQLException(RestfulStatement.STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
     }
 
     @Override
     public boolean execute(String sql) throws SQLException {
-        if (isClosed()) {
+        if (isClosed())
             throw new SQLException("Invalid method call on a closed statement.");
-        }
+        if (!SqlSyntaxValidator.isValidForExecute(sql))
+            throw new SQLException("not a valid sql for execute: " + sql);
+
         //如果执行了use操作应该将当前Statement的catalog设置为新的database
+        final String url = "http://" + conn.getHost() + ":" + conn.getPort() + "/rest/sql";
         if (SqlSyntaxValidator.isUseSql(sql)) {
+            HttpClientPoolUtil.execute(url, sql);
             this.database = sql.trim().replace("use", "").trim();
             this.conn.setCatalog(this.database);
+        } else if (SqlSyntaxValidator.isDatabaseUnspecifiedQuery(sql)) {
+            executeOneQuery(url, sql);
+        } else if (SqlSyntaxValidator.isDatabaseUnspecifiedUpdate(sql)) {
+            executeOneUpdate(url, sql);
+        } else {
+            if (SqlSyntaxValidator.isValidForExecuteQuery(sql)) {
+                executeQuery(sql);
+            } else {
+                executeUpdate(sql);
+            }
         }
-        if (this.database == null)
-            throw new SQLException("Database not specified or available");
 
-        if (SqlSyntaxValidator.isSelectSql(sql)) {
-            executeQuery(sql);
-        } else if (SqlSyntaxValidator.isShowSql(sql) || SqlSyntaxValidator.isDescribeSql(sql)) {
-            final String url = "http://" + conn.getHost().trim() + ":" + conn.getPort() + "/rest/sql";
-            if (!SqlSyntaxValidator.isShowDatabaseSql(sql)) {
-                HttpClientPoolUtil.execute(url, "use " + conn.getDatabase());
+        return true;
     }
+
+    private ResultSet executeOneQuery(String url, String sql) throws SQLException {
+        if (!SqlSyntaxValidator.isValidForExecuteQuery(sql))
+            throw new SQLException("not a select sql for executeQuery: " + sql);
+
+        // row data
         String result = HttpClientPoolUtil.execute(url, sql);
         JSONObject resultJson = JSON.parseObject(result);
         if (resultJson.getString("status").equals("error")) {
             throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + resultJson.getString("desc") + "\n" + "error code: " + resultJson.getString("code")));
         }
-            this.resultSet = new RestfulResultSet(database, this, resultJson);
+        // parse table name from sql
+        String[] tableIdentifiers = parseTableIdentifier(sql);
+        if (tableIdentifiers != null) {
+            List<JSONObject> fieldJsonList = new ArrayList<>();
+            for (String tableIdentifier : tableIdentifiers) {
+                // field meta
+                String fields = HttpClientPoolUtil.execute(url, "DESCRIBE " + tableIdentifier);
+                JSONObject fieldJson = JSON.parseObject(fields);
+                if (fieldJson.getString("status").equals("error")) {
+                    throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + fieldJson.getString("desc") + "\n" + "error code: " + fieldJson.getString("code")));
+                }
+                fieldJsonList.add(fieldJson);
+            }
+            this.resultSet = new RestfulResultSet(database, this, resultJson, fieldJsonList);
         } else {
-            executeUpdate(sql);
+            this.resultSet = new RestfulResultSet(database, this, resultJson);
+        }
+        this.affectedRows = 0;
+        return resultSet;
     }
 
-        return true;
+    private int executeOneUpdate(String url, String sql) throws SQLException {
+        if (!SqlSyntaxValidator.isValidForExecuteUpdate(sql))
+            throw new SQLException("not a valid sql for executeUpdate: " + sql);
+
+        String result = HttpClientPoolUtil.execute(url, sql);
+        JSONObject jsonObject = JSON.parseObject(result);
+        if (jsonObject.getString("status").equals("error")) {
+            throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + jsonObject.getString("desc") + "\n" + "error code: " + jsonObject.getString("code")));
+        }
+        this.resultSet = null;
+        this.affectedRows = Integer.parseInt(jsonObject.getString("rows"));
+        return this.affectedRows;
     }
 
     @Override
     public ResultSet getResultSet() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return resultSet;
     }
 
@@ -275,7 +291,7 @@ public class RestfulStatement implements Statement {
     @Override
     public void setFetchSize(int rows) throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         if (rows < 0)
             throw new SQLException(TSDBConstants.INVALID_VARIABLES);
         //nothing to do
@@ -284,28 +300,28 @@ public class RestfulStatement implements Statement {
     @Override
     public int getFetchSize() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return 0;
     }
 
     @Override
     public int getResultSetConcurrency() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return this.resultSet.getConcurrency();
     }
 
     @Override
     public int getResultSetType() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return this.resultSet.getType();
     }
 
     @Override
     public void addBatch(String sql) throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         //TODO:
     }
 
@@ -323,14 +339,14 @@ public class RestfulStatement implements Statement {
     @Override
     public Connection getConnection() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return this.conn;
     }
 
     @Override
     public boolean getMoreResults(int current) throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         if (resultSet == null)
             return false;
 
@@ -388,7 +404,7 @@ public class RestfulStatement implements Statement {
     @Override
     public int getResultSetHoldability() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return this.resultSet.getHoldability();
     }
 
@@ -400,28 +416,28 @@ public class RestfulStatement implements Statement {
     @Override
     public void setPoolable(boolean poolable) throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         //nothing to do
     }
 
     @Override
     public boolean isPoolable() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return false;
     }
 
     @Override
     public void closeOnCompletion() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         this.closeOnCompletion = true;
     }
 
     @Override
     public boolean isCloseOnCompletion() throws SQLException {
         if (isClosed())
-            throw new SQLException(STATEMENT_CLOSED);
+            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
         return this.closeOnCompletion;
     }
 

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java

@@ -20,8 +20,11 @@ import java.sql.Connection;
 
 public class SqlSyntaxValidator {
 
-    private static final String[] updateSQL = {"insert", "update", "delete", "create", "alter", "drop", "show", "describe", "use", "import"};
-    private static final String[] querySQL = {"select"};
+    private static final String[] SQL = {"select", "insert", "import", "create", "use", "alter", "drop", "set", "show", "describe"};
+    private static final String[] updateSQL = {"insert", "import", "create", "use", "alter", "drop", "set"};
+    private static final String[] querySQL = {"select", "show", "describe"};
+
+    private static final String[] databaseUnspecifiedShow = {"databases", "dnodes", "mnodes", "variables"};
 
     private TSDBConnection tsdbConnection;
 
@@ -37,8 +40,38 @@ public class SqlSyntaxValidator {
         return false;
     }
 
+    public static boolean isValidForExecuteQuery(String sql) {
+        for (String prefix : querySQL) {
+            if (sql.trim().toLowerCase().startsWith(prefix))
+                return true;
+        }
+        return false;
+    }
+
+    public static boolean isValidForExecute(String sql) {
+        for (String prefix : SQL) {
+            if (sql.trim().toLowerCase().startsWith(prefix))
+                return true;
+        }
+        return false;
+    }
+
+    public static boolean isDatabaseUnspecifiedQuery(String sql) {
+        for (String databaseObj : databaseUnspecifiedShow) {
+            if (sql.trim().toLowerCase().matches("show\\s+" + databaseObj + ".*"))
+                return true;
+        }
+        return false;
+    }
+
+    public static boolean isDatabaseUnspecifiedUpdate(String sql) {
+        sql = sql.trim().toLowerCase();
+        return sql.matches("create\\s+database.*") || sql.startsWith("set") || sql.matches("drop\\s+database.*");
+    }
+
     public static boolean isUseSql(String sql) {
-        return sql.trim().toLowerCase().startsWith("use") || sql.trim().toLowerCase().matches("create\\s*database.*") || sql.toLowerCase().toLowerCase().matches("drop\\s*database.*");
+        return sql.trim().toLowerCase().startsWith("use");
+//                || sql.trim().toLowerCase().matches("create\\s*database.*") || sql.toLowerCase().toLowerCase().matches("drop\\s*database.*");
     }
 
     public static boolean isShowSql(String sql) {
@@ -58,8 +91,9 @@ public class SqlSyntaxValidator {
         return sql.trim().toLowerCase().startsWith("select");
     }
 
-
     public static boolean isShowDatabaseSql(String sql) {
         return sql.trim().toLowerCase().matches("show\\s*databases");
     }
+
+
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java

-package com.taosdata.jdbc;
-
-import com.taosdata.jdbc.utils.TDNodes;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-public abstract class BaseTest {
-
-    private static boolean testCluster = false;
-    private static TDNodes nodes = new TDNodes();
-
-    @BeforeClass
-    public static void setupEnv() {
-        try {
-            if (nodes.getTDNode(1).getTaosdPid() != null) {
-                System.out.println("Kill taosd before running JDBC test");
-                nodes.getTDNode(1).setRunning(1);
-                nodes.stop(1);
-            }
-            nodes.setTestCluster(testCluster);
-            nodes.deploy(1);
-            nodes.start(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void cleanUpEnv() {
-        nodes.stop(1);
-    }
-}
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java

-package com.taosdata.jdbc;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.sql.*;
-import java.util.Properties;
-import java.util.Random;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
-public class BatchInsertTest {
-
-    private Connection connection;
-
-    private static String dbName = "test";
-    private static String stbName = "meters";
-    private static String host = "127.0.0.1";
-    private static int numOfTables = 30;
-    private static int numOfRecordsPerTable = 1000;
-    private static long ts = 1496732686000l;
-    private static String tablePrefix = "t";
-
-    @Before
-    public void createDatabase() throws SQLException {
-        try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
-        } catch (ClassNotFoundException e) {
-            return;
-        }
-
-        Properties properties = new Properties();
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
-
-        Statement stmt = connection.createStatement();
-        stmt.execute("drop database if exists " + dbName);
-        stmt.execute("create database if not exists " + dbName);
-        stmt.execute("use " + dbName);
-
-        String createTableSql = "create table " + stbName + "(ts timestamp, f1 int, f2 int, f3 int) tags(areaid int, loc binary(20))";
-        stmt.execute(createTableSql);
-
-        for (int i = 0; i < numOfTables; i++) {
-            String loc = i % 2 == 0 ? "beijing" : "shanghai";
-            String createSubTalbesSql = "create table " + tablePrefix + i + " using " + stbName + " tags(" + i + ", '" + loc + "')";
-            stmt.execute(createSubTalbesSql);
-        }
-        stmt.close();
-    }
-
-    @Test
-    public void testBatchInsert() throws SQLException {
-        ExecutorService executorService = Executors.newFixedThreadPool(numOfTables);
-        for (int i = 0; i < numOfTables; i++) {
-            final int index = i;
-            executorService.execute(() -> {
-                try {
-                    long startTime = System.currentTimeMillis();
-                    Statement statement = connection.createStatement(); // get statement
-                    StringBuilder sb = new StringBuilder();
-                    sb.append("INSERT INTO " + tablePrefix + index + " VALUES");
-                    Random rand = new Random();
-                    for (int j = 1; j <= numOfRecordsPerTable; j++) {
-                        sb.append("(" + (ts + j) + ", ");
-                        sb.append(rand.nextInt(100) + ", ");
-                        sb.append(rand.nextInt(100) + ", ");
-                        sb.append(rand.nextInt(100) + ")");
-                    }
-                    statement.addBatch(sb.toString());
-                    statement.executeBatch();
-                    long endTime = System.currentTimeMillis();
-                    System.out.println("Thread " + index + " takes " + (endTime - startTime) + " microseconds");
-                    connection.commit();
-                    statement.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
-        }
-        executorService.shutdown();
-
-        try {
-            executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        Statement statement = connection.createStatement();
-        ResultSet rs = statement.executeQuery("select * from meters");
-        int num = 0;
-        while (rs.next()) {
-            num++;
-        }
-        assertEquals(num, numOfTables * numOfRecordsPerTable);
-        rs.close();
-    }
-
-    @After
-    public void close() {
-        try {
-            if (connection != null)
-                connection.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java

 package com.taosdata.jdbc;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
+import org.junit.*;
+import org.junit.runners.MethodSorters;
 
 import java.sql.*;
 import java.util.Properties;
@@ -11,14 +9,13 @@ import java.util.Properties;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-@FixMethodOrder()
-public class PreparedStatementTest extends BaseTest {
-    static Connection connection = null;
-    static PreparedStatement statement = null;
+@FixMethodOrder(value = MethodSorters.NAME_ASCENDING)
+public class PreparedStatementTest {
+    static Connection connection;
+    static TSDBPreparedStatement statement;
     static String dbName = "test";
     static String tName = "t0";
     static String host = "localhost";
-    static ResultSet resSet = null;
 
     @BeforeClass
     public static void createConnection() throws SQLException {
@@ -28,19 +25,16 @@ public class PreparedStatementTest extends BaseTest {
             return;
         }
         Properties properties = new Properties();
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
         connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
-
         String sql = "drop database if exists " + dbName;
         statement = (TSDBPreparedStatement) connection.prepareStatement(sql);
-
     }
 
     @Test
-    public void createTableAndQuery() throws SQLException {
+    public void case001_createTableAndQuery() throws SQLException {
         long ts = System.currentTimeMillis();
 
         statement.executeUpdate("create database if not exists " + dbName);
@@ -48,141 +42,132 @@ public class PreparedStatementTest extends BaseTest {
         statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", 1)");
 
         PreparedStatement selectStatement = connection.prepareStatement("select * from " + dbName + "." + tName);
-
         ResultSet resultSet = selectStatement.executeQuery();
         assertTrue(null != resultSet);
 
         boolean isClosed = statement.isClosed();
         assertEquals(false, isClosed);
+        selectStatement.close();
     }
 
     @Test
-    public void testPreparedStatement() throws SQLException {
+    public void case002_testPreparedStatement() throws SQLException {
         long ts = System.currentTimeMillis() + 20000;
-        PreparedStatement saveStatement = connection
-                .prepareStatement("insert into " + dbName + "." + tName + " values (" + ts + ", 1)");
 
+        PreparedStatement saveStatement = connection.prepareStatement("insert into " + dbName + "." + tName + " values (" + ts + ", 1)");
         int affectedRows = saveStatement.executeUpdate();
         assertTrue(1 == affectedRows);
+        saveStatement.close();
     }
 
     @Test
-    public void testSavedPreparedStatement() throws SQLException {
+    public void case003_testSavedPreparedStatement() throws SQLException {
         long ts = System.currentTimeMillis();
-
-        TSDBPreparedStatement saveStatement = (TSDBPreparedStatement) connection
-                .prepareStatement("insert into  " + dbName + "." + tName + " values (?, ?)");
-
+        TSDBPreparedStatement saveStatement = (TSDBPreparedStatement) connection.prepareStatement("insert into  " + dbName + "." + tName + " values (?, ?)");
         saveStatement.setObject(1, ts + 10000);
         saveStatement.setObject(2, 3);
         int rows = saveStatement.executeUpdate();
         assertEquals(1, rows);
+        saveStatement.close();
     }
 
     @Test
-    public void testUnsupport() {
-        // if(null == resSet) {
-        // return;
-        // }
-        TSDBPreparedStatement tsdbStatement = (TSDBPreparedStatement) statement;
-        try {
-            tsdbStatement.unwrap(null);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.isWrapperFor(null);
-        } catch (SQLException e) {
-        }
+    public void case004_testUnsupport() throws SQLException {
+
+        Assert.assertNotNull(statement.unwrap(TSDBPreparedStatement.class));
+        Assert.assertTrue(statement.isWrapperFor(TSDBPreparedStatement.class));
+
         try {
-            tsdbStatement.getMaxFieldSize();
+            statement.getMaxFieldSize();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.setMaxFieldSize(0);
+            statement.setMaxFieldSize(0);
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.setEscapeProcessing(true);
+            statement.setEscapeProcessing(true);
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.cancel();
+            statement.cancel();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getWarnings();
+            statement.getWarnings();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.clearWarnings();
+            statement.clearWarnings();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.setCursorName(null);
+            statement.setCursorName(null);
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getMoreResults();
+            statement.getMoreResults();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.setFetchDirection(0);
+            statement.setFetchDirection(0);
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getFetchDirection();
+            statement.getFetchDirection();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getResultSetConcurrency();
+            statement.getResultSetConcurrency();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getResultSetType();
+            statement.getResultSetType();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getConnection();
+            statement.getConnection();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getMoreResults();
+            statement.getMoreResults();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getGeneratedKeys();
+            statement.getGeneratedKeys();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.executeUpdate(null, 0);
+            statement.executeUpdate(null, 0);
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.executeUpdate(null, new int[]{0});
+            statement.executeUpdate(null, new int[]{0});
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.executeUpdate(null, new String[]{"str1", "str2"});
+            statement.executeUpdate(null, new String[]{"str1", "str2"});
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.getResultSetHoldability();
+            statement.getResultSetHoldability();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.setPoolable(true);
+            statement.setPoolable(true);
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.isPoolable();
+            statement.isPoolable();
         } catch (SQLException e) {
         }
         try {
-            tsdbStatement.closeOnCompletion();
+            statement.closeOnCompletion();
         } catch (SQLException e) {
+
         }
         try {
-            tsdbStatement.isCloseOnCompletion();
+            statement.isCloseOnCompletion();
         } catch (SQLException e) {
         }
     }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/QueryDataTest.java

@@ -6,37 +6,22 @@ import org.junit.Test;
 
 import java.sql.*;
 import java.util.Properties;
-import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-import java.util.concurrent.*;
-
-import static org.junit.Assert.assertTrue;
 
-public class QueryDataTest extends BaseTest {
+public class QueryDataTest {
 
-    static Connection connection = null;
-    static Statement statement = null;
+    static Connection connection;
+    static Statement statement;
     static String dbName = "test";
     static String stbName = "meters";
-    static String host = "localhost";
-    static int numOfTables = 30;
-    final static int numOfRecordsPerTable = 1000;
-    static long ts = 1496732686000l;
-    final static String tablePrefix = "t";
+    static String host = "127.0.0.1";
 
     @Before
-    public void createDatabase() throws SQLException {
+    public void createDatabase() {
         try {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
-        } catch (ClassNotFoundException e) {
-            return;
-        }
-        
             Properties properties = new Properties();
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
@@ -47,35 +32,41 @@ public class QueryDataTest extends BaseTest {
             statement.executeUpdate("create database if not exists " + dbName);
             statement.executeUpdate("use " + dbName);
 
-        String createTableSql = "create table " + stbName + "(ts timestamp, name binary(6))";  
+            String createTableSql = "create table " + stbName + "(ts timestamp, name binary(64))";
             statement.executeUpdate(createTableSql);
+
+        } catch (ClassNotFoundException | SQLException e) {
+            return;
+        }
     }
 
     @Test
-    public void testQueryBinaryData() throws SQLException{                
-                
-        String insertSql = "insert into "  + stbName + " values(now, 'taosda')";
+    public void testQueryBinaryData() throws SQLException {
+        String insertSql = "insert into " + stbName + " values(now, 'taosdata')";
         System.out.println(insertSql);
-
         statement.executeUpdate(insertSql);
 
         String querySql = "select * from " + stbName;
         ResultSet rs = statement.executeQuery(querySql);
 
-        while(rs.next()) {
-            String name = rs.getString(2) + "001";
+        while (rs.next()) {
+            String name = rs.getString(2);
             System.out.println("name = " + name);
-            assertEquals(name, "taosda001");
+            assertEquals("taosdata", name);
         }
         rs.close();
     }
 
-
     @After
-    public void close() throws Exception {        
+    public void close() {
+        try {
+            if (statement != null)
                 statement.close();
+            if (connection != null)
                 connection.close();
-        Thread.sleep(10);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
     }
 
 }
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java

 package com.taosdata.jdbc;
 
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -13,42 +14,37 @@ import java.util.Properties;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class ResultSetTest extends BaseTest {
-    static Connection connection = null;
-    static Statement statement = null;
+public class ResultSetTest {
+    static Connection connection;
+    static Statement statement;
     static String dbName = "test";
     static String tName = "t0";
     static String host = "localhost";
-    static ResultSet resSet = null;
+    static ResultSet resSet;
 
     @BeforeClass
-    public static void createDatabaseAndTable() throws SQLException {
+    public static void createDatabaseAndTable() {
         try {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
-        } catch (ClassNotFoundException e) {
-            return;
-        }
             Properties properties = new Properties();
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
             properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-
             connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
-
             statement = connection.createStatement();
             statement.executeUpdate("drop database if exists " + dbName);
             statement.executeUpdate("create database if not exists " + dbName);
-        statement.executeUpdate("create table if not exists " + dbName + "." + tName +
-                " (ts timestamp, k1 int, k2 bigint, k3 float, k4 double, k5 binary(30), k6 smallint, k7 bool, k8 nchar(20))");
+            statement.execute("use " + dbName);
+            statement.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k1 int, k2 bigint, k3 float, k4 double, k5 binary(30), k6 smallint, k7 bool, k8 nchar(20))");
+        } catch (ClassNotFoundException | SQLException e) {
+            return;
+        }
 
-        statement.executeQuery("use " + dbName);
     }
 
     @Test
     public void testResultSet() {
-        String sql = null;
+        String sql;
         long ts = 1496732686000l;
         int v1 = 2147483600;
         long v2 = ts + 1000;
@@ -119,16 +115,8 @@ public class ResultSetTest extends BaseTest {
     public void testUnsupport() throws SQLException {
         statement.executeQuery("show databases");
         resSet = statement.getResultSet();
-        try {
-            resSet.unwrap(null);
-        } catch (SQLException e) {
-            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
-        }
-        try {
-            resSet.isWrapperFor(null);
-        } catch (SQLException e) {
-            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
-        }
+        Assert.assertNotNull(resSet.unwrap(TSDBResultSet.class));
+        Assert.assertTrue(resSet.isWrapperFor(TSDBResultSet.class));
         try {
             resSet.getAsciiStream(0);
         } catch (SQLException e) {
@@ -815,13 +803,18 @@ public class ResultSetTest extends BaseTest {
         assertEquals(res.length, 2);
         statement.clearBatch();
     }
+
     @AfterClass
-    public static void close() throws Exception {
+    public static void close() {
+        try {
             statement.executeUpdate("drop database " + dbName);
+            if (statement != null)
                 statement.close();
+            if (connection != null)
                 connection.close();
-        Thread.sleep(10);
-
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
     }
 
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java

@@ -29,6 +29,7 @@ public class StableTest {
             properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
             connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
             Statement statement = connection.createStatement();
+            statement.execute("drop database if exists " + dbName);
             statement.execute("create database if not exists " + dbName);
             statement.execute("use " + dbName);
             statement.close();

src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java

 package com.taosdata.jdbc;
 
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -16,23 +17,22 @@ public class StatementTest {
     static String dbName = "test";
     static String tName = "t0";
     static String host = "localhost";
-    static ResultSet resSet = null;
 
     @BeforeClass
     public static void createConnection() throws SQLException {
         try {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
-        } catch (ClassNotFoundException e) {
-            return;
-        }
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
             connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", properties);
-
             statement = connection.createStatement();
             statement.executeUpdate("drop database if exists " + dbName);
+
+        } catch (ClassNotFoundException e) {
+            return;
+        }
     }
 
     @Test
@@ -49,7 +49,6 @@ public class StatementTest {
         } catch (SQLException e) {
             e.printStackTrace();
         }
-
     }
 
     @Test
@@ -67,118 +66,46 @@ public class StatementTest {
         assertEquals(false, isClosed);
     }
 
-    @Test
-    public void testUnsupport() {
-        TSDBStatement tsdbStatement = (TSDBStatement) statement;
-        try {
-            tsdbStatement.unwrap(null);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.isWrapperFor(null);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getMaxFieldSize();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.setMaxFieldSize(0);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.setEscapeProcessing(true);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.cancel();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getWarnings();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.clearWarnings();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.setCursorName(null);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getMoreResults();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.setFetchDirection(0);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getFetchDirection();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getResultSetConcurrency();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getResultSetType();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getConnection();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getMoreResults();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getGeneratedKeys();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.executeUpdate(null, 0);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.executeUpdate(null, new int[]{0});
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.executeUpdate(null, new String[]{"str1", "str2"});
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.getResultSetHoldability();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.setPoolable(true);
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.isPoolable();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.closeOnCompletion();
-        } catch (SQLException e) {
-        }
-        try {
-            tsdbStatement.isCloseOnCompletion();
-        } catch (SQLException e) {
-        }
+    @Test(expected = SQLException.class)
+    public void testUnsupport() throws SQLException {
+        Assert.assertNotNull(statement.unwrap(TSDBStatement.class));
+        Assert.assertTrue(statement.isWrapperFor(TSDBStatement.class));
+
+        statement.getMaxFieldSize();
+        statement.setMaxFieldSize(0);
+        statement.setEscapeProcessing(true);
+        statement.cancel();
+        statement.getWarnings();
+        statement.clearWarnings();
+        statement.setCursorName(null);
+        statement.getMoreResults();
+        statement.setFetchDirection(0);
+        statement.getFetchDirection();
+        statement.getResultSetConcurrency();
+        statement.getResultSetType();
+        statement.getConnection();
+        statement.getMoreResults();
+        statement.getGeneratedKeys();
+        statement.executeUpdate(null, 0);
+        statement.executeUpdate(null, new int[]{0});
+        statement.executeUpdate(null, new String[]{"str1", "str2"});
+        statement.getResultSetHoldability();
+        statement.setPoolable(true);
+        statement.isPoolable();
+        statement.closeOnCompletion();
+        statement.isCloseOnCompletion();
     }
 
     @AfterClass
-    public static void close() throws Exception {
-        if (!statement.isClosed()) {
-            statement.executeUpdate("drop database if exists " + dbName);
+    public static void close() {
+        try {
+            statement.execute("drop database if exists " + dbName);
+            if (statement != null)
                 statement.close();
+            if (connection != null)
                 connection.close();
-            Thread.sleep(10);
+        } catch (SQLException e) {
+            e.printStackTrace();
         }
     }
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java

@@ -10,21 +10,18 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
-public class SubscribeTest extends BaseTest {
-    Connection connection = null;
-    Statement statement = null;
+public class SubscribeTest {
+    Connection connection;
+    Statement statement;
     String dbName = "test";
     String tName = "t0";
     String host = "localhost";
     String topic = "test";
 
     @Before
-    public void createDatabase() throws SQLException {
+    public void createDatabase() {
         try {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
-        } catch (ClassNotFoundException e) {
-            return;
-        }
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
@@ -41,6 +38,10 @@ public class SubscribeTest extends BaseTest {
                 String sql = "insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")";
                 statement.executeUpdate(sql);
             }
+
+        } catch (ClassNotFoundException | SQLException e) {
+            return;
+        }
     }
 
     @Test
@@ -79,10 +80,16 @@ public class SubscribeTest extends BaseTest {
     }
 
     @After
-    public void close() throws Exception {
+    public void close() {
+        try {
             statement.executeQuery("drop database " + dbName);
+            if (statement != null)
                 statement.close();
+            if (connection != null)
                 connection.close();
-        Thread.sleep(10);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
     }
 }
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDatabaseMetaDataTest.java

@@ -6,37 +6,9 @@ import java.sql.*;
 import java.util.Properties;
 
 public class TSDBDatabaseMetaDataTest {
-    private TSDBDatabaseMetaData metaData;
     private static final String host = "127.0.0.1";
-    private Connection connection;
-
-    @BeforeClass
-    public void before() {
-        try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
-            Properties properties = new Properties();
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-            connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata", properties);
-            metaData = connection.getMetaData().unwrap(TSDBDatabaseMetaData.class);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public void after() {
-        try {
-            if (connection != null)
-                connection.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
+    private static Connection connection;
+    private static TSDBDatabaseMetaData metaData;
 
     @Test
     public void unwrap() throws SQLException {
@@ -61,7 +33,7 @@ public class TSDBDatabaseMetaDataTest {
 
     @Test
     public void getURL() throws SQLException {
-        Assert.assertEquals("jdbc:TAOS://localhost:6030/?user=root&password=taosdata", metaData.getURL());
+        Assert.assertEquals("jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata", metaData.getURL());
     }
 
     @Test
@@ -975,4 +947,32 @@ public class TSDBDatabaseMetaDataTest {
     public void generatedKeyAlwaysReturned() throws SQLException {
         Assert.assertFalse(metaData.generatedKeyAlwaysReturned());
     }
+
+    @BeforeClass
+    public static void beforeClass() {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata", properties);
+            metaData = connection.getMetaData().unwrap(TSDBDatabaseMetaData.class);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            if (connection != null)
+                connection.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
 }
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java

@@ -3,9 +3,6 @@ package com.taosdata.jdbc;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.sql.*;
 import java.util.Properties;
 
@@ -27,54 +24,15 @@ public class TSDBDriverTest {
             "jdbc:TAOS://:/test",
             "jdbc:TAOS://localhost:0/?user=root&password=taosdata"
     };
-    private static boolean islibLoaded = false;
-    private static boolean isTaosdActived;
 
     private Connection conn;
 
-    @BeforeClass
-    public static void before() {
-        String osName = System.getProperty("os.name").toLowerCase();
-        if (!osName.equals("linux"))
-            return;
-        // try to load taos lib
-        try {
-            System.loadLibrary("taos");
-            islibLoaded = true;
-        } catch (UnsatisfiedLinkError error) {
-            System.out.println("load tdengine lib failed.");
-            error.printStackTrace();
-        }
-        // check taosd is activated
-        try {
-            String[] cmd = {"/bin/bash", "-c", "ps -ef | grep taosd | grep -v \"grep\""};
-            Process exec = Runtime.getRuntime().exec(cmd);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream()));
-            int lineCnt = 0;
-            while (reader.readLine() != null) {
-                lineCnt++;
-            }
-            if (lineCnt > 0)
-                isTaosdActived = true;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
     @Test
     public void testConnectWithJdbcURL() {
         final String url = "jdbc:TAOS://localhost:6030/log?user=root&password=taosdata";
         try {
-            if (islibLoaded && isTaosdActived) {
             conn = DriverManager.getConnection(url);
             assertNotNull("failure - connection should not be null", conn);
-            }
         } catch (SQLException e) {
             e.printStackTrace();
             fail("failure - should not throw Exception");
@@ -89,10 +47,8 @@ public class TSDBDriverTest {
         connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
         try {
-            if (islibLoaded && isTaosdActived) {
             conn = DriverManager.getConnection(jdbcUrl, connProps);
             assertNotNull("failure - connection should not be null", conn);
-            }
         } catch (SQLException e) {
             e.printStackTrace();
             fail("failure - should not throw Exception");
@@ -107,10 +63,8 @@ public class TSDBDriverTest {
         connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
         try {
-            if (islibLoaded && isTaosdActived) {
             conn = DriverManager.getConnection(jdbcUrl, connProps);
             assertNotNull("failure - connection should not be null", conn);
-            }
         } catch (SQLException e) {
             e.printStackTrace();
             fail("failure - should not throw Exception");
@@ -207,4 +161,14 @@ public class TSDBDriverTest {
         assertNull("failure - getParentLogger should be be null", new TSDBDriver().getParentLogger());
     }
 
+    @BeforeClass
+    public static void before() {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+
 }
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java

+package com.taosdata.jdbc;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+public class TSDBPreparedStatementTest {
+    private static final String host = "127.0.0.1";
+    private static Connection conn;
+
+    @Test
+    public void executeQuery() {
+
+    }
+
+    @Test
+    public void executeUpdate() {
+
+    }
+
+    @Test
+    public void setNull() {
+    }
+
+    @Test
+    public void setBoolean() {
+    }
+
+    @Test
+    public void setByte() {
+    }
+
+    @Test
+    public void setShort() {
+    }
+
+    @Test
+    public void setInt() {
+    }
+
+    @Test
+    public void setLong() {
+    }
+
+    @Test
+    public void setFloat() {
+    }
+
+    @Test
+    public void setDouble() {
+    }
+
+    @Test
+    public void setBigDecimal() {
+    }
+
+    @Test
+    public void setString() {
+    }
+
+    @Test
+    public void setBytes() {
+    }
+
+    @Test
+    public void setDate() {
+    }
+
+    @Test
+    public void setTime() {
+    }
+
+    @Test
+    public void setTimestamp() {
+    }
+
+    @Test
+    public void setAsciiStream() {
+    }
+
+    @Test
+    public void setUnicodeStream() {
+    }
+
+    @Test
+    public void setBinaryStream() {
+    }
+
+    @Test
+    public void clearParameters() {
+    }
+
+    @Test
+    public void setObject() {
+
+    }
+
+    @Test
+    public void execute() {
+    }
+
+    @Test
+    public void addBatch() {
+
+    }
+
+    @Test
+    public void setCharacterStream() {
+    }
+
+    @Test
+    public void setRef() {
+    }
+
+    @Test
+    public void setBlob() {
+    }
+
+    @Test
+    public void setClob() {
+    }
+
+    @Test
+    public void setArray() {
+    }
+
+    @Test
+    public void getMetaData() {
+    }
+
+    @Test
+    public void setURL() {
+    }
+
+    @Test
+    public void getParameterMetaData() {
+    }
+
+    @Test
+    public void setRowId() {
+    }
+
+    @Test
+    public void setNString() {
+    }
+
+    @Test
+    public void setNCharacterStream() {
+    }
+
+    @Test
+    public void setNClob() {
+
+    }
+
+    @Test
+    public void setSQLXML() {
+
+    }
+
+
+    @BeforeClass
+    public static void beforeClass() {
+        try {
+            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+            conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata");
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java

 package com.taosdata.jdbc.cases;
 
-import com.taosdata.jdbc.lib.TSDBCommon;
+import com.taosdata.jdbc.TSDBDriver;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
+import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -18,36 +16,51 @@ import static org.junit.Assert.assertEquals;
 
 public class BatchInsertTest {
 
-    static String host = "localhost";
+    static String host = "127.0.0.1";
     static String dbName = "test";
     static String stbName = "meters";
     static int numOfTables = 30;
     final static int numOfRecordsPerTable = 1000;
     static long ts = 1496732686000l;
     final static String tablePrefix = "t";
-
     private Connection connection;
 
     @Before
     public void before() {
         try {
-            connection = TSDBCommon.getConn(host);
-            TSDBCommon.createDatabase(connection, dbName);
-            TSDBCommon.createStable(connection, stbName);
-            TSDBCommon.createTables(connection, numOfTables, stbName, tablePrefix);
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+            Statement statement = connection.createStatement();
+            statement.executeUpdate("drop database if exists " + dbName);
+            statement.executeUpdate("create database if not exists " + dbName);
+            statement.executeUpdate("use " + dbName);
+            // create stable
+            String createTableSql = "create table " + stbName + "(ts timestamp, f1 int, f2 int, f3 int) tags(areaid int, loc binary(20))";
+            statement.executeUpdate(createTableSql);
+            // create tables
+            for(int i = 0; i < numOfTables; i++) {
+                String loc = i % 2 == 0 ? "beijing" : "shanghai";
+                String createSubTalbesSql = "create table " + tablePrefix + i + " using " + stbName + " tags(" + i + ", '" + loc + "')";
+                statement.executeUpdate(createSubTalbesSql);
+            }
+            statement.close();
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     @Test
-    public void testBatchInsert(){
+    public void testBatchInsert() {
         ExecutorService executorService = Executors.newFixedThreadPool(numOfTables);
         for (int i = 0; i < numOfTables; i++) {
             final int index = i;
-            executorService.execute(new Runnable() {
-                @Override
-                public void run() {
+            executorService.execute(() -> {
                 try {
                     long startTime = System.currentTimeMillis();
                     Statement statement = connection.createStatement(); // get statement
@@ -69,7 +82,6 @@ public class BatchInsertTest {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                }
             });
         }
 
@@ -80,7 +92,7 @@ public class BatchInsertTest {
             e.printStackTrace();
         }
 
-        try{
+        try {
             Statement statement = connection.createStatement();
             ResultSet rs = statement.executeQuery("select * from meters");
             int num = 0;
@@ -89,7 +101,7 @@ public class BatchInsertTest {
             }
             assertEquals(num, numOfTables * numOfRecordsPerTable);
             rs.close();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -102,7 +114,6 @@ public class BatchInsertTest {
         } catch (SQLException e) {
             e.printStackTrace();
         }
-
     }
 
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/lib/TSDBCommon.java

-package com.taosdata.jdbc.lib;
-
-import com.taosdata.jdbc.TSDBDriver;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-public class TSDBCommon {
-
-    public static Connection getConn(String host) throws SQLException, ClassNotFoundException {
-        Class.forName("com.taosdata.jdbc.TSDBDriver");
-        Properties properties = new Properties();
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        return DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
-    }
-
-    public static void createDatabase(Connection connection, String dbName) throws SQLException {
-        Statement statement = connection.createStatement();
-        statement.executeUpdate("drop database if exists " + dbName);
-        statement.executeUpdate("create database if not exists " + dbName);
-        statement.executeUpdate("use " + dbName);
-        statement.close();
-    }
-
-    public static void createStable(Connection connection, String stbName) throws SQLException {
-        Statement statement = connection.createStatement();
-        String createTableSql = "create table " + stbName + "(ts timestamp, f1 int, f2 int, f3 int) tags(areaid int, loc binary(20))";
-        statement.executeUpdate(createTableSql);
-        statement.close();
-    }
-
-    public static void createTables(Connection connection, int numOfTables, String stbName,String tablePrefix) throws SQLException {
-        Statement statement = connection.createStatement();
-        for(int i = 0; i < numOfTables; i++) {
-            String loc = i % 2 == 0 ? "beijing" : "shanghai";
-            String createSubTalbesSql = "create table " + tablePrefix + i + " using " + stbName + " tags(" + i + ", '" + loc + "')";
-            statement.executeUpdate(createSubTalbesSql);
-        }
-        statement.close();
-    }
-}

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java

@@ -8,6 +8,7 @@ import java.sql.*;
 public class AuthenticationTest {
 
     private static final String host = "127.0.0.1";
+    //    private static final String host = "master";
     private static final String user = "root";
     private static final String password = "123456";
     private Connection conn;

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java

@@ -10,23 +10,12 @@ import java.util.Random;
 public class RestfulJDBCTest {
 
     private static final String host = "127.0.0.1";
-    private Connection connection;
-
-    @Before
-    public void before() throws ClassNotFoundException, SQLException {
-        Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
-        connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
-    }
-
-    @After
-    public void after() throws SQLException {
-        if (connection != null)
-            connection.close();
-    }
-
+    //    private static final String host = "master";
+    private static Connection connection;
+    private Random random = new Random(System.currentTimeMillis());
 
     /**
-     * 查询所有log.log
+     * select * from log.log
      **/
     @Test
     public void testCase001() {
@@ -85,7 +74,6 @@ public class RestfulJDBCTest {
         }
     }
 
-    private Random random = new Random(System.currentTimeMillis());
 
     @Test
     public void testCase005() {
@@ -105,5 +93,50 @@ public class RestfulJDBCTest {
         }
     }
 
+    @Test
+    public void testCase006() {
+        try (Statement stmt = connection.createStatement()) {
+            ResultSet rs = stmt.executeQuery("select * from weather");
+            while (rs.next()) {
+                System.out.print("ts: " + rs.getTimestamp("ts"));
+                System.out.print(", temperature: " + rs.getString("temperature"));
+                System.out.print(", humidity: " + rs.getString("humidity"));
+                System.out.println(", location: " + rs.getString("location"));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testCase007() {
+        try (Statement stmt = connection.createStatement()) {
+            ResultSet rs = stmt.executeQuery("select * from weather");
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                int columnCount = meta.getColumnCount();
+                for (int i = 1; i <= columnCount; i++) {
+                    String columnLabel = meta.getColumnLabel(i);
+                    String value = rs.getString(i);
+                    System.out.print(columnLabel + ": " + value + "\t");
+                }
+                System.out.println();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @BeforeClass
+    public static void before() throws ClassNotFoundException, SQLException {
+        Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+        connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+    }
+
+    @AfterClass
+    public static void after() throws SQLException {
+        if (connection != null)
+            connection.close();
+    }
 
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java

+package com.taosdata.jdbc.rs;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.*;
+
+public class RestfulResultSetMetaDataTest {
+
+    private static final String host = "127.0.0.1";
+//    private static final String host = "master";
+
+    private static Connection conn;
+    private static Statement stmt;
+    private static ResultSet rs;
+    private static ResultSetMetaData meta;
+
+    @Test
+    public void getColumnCount() throws SQLException {
+        Assert.assertEquals(10, meta.getColumnCount());
+    }
+
+    @Test
+    public void isAutoIncrement() throws SQLException {
+        Assert.assertFalse(meta.isAutoIncrement(1));
+        Assert.assertFalse(meta.isAutoIncrement(2));
+        Assert.assertFalse(meta.isAutoIncrement(3));
+        Assert.assertFalse(meta.isAutoIncrement(4));
+        Assert.assertFalse(meta.isAutoIncrement(5));
+        Assert.assertFalse(meta.isAutoIncrement(6));
+        Assert.assertFalse(meta.isAutoIncrement(7));
+        Assert.assertFalse(meta.isAutoIncrement(8));
+        Assert.assertFalse(meta.isAutoIncrement(9));
+        Assert.assertFalse(meta.isAutoIncrement(10));
+    }
+
+    @Test
+    public void isCaseSensitive() throws SQLException {
+        Assert.assertFalse(meta.isCaseSensitive(1));
+    }
+
+    @Test
+    public void isSearchable() throws SQLException {
+        Assert.assertTrue(meta.isSearchable(1));
+    }
+
+    @Test
+    public void isCurrency() throws SQLException {
+        Assert.assertFalse(meta.isCurrency(1));
+    }
+
+    @Test
+    public void isNullable() throws SQLException {
+        Assert.assertEquals(ResultSetMetaData.columnNoNulls, meta.isNullable(1));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(2));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(3));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(4));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(5));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(6));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(7));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(8));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(9));
+        Assert.assertEquals(ResultSetMetaData.columnNullable, meta.isNullable(10));
+    }
+
+    @Test
+    public void isSigned() throws SQLException {
+        Assert.assertFalse(meta.isSigned(1));
+    }
+
+    @Test
+    public void getColumnDisplaySize() throws SQLException {
+        Assert.assertEquals(64, meta.getColumnDisplaySize(10));
+    }
+
+    @Test
+    public void getColumnLabel() throws SQLException {
+        Assert.assertEquals("f1", meta.getColumnLabel(1));
+    }
+
+    @Test
+    public void getColumnName() throws SQLException {
+        Assert.assertEquals("f1", meta.getColumnName(1));
+    }
+
+    @Test
+    public void getSchemaName() throws SQLException {
+        Assert.assertEquals("", meta.getSchemaName(1));
+    }
+
+    @Test
+    public void getPrecision() throws SQLException {
+        Assert.assertEquals(0, meta.getPrecision(1));
+    }
+
+    @Test
+    public void getScale() throws SQLException {
+        Assert.assertEquals(0, meta.getScale(1));
+    }
+
+    @Test
+    public void getTableName() throws SQLException {
+        Assert.assertEquals("", meta.getTableName(1));
+    }
+
+    @Test
+    public void getCatalogName() throws SQLException {
+        Assert.assertEquals("restful_test", meta.getCatalogName(1));
+        Assert.assertEquals("restful_test", meta.getCatalogName(2));
+        Assert.assertEquals("restful_test", meta.getCatalogName(3));
+        Assert.assertEquals("restful_test", meta.getCatalogName(4));
+        Assert.assertEquals("restful_test", meta.getCatalogName(5));
+        Assert.assertEquals("restful_test", meta.getCatalogName(6));
+        Assert.assertEquals("restful_test", meta.getCatalogName(7));
+        Assert.assertEquals("restful_test", meta.getCatalogName(8));
+        Assert.assertEquals("restful_test", meta.getCatalogName(9));
+        Assert.assertEquals("restful_test", meta.getCatalogName(10));
+    }
+
+    @Test
+    public void getColumnType() throws SQLException {
+        Assert.assertEquals(Types.TIMESTAMP, meta.getColumnType(1));
+        Assert.assertEquals(Types.INTEGER, meta.getColumnType(2));
+        Assert.assertEquals(Types.BIGINT, meta.getColumnType(3));
+        Assert.assertEquals(Types.FLOAT, meta.getColumnType(4));
+        Assert.assertEquals(Types.DOUBLE, meta.getColumnType(5));
+        Assert.assertEquals(Types.BINARY, meta.getColumnType(6));
+        Assert.assertEquals(Types.SMALLINT, meta.getColumnType(7));
+        Assert.assertEquals(Types.TINYINT, meta.getColumnType(8));
+        Assert.assertEquals(Types.BOOLEAN, meta.getColumnType(9));
+        Assert.assertEquals(Types.NCHAR, meta.getColumnType(10));
+    }
+
+    @Test
+    public void getColumnTypeName() throws SQLException {
+        Assert.assertEquals("TIMESTAMP", meta.getColumnTypeName(1));
+        Assert.assertEquals("INT", meta.getColumnTypeName(2));
+        Assert.assertEquals("BIGINT", meta.getColumnTypeName(3));
+        Assert.assertEquals("FLOAT", meta.getColumnTypeName(4));
+        Assert.assertEquals("DOUBLE", meta.getColumnTypeName(5));
+        Assert.assertEquals("BINARY", meta.getColumnTypeName(6));
+        Assert.assertEquals("SMALLINT", meta.getColumnTypeName(7));
+        Assert.assertEquals("TINYINT", meta.getColumnTypeName(8));
+        Assert.assertEquals("BOOL", meta.getColumnTypeName(9));
+        Assert.assertEquals("NCHAR", meta.getColumnTypeName(10));
+    }
+
+    @Test
+    public void isReadOnly() throws SQLException {
+        Assert.assertTrue(meta.isReadOnly(1));
+    }
+
+    @Test
+    public void isWritable() throws SQLException {
+        Assert.assertFalse(meta.isWritable(1));
+    }
+
+    @Test
+    public void isDefinitelyWritable() throws SQLException {
+        Assert.assertFalse(meta.isDefinitelyWritable(1));
+    }
+
+    @Test
+    public void getColumnClassName() throws SQLException {
+        Assert.assertEquals(Timestamp.class.getName(), meta.getColumnClassName(1));
+        Assert.assertEquals(Integer.class.getName(), meta.getColumnClassName(2));
+        Assert.assertEquals(Long.class.getName(), meta.getColumnClassName(3));
+        Assert.assertEquals(Float.class.getName(), meta.getColumnClassName(4));
+        Assert.assertEquals(Double.class.getName(), meta.getColumnClassName(5));
+        Assert.assertEquals(String.class.getName(), meta.getColumnClassName(6));
+        Assert.assertEquals(Short.class.getName(), meta.getColumnClassName(7));
+        Assert.assertEquals(Short.class.getName(), meta.getColumnClassName(8));
+        Assert.assertEquals(Boolean.class.getName(), meta.getColumnClassName(9));
+        Assert.assertEquals(String.class.getName(), meta.getColumnClassName(10));
+    }
+
+    @Test
+    public void unwrap() throws SQLException {
+        Assert.assertNotNull(meta.unwrap(RestfulResultSetMetaData.class));
+    }
+
+    @Test
+    public void isWrapperFor() throws SQLException {
+        Assert.assertTrue(meta.isWrapperFor(RestfulResultSetMetaData.class));
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+        try {
+            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+            stmt = conn.createStatement();
+            stmt.execute("create database if not exists restful_test");
+            stmt.execute("use restful_test");
+            stmt.execute("drop table if exists weather");
+            stmt.execute("create table if not exists weather(f1 timestamp, f2 int, f3 bigint, f4 float, f5 double, f6 binary(64), f7 smallint, f8 tinyint, f9 bool, f10 nchar(64))");
+            stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', 1, 100, 3.1415, 3.1415926, 'abc', 10, 10, true, '涛思数据')");
+            rs = stmt.executeQuery("select * from restful_test.weather");
+            rs.next();
+            meta = rs.getMetaData();
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            if (rs != null)
+                rs.close();
+            if (stmt != null)
+                stmt.close();
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java

+package com.taosdata.jdbc.rs;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.sql.*;
+
+public class RestfulResultSetTest {
+
+    private static final String host = "127.0.0.1";
+//    private static final String host = "master";
+
+    private static Connection conn;
+    private static Statement stmt;
+    private static ResultSet rs;
+
+    @Test
+    public void wasNull() throws SQLException {
+        Assert.assertFalse(rs.wasNull());
+    }
+
+    @Test
+    public void getString() throws SQLException {
+        String f10 = rs.getString("f10");
+        Assert.assertEquals("涛思数据", f10);
+        f10 = rs.getString(10);
+        Assert.assertEquals("涛思数据", f10);
+    }
+
+    @Test
+    public void getBoolean() throws SQLException {
+        Boolean f9 = rs.getBoolean("f9");
+        Assert.assertEquals(true, f9);
+        f9 = rs.getBoolean(9);
+        Assert.assertEquals(true, f9);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getByte() throws SQLException {
+        rs.getByte(1);
+    }
+
+    @Test
+    public void getShort() throws SQLException {
+        short f7 = rs.getShort("f7");
+        Assert.assertEquals(10, f7);
+        f7 = rs.getShort(7);
+        Assert.assertEquals(10, f7);
+    }
+
+    @Test
+    public void getInt() throws SQLException {
+        int f2 = rs.getInt("f2");
+        Assert.assertEquals(1, f2);
+        f2 = rs.getInt(2);
+        Assert.assertEquals(1, f2);
+    }
+
+    @Test
+    public void getLong() throws SQLException {
+        long f3 = rs.getLong("f3");
+        Assert.assertEquals(100, f3);
+        f3 = rs.getLong(3);
+        Assert.assertEquals(100, f3);
+    }
+
+    @Test
+    public void getFloat() throws SQLException {
+        float f4 = rs.getFloat("f4");
+        Assert.assertEquals(3.1415f, f4, 0f);
+        f4 = rs.getFloat(4);
+        Assert.assertEquals(3.1415f, f4, 0f);
+    }
+
+    @Test
+    public void getDouble() throws SQLException {
+        double f5 = rs.getDouble("f5");
+        Assert.assertEquals(3.1415926, f5, 0.0);
+        f5 = rs.getDouble(5);
+        Assert.assertEquals(3.1415926, f5, 0.0);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getBigDecimal() throws SQLException {
+        rs.getBigDecimal("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getBytes() throws SQLException {
+        rs.getBytes("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getDate() throws SQLException {
+        rs.getDate("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getTime() throws SQLException {
+        rs.getTime("f1");
+    }
+
+    @Test
+    public void getTimestamp() throws SQLException {
+        Timestamp f1 = rs.getTimestamp("f1");
+        Assert.assertEquals("2021-01-01 00:00:00.0", f1.toString());
+        f1 = rs.getTimestamp(1);
+        Assert.assertEquals("2021-01-01 00:00:00.0", f1.toString());
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getAsciiStream() throws SQLException {
+        rs.getAsciiStream("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getUnicodeStream() throws SQLException {
+        rs.getUnicodeStream("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getBinaryStream() throws SQLException {
+        rs.getBinaryStream("f1");
+    }
+
+    @Test
+    public void getWarnings() throws SQLException {
+        Assert.assertNull(rs.getWarnings());
+    }
+
+    @Test
+    public void clearWarnings() throws SQLException {
+        rs.clearWarnings();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getCursorName() throws SQLException {
+        rs.getCursorName();
+    }
+
+    @Test
+    public void getMetaData() throws SQLException {
+        ResultSetMetaData meta = rs.getMetaData();
+        Assert.assertNotNull(meta);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getObject() throws SQLException {
+        rs.getObject("f1");
+    }
+
+    @Test(expected = SQLException.class)
+    public void findColumn() throws SQLException {
+        int columnIndex = rs.findColumn("f1");
+        Assert.assertEquals(1, columnIndex);
+        columnIndex = rs.findColumn("f2");
+        Assert.assertEquals(2, columnIndex);
+        columnIndex = rs.findColumn("f3");
+        Assert.assertEquals(3, columnIndex);
+        columnIndex = rs.findColumn("f4");
+        Assert.assertEquals(4, columnIndex);
+        columnIndex = rs.findColumn("f5");
+        Assert.assertEquals(5, columnIndex);
+        columnIndex = rs.findColumn("f6");
+        Assert.assertEquals(6, columnIndex);
+        columnIndex = rs.findColumn("f7");
+        Assert.assertEquals(7, columnIndex);
+        columnIndex = rs.findColumn("f8");
+        Assert.assertEquals(8, columnIndex);
+        columnIndex = rs.findColumn("f9");
+        Assert.assertEquals(9, columnIndex);
+        columnIndex = rs.findColumn("f10");
+        Assert.assertEquals(10, columnIndex);
+
+        rs.findColumn("f11");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getCharacterStream() throws SQLException {
+        rs.getCharacterStream(1);
+    }
+
+    @Test
+    public void isBeforeFirst() throws SQLException {
+        Assert.assertFalse(rs.isBeforeFirst());
+        rs.beforeFirst();
+        Assert.assertTrue(rs.isBeforeFirst());
+        rs.next();
+    }
+
+    @Test
+    public void isAfterLast() throws SQLException {
+        Assert.assertFalse(rs.isAfterLast());
+    }
+
+    @Test
+    public void isFirst() throws SQLException {
+        Assert.assertTrue(rs.isFirst());
+    }
+
+    @Test
+    public void isLast() throws SQLException {
+        Assert.assertTrue(rs.isLast());
+    }
+
+    @Test
+    public void beforeFirst() throws SQLException {
+        rs.beforeFirst();
+        Assert.assertTrue(rs.isBeforeFirst());
+        rs.next();
+    }
+
+    @Test
+    public void afterLast() throws SQLException {
+        rs.afterLast();
+        Assert.assertTrue(rs.isAfterLast());
+        rs.first();
+    }
+
+    @Test
+    public void first() throws SQLException {
+        rs.first();
+        Assert.assertEquals("2021-01-01 00:00:00.0", rs.getTimestamp("f1").toString());
+    }
+
+    @Test
+    public void last() throws SQLException {
+        rs.last();
+        Assert.assertEquals("2021-01-01 00:00:00.0", rs.getTimestamp("f1").toString());
+    }
+
+    @Test
+    public void getRow() throws SQLException {
+        int row = rs.getRow();
+        Assert.assertEquals(1, row);
+        rs.beforeFirst();
+        row = rs.getRow();
+        Assert.assertEquals(0, row);
+        rs.first();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void absolute() throws SQLException {
+        rs.absolute(-1);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void relative() throws SQLException {
+        rs.relative(-1);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void previous() throws SQLException {
+        rs.previous();
+    }
+
+    @Test(expected = SQLException.class)
+    public void setFetchDirection() throws SQLException {
+        rs.setFetchDirection(ResultSet.FETCH_FORWARD);
+        rs.setFetchDirection(ResultSet.FETCH_UNKNOWN);
+    }
+
+    @Test
+    public void getFetchDirection() throws SQLException {
+        Assert.assertEquals(ResultSet.FETCH_FORWARD, rs.getFetchDirection());
+    }
+
+    @Test(expected = SQLException.class)
+    public void setFetchSize() throws SQLException {
+        rs.setFetchSize(0);
+    }
+
+    @Test
+    public void getFetchSize() throws SQLException {
+        Assert.assertEquals(1, rs.getFetchSize());
+    }
+
+    @Test
+    public void getType() throws SQLException {
+        Assert.assertEquals(ResultSet.TYPE_FORWARD_ONLY, rs.getType());
+    }
+
+    @Test
+    public void getConcurrency() throws SQLException {
+        Assert.assertEquals(ResultSet.CONCUR_READ_ONLY, rs.getConcurrency());
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void rowUpdated() throws SQLException {
+        rs.rowUpdated();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void rowInserted() throws SQLException {
+        rs.rowInserted();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void rowDeleted() throws SQLException {
+        rs.rowDeleted();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateNull() throws SQLException {
+        rs.updateNull("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateBoolean() throws SQLException {
+        rs.updateBoolean(1, false);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateByte() throws SQLException {
+        rs.updateByte(1, new Byte("0"));
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateShort() throws SQLException {
+        rs.updateShort(1, new Short("0"));
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateInt() throws SQLException {
+        rs.updateInt(1, 1);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateLong() throws SQLException {
+        rs.updateLong(1, 1l);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateFloat() throws SQLException {
+        rs.updateFloat(1, 1f);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateDouble() throws SQLException {
+        rs.updateDouble(1, 1.0);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateBigDecimal() throws SQLException {
+        rs.updateBigDecimal(1, new BigDecimal(1));
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateString() throws SQLException {
+        rs.updateString(1, "abc");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateBytes() throws SQLException {
+        rs.updateBytes(1, new byte[]{});
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateDate() throws SQLException {
+        rs.updateDate(1, new Date(System.currentTimeMillis()));
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateTime() throws SQLException {
+        rs.updateTime(1, new Time(System.currentTimeMillis()));
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateTimestamp() throws SQLException {
+        rs.updateTimestamp(1, new Timestamp(System.currentTimeMillis()));
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateAsciiStream() throws SQLException {
+        rs.updateAsciiStream(1, null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateBinaryStream() throws SQLException {
+        rs.updateBinaryStream(1, null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateCharacterStream() throws SQLException {
+        rs.updateCharacterStream(1, null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateObject() throws SQLException {
+        rs.updateObject(1, null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void insertRow() throws SQLException {
+        rs.insertRow();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateRow() throws SQLException {
+        rs.updateRow();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void deleteRow() throws SQLException {
+        rs.deleteRow();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void refreshRow() throws SQLException {
+        rs.refreshRow();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void cancelRowUpdates() throws SQLException {
+        rs.cancelRowUpdates();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void moveToInsertRow() throws SQLException {
+        rs.moveToInsertRow();
+    }
+
+    @Test
+    public void getStatement() throws SQLException {
+        Statement stmt = rs.getStatement();
+        Assert.assertNotNull(stmt);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void moveToCurrentRow() throws SQLException {
+        rs.moveToCurrentRow();
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getRef() throws SQLException {
+        rs.getRef(1);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getBlob() throws SQLException {
+        rs.getBlob("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getClob() throws SQLException {
+        rs.getClob("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getArray() throws SQLException {
+        rs.getArray("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getURL() throws SQLException {
+        rs.getURL("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateRef() throws SQLException {
+        rs.updateRef("f1", null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateBlob() throws SQLException {
+        rs.updateBlob(1, (InputStream) null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateClob() throws SQLException {
+        rs.updateClob(1, (Reader) null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateArray() throws SQLException {
+        rs.updateArray(1, null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getRowId() throws SQLException {
+        rs.getRowId("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateRowId() throws SQLException {
+        rs.updateRowId(1, null);
+    }
+
+    @Test
+    public void getHoldability() throws SQLException {
+        Assert.assertEquals(ResultSet.HOLD_CURSORS_OVER_COMMIT, rs.getHoldability());
+    }
+
+    @Test
+    public void isClosed() throws SQLException {
+        Assert.assertFalse(rs.isClosed());
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateNString() throws SQLException {
+        rs.updateNString(1, null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateNClob() throws SQLException {
+        rs.updateNClob(1, (Reader) null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getNClob() throws SQLException {
+        rs.getNClob("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getSQLXML() throws SQLException {
+        rs.getSQLXML("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateSQLXML() throws SQLException {
+        rs.updateSQLXML(1, null);
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getNString() throws SQLException {
+        rs.getNString("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void getNCharacterStream() throws SQLException {
+        rs.getNCharacterStream("f1");
+    }
+
+    @Test(expected = SQLFeatureNotSupportedException.class)
+    public void updateNCharacterStream() throws SQLException {
+        rs.updateNCharacterStream(1, null);
+    }
+
+    @Test
+    public void unwrap() throws SQLException {
+        RestfulResultSet unwrap = rs.unwrap(RestfulResultSet.class);
+        Assert.assertNotNull(unwrap);
+    }
+
+    @Test
+    public void isWrapperFor() throws SQLException {
+        Assert.assertTrue(rs.isWrapperFor(RestfulResultSet.class));
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+        try {
+            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+            conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
+            stmt = conn.createStatement();
+            stmt.execute("create database if not exists restful_test");
+            stmt.execute("use restful_test");
+            stmt.execute("drop table if exists weather");
+            stmt.execute("create table if not exists weather(f1 timestamp, f2 int, f3 bigint, f4 float, f5 double, f6 binary(64), f7 smallint, f8 tinyint, f9 bool, f10 nchar(64))");
+            stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', 1, 100, 3.1415, 3.1415926, 'abc', 10, 10, true, '涛思数据')");
+            rs = stmt.executeQuery("select * from restful_test.weather");
+            rs.next();
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            if (rs != null)
+                rs.close();
+            if (stmt != null)
+                stmt.close();
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
\ No newline at end of file

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java

 package com.taosdata.jdbc.rs;
 
+import com.taosdata.jdbc.utils.SQLExecutor;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
@@ -11,378 +12,315 @@ import java.sql.*;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class SQLTest {
     private static final String host = "127.0.0.1";
-
+    //    private static final String host = "master";
     private static Connection connection;
 
     @Test
     public void testCase001() {
         String sql = "create database if not exists restful_test";
-        execute(sql);
+        SQLExecutor.execute(connection, sql);
     }
 
     @Test
     public void testCase002() {
         String sql = "use restful_test";
-        execute(sql);
+        SQLExecutor.execute(connection, sql);
     }
 
     @Test
     public void testCase003() {
         String sql = "show databases";
-        executeWithResult(sql);
+        SQLExecutor.executeWithResult(connection, sql);
     }
 
     @Test
     public void testCase004() {
         String sql = "show tables";
-        executeWithResult(sql);
+        SQLExecutor.executeWithResult(connection, sql);
     }
 
     @Test
     public void testCase005() {
         String sql = "show stables";
-        executeWithResult(sql);
+        SQLExecutor.executeWithResult(connection, sql);
     }
 
     @Test
     public void testCase006() {
         String sql = "show dnodes";
-        executeWithResult(sql);
+        SQLExecutor.executeWithResult(connection, sql);
     }
 
     @Test
     public void testCase007() {
         String sql = "show vgroups";
-        executeWithResult(sql);
+        SQLExecutor.executeWithResult(connection, sql);
     }
 
     @Test
     public void testCase008() {
         String sql = "drop table if exists restful_test.weather";
-        execute(sql);
+        SQLExecutor.execute(connection, sql);
     }
 
     @Test
     public void testCase009() {
         String sql = "create table if not exists restful_test.weather(ts timestamp, temperature float) tags(location nchar(64))";
-        execute(sql);
+        SQLExecutor.execute(connection, sql);
     }
 
     @Test
     public void testCase010() {
         String sql = "create table t1 using restful_test.weather tags('北京')";
-        execute(sql);
+        SQLExecutor.execute(connection, sql);
     }
 
     @Test
     public void testCase011() {
         String sql = "insert into restful_test.t1 values(now, 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase012() {
         String sql = "insert into restful_test.t1 values('2020-01-01 00:00:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase013() {
         String sql = "insert into restful_test.t1 values('2020-01-01 00:01:00.000', 22.22),('2020-01-01 00:02:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase014() {
         String sql = "insert into restful_test.t2 using weather tags('上海') values('2020-01-01 00:03:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase015() {
         String sql = "insert into restful_test.t2 using weather tags('上海') values('2020-01-01 00:01:00.000', 22.22),('2020-01-01 00:02:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase016() {
         String sql = "insert into t1 values('2020-01-01 01:0:00.000', 22.22),('2020-01-01 02:00:00.000', 22.22) t2 values('2020-01-01 01:0:00.000', 33.33),('2020-01-01 02:00:00.000', 33.33)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase017() {
         String sql = "Insert into t3 using weather tags('广东') values('2020-01-01 01:0:00.000', 22.22),('2020-01-01 02:00:00.000', 22.22) t4 using weather tags('天津') values('2020-01-01 01:0:00.000', 33.33),('2020-01-01 02:00:00.000', 33.33)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase018() {
         String sql = "select * from restful_test.t1";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase019() {
         String sql = "select * from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase020() {
         String sql = "select ts, temperature from restful_test.t1";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase021() {
         String sql = "select ts, temperature from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase022() {
         String sql = "select temperature, ts from restful_test.t1";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase023() {
         String sql = "select temperature, ts from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase024() {
         String sql = "import into restful_test.t5 using weather tags('石家庄') values('2020-01-01 00:01:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase025() {
         String sql = "import into restful_test.t6 using weather tags('沈阳') values('2020-01-01 00:01:00.000', 22.22),('2020-01-01 00:02:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase026() {
         String sql = "import into restful_test.t7 using weather tags('长沙') values('2020-01-01 00:01:00.000', 22.22) restful_test.t8 using weather tags('吉林') values('2020-01-01 00:01:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase027() {
         String sql = "import into restful_test.t9 using weather tags('武汉') values('2020-01-01 00:01:00.000', 22.22) ,('2020-01-02 00:01:00.000', 22.22) restful_test.t10 using weather tags('哈尔滨') values('2020-01-01 00:01:00.000', 22.22),('2020-01-02 00:01:00.000', 22.22)";
-        executeUpdate(sql);
+        SQLExecutor.executeUpdate(connection, sql);
     }
 
     @Test
     public void testCase028() {
         String sql = "select location, temperature, ts from restful_test.weather where temperature > 1";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase029() {
         String sql = "select location, temperature, ts from restful_test.weather where temperature < 1";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase030() {
         String sql = "select location, temperature, ts from restful_test.weather where ts  > now";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase031() {
         String sql = "select location, temperature, ts from restful_test.weather where ts  < now";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase032() {
         String sql = "select count(*) from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase033() {
         String sql = "select first(*) from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase034() {
         String sql = "select last(*) from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase035() {
         String sql = "select last_row(*) from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase036() {
         String sql = "select ts, ts as primary_key from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
 
     @Test
     public void testCase037() {
         String sql = "select database()";
-        execute("use restful_test");
-        executeQuery(sql);
+        SQLExecutor.execute(connection, "use restful_test");
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase038() {
         String sql = "select client_version()";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase039() {
         String sql = "select server_status()";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase040() {
         String sql = "select server_status() as status";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase041() {
         String sql = "select tbname, location from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase042() {
         String sql = "select count(tbname) from restful_test.weather";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase043() {
         String sql = "select * from restful_test.weather where ts < now - 1h";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase044() {
         String sql = "select * from restful_test.weather where ts < now - 1h and location like '%'";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase045() {
         String sql = "select * from restful_test.weather where ts < now - 1h order by ts";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase046() {
         String sql = "select last(*) from restful_test.weather where ts < now - 1h group by tbname order by tbname";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase047() {
         String sql = "select * from restful_test.weather limit 2";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase048() {
         String sql = "select * from restful_test.weather limit 2 offset 5";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase049() {
         String sql = "select * from restful_test.t1, restful_test.t3 where t1.ts = t3.ts ";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase050() {
         String sql = "select * from restful_test.t1, restful_test.t3 where t1.ts = t3.ts and t1.location = t3.location";
-        executeQuery(sql);
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @Test
     public void testCase051() {
         String sql = "select * from restful_test.t1 tt, restful_test.t3 yy where tt.ts = yy.ts";
-        executeQuery(sql);
-    }
-
-    private void executeUpdate(String sql) {
-        try (Statement statement = connection.createStatement()) {
-            long start = System.currentTimeMillis();
-            int affectedRows = statement.executeUpdate(sql);
-            long end = System.currentTimeMillis();
-            System.out.println("[ affected rows : " + affectedRows + " ] time cost: " + (end - start) + " ms, execute statement ====> " + sql);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void executeWithResult(String sql) {
-        try (Statement statement = connection.createStatement()) {
-            statement.execute(sql);
-            ResultSet resultSet = statement.getResultSet();
-            printResult(resultSet);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void execute(String sql) {
-        try (Statement statement = connection.createStatement()) {
-            long start = System.currentTimeMillis();
-            boolean execute = statement.execute(sql);
-            long end = System.currentTimeMillis();
-            printSql(sql, execute, (end - start));
-        } catch (SQLException e) {
-            System.out.println("ERROR execute SQL ===> " + sql);
-            e.printStackTrace();
-        }
-    }
-
-    private static void printSql(String sql, boolean succeed, long cost) {
-        System.out.println("[ " + (succeed ? "OK" : "ERROR!") + " ] time cost: " + cost + " ms, execute statement ====> " + sql);
-    }
-
-    private void executeQuery(String sql) {
-        try (Statement statement = connection.createStatement()) {
-            long start = System.currentTimeMillis();
-            ResultSet resultSet = statement.executeQuery(sql);
-            long end = System.currentTimeMillis();
-            printSql(sql, true, (end - start));
-            printResult(resultSet);
-        } catch (SQLException e) {
-            System.out.println("ERROR execute SQL ===> " + sql);
-            e.printStackTrace();
-        }
-    }
-
-    private static void printResult(ResultSet resultSet) throws SQLException {
-        ResultSetMetaData metaData = resultSet.getMetaData();
-        while (resultSet.next()) {
-            StringBuilder sb = new StringBuilder();
-            for (int i = 1; i <= metaData.getColumnCount(); i++) {
-                String columnLabel = metaData.getColumnLabel(i);
-                String value = resultSet.getString(i);
-                sb.append(columnLabel + ": " + value + "\t");
-            }
-            System.out.println(sb.toString());
-        }
+        SQLExecutor.executeQuery(connection, sql);
     }
 
     @BeforeClass

src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/SQLExecutor.java

+package com.taosdata.jdbc.utils;
+
+import java.sql.*;
+
+public class SQLExecutor {
+
+    // insert, import
+    public static void executeUpdate(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            long start = System.currentTimeMillis();
+            int affectedRows = statement.executeUpdate(sql);
+            long end = System.currentTimeMillis();
+            System.out.println("[ affected rows : " + affectedRows + " ] time cost: " + (end - start) + " ms, execute statement ====> " + sql);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // show databases, show tables, show stables
+    public static void executeWithResult(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            statement.execute(sql);
+            ResultSet resultSet = statement.getResultSet();
+            printResult(resultSet);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // use database, create database, create table, drop table...
+    public static void execute(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            long start = System.currentTimeMillis();
+            boolean execute = statement.execute(sql);
+            long end = System.currentTimeMillis();
+            printSql(sql, execute, (end - start));
+        } catch (SQLException e) {
+            System.out.println("ERROR execute SQL ===> " + sql);
+            e.printStackTrace();
+        }
+    }
+
+    // select
+    public static void executeQuery(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            long start = System.currentTimeMillis();
+            ResultSet resultSet = statement.executeQuery(sql);
+            long end = System.currentTimeMillis();
+            printSql(sql, true, (end - start));
+            printResult(resultSet);
+        } catch (SQLException e) {
+            System.out.println("ERROR execute SQL ===> " + sql);
+            e.printStackTrace();
+        }
+    }
+
+    private static void printSql(String sql, boolean succeed, long cost) {
+        System.out.println("[ " + (succeed ? "OK" : "ERROR!") + " ] time cost: " + cost + " ms, execute statement ====> " + sql);
+    }
+
+    private static void printResult(ResultSet resultSet) throws SQLException {
+        ResultSetMetaData metaData = resultSet.getMetaData();
+        while (resultSet.next()) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 1; i <= metaData.getColumnCount(); i++) {
+                String columnLabel = metaData.getColumnLabel(i);
+                String value = resultSet.getString(i);
+                sb.append(columnLabel + ": " + value + "\t");
+            }
+            System.out.println(sb.toString());
+        }
+    }
+
+}

src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/SqlSyntaxValidatorTest.java

@@ -16,10 +16,6 @@ public class SqlSyntaxValidatorTest {
     @Test
     public void isUseSQL() {
         Assert.assertTrue(SqlSyntaxValidator.isUseSql("use database test"));
-        Assert.assertTrue(SqlSyntaxValidator.isUseSql("create database test"));
-        Assert.assertTrue(SqlSyntaxValidator.isUseSql("create database if not exist test"));
-        Assert.assertTrue(SqlSyntaxValidator.isUseSql("drop database test"));
-        Assert.assertTrue(SqlSyntaxValidator.isUseSql("drop database if exist test"));
     }
 
 }
\ No newline at end of file

src/inc/taoserror.h

@@ -256,6 +256,8 @@ TAOS_DEFINE_ERROR(TSDB_CODE_QRY_HAS_RSP,                  0, 0x0708, "Query shou
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_IN_EXEC,                  0, 0x0709, "Multiple retrieval of this query")
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_TOO_MANY_TIMEWINDOW,      0, 0x070A, "Too many time window in query")
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_NOT_ENOUGH_BUFFER,        0, 0x070B, "Query buffer limit has reached")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_INCONSISTAN,              0, 0x070C, "File inconsistance in replica")
+
 
 // grant
 TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_EXPIRED,                0, 0x0800, "License expired")

src/kit/shell/src/shellWindows.c

@@ -19,6 +19,10 @@
 
 extern char configDir[];
 
+void printVersion() {
+  printf("version: %s\n", version);
+}
+
 void printHelp() {
   char indent[10] = "        ";
   printf("taos shell is used to test the TDengine database\n");
@@ -51,6 +55,8 @@ void printHelp() {
   printf("%s%s%s\n", indent, indent, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup.");
   printf("%s%s\n", indent, "-l");
   printf("%s%s%s\n", indent, indent, "Packet length used for net test, default is 1000 bytes.");
+  printf("%s%s\n", indent, "-V");
+  printf("%s%s%s\n", indent, indent, "Print program version.");
 
   exit(EXIT_SUCCESS);
 }
@@ -69,6 +75,9 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
     // for password
     else if (strcmp(argv[i], "-p") == 0) {
       arguments->is_use_passwd = true;
+      if (i < argc - 1 && argv[i + 1][0] != '-') {
+        arguments->password = argv[++i];
+      }
     }
     // for management port
     else if (strcmp(argv[i], "-P") == 0) {
@@ -145,7 +154,6 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     }
-    // For time zone
     else if (strcmp(argv[i], "-n") == 0) {
       if (i < argc - 1) {
         arguments->netTestRole = argv[++i];
@@ -154,7 +162,6 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     }
-    // For time zone
     else if (strcmp(argv[i], "-l") == 0) {
       if (i < argc - 1) {
         arguments->pktLen = atoi(argv[++i]);
@@ -163,10 +170,14 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     }
+    else if (strcmp(argv[i], "-V") == 0) {
+      printVersion();
+      exit(EXIT_SUCCESS);
+    }
     // For temperory command TODO
     else if (strcmp(argv[i], "--help") == 0) {
       printHelp();
-      exit(EXIT_FAILURE);
+      exit(EXIT_SUCCESS);
     } else {
       fprintf(stderr, "wrong options\n");
       printHelp();

src/mnode/src/mnodeCluster.c

@@ -138,14 +138,6 @@ void mnodeDecClusterRef(SClusterObj *pCluster) {
   sdbDecRef(tsClusterSdb, pCluster);
 }
 
-#ifdef __APPLE__
-bool taosGetSystemUid(char *uid) {
-  fprintf(stderr, "%s[%d]%s(): not implemented yet!\n", basename(__FILE__), __LINE__, __func__);
-  abort();
-  return false;
-}
-#endif // __APPLE__
-
 static int32_t mnodeCreateCluster() {
   int64_t numOfClusters = sdbGetNumOfRows(tsClusterSdb);
   if (numOfClusters != 0) return TSDB_CODE_SUCCESS;

src/os/inc/osDarwin.h

@@ -91,7 +91,12 @@ extern "C" {
 typedef int(*__compar_fn_t)(const void *, const void *);
 
 // for send function in tsocket.c
-// #define MSG_NOSIGNAL             0
+#if defined(MSG_NOSIGNAL)
+#undef MSG_NOSIGNAL
+#endif
+
+#define MSG_NOSIGNAL             0
+
 #define SO_NO_CHECK              0x1234
 #define SOL_TCP                  0x1234
 #define TCP_KEEPIDLE             0x1234

src/os/src/darwin/darwinSemphone.c

@@ -134,7 +134,7 @@ int tsem_init(tsem_t *sem, int pshared, unsigned int value) {
     errno = ENOMEM;
     return -1;
   }
-  kern_return_t ret = semaphore_create(sem_port, &p->sem, SYNC_POLICY_FIFO, 0);
+  kern_return_t ret = semaphore_create(sem_port, &p->sem, SYNC_POLICY_FIFO, value);
   if (ret != KERN_SUCCESS) {
     fprintf(stderr, "==%s[%d]%s():[%p]==semophore_create failed\n", basename(__FILE__), __LINE__, __func__, sem);
     // we fail-fast here, because we have less-doc about semaphore_create for the moment

src/os/src/darwin/darwinSysInfo.c

@@ -103,4 +103,14 @@ int taosSystem(const char *cmd) {
 
 void taosSetCoreDump() {}
 
-char *taosGetCmdlineByPID(int pid) { return ""; }
\ No newline at end of file
+char *taosGetCmdlineByPID(int pid) {
+  return "[not supported yet]";
+}
+
+bool taosGetSystemUid(char *uid) {
+  uuid_t uuid = {0};
+  uuid_generate(uuid);
+  // it's caller's responsibility to make enough space for `uid`, that's 36-char + 1-null
+  uuid_unparse(uuid, uid);
+  return true;
+}

src/plugins/http/inc/httpUtil.h

@@ -17,7 +17,7 @@
 #define TDENGINE_HTTP_UTIL_H
 
 bool httpCheckUsedbSql(char *sql);
-void httpTimeToString(time_t t, char *buf, int32_t buflen);
+void httpTimeToString(int32_t t, char *buf, int32_t buflen);
 
 bool    httpUrlMatch(HttpContext *pContext, int32_t pos, char *cmp);
 bool    httpParseRequest(HttpContext *pContext);

src/plugins/http/src/httpUtil.c

@@ -29,7 +29,7 @@ bool httpCheckUsedbSql(char *sql) {
   return false;
 }
 
-void httpTimeToString(time_t t, char *buf, int32_t buflen) {
+void httpTimeToString(int32_t t, char *buf, int32_t buflen) {
   memset(buf, 0, (size_t)buflen);
   char ts[32] = {0};
 
@@ -37,7 +37,7 @@ void httpTimeToString(time_t t, char *buf, int32_t buflen) {
   time_t     tt = t / 1000;
   ptm = localtime(&tt);
   strftime(ts, 31, "%Y-%m-%d %H:%M:%S", ptm);
-  sprintf(buf, "%s.%03" PRId64, ts, t % 1000);
+  sprintf(buf, "%s.%03d", ts, t % 1000);
 }
 
 int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...) {

src/query/src/qExecutor.c

@@ -1398,13 +1398,13 @@ static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, int32_t offset) {
     if (key < elem.ts) {
       return TS_JOIN_TS_NOT_EQUALS;
     } else if (key > elem.ts) {
-      assert(false);
+      longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_INCONSISTAN);
     }
   } else {
     if (key > elem.ts) {
       return TS_JOIN_TS_NOT_EQUALS;
     } else if (key < elem.ts) {
-      assert(false);
+      longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_INCONSISTAN);
     }
   }
 
@@ -3828,6 +3828,11 @@ void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) {
     setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
     pRuntimeEnv->scanFlag = REPEAT_SCAN;
 
+    if (pRuntimeEnv->pTsBuf) {
+      bool ret = tsBufNextPos(pRuntimeEnv->pTsBuf);
+      assert(ret);
+    }
+
     qDebug("QInfo:%p start to repeat scan data blocks due to query func required, qrange:%"PRId64"-%"PRId64, pQInfo,
         cond.twindow.skey, cond.twindow.ekey);
   }
@@ -6424,6 +6429,11 @@ static int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SArray **pTableIdList,
     pMsg += pQueryMsg->tbnameCondLen;
   }
 
+  //skip ts buf
+  if ((pQueryMsg->tsOffset + pQueryMsg->tsLen) > 0) {
+    pMsg = (char *)pQueryMsg + pQueryMsg->tsOffset + pQueryMsg->tsLen;
+  }
+
   *sql = strndup(pMsg, pQueryMsg->sqlstrLen);
 
   if (!validateQuerySourceCols(pQueryMsg, *pExpr, *tagCols)) {

src/tsdb/inc/tsdbMain.h

@@ -233,11 +233,7 @@ typedef struct {
   SMemTable*      mem;
   SMemTable*      imem;
   STsdbFileH*     tsdbFileH;
-#ifdef __APPLE__
-  sem_t          *readyToCommit;
-#else // __APPLE__
-  sem_t           readyToCommit;
-#endif // __APPLE__
+  tsem_t          readyToCommit;
   pthread_mutex_t mutex;
   bool            repoLocked;
   int32_t         code; // Commit code

src/tsdb/src/tsdbCommit.c

@@ -166,11 +166,7 @@ static void tsdbEndCommit(STsdbRepo *pRepo, int eno) {
   pRepo->imem = NULL;
   tsdbUnlockRepo(pRepo);
   tsdbUnRefMemTable(pRepo, pIMem);
-#ifdef __APPLE__
-  sem_post(pRepo->readyToCommit);
-#else // __APPLE__
-  sem_post(&(pRepo->readyToCommit));
-#endif // __APPLE__
+  tsem_post(&(pRepo->readyToCommit));
 }
 
 static int tsdbHasDataToCommit(SCommitIter *iters, int nIters, TSKEY minKey, TSKEY maxKey) {

src/tsdb/src/tsdbMain.c

@@ -146,11 +146,7 @@ int tsdbCloseRepo(TSDB_REPO_T *repo, int toCommit) {
 
   if (toCommit) {
     tsdbAsyncCommit(pRepo);
-#ifdef __APPLE__
-    sem_wait(pRepo->readyToCommit);
-#else // __APPLE__
-    sem_wait(&(pRepo->readyToCommit));
-#endif // __APPLE__
+    tsem_wait(&(pRepo->readyToCommit));
     terrno = pRepo->code;
   }
   tsdbUnRefMemTable(pRepo, pRepo->mem);
@@ -647,21 +643,12 @@ static STsdbRepo *tsdbNewRepo(char *rootDir, STsdbAppH *pAppH, STsdbCfg *pCfg) {
     goto _err;
   }
 
-#ifdef __APPLE__
-  pRepo->readyToCommit = sem_open(NULL, O_CREAT, 0644, 1);
-  if (pRepo->readyToCommit==SEM_FAILED) {
-    code = errno;
-    terrno = TAOS_SYSTEM_ERROR(code);
-    goto _err;
-  }
-#else // __APPLE__
-  code = sem_init(&(pRepo->readyToCommit), 0, 1);
+  code = tsem_init(&(pRepo->readyToCommit), 0, 1);
   if (code != 0) {
     code = errno;
     terrno = TAOS_SYSTEM_ERROR(code);
     goto _err;
   }
-#endif // __APPLE__
 
   pRepo->repoLocked = false;
 
@@ -707,11 +694,7 @@ static void tsdbFreeRepo(STsdbRepo *pRepo) {
     // tsdbFreeMemTable(pRepo->mem);
     // tsdbFreeMemTable(pRepo->imem);
     tfree(pRepo->rootDir);
-#ifdef __APPLE__
-    sem_close(pRepo->readyToCommit);
-#else // __APPLE__
-    sem_destroy(&(pRepo->readyToCommit));
-#endif // __APPLE__
+    tsem_destroy(&(pRepo->readyToCommit));
     pthread_mutex_destroy(&pRepo->mutex);
     free(pRepo);
   }

src/tsdb/src/tsdbMemTable.c

@@ -207,11 +207,7 @@ void *tsdbAllocBytes(STsdbRepo *pRepo, int bytes) {
 int tsdbAsyncCommit(STsdbRepo *pRepo) {
   if (pRepo->mem == NULL) return 0;
 
-#ifdef __APPLE__
-  sem_wait(pRepo->readyToCommit);
-#else // __APPLE__
-  sem_wait(&(pRepo->readyToCommit));
-#endif // __APPLE__
+  tsem_wait(&(pRepo->readyToCommit));
 
   ASSERT(pRepo->imem == NULL);
 
@@ -233,13 +229,8 @@ int tsdbSyncCommit(TSDB_REPO_T *repo) {
   STsdbRepo *pRepo = (STsdbRepo *)repo;
 
   tsdbAsyncCommit(pRepo);
-#ifdef __APPLE__
-  sem_wait(pRepo->readyToCommit);
-  sem_post(pRepo->readyToCommit);
-#else // __APPLE__
-  sem_wait(&(pRepo->readyToCommit));
-  sem_post(&(pRepo->readyToCommit));
-#endif // __APPLE__
+  tsem_wait(&(pRepo->readyToCommit));
+  tsem_post(&(pRepo->readyToCommit));
 
   if (pRepo->code != TSDB_CODE_SUCCESS) {
     terrno = pRepo->code;

tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java

@@ -14,13 +14,14 @@ public class JdbcRestfulDemo {
             String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata";
 
             Properties properties = new Properties();
-            properties.setProperty("charset", "UTF-8");
-            properties.setProperty("locale", "en_US.UTF-8");
-            properties.setProperty("timezone", "UTC-8");
+//            properties.setProperty("charset", "UTF-8");
+//            properties.setProperty("locale", "en_US.UTF-8");
+//            properties.setProperty("timezone", "UTC-8");
 
             Connection conn = DriverManager.getConnection(url, properties);
             Statement stmt = conn.createStatement();
 
+            stmt.execute("drop database if exists restful_test");
             stmt.execute("create database if not exists restful_test");
             stmt.execute("use restful_test");
             stmt.execute("create table restful_test.weather(ts timestamp, temperature float) tags(location nchar(64))");
@@ -34,6 +35,7 @@ public class JdbcRestfulDemo {
                 System.out.println();
             }
 
+            rs.close();
             stmt.close();
             conn.close();
         } catch (ClassNotFoundException e) {

tests/examples/JDBC/connectionPools/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.11</version>
+            <version>2.0.17</version>
         </dependency>
 
         <!-- druid -->
@@ -44,7 +44,6 @@
             <artifactId>c3p0</artifactId>
             <version>0.9.5.4</version>
         </dependency>
-
         <!-- log4j -->
         <dependency>
             <groupId>log4j</groupId>

tests/examples/JDBC/connectionPools/src/main/java/com/taosdata/demo/pool/DruidPoolBuilder.java

@@ -10,20 +10,18 @@ public class DruidPoolBuilder {
         final String url = "jdbc:TAOS://" + host + ":6030";
 
         DruidDataSource dataSource = new DruidDataSource();
+        // jdbc properties
         dataSource.setUrl(url);
         dataSource.setDriverClassName("com.taosdata.jdbc.TSDBDriver");
         dataSource.setUsername("root");
         dataSource.setPassword("taosdata");
 
-        //初始连接数，默认0
-        dataSource.setInitialSize(poolSize);
-        //最大连接数，默认8
-        dataSource.setMaxActive(poolSize);
-        //最小闲置数
-        dataSource.setMinIdle(poolSize);
-        //获取连接的最大等待时间，单位毫秒
-        dataSource.setMaxWait(2000);
-
+        // pool configurations
+        dataSource.setInitialSize(poolSize);//初始连接数，默认0
+        dataSource.setMinIdle(poolSize);//最小闲置数
+        dataSource.setMaxActive(poolSize);//最大连接数，默认8
+        dataSource.setMaxWait(30000);//获取连接的最大等待时间，单位毫秒
+        dataSource.setValidationQuery("select server_status()");
         return dataSource;
     }
 

tests/examples/JDBC/connectionPools/src/main/java/com/taosdata/demo/pool/HikariCpBuilder.java

@@ -9,13 +9,18 @@ public class HikariCpBuilder {
 
     public static DataSource getDataSource(String host, int poolSize) {
         HikariConfig config = new HikariConfig();
+        // jdbc properties
         config.setDriverClassName("com.taosdata.jdbc.TSDBDriver");
         config.setJdbcUrl("jdbc:TAOS://" + host + ":6030");
         config.setUsername("root");
         config.setPassword("taosdata");
+        // pool configurations
+        config.setMinimumIdle(3);           //minimum number of idle connection
+        config.setMaximumPoolSize(10);      //maximum number of connection in the pool
+        config.setConnectionTimeout(30000); //maximum wait milliseconds for get connection from pool
+        config.setIdleTimeout(0);       // max idle time for recycle idle connection
+        config.setConnectionTestQuery("select server_status()"); //validation query
 
-        config.setMaximumPoolSize(poolSize);
-        config.setMinimumIdle(poolSize);
         HikariDataSource ds = new HikariDataSource(config);
         return ds;
     }

tests/examples/c/epoll.c

@@ -13,6 +13,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+// how to use to do a pressure-test upon eok
+// tester:               cat /dev/urandom | nc -c <ip> <port>
+// testee:               ./debug/build/bin/epoll -l <port> > /dev/null
+// compare against:      nc -l <port> > /dev/null
+// monitor and compare : glances
+
 #ifdef __APPLE__
 #include "eok.h"
 #else // __APPLE__
@@ -68,55 +74,62 @@ static int ep_dummy = 0;
 static ep_t* ep_create(void);
 static void  ep_destroy(ep_t *ep);
 static void* routine(void* arg);
-static int open_connect(unsigned short port);
 static int open_listen(unsigned short port);
 
-typedef struct client_s          client_t;
-struct client_s {
+typedef struct fde_s          fde_t;
+struct fde_s {
   int                          skt;
-  void (*on_event)(ep_t *ep, struct epoll_event *events, client_t *client);
-  volatile unsigned int        state; // 1: listenning; 2: connected
+  void (*on_event)(ep_t *ep, struct epoll_event *events, fde_t *client);
 };
 
-static void echo_event(ep_t *ep, struct epoll_event *ev, client_t *client);
+static void listen_event(ep_t *ep, struct epoll_event *ev, fde_t *client);
+static void null_event(ep_t *ep, struct epoll_event *ev, fde_t *client);
+
+#define usage(arg0, fmt, ...)       do {                                               \
+  if (fmt[0]) {                                                                        \
+    fprintf(stderr, "" fmt "\n", ##__VA_ARGS__);                                       \
+  }                                                                                    \
+  fprintf(stderr, "usage:\n");                                                         \
+  fprintf(stderr, "  %s -l <port>             : specify listenning port\n", arg0);     \
+} while (0)
 
 int main(int argc, char *argv[]) {
+  char *prg = basename(argv[0]);
+  if (argc==1) {
+    usage(prg, "");
+    return 0;
+  }
   ep_t* ep = ep_create();
   A(ep, "failed");
-  int skt = open_connect(6789);
-  if (skt!=-1) {
-    client_t *client = (client_t*)calloc(1, sizeof(*client));
-    if (client) {
-      client->skt = skt;
-      client->on_event = echo_event;
-      client->state = 2;
-      struct epoll_event ev = {0};
-      ev.events   = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
-      ev.data.ptr = client;
-      A(0==epoll_ctl(ep->ep, EPOLL_CTL_ADD, skt, &ev), "");
+  for (int i=1; i<argc; ++i) {
+    const char *arg = argv[i];
+    if (0==strcmp(arg, "-l")) {
+      ++i;
+      if (i>=argc) {
+        usage(prg, "expecting <port> after -l, but got nothing");
+        return 1; // confirmed potential leakage
       }
+      arg = argv[i];
+      int port = atoi(arg);
+      int skt = open_listen(port);
+      if (skt==-1) continue;
+      fde_t *client = (fde_t*)calloc(1, sizeof(*client));
+      if (!client) {
+        E("out of memory");
+        close(skt);
+        continue;
       }
-  skt = open_listen(0);
-  if (skt!=-1) {
-    client_t *client = (client_t*)calloc(1, sizeof(*client));
-    if (client) {
       client->skt = skt;
-      client->on_event = echo_event;
-      client->state = 1;
+      client->on_event = listen_event;
       struct epoll_event ev = {0};
       ev.events   = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
       ev.data.ptr = client;
       A(0==epoll_ctl(ep->ep, EPOLL_CTL_ADD, skt, &ev), "");
+      continue;
     }
+    usage(prg, "unknown argument: [%s]", arg);
+    return 1;
   }
-  // char c = '\0';
-  // while ((c=getchar())!=EOF) {
-  //   switch (c) {
-  //     case 'q': break;
-  //     default: continue;
-  //   }
-  // }
-  // getchar();
   char *line = NULL;
   size_t linecap = 0;
   ssize_t linelen;
@@ -205,7 +218,7 @@ static void* routine(void* arg) {
         continue;
       }
       A(ev->data.ptr, "internal logic error");
-      client_t *client = (client_t*)ev->data.ptr;
+      fde_t *client = (fde_t*)ev->data.ptr;
       client->on_event(ep, ev, client);
       continue;
     }
@@ -223,7 +236,7 @@ static int open_listen(unsigned short port) {
   do {
     struct sockaddr_in si = {0};
     si.sin_family = AF_INET;
-    si.sin_addr.s_addr = inet_addr("127.0.0.1");
+    si.sin_addr.s_addr = inet_addr("0.0.0.0");
     si.sin_port = htons(port);
     r = bind(skt, (struct sockaddr*)&si, sizeof(si));
     if (r) {
@@ -249,63 +262,31 @@ static int open_listen(unsigned short port) {
   return -1;
 }
 
-static int open_connect(unsigned short port) {
-  int r = 0;
-  int skt = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if (skt==-1) {
-    E("socket() failed");
-    return -1;
-  }
-  do {
+static void listen_event(ep_t *ep, struct epoll_event *ev, fde_t *client) {
+  A(ev->events & EPOLLIN, "internal logic error");
   struct sockaddr_in si = {0};
-    si.sin_family = AF_INET;
-    si.sin_addr.s_addr = inet_addr("127.0.0.1");
-    si.sin_port = htons(port);
-    r = connect(skt, (struct sockaddr*)&si, sizeof(si));
-    if (r) {
-      E("connect(%u) failed", port);
-      break;
-    }
-    memset(&si, 0, sizeof(si));
-    socklen_t len = sizeof(si);
-    r = getsockname(skt, (struct sockaddr *)&si, &len);
-    if (r) {
-      E("getsockname() failed");
-    }
-    A(len==sizeof(si), "internal logic error");
-    D("connected: %d", ntohs(si.sin_port));
-    return skt;
-  } while (0);
+  socklen_t silen = sizeof(si);
+  int skt = accept(client->skt, (struct sockaddr*)&si, &silen);
+  A(skt!=-1, "internal logic error");
+  fde_t *server = (fde_t*)calloc(1, sizeof(*server));
+  if (!server) {
     close(skt);
-  return -1;
+    return;
+  }
+  server->skt = skt;
+  server->on_event = null_event;
+  struct epoll_event ee = {0};
+  ee.events   = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
+  ee.data.ptr = server;
+  A(0==epoll_ctl(ep->ep, EPOLL_CTL_ADD, skt, &ee), "");
 }
 
-static void echo_event(ep_t *ep, struct epoll_event *ev, client_t *client) {
+static void null_event(ep_t *ep, struct epoll_event *ev, fde_t *client) {
   if (ev->events & EPOLLIN) {
-    if (client->state==1) {
-      struct sockaddr_in si = {0};
-      socklen_t silen = sizeof(si);
-      int skt = accept(client->skt, (struct sockaddr*)&si, &silen);
-      if (skt!=-1) {
-        client_t *server = (client_t*)calloc(1, sizeof(*server));
-        if (server) {
-          server->skt = skt;
-          server->on_event = echo_event;
-          server->state = 2;
-          struct epoll_event ev = {0};
-          ev.events   = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
-          ev.data.ptr = server;
-          A(0==epoll_ctl(ep->ep, EPOLL_CTL_ADD, skt, &ev), "");
-        }
-      }
-    }
-    if (client->state==2) {
-      char buf[4];
-      int n = recv(client->skt, buf, sizeof(buf)-1, 0);
-      A(n>=0 && n<sizeof(buf), "internal logic error:[%d]", n);
-      buf[n] = '\0';
-      fprintf(stderr, "events[%x]:%s\n", ev->events, buf);
-    }
+    char buf[8192];
+    int n = recv(client->skt, buf, sizeof(buf), 0);
+    A(n>=0 && n<=sizeof(buf), "internal logic error:[%d]", n);
+    A(n==fwrite(buf, 1, n, stdout), "internal logic error");
   }
   if (ev->events & (EPOLLERR | EPOLLHUP | EPOLLRDHUP)) {
     A(0==pthread_mutex_lock(&ep->lock), "");

tests/pytest/multilevel/threeLevelMountPoint.py

@@ -56,6 +56,15 @@ class TDTestCase:
         tdDnodes.startWithoutSleep(1)
         
         tdSql.taosdStatus(1)
+        tdSql.haveFile('/mnt/data00',1)
+        tdSql.haveFile('/mnt/data01',1)
+        tdSql.haveFile('/mnt/data02',1)
+        tdSql.haveFile('/mnt/data10',1)
+        tdSql.haveFile('/mnt/data11',1)
+        tdSql.haveFile('/mnt/data12',1)
+        tdSql.haveFile('/mnt/data20',1)
+        tdSql.haveFile('/mnt/data21',1)
+        tdSql.haveFile('/mnt/data22',1)
 
     def stop(self):
         tdSql.close()