Merge pull request #5 from wu-champion/develop

更新1380分支

Jenkinsfile

@@ -42,15 +42,15 @@ def pre_test(){
     cd ${WKC}
     git checkout develop
     git reset --hard HEAD~10 >/dev/null 
-    git pull
+    git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
-    git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit 0
+    git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile'
     find ${WKC}/tests/pytest -name \'*\'.sql -exec rm -rf {} \\;
     cd ${WK}
     git reset --hard HEAD~10
-    git checkout develop
-    git pull
+    git checkout develop 
+    git pull >/dev/null 
     cd ${WK}
     export TZ=Asia/Harbin
     date

README.md

@@ -176,18 +176,18 @@ option "-c test/cfg" specifies the system configuration file directory.
 # Installing
 After building successfully, TDengine can be installed by:
 ```bash
-make install
+sudo 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.
+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. Since version 2.0, installing from source code will also configure service management for TDengine.
 Users can also choose to [install from packages](https://www.taosdata.com/en/getting-started/#Install-from-Package) for it.
 
 To start the service after installation, in a terminal, use:
-```cmd
-taosd
+```bash
+sudo systemctl start taosd
 ```
 
 Then users can use the [TDengine shell](https://www.taosdata.com/en/getting-started/#TDengine-Shell) to connect the TDengine server. In a terminal, use:
-```cmd
+```bash
 taos
 ```
 

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.21-dist.jar DESTINATION connector/jdbc)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.22-dist.jar DESTINATION connector/jdbc)
   ENDIF ()
 ELSEIF (TD_DARWIN)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")

documentation20/cn/11.administrator/docs.md

@@ -14,6 +14,8 @@ Memory Size = maxVgroupsPerDb * (blocks * cache + 10MB) + numOfTables * (tagSize
 
 示例：假设是 4 核机器，cache 是缺省大小 16M, blocks 是缺省值 6，假设有 10 万张表，标签总长度是 256 字节，则总的内存需求为：4 \* (16 \* 6 + 10) + 100000 \* (0.25 + 0.5) / 1000 = 499M。
 
+注意：从这个公式计算得到的内存容量，应理解为系统的“必要需求”，而不是“内存总数”。在实际运行的生产系统中，由于操作系统缓存、资源管理调度等方面的需要，内存规划应当在计算结果的基础上保留一定冗余，以维持系统状态和系统性能的稳定性。
+
 实际运行的系统往往会根据数据特点的不同，将数据存放在不同的 DB 里。因此做规划时，也需要考虑。
 
 如果内存充裕，可以加大 Blocks 的配置，这样更多数据将保存在内存里，提高查询速度。

documentation20/cn/12.taos-sql/docs.md

@@ -331,7 +331,8 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
     ```mysql
     INSERT INTO tb_name VALUES (field1_value1, ...) (field1_value2, ...) ...;
     ```
-    向表tb_name中插入多条记录
+    向表tb_name中插入多条记录  
+    **注意**：在使用“插入多条记录”方式写入数据时，不能把第一列的时间戳取值都设为now，否则会导致语句中的多条记录使用相同的时间戳，于是就可能出现相互覆盖以致这些数据行无法全部被正确保存。
 
 - **按指定的列插入多条记录**
     ```mysql

src/client/src/TSDBJNIConnector.c

@@ -481,15 +481,19 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
       case TSDB_DATA_TYPE_BOOL:
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetBooleanFp, i, (jboolean)(*((char *)row[i]) == 1));
         break;
+      case TSDB_DATA_TYPE_UTINYINT:
       case TSDB_DATA_TYPE_TINYINT:
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetByteFp, i, (jbyte) * ((int8_t *)row[i]));
         break;
+      case TSDB_DATA_TYPE_USMALLINT:
       case TSDB_DATA_TYPE_SMALLINT:
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetShortFp, i, (jshort) * ((int16_t *)row[i]));
         break;
+      case TSDB_DATA_TYPE_UINT:
       case TSDB_DATA_TYPE_INT:
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetIntFp, i, (jint) * (int32_t *)row[i]);
         break;
+      case TSDB_DATA_TYPE_UBIGINT:
       case TSDB_DATA_TYPE_BIGINT:
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetLongFp, i, (jlong) * ((int64_t *)row[i]));
         break;

src/client/src/tscParseInsert.c

@@ -394,7 +394,7 @@ static int32_t tsCheckTimestamp(STableDataBlocks *pDataBlocks, const char *start
 
   TSKEY k = *(TSKEY *)start;
 
-  if (k == 0) {
+  if (k == INT64_MIN) {
     if (pDataBlocks->tsSource == TSDB_USE_CLI_TS) {
       return -1;
     } else if (pDataBlocks->tsSource == -1) {
@@ -1360,7 +1360,7 @@ int tsParseSql(SSqlObj *pSql, bool initial) {
       }
     }
   } else {
-    SSqlInfo SQLInfo = qSQLParse(pSql->sqlstr);
+    SSqlInfo SQLInfo = qSqlParse(pSql->sqlstr);
     ret = tscToSQLCmd(pSql, &SQLInfo);
     if (ret == TSDB_CODE_TSC_INVALID_SQL && pSql->parseRetry == 0 && SQLInfo.type == TSDB_SQL_NULL) {
       tscResetSqlCmd(pCmd, true);

src/client/src/tscServer.c

@@ -520,7 +520,7 @@ int tscBuildFetchMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
       assert(pVgroupInfo->vgroups[vgIndex].vgId > 0 && vgIndex < pTableMetaInfo->vgroupList->numOfVgroups);
 
       pRetrieveMsg->header.vgId = htonl(pVgroupInfo->vgroups[vgIndex].vgId);
-      tscDebug("%p build fetch msg from vgId:%d, vgIndex:%d", pSql, pVgroupInfo->vgroups[vgIndex].vgId, vgIndex);
+      tscDebug("%p build fetch msg from vgId:%d, vgIndex:%d, qhandle:%" PRIX64, pSql, pVgroupInfo->vgroups[vgIndex].vgId, vgIndex, pSql->res.qhandle);
     } else {
       int32_t numOfVgroups = (int32_t)taosArrayGetSize(pTableMetaInfo->pVgroupTables);
       assert(vgIndex >= 0 && vgIndex < numOfVgroups);
@@ -528,12 +528,12 @@ int tscBuildFetchMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
       SVgroupTableInfo* pTableIdList = taosArrayGet(pTableMetaInfo->pVgroupTables, vgIndex);
 
       pRetrieveMsg->header.vgId = htonl(pTableIdList->vgInfo.vgId);
-      tscDebug("%p build fetch msg from vgId:%d, vgIndex:%d", pSql, pTableIdList->vgInfo.vgId, vgIndex);
+      tscDebug("%p build fetch msg from vgId:%d, vgIndex:%d, qhandle:%" PRIX64, pSql, pTableIdList->vgInfo.vgId, vgIndex, pSql->res.qhandle);
     }
   } else {
     STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
     pRetrieveMsg->header.vgId = htonl(pTableMeta->vgId);
-    tscDebug("%p build fetch msg from only one vgroup, vgId:%d", pSql, pTableMeta->vgId);
+    tscDebug("%p build fetch msg from only one vgroup, vgId:%d, qhandle:%" PRIX64, pSql, pTableMeta->vgId, pSql->res.qhandle);
   }
 
   pSql->cmd.payloadLen = sizeof(SRetrieveTableMsg);
@@ -1350,7 +1350,7 @@ int tscEstimateCreateTableMsgLength(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &(pSql->cmd);
   int32_t size = minMsgSize() + sizeof(SCMCreateTableMsg) + sizeof(SCreateTableMsg);
 
-  SCreateTableSQL *pCreateTableInfo = pInfo->pCreateTableInfo;
+  SCreateTableSql *pCreateTableInfo = pInfo->pCreateTableInfo;
   if (pCreateTableInfo->type == TSQL_CREATE_TABLE_FROM_STABLE) {
     int32_t numOfTables = (int32_t)taosArrayGetSize(pInfo->pCreateTableInfo->childTableInfo);
     size += numOfTables * (sizeof(SCreateTableMsg) + TSDB_MAX_TAGS_LEN);
@@ -1359,7 +1359,7 @@ int tscEstimateCreateTableMsgLength(SSqlObj *pSql, SSqlInfo *pInfo) {
   }
 
   if (pCreateTableInfo->pSelect != NULL) {
-    size += (pCreateTableInfo->pSelect->selectToken.n + 1);
+    size += (pCreateTableInfo->pSelect->sqlstr.n + 1);
   }
 
   return size + TSDB_EXTRA_PAYLOAD_SIZE;
@@ -1417,7 +1417,7 @@ int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pCreateMsg->tableName);
     assert(code == 0);
 
-    SCreateTableSQL *pCreateTable = pInfo->pCreateTableInfo;
+    SCreateTableSql *pCreateTable = pInfo->pCreateTableInfo;
 
     pCreateMsg->igExists = pCreateTable->existCheck ? 1 : 0;
     pCreateMsg->numOfColumns = htons(pCmd->numOfCols);
@@ -1440,11 +1440,11 @@ int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
     pMsg = (char *)pSchema;
     if (type == TSQL_CREATE_STREAM) {  // check if it is a stream sql
-      SQuerySQL *pQuerySql = pInfo->pCreateTableInfo->pSelect;
+      SQuerySqlNode *pQuerySql = pInfo->pCreateTableInfo->pSelect;
 
-      strncpy(pMsg, pQuerySql->selectToken.z, pQuerySql->selectToken.n + 1);
-      pCreateMsg->sqlLen = htons(pQuerySql->selectToken.n + 1);
-      pMsg += pQuerySql->selectToken.n + 1;
+      strncpy(pMsg, pQuerySql->sqlstr.z, pQuerySql->sqlstr.n + 1);
+      pCreateMsg->sqlLen = htons(pQuerySql->sqlstr.n + 1);
+      pMsg += pQuerySql->sqlstr.n + 1;
     }
   }
 

src/client/src/tscUtil.c

@@ -1159,7 +1159,7 @@ SSqlExpr* tscSqlExprInsert(SQueryInfo* pQueryInfo, int32_t index, int16_t functi
 }
 
 SSqlExpr* tscSqlExprAppend(SQueryInfo* pQueryInfo, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
-    int16_t size, int16_t resColId, int16_t interSize, bool isTagCol) {
+                           int16_t size, int16_t resColId, int16_t interSize, bool isTagCol) {
   SSqlExpr* pExpr = doCreateSqlExpr(pQueryInfo, functionId, pColIndex, type, size, resColId, interSize, isTagCol);
   taosArrayPush(pQueryInfo->exprList, &pExpr);
   return pExpr;

src/common/src/texpr.c

@@ -41,41 +41,46 @@ static uint8_t UNUSED_FUNC isQueryOnPrimaryKey(const char *primaryColumnName, co
 
 static void reverseCopy(char* dest, const char* src, int16_t type, int32_t numOfRows) {
   switch(type) {
-    case TSDB_DATA_TYPE_TINYINT: {
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_UTINYINT:{
       int8_t* p = (int8_t*) dest;
       int8_t* pSrc = (int8_t*) src;
 
       for(int32_t i = 0; i < numOfRows; ++i) {
         p[i] = pSrc[numOfRows - i - 1];
       }
-      break;
+      return;
     }
-    case TSDB_DATA_TYPE_SMALLINT: {
+
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_USMALLINT:{
       int16_t* p = (int16_t*) dest;
       int16_t* pSrc = (int16_t*) src;
 
       for(int32_t i = 0; i < numOfRows; ++i) {
         p[i] = pSrc[numOfRows - i - 1];
       }
-      break;
+      return;
     }
-    case TSDB_DATA_TYPE_INT: {
+    case TSDB_DATA_TYPE_INT:
+    case TSDB_DATA_TYPE_UINT: {
       int32_t* p = (int32_t*) dest;
       int32_t* pSrc = (int32_t*) src;
 
       for(int32_t i = 0; i < numOfRows; ++i) {
         p[i] = pSrc[numOfRows - i - 1];
       }
-      break;
+      return;
     }
-    case TSDB_DATA_TYPE_BIGINT: {
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_UBIGINT: {
       int64_t* p = (int64_t*) dest;
       int64_t* pSrc = (int64_t*) src;
 
       for(int32_t i = 0; i < numOfRows; ++i) {
         p[i] = pSrc[numOfRows - i - 1];
       }
-      break;
+      return;
     }
     case TSDB_DATA_TYPE_FLOAT: {
       float* p = (float*) dest;
@@ -84,7 +89,7 @@ static void reverseCopy(char* dest, const char* src, int16_t type, int32_t numOf
       for(int32_t i = 0; i < numOfRows; ++i) {
         p[i] = pSrc[numOfRows - i - 1];
       }
-      break;
+      return;
     }
     case TSDB_DATA_TYPE_DOUBLE: {
       double* p = (double*) dest;
@@ -93,7 +98,7 @@ static void reverseCopy(char* dest, const char* src, int16_t type, int32_t numOf
       for(int32_t i = 0; i < numOfRows; ++i) {
         p[i] = pSrc[numOfRows - i - 1];
       }
-      break;
+      return;
     }
     default: assert(0);
   }

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.21-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.22-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.21</version>
+  <version>2.0.22</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.21</version>
+    <version>2.0.22</version>
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
@@ -102,6 +102,8 @@
                         <include>**/*Test.java</include>
                     </includes>
                     <excludes>
+                        <exclude>**/TSDBJNIConnectorTest.java</exclude>
+                        <exclude>**/UnsignedNumberJniTest.java</exclude>
                         <exclude>**/DatetimeBefore1970Test.java</exclude>
                         <exclude>**/AppMemoryLeakTest.java</exclude>
                         <exclude>**/AuthenticationTest.java</exclude>

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

@@ -12,7 +12,7 @@ public abstract class AbstractDriver implements Driver {
         hostProp.required = false;
         hostProp.description = "Hostname";
 
-        DriverPropertyInfo portProp = new DriverPropertyInfo(TSDBDriver.PROPERTY_KEY_PORT, info.getProperty(TSDBDriver.PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
+        DriverPropertyInfo portProp = new DriverPropertyInfo(TSDBDriver.PROPERTY_KEY_PORT, info.getProperty(TSDBDriver.PROPERTY_KEY_PORT));
         portProp.required = false;
         portProp.description = "Port";
 
@@ -40,11 +40,11 @@ public abstract class AbstractDriver implements Driver {
     protected Properties parseURL(String url, Properties defaults) {
         Properties urlProps = (defaults != null) ? defaults : new Properties();
 
-        // parse properties
+        // parse properties in url
         int beginningOfSlashes = url.indexOf("//");
         int index = url.indexOf("?");
         if (index != -1) {
-            String paramString = url.substring(index + 1, url.length());
+            String paramString = url.substring(index + 1);
             url = url.substring(0, index);
             StringTokenizer queryParams = new StringTokenizer(paramString, "&");
             while (queryParams.hasMoreElements()) {
@@ -68,6 +68,7 @@ public abstract class AbstractDriver implements Driver {
         String dbProductName = url.substring(0, beginningOfSlashes);
         dbProductName = dbProductName.substring(dbProductName.indexOf(":") + 1);
         dbProductName = dbProductName.substring(0, dbProductName.indexOf(":"));
+        urlProps.setProperty(TSDBDriver.PROPERTY_KEY_PRODUCT_NAME,dbProductName);
         // parse dbname
         url = url.substring(beginningOfSlashes + 2);
         int indexOfSlash = url.indexOf("/");

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

@@ -29,12 +29,7 @@ public abstract class AbstractResultSet extends WrapperImpl implements ResultSet
     public abstract boolean getBoolean(int columnIndex) throws SQLException;
 
     @Override
-    public byte getByte(int columnIndex) throws SQLException {
-        if (isClosed())
-            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
-
-        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
-    }
+    public abstract byte getByte(int columnIndex) throws SQLException;
 
     @Override
     public abstract short getShort(int columnIndex) throws SQLException;
@@ -1205,6 +1200,7 @@ public abstract class AbstractResultSet extends WrapperImpl implements ResultSet
     public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_STATEMENT_CLOSED);
-        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);    }
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
+    }
 
 }

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

@@ -122,8 +122,7 @@ public class SavedPreparedStatement {
             initPreparedParam = initDefaultParam(tableName, middleParamSize, valueListSize);
 
         } else {
-            // not match
-            throw new SQLException(TSDBConstants.WrapErrMsg("the sql is not complete!"));
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_SQL);
         }
 
     }
@@ -189,7 +188,7 @@ public class SavedPreparedStatement {
         String errorMsg = String.format("the parameterIndex %s out of the range [1, %s]", parameterIndex, paramSize);
 
         if (parameterIndex < 1 || parameterIndex > paramSize) {
-            throw new SQLException(TSDBConstants.WrapErrMsg(errorMsg));
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE,errorMsg);
         }
 
         this.isAddBatch = false; //set isAddBatch to false
@@ -212,7 +211,7 @@ public class SavedPreparedStatement {
             return;
         }
 
-        throw new SQLException(TSDBConstants.WrapErrMsg(errorMsg));
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE,errorMsg);
     }
 
     public void addBatch() {

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

@@ -16,16 +16,11 @@ package com.taosdata.jdbc;
 
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.HashMap;
-import java.util.Map;
 
 public abstract class TSDBConstants {
 
-    public static final String DEFAULT_PORT = "6200";
-    public static Map<Integer, String> DATATYPE_MAP = null;
-
     public static final long JNI_NULL_POINTER = 0L;
-
+    // JNI_ERROR_NUMBER
     public static final int JNI_SUCCESS = 0;
     public static final int JNI_TDENGINE_ERROR = -1;
     public static final int JNI_CONNECTION_NULL = -2;
@@ -34,8 +29,7 @@ public abstract class TSDBConstants {
     public static final int JNI_SQL_NULL = -5;
     public static final int JNI_FETCH_END = -6;
     public static final int JNI_OUT_OF_MEMORY = -7;
-
-    public static final int TSDB_DATA_TYPE_NULL = 0;
+    // TSDB Data Types
     public static final int TSDB_DATA_TYPE_BOOL = 1;
     public static final int TSDB_DATA_TYPE_TINYINT = 2;
     public static final int TSDB_DATA_TYPE_SMALLINT = 3;
@@ -46,46 +40,36 @@ public abstract class TSDBConstants {
     public static final int TSDB_DATA_TYPE_BINARY = 8;
     public static final int TSDB_DATA_TYPE_TIMESTAMP = 9;
     public static final int TSDB_DATA_TYPE_NCHAR = 10;
-
-    // nchar field's max length
+    /*
+    系统增加新的无符号数据类型，分别是：
+        unsigned tinyint， 数值范围：0-254, NULL 为255
+        unsigned smallint，数值范围： 0-65534， NULL 为65535
+        unsigned int，数值范围：0-4294967294，NULL 为4294967295u
+        unsigned bigint，数值范围：0-18446744073709551614u，NULL 为18446744073709551615u。
+    example:
+        create table tb(ts timestamp, a tinyint unsigned, b smallint unsigned, c int unsigned, d bigint unsigned);
+    */
+    public static final int TSDB_DATA_TYPE_UTINYINT = 11;       //unsigned tinyint
+    public static final int TSDB_DATA_TYPE_USMALLINT = 12;      //unsigned smallint
+    public static final int TSDB_DATA_TYPE_UINT = 13;           //unsigned int
+    public static final int TSDB_DATA_TYPE_UBIGINT = 14;        //unsigned bigint
+    // nchar column max length
     public static final int maxFieldSize = 16 * 1024;
 
-    public static String WrapErrMsg(String msg) {
-        return "TDengine Error: " + msg;
-    }
-
-    public static String FixErrMsg(int code) {
-        switch (code) {
-            case JNI_TDENGINE_ERROR:
-                return WrapErrMsg("internal error of database!");
-            case JNI_CONNECTION_NULL:
-                return WrapErrMsg("invalid tdengine connection!");
-            case JNI_RESULT_SET_NULL:
-                return WrapErrMsg("invalid resultset pointer!");
-            case JNI_NUM_OF_FIELDS_0:
-                return WrapErrMsg("invalid num of fields!");
-            case JNI_SQL_NULL:
-                return WrapErrMsg("can't execute empty sql!");
-            case JNI_FETCH_END:
-                return WrapErrMsg("fetch to the end of resultset");
-            default:
-                break;
-        }
-        return WrapErrMsg("unkown error!");
-    }
-
     public static int taosType2JdbcType(int taosType) throws SQLException {
         switch (taosType) {
-            case TSDBConstants.TSDB_DATA_TYPE_NULL:
-                return Types.NULL;
             case TSDBConstants.TSDB_DATA_TYPE_BOOL:
                 return Types.BOOLEAN;
             case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+            case TSDBConstants.TSDB_DATA_TYPE_UTINYINT:
                 return Types.TINYINT;
+            case TSDBConstants.TSDB_DATA_TYPE_USMALLINT:
             case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
                 return Types.SMALLINT;
+            case TSDBConstants.TSDB_DATA_TYPE_UINT:
             case TSDBConstants.TSDB_DATA_TYPE_INT:
                 return Types.INTEGER;
+            case TSDBConstants.TSDB_DATA_TYPE_UBIGINT:
             case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
                 return Types.BIGINT;
             case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
@@ -99,13 +83,42 @@ public abstract class TSDBConstants {
             case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
                 return Types.NCHAR;
         }
-        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_TAOS_TYPE_IN_TDENGINE);
+    }
+
+    public static String taosType2JdbcTypeName(int taosType) throws SQLException {
+        switch (taosType){
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return "BOOL";
+            case TSDBConstants.TSDB_DATA_TYPE_UTINYINT:
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return "TINYINT";
+            case TSDBConstants.TSDB_DATA_TYPE_USMALLINT:
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return "SMALLINT";
+            case TSDBConstants.TSDB_DATA_TYPE_UINT:
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return "INT";
+            case TSDBConstants.TSDB_DATA_TYPE_UBIGINT:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return "BIGINT";
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return "FLOAT";
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return "DOUBLE";
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY:
+                return "BINARY";
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+                return "TIMESTAMP";
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+                return "NCHAR";
+            default:
+                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_TAOS_TYPE_IN_TDENGINE);
+        }
     }
 
     public static int jdbcType2TaosType(int jdbcType) throws SQLException {
         switch (jdbcType){
-            case Types.NULL:
-                return TSDBConstants.TSDB_DATA_TYPE_NULL;
             case Types.BOOLEAN:
                 return TSDBConstants.TSDB_DATA_TYPE_BOOL;
             case Types.TINYINT:
@@ -130,22 +143,31 @@ public abstract class TSDBConstants {
         throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
     }
 
-    static {
-        DATATYPE_MAP = new HashMap<>();
-        DATATYPE_MAP.put(0, "NULL");
-        DATATYPE_MAP.put(1, "BOOL");
-        DATATYPE_MAP.put(2, "TINYINT");
-        DATATYPE_MAP.put(3, "SMALLINT");
-        DATATYPE_MAP.put(4, "INT");
-        DATATYPE_MAP.put(5, "BIGINT");
-        DATATYPE_MAP.put(6, "FLOAT");
-        DATATYPE_MAP.put(7, "DOUBLE");
-        DATATYPE_MAP.put(8, "BINARY");
-        DATATYPE_MAP.put(9, "TIMESTAMP");
-        DATATYPE_MAP.put(10, "NCHAR");
+    public static String jdbcType2TaosTypeName(int jdbcType) throws SQLException {
+        switch (jdbcType){
+            case Types.BOOLEAN:
+                return "BOOL";
+            case Types.TINYINT:
+                return "TINYINT";
+            case Types.SMALLINT:
+                return "SMALLINT";
+            case Types.INTEGER:
+                return "INT";
+            case Types.BIGINT:
+                return "BIGINT";
+            case Types.FLOAT:
+                return "FLOAT";
+            case Types.DOUBLE:
+                return "DOUBLE";
+            case Types.BINARY:
+                return "BINARY";
+            case Types.TIMESTAMP:
+                return "TIMESTAMP";
+            case Types.NCHAR:
+                return "NCHAR";
+            default:
+                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
+        }
     }
 
-    public static String jdbcType2TaosTypeName(int type) throws SQLException {
-        return DATATYPE_MAP.get(jdbcType2TaosType(type));
-    }
 }

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

@@ -44,6 +44,10 @@ public class TSDBDriver extends AbstractDriver {
 
     private static final String URL_PREFIX = "jdbc:TAOS://";
 
+    /**
+     * PRODUCT_NAME
+     */
+    public static final String PROPERTY_KEY_PRODUCT_NAME = "productName";
     /**
      * Key used to retrieve the host value from the properties instance passed to
      * the driver.
@@ -96,38 +100,34 @@ public class TSDBDriver extends AbstractDriver {
     static {
         try {
             java.sql.DriverManager.registerDriver(new TSDBDriver());
-        } catch (SQLException E) {
-            throw new RuntimeException(TSDBConstants.WrapErrMsg("can't register tdengine jdbc driver!"));
+        } catch (SQLException e) {
+            throw TSDBError.createRuntimeException(TSDBErrorNumbers.ERROR_CANNOT_REGISTER_JNI_DRIVER, e);
         }
     }
 
     public Connection connect(String url, Properties info) throws SQLException {
         if (url == null)
-            throw new SQLException(TSDBConstants.WrapErrMsg("url is not set!"));
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_URL_NOT_SET);
 
         if (!acceptsURL(url))
             return null;
 
-        Properties props = null;
-        if ((props = parseURL(url, info)) == null) {
+        Properties props = parseURL(url, info);
+        if (props == null) {
             return null;
         }
 
         try {
             TSDBJNIConnector.init((String) props.get(PROPERTY_KEY_CONFIG_DIR), (String) props.get(PROPERTY_KEY_LOCALE),
                     (String) props.get(PROPERTY_KEY_CHARSET), (String) props.get(PROPERTY_KEY_TIME_ZONE));
-            Connection newConn = new TSDBConnection(props, this.dbMetaData);
-            return newConn;
+            return new TSDBConnection(props, this.dbMetaData);
         } catch (SQLWarning sqlWarning) {
             sqlWarning.printStackTrace();
-            Connection newConn = new TSDBConnection(props, this.dbMetaData);
-            return newConn;
+            return new TSDBConnection(props, this.dbMetaData);
         } catch (SQLException sqlEx) {
             throw sqlEx;
         } catch (Exception ex) {
-            SQLException sqlEx = new SQLException("SQLException:" + ex.toString());
-            sqlEx.initCause(ex);
-            throw sqlEx;
+            throw new SQLException("SQLException:" + ex.toString(), ex);
         }
     }
 
@@ -139,8 +139,8 @@ public class TSDBDriver extends AbstractDriver {
      */
     public boolean acceptsURL(String url) throws SQLException {
         if (url == null)
-            throw new SQLException(TSDBConstants.WrapErrMsg("url is null"));
-        return (url != null && url.length() > 0 && url.trim().length() > 0) && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1));
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_URL_NOT_SET);
+        return url.length() > 0 && url.trim().length() > 0 && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1));
     }
 
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {

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

@@ -3,6 +3,7 @@ package com.taosdata.jdbc;
 import java.sql.SQLClientInfoException;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLWarning;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,18 +19,25 @@ public class TSDBError {
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_BATCH_IS_EMPTY, "Batch is empty!");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_WITH_EXECUTEQUERY, "Can not issue data manipulation statements with executeQuery()");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_WITH_EXECUTEUPDATE, "Can not issue SELECT via executeUpdate()");
-        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE_QUERY, "not a valid sql for executeQuery: (?)");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE_QUERY, "invalid sql for executeQuery: (?)");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_DATABASE_NOT_SPECIFIED_OR_AVAILABLE, "Database not specified or available");
-        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE_UPDATE, "not a valid sql for executeUpdate: (?)");
-        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE, "not a valid sql for execute: (?)");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE_UPDATE, "invalid sql for executeUpdate: (?)");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE, "invalid sql for execute: (?)");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "parameter index out of range");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED, "connection already closed");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE, "unknown sql type in tdengine");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_CANNOT_REGISTER_JNI_DRIVER, "can't register JDBC-JNI driver");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_CANNOT_REGISTER_RESTFUL_DRIVER, "can't register JDBC-RESTful driver");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_URL_NOT_SET, "url is not set");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_INVALID_SQL, "invalid sql");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE, "numeric value out of range");
+        TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN_TAOS_TYPE_IN_TDENGINE, "unknown taos type in tdengine");
+
         /**************************************************/
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN, "unknown error");
         /**************************************************/
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_SUBSCRIBE_FAILED, "failed to create subscription");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNSUPPORTED_ENCODING, "Unsupported encoding");
-
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_JNI_TDENGINE_ERROR, "internal error of database");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL, "JNI connection is NULL");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_JNI_RESULT_SET_NULL, "JNI result set is NULL");
@@ -65,4 +73,12 @@ public class TSDBError {
         return new SQLException("TDengine ERROR (" + Integer.toHexString(errorCode) + "): " + message, "", errorCode);
     }
 
-}
+    public static RuntimeException createRuntimeException(int errorCode, Throwable t) {
+        String message = TSDBErrorMap.get(errorCode);
+        return new RuntimeException("ERROR (" + Integer.toHexString(errorCode) + "): " + message, t);
+    }
+
+    public static SQLWarning createSQLWarning(String message) {
+        return new SQLWarning(message);
+    }
+}

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

@@ -16,15 +16,20 @@ public class TSDBErrorNumbers {
     public static final int ERROR_DATABASE_NOT_SPECIFIED_OR_AVAILABLE = 0x230a; //Database not specified or available
     public static final int ERROR_INVALID_FOR_EXECUTE_UPDATE = 0x230b;  //not a valid sql for executeUpdate: (SQL)
     public static final int ERROR_INVALID_FOR_EXECUTE = 0x230c;         //not a valid sql for execute: (SQL)
-    public static final int ERROR_PARAMETER_INDEX_OUT_RANGE = 0x230d; // parameter index out of range
+    public static final int ERROR_PARAMETER_INDEX_OUT_RANGE = 0x230d;   // parameter index out of range
     public static final int ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED = 0x230e;    // connection already closed
     public static final int ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE = 0x230f;        //unknown sql type in tdengine
+    public static final int ERROR_CANNOT_REGISTER_JNI_DRIVER = 0x2310;  // can't register JDBC-JNI driver
+    public static final int ERROR_CANNOT_REGISTER_RESTFUL_DRIVER = 0x2311;  // can't register JDBC-RESTful driver
+    public static final int ERROR_URL_NOT_SET = 0x2312;  // url is not set
+    public static final int ERROR_INVALID_SQL = 0x2313;     // invalid sql
+    public static final int ERROR_NUMERIC_VALUE_OUT_OF_RANGE = 0x2314;  // numeric value out of range
+    public static final int ERROR_UNKNOWN_TAOS_TYPE_IN_TDENGINE = 0x2315; //unknown taos type in tdengine
 
     public static final int ERROR_UNKNOWN = 0x2350;    //unknown error
 
     public static final int ERROR_SUBSCRIBE_FAILED = 0x2351;     // failed to create subscription
     public static final int ERROR_UNSUPPORTED_ENCODING = 0x2352; // Unsupported encoding
-
     public static final int ERROR_JNI_TDENGINE_ERROR = 0x2353;   // internal error of database
     public static final int ERROR_JNI_CONNECTION_NULL = 0x2354;  // JNI connection is NULL
     public static final int ERROR_JNI_RESULT_SET_NULL = 0x2355;  // invalid JNI result set
@@ -51,11 +56,16 @@ public class TSDBErrorNumbers {
         errorNumbers.add(ERROR_PARAMETER_INDEX_OUT_RANGE);
         errorNumbers.add(ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED);
         errorNumbers.add(ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
+        errorNumbers.add(ERROR_CANNOT_REGISTER_JNI_DRIVER);
+        errorNumbers.add(ERROR_CANNOT_REGISTER_RESTFUL_DRIVER);
+        errorNumbers.add(ERROR_URL_NOT_SET);
+        errorNumbers.add(ERROR_INVALID_SQL);
+        errorNumbers.add(ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+        errorNumbers.add(ERROR_UNKNOWN_TAOS_TYPE_IN_TDENGINE);
 
         /*****************************************************/
         errorNumbers.add(ERROR_SUBSCRIBE_FAILED);
         errorNumbers.add(ERROR_UNSUPPORTED_ENCODING);
-
         errorNumbers.add(ERROR_JNI_TDENGINE_ERROR);
         errorNumbers.add(ERROR_JNI_CONNECTION_NULL);
         errorNumbers.add(ERROR_JNI_RESULT_SET_NULL);
@@ -63,7 +73,6 @@ public class TSDBErrorNumbers {
         errorNumbers.add(ERROR_JNI_SQL_NULL);
         errorNumbers.add(ERROR_JNI_FETCH_END);
         errorNumbers.add(ERROR_JNI_OUT_OF_MEMORY);
-
     }
 
     private TSDBErrorNumbers() {

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

@@ -1,18 +1,19 @@
 /**
  * *************************************************************************
  * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
+ * <p>
  * This program is free software: you can use, redistribute, and/or modify
  * it under the terms of the GNU Affero General Public License, version 3
  * or later ("AGPL"), as published by the Free Software Foundation.
- *
+ * <p>
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
- *
+ * <p>
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **************************************************************************** */
+ * ***************************************************************************
+ */
 package com.taosdata.jdbc;
 
 import com.taosdata.jdbc.utils.TaosInfo;
@@ -23,7 +24,7 @@ import java.util.List;
 
 /**
  * JNI connector
- * */
+ */
 public class TSDBJNIConnector {
     private static volatile Boolean isInitialized = false;
 
@@ -72,13 +73,13 @@ public class TSDBJNIConnector {
             if (!isInitialized) {
                 initImp(configDir);
                 if (setOptions(0, locale) < 0) {
-                    throw new SQLWarning(TSDBConstants.WrapErrMsg("Failed to set locale: " + locale + ". System default will be used."));
+                    throw TSDBError.createSQLWarning("Failed to set locale: " + locale + ". System default will be used.");
                 }
                 if (setOptions(1, charset) < 0) {
-                    throw new SQLWarning(TSDBConstants.WrapErrMsg("Failed to set charset: " + charset + ". System default will be used."));
+                    throw TSDBError.createSQLWarning("Failed to set charset: " + charset + ". System default will be used.");
                 }
                 if (setOptions(2, timezone) < 0) {
-                    throw new SQLWarning(TSDBConstants.WrapErrMsg("Failed to set timezone: " + timezone + ". System default will be used."));
+                    throw TSDBError.createSQLWarning("Failed to set timezone: " + timezone + ". System default will be used.");
                 }
                 isInitialized = true;
                 TaosGlobalConfig.setCharset(getTsCharset());

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

@@ -27,8 +27,8 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
     private final TSDBResultSetRowData rowData;
     private final TSDBResultSetBlockData blockData;
 
-    private boolean batchFetch = false;
-    private boolean lastWasNull = false;
+    private boolean batchFetch;
+    private boolean lastWasNull;
     private boolean isClosed;
 
     public void setBatchFetch(boolean batchFetch) {
@@ -86,7 +86,6 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
             if (rowData != null) {
                 this.rowData.clear();
             }
-
             int code = this.jniConnector.fetchRow(this.resultSetPointer, this.rowData);
             if (code == TSDBConstants.JNI_CONNECTION_NULL) {
                 throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL);
@@ -124,30 +123,27 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
         String res = null;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return this.blockData.getString(colIndex);
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType());
         }
+        return res;
     }
 
     public boolean getBoolean(int columnIndex) throws SQLException {
         boolean res = false;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = this.rowData.getBoolean(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-        } else {
+        if (this.getBatchFetch())
             return this.blockData.getBoolean(colIndex);
-        }
 
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = this.rowData.getBoolean(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+        }
         return res;
     }
 
@@ -155,91 +151,84 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
         byte res = 0;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = (byte) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return (byte) this.blockData.getInt(colIndex);
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = (byte) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
         }
+        return res;
     }
 
     public short getShort(int columnIndex) throws SQLException {
         short res = 0;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = (short) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return (short) this.blockData.getInt(colIndex);
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = (short) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
         }
+        return res;
     }
 
     public int getInt(int columnIndex) throws SQLException {
         int res = 0;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return this.blockData.getInt(colIndex);
-        }
 
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+        }
+        return res;
     }
 
     public long getLong(int columnIndex) throws SQLException {
         long res = 0L;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return this.blockData.getLong(colIndex);
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType());
         }
+        return res;
     }
 
     public float getFloat(int columnIndex) throws SQLException {
         float res = 0;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = this.rowData.getFloat(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return (float) this.blockData.getDouble(colIndex);
-        }
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull)
+            res = this.rowData.getFloat(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+
+        return res;
     }
 
     public double getDouble(int columnIndex) throws SQLException {
         double res = 0;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = this.rowData.getDouble(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return this.blockData.getDouble(colIndex);
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = this.rowData.getDouble(colIndex, this.columnMetaDataList.get(colIndex).getColType());
         }
+        return res;
     }
 
     @Deprecated
@@ -255,15 +244,14 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
         Timestamp res = null;
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            if (!lastWasNull) {
-                res = this.rowData.getTimestamp(colIndex);
-            }
-            return res;
-        } else {
+        if (this.getBatchFetch())
             return this.blockData.getTimestamp(columnIndex);
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        if (!lastWasNull) {
+            res = this.rowData.getTimestamp(colIndex);
         }
+        return res;
     }
 
     public ResultSetMetaData getMetaData() throws SQLException {
@@ -274,12 +262,11 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
     public Object getObject(int columnIndex) throws SQLException {
         int colIndex = getTrueColumnIndex(columnIndex);
 
-        if (!this.getBatchFetch()) {
-            this.lastWasNull = this.rowData.wasNull(colIndex);
-            return this.rowData.get(colIndex);
-        } else {
+        if (this.getBatchFetch())
             return this.blockData.get(colIndex);
-        }
+
+        this.lastWasNull = this.rowData.wasNull(colIndex);
+        return this.rowData.get(colIndex);
     }
 
     @Override

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

@@ -30,468 +30,472 @@ import java.util.Collections;
 import java.util.List;
 
 public class TSDBResultSetBlockData {
-	private int numOfRows = 0;
-	private int rowIndex = 0;
-
-	private List<ColumnMetaData> columnMetaDataList;
-	private ArrayList<Object> colData = null;
-
-	public TSDBResultSetBlockData(List<ColumnMetaData> colMeta, int numOfCols) {
-		this.columnMetaDataList = colMeta;
-		this.colData = new ArrayList<Object>(numOfCols);
-	}
-
-	public TSDBResultSetBlockData() {
-		this.colData = new ArrayList<Object>();
-	}
-
-	public void clear() {
-		int size = this.colData.size();
-		if (this.colData != null) {
-			this.colData.clear();
-		}
-		
-		setNumOfCols(size);
-	}
-
-	public int getNumOfRows() {
-		return this.numOfRows;
-	}
-
-	public void setNumOfRows(int numOfRows) {
-		this.numOfRows = numOfRows;
-	}
-
-	public int getNumOfCols() {
-		return this.colData.size();
-	}
-
-	public void setNumOfCols(int numOfCols) {
-		this.colData = new ArrayList<Object>(numOfCols);
-		this.colData.addAll(Collections.nCopies(numOfCols, null));
-	}
-
-	public boolean hasMore() {
-		return this.rowIndex < this.numOfRows;
-	}
-
-	public boolean forward() {
-		if (this.rowIndex > this.numOfRows) {
-			return false;
-		}
-
-		return ((++this.rowIndex) < this.numOfRows);
-	}
-
-	public void reset() {
-		this.rowIndex = 0;
-	}
-
-	public void setBoolean(int col, boolean value) {
-		colData.set(col, value);
-	}
-
-	public void setByteArray(int col, int length, byte[] value) {
-		try {
-			switch (this.columnMetaDataList.get(col).getColType()) {
-			case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				buf.order(ByteOrder.LITTLE_ENDIAN).asCharBuffer();
-				this.colData.set(col, buf);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				buf.order(ByteOrder.LITTLE_ENDIAN);
-				this.colData.set(col, buf);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				ShortBuffer sb = buf.order(ByteOrder.LITTLE_ENDIAN).asShortBuffer();
-				this.colData.set(col, sb);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_INT: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				IntBuffer ib = buf.order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();
-				this.colData.set(col, ib);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				LongBuffer lb = buf.order(ByteOrder.LITTLE_ENDIAN).asLongBuffer();
-				this.colData.set(col, lb);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				FloatBuffer fb = buf.order(ByteOrder.LITTLE_ENDIAN).asFloatBuffer();
-				this.colData.set(col, fb);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				DoubleBuffer db = buf.order(ByteOrder.LITTLE_ENDIAN).asDoubleBuffer();
-				this.colData.set(col, db);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				buf.order(ByteOrder.LITTLE_ENDIAN);
-				this.colData.set(col, buf);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				LongBuffer lb = buf.order(ByteOrder.LITTLE_ENDIAN).asLongBuffer();
-				this.colData.set(col, lb);
-				break;
-			}
-			case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
-				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
-				buf.order(ByteOrder.LITTLE_ENDIAN);
-				this.colData.set(col, buf);
-				break;
-			}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	private static class NullType {
-		private static final byte NULL_BOOL_VAL = 0x2;
-		private static final String NULL_STR = "null";
-		
-		public String toString() {
-			return NullType.NULL_STR;
-		}
-
-		public static boolean isBooleanNull(byte val) {
-			return val == NullType.NULL_BOOL_VAL;
-		}
-
-		private static boolean isTinyIntNull(byte val) {
-			return val == Byte.MIN_VALUE;
-		}
-
-		private static boolean isSmallIntNull(short val) {
-			return val == Short.MIN_VALUE;
-		}
-
-		private static boolean isIntNull(int val) {
-			return val == Integer.MIN_VALUE;
-		}
-
-		private static boolean isBigIntNull(long val) {
-			return val == Long.MIN_VALUE;
-		}
-
-		private static boolean isFloatNull(float val) {
-			return Float.isNaN(val);
-		}
-
-		private static boolean isDoubleNull(double val) {
-			return Double.isNaN(val);
-		}
-
-		private static boolean isBinaryNull(byte[] val, int length) {
-			if (length != Byte.BYTES) {
-				return false;
-			}
-
-			return val[0] == 0xFF;
-		}
-
-		private static boolean isNcharNull(byte[] val, int length) {
-			if (length != Integer.BYTES) {
-				return false;
-			}
-
-			return (val[0] & val[1] & val[2] & val[3]) == 0xFF;
-		}
-
-	}
-
-	/**
-	 * The original type may not be a string type, but will be converted to by
-	 * calling this method
-	 * 
-	 * @param col column index
-	 * @return
-	 * @throws SQLException
-	 */
-	public String getString(int col) throws SQLException {
-		Object obj = get(col);
-		if (obj == null) {
-			return new NullType().toString();
-		}
-
-		return obj.toString();
-	}
-
-	public int getInt(int col) {
-		Object obj = get(col);
-		if (obj == null) {
-			return 0;
-		}
-
-		int type = this.columnMetaDataList.get(col).getColType();
-		switch (type) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
-		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			return (int) obj;
-		}
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
-			return ((Long) obj).intValue();
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			return ((Double) obj).intValue();
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-			return Integer.parseInt((String) obj);
-		}
-		}
-
-		return 0;
-	}
-
-	public boolean getBoolean(int col) throws SQLException {
-		Object obj = get(col);
-		if (obj == null) {
-			return Boolean.FALSE;
-		}
-
-		int type = this.columnMetaDataList.get(col).getColType();
-		switch (type) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
-		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			return ((int) obj == 0L) ? Boolean.FALSE : Boolean.TRUE;
-		}
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
-			return (((Long) obj) == 0L) ? Boolean.FALSE : Boolean.TRUE;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			return (((Double) obj) == 0) ? Boolean.FALSE : Boolean.TRUE;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-			if ("TRUE".compareToIgnoreCase((String) obj) == 0) {
-				return Boolean.TRUE;
-			} else if ("FALSE".compareToIgnoreCase((String) obj) == 0) {
-				return Boolean.TRUE;
-			} else {
-				throw new SQLDataException();
-			}
-		}
-		}
-
-		return Boolean.FALSE;
-	}
-
-	public long getLong(int col) throws SQLException {
-		Object obj = get(col);
-		if (obj == null) {
-			return 0;
-		}
-
-		int type = this.columnMetaDataList.get(col).getColType();
-		switch (type) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
-		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			return (int) obj;
-		}
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
-			return (long) obj;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			return ((Double) obj).longValue();
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-			return Long.parseLong((String) obj);
-		}
-		}
-
-		return 0;
-	}
-
-	public Timestamp getTimestamp(int col) {
-		try {
-			return new Timestamp(getLong(col));
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	public double getDouble(int col) {
-		Object obj = get(col);
-		if (obj == null) {
-			return 0;
-		}
-
-		int type = this.columnMetaDataList.get(col).getColType();
-		switch (type) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
-		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			return (int) obj;
-		}
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
-			return (long) obj;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			return (double) obj;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-			return Double.parseDouble((String) obj);
-		}
-		}
-
-		return 0;
-	}
-
-	public Object get(int col) {
-		int fieldSize = this.columnMetaDataList.get(col).getColSize();
-
-		switch (this.columnMetaDataList.get(col).getColType()) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
-			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
-
-			byte val = bb.get(this.rowIndex);
-			if (NullType.isBooleanNull(val)) {
-				return null;
-			}
-
-			return (val == 0x0) ? Boolean.FALSE : Boolean.TRUE;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
-			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
-
-			byte val = bb.get(this.rowIndex);
-			if (NullType.isTinyIntNull(val)) {
-				return null;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
-			ShortBuffer sb = (ShortBuffer) this.colData.get(col);
-			short val = sb.get(this.rowIndex);
-			if (NullType.isSmallIntNull(val)) {
-				return null;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			IntBuffer ib = (IntBuffer) this.colData.get(col);
-			int val = ib.get(this.rowIndex);
-			if (NullType.isIntNull(val)) {
-				return null;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
-			LongBuffer lb = (LongBuffer) this.colData.get(col);
-			long val = lb.get(this.rowIndex);
-			if (NullType.isBigIntNull(val)) {
-				return null;
-			}
-
-			return (long) val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
-			FloatBuffer fb = (FloatBuffer) this.colData.get(col);
-			float val = fb.get(this.rowIndex);
-			if (NullType.isFloatNull(val)) {
-				return null;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
-			double val = lb.get(this.rowIndex);
-			if (NullType.isDoubleNull(val)) {
-				return null;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
-			bb.position(fieldSize * this.rowIndex);
-
-			int length = bb.getShort();
-
-			byte[] dest = new byte[length];
-			bb.get(dest, 0, length);
-			if (NullType.isBinaryNull(dest, length)) {
-				return null;
-			}
-
-			return new String(dest);
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
-			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
-			bb.position(fieldSize * this.rowIndex);
-
-			int length = bb.getShort();
-
-			byte[] dest = new byte[length];
-			bb.get(dest, 0, length);
-			if (NullType.isNcharNull(dest, length)) {
-				return null;
-			}
-
-			try {
-				String ss = TaosGlobalConfig.getCharset();
-				return new String(dest, ss);
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-		}
-		}
-
-		return 0;
-	}
+    private int numOfRows = 0;
+    private int rowIndex = 0;
+
+    private List<ColumnMetaData> columnMetaDataList;
+    private ArrayList<Object> colData = null;
+
+    public TSDBResultSetBlockData(List<ColumnMetaData> colMeta, int numOfCols) {
+        this.columnMetaDataList = colMeta;
+        this.colData = new ArrayList<Object>(numOfCols);
+    }
+
+    public TSDBResultSetBlockData() {
+        this.colData = new ArrayList<Object>();
+    }
+
+    public void clear() {
+        int size = this.colData.size();
+        if (this.colData != null) {
+            this.colData.clear();
+        }
+
+        setNumOfCols(size);
+    }
+
+    public int getNumOfRows() {
+        return this.numOfRows;
+    }
+
+    public void setNumOfRows(int numOfRows) {
+        this.numOfRows = numOfRows;
+    }
+
+    public int getNumOfCols() {
+        return this.colData.size();
+    }
+
+    public void setNumOfCols(int numOfCols) {
+        this.colData = new ArrayList<Object>(numOfCols);
+        this.colData.addAll(Collections.nCopies(numOfCols, null));
+    }
+
+    public boolean hasMore() {
+        return this.rowIndex < this.numOfRows;
+    }
+
+    public boolean forward() {
+        if (this.rowIndex > this.numOfRows) {
+            return false;
+        }
+
+        return ((++this.rowIndex) < this.numOfRows);
+    }
+
+    public void reset() {
+        this.rowIndex = 0;
+    }
+
+    public void setBoolean(int col, boolean value) {
+        colData.set(col, value);
+    }
+
+    public void setByteArray(int col, int length, byte[] value) {
+        try {
+            switch (this.columnMetaDataList.get(col).getColType()) {
+                case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    buf.order(ByteOrder.LITTLE_ENDIAN).asCharBuffer();
+                    this.colData.set(col, buf);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_UTINYINT:
+                case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    buf.order(ByteOrder.LITTLE_ENDIAN);
+                    this.colData.set(col, buf);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_USMALLINT:
+                case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    ShortBuffer sb = buf.order(ByteOrder.LITTLE_ENDIAN).asShortBuffer();
+                    this.colData.set(col, sb);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_UINT:
+                case TSDBConstants.TSDB_DATA_TYPE_INT: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    IntBuffer ib = buf.order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();
+                    this.colData.set(col, ib);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_UBIGINT:
+                case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    LongBuffer lb = buf.order(ByteOrder.LITTLE_ENDIAN).asLongBuffer();
+                    this.colData.set(col, lb);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    FloatBuffer fb = buf.order(ByteOrder.LITTLE_ENDIAN).asFloatBuffer();
+                    this.colData.set(col, fb);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    DoubleBuffer db = buf.order(ByteOrder.LITTLE_ENDIAN).asDoubleBuffer();
+                    this.colData.set(col, db);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    buf.order(ByteOrder.LITTLE_ENDIAN);
+                    this.colData.set(col, buf);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    LongBuffer lb = buf.order(ByteOrder.LITTLE_ENDIAN).asLongBuffer();
+                    this.colData.set(col, lb);
+                    break;
+                }
+                case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
+                    ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+                    buf.order(ByteOrder.LITTLE_ENDIAN);
+                    this.colData.set(col, buf);
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static class NullType {
+        private static final byte NULL_BOOL_VAL = 0x2;
+        private static final String NULL_STR = "null";
+
+        public String toString() {
+            return NullType.NULL_STR;
+        }
+
+        public static boolean isBooleanNull(byte val) {
+            return val == NullType.NULL_BOOL_VAL;
+        }
+
+        private static boolean isTinyIntNull(byte val) {
+            return val == Byte.MIN_VALUE;
+        }
+
+        private static boolean isSmallIntNull(short val) {
+            return val == Short.MIN_VALUE;
+        }
+
+        private static boolean isIntNull(int val) {
+            return val == Integer.MIN_VALUE;
+        }
+
+        private static boolean isBigIntNull(long val) {
+            return val == Long.MIN_VALUE;
+        }
+
+        private static boolean isFloatNull(float val) {
+            return Float.isNaN(val);
+        }
+
+        private static boolean isDoubleNull(double val) {
+            return Double.isNaN(val);
+        }
+
+        private static boolean isBinaryNull(byte[] val, int length) {
+            if (length != Byte.BYTES) {
+                return false;
+            }
+
+            return val[0] == 0xFF;
+        }
+
+        private static boolean isNcharNull(byte[] val, int length) {
+            if (length != Integer.BYTES) {
+                return false;
+            }
+
+            return (val[0] & val[1] & val[2] & val[3]) == 0xFF;
+        }
+
+    }
+
+    /**
+     * The original type may not be a string type, but will be converted to by
+     * calling this method
+     *
+     * @param col column index
+     * @return
+     * @throws SQLException
+     */
+    public String getString(int col) throws SQLException {
+        Object obj = get(col);
+        if (obj == null) {
+            return new NullType().toString();
+        }
+
+        return obj.toString();
+    }
+
+    public int getInt(int col) {
+        Object obj = get(col);
+        if (obj == null) {
+            return 0;
+        }
+
+        int type = this.columnMetaDataList.get(col).getColType();
+        switch (type) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+            case TSDBConstants.TSDB_DATA_TYPE_INT: {
+                return (int) obj;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+                return ((Long) obj).intValue();
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+                return ((Double) obj).intValue();
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+                return Integer.parseInt((String) obj);
+            }
+        }
+
+        return 0;
+    }
+
+    public boolean getBoolean(int col) throws SQLException {
+        Object obj = get(col);
+        if (obj == null) {
+            return Boolean.FALSE;
+        }
+
+        int type = this.columnMetaDataList.get(col).getColType();
+        switch (type) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+            case TSDBConstants.TSDB_DATA_TYPE_INT: {
+                return ((int) obj == 0L) ? Boolean.FALSE : Boolean.TRUE;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+                return (((Long) obj) == 0L) ? Boolean.FALSE : Boolean.TRUE;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+                return (((Double) obj) == 0) ? Boolean.FALSE : Boolean.TRUE;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+                if ("TRUE".compareToIgnoreCase((String) obj) == 0) {
+                    return Boolean.TRUE;
+                } else if ("FALSE".compareToIgnoreCase((String) obj) == 0) {
+                    return Boolean.TRUE;
+                } else {
+                    throw new SQLDataException();
+                }
+            }
+        }
+
+        return Boolean.FALSE;
+    }
+
+    public long getLong(int col) throws SQLException {
+        Object obj = get(col);
+        if (obj == null) {
+            return 0;
+        }
+
+        int type = this.columnMetaDataList.get(col).getColType();
+        switch (type) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+            case TSDBConstants.TSDB_DATA_TYPE_INT: {
+                return (int) obj;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+                return (long) obj;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+                return ((Double) obj).longValue();
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+                return Long.parseLong((String) obj);
+            }
+        }
+
+        return 0;
+    }
+
+    public Timestamp getTimestamp(int col) {
+        try {
+            return new Timestamp(getLong(col));
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public double getDouble(int col) {
+        Object obj = get(col);
+        if (obj == null) {
+            return 0;
+        }
+
+        int type = this.columnMetaDataList.get(col).getColType();
+        switch (type) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+            case TSDBConstants.TSDB_DATA_TYPE_INT: {
+                return (int) obj;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+                return (long) obj;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+                return (double) obj;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+                return Double.parseDouble((String) obj);
+            }
+        }
+
+        return 0;
+    }
+
+    public Object get(int col) {
+        int fieldSize = this.columnMetaDataList.get(col).getColSize();
+
+        switch (this.columnMetaDataList.get(col).getColType()) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
+                ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+
+                byte val = bb.get(this.rowIndex);
+                if (NullType.isBooleanNull(val)) {
+                    return null;
+                }
+
+                return (val == 0x0) ? Boolean.FALSE : Boolean.TRUE;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
+                ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+
+                byte val = bb.get(this.rowIndex);
+                if (NullType.isTinyIntNull(val)) {
+                    return null;
+                }
+
+                return val;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
+                ShortBuffer sb = (ShortBuffer) this.colData.get(col);
+                short val = sb.get(this.rowIndex);
+                if (NullType.isSmallIntNull(val)) {
+                    return null;
+                }
+
+                return val;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_INT: {
+                IntBuffer ib = (IntBuffer) this.colData.get(col);
+                int val = ib.get(this.rowIndex);
+                if (NullType.isIntNull(val)) {
+                    return null;
+                }
+
+                return val;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
+                LongBuffer lb = (LongBuffer) this.colData.get(col);
+                long val = lb.get(this.rowIndex);
+                if (NullType.isBigIntNull(val)) {
+                    return null;
+                }
+
+                return (long) val;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
+                FloatBuffer fb = (FloatBuffer) this.colData.get(col);
+                float val = fb.get(this.rowIndex);
+                if (NullType.isFloatNull(val)) {
+                    return null;
+                }
+
+                return val;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+                DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
+                double val = lb.get(this.rowIndex);
+                if (NullType.isDoubleNull(val)) {
+                    return null;
+                }
+
+                return val;
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+                ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+                bb.position(fieldSize * this.rowIndex);
+
+                int length = bb.getShort();
+
+                byte[] dest = new byte[length];
+                bb.get(dest, 0, length);
+                if (NullType.isBinaryNull(dest, length)) {
+                    return null;
+                }
+
+                return new String(dest);
+            }
+
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
+                ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+                bb.position(fieldSize * this.rowIndex);
+
+                int length = bb.getShort();
+
+                byte[] dest = new byte[length];
+                bb.get(dest, 0, length);
+                if (NullType.isNcharNull(dest, length)) {
+                    return null;
+                }
+
+                try {
+                    String ss = TaosGlobalConfig.getCharset();
+                    return new String(dest, ss);
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return 0;
+    }
 }

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

@@ -126,34 +126,12 @@ public class TSDBResultSetMetaData extends WrapperImpl implements ResultSetMetaD
 
 	public int getColumnType(int column) throws SQLException {
 		ColumnMetaData meta = this.colMetaDataList.get(column - 1);
-		switch (meta.getColType()) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
-			return Types.BOOLEAN;
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
-			return java.sql.Types.TINYINT;
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
-			return java.sql.Types.SMALLINT;
-		case TSDBConstants.TSDB_DATA_TYPE_INT:
-			return java.sql.Types.INTEGER;
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
-			return java.sql.Types.BIGINT;
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
-			return java.sql.Types.FLOAT;
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
-			return java.sql.Types.DOUBLE;
-		case TSDBConstants.TSDB_DATA_TYPE_BINARY:
-			return Types.BINARY;
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-			return java.sql.Types.TIMESTAMP;
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-			return Types.NCHAR;
-		}
-		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
+		return TSDBConstants.taosType2JdbcType(meta.getColType());
 	}
 
 	public String getColumnTypeName(int column) throws SQLException {
 		ColumnMetaData meta = this.colMetaDataList.get(column - 1);
-		return TSDBConstants.DATATYPE_MAP.get(meta.getColType());
+		return TSDBConstants.taosType2JdbcTypeName(meta.getColType());
 	}
 
 	public boolean isReadOnly(int column) throws SQLException {

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

@@ -14,208 +14,322 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
+import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 
 public class TSDBResultSetRowData {
-	private ArrayList<Object> data = null;
-	private int colSize = 0;
+    private ArrayList<Object> data = null;
+    private int colSize = 0;
 
-	public TSDBResultSetRowData(int colSize) {
-		this.setColSize(colSize);
-	}
+    public TSDBResultSetRowData(int colSize) {
+        this.setColSize(colSize);
+    }
 
-	public TSDBResultSetRowData() {
-		this.data = new ArrayList<>();
-		this.setColSize(0);
-	}
+    public TSDBResultSetRowData() {
+        this.data = new ArrayList<>();
+        this.setColSize(0);
+    }
 
-	public void clear() {
-		if(this.data != null) {
-			this.data.clear();
-		}
-		if (this.colSize == 0) {
-			return;
-		}
-		this.data = new ArrayList<>(colSize);
-		this.data.addAll(Collections.nCopies(this.colSize, null));
-	}
+    public void clear() {
+        if (this.data != null) {
+            this.data.clear();
+        }
+        if (this.colSize == 0) {
+            return;
+        }
+        this.data = new ArrayList<>(colSize);
+        this.data.addAll(Collections.nCopies(this.colSize, null));
+    }
 
-	public boolean wasNull(int col) {
-		return data.get(col) == null;
-	}
+    public boolean wasNull(int col) {
+        return data.get(col) == null;
+    }
 
-	public void setBoolean(int col, boolean value) {
-		data.set(col, value);
-	}
+    public void setBoolean(int col, boolean value) {
+        data.set(col, value);
+    }
 
-	public boolean getBoolean(int col, int srcType) throws SQLException {
-		Object obj = data.get(col);
+    public boolean getBoolean(int col, int srcType) throws SQLException {
+        Object obj = data.get(col);
 
-		switch(srcType) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:    return (Boolean) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:   return ((Float) obj) == 1.0? Boolean.TRUE:Boolean.FALSE;
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:  return ((Double) obj) == 1.0? Boolean.TRUE:Boolean.FALSE;
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: return ((Byte) obj) == 1? Boolean.TRUE:Boolean.FALSE;
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:return ((Short)obj) == 1?   Boolean.TRUE:Boolean.FALSE;
-		case TSDBConstants.TSDB_DATA_TYPE_INT:     return ((Integer)obj) == 1? Boolean.TRUE:Boolean.FALSE;
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:  return ((Long) obj) == 1L?   Boolean.TRUE:Boolean.FALSE;
-		}
+        switch (srcType) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return (Boolean) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return ((Float) obj) == 1.0 ? Boolean.TRUE : Boolean.FALSE;
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return ((Double) obj) == 1.0 ? Boolean.TRUE : Boolean.FALSE;
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return ((Byte) obj) == 1 ? Boolean.TRUE : Boolean.FALSE;
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return ((Short) obj) == 1 ? Boolean.TRUE : Boolean.FALSE;
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return ((Integer) obj) == 1 ? Boolean.TRUE : Boolean.FALSE;
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return ((Long) obj) == 1L ? Boolean.TRUE : Boolean.FALSE;
+        }
 
-		return Boolean.TRUE;
-	}
+        return Boolean.TRUE;
+    }
 
-	public void setByte(int col, byte value) {
-		data.set(col, value);
-	}
+    public void setByte(int col, byte value) {
+        data.set(col, value);
+    }
 
-	public void setShort(int col, short value) {
-		data.set(col, value);
-	}
+    public void setShort(int col, short value) {
+        data.set(col, value);
+    }
 
-	public void setInt(int col, int value) {
-		data.set(col, value);
-	}
+    public void setInt(int col, int value) {
+        data.set(col, value);
+    }
 
-	public int getInt(int col, int srcType) throws SQLException {
-		Object obj = data.get(col);
+    public int getInt(int col, int srcType) throws SQLException {
+        Object obj = data.get(col);
 
-		switch(srcType) {
-		    case TSDBConstants.TSDB_DATA_TYPE_BOOL:    return Boolean.TRUE.equals(obj)? 1:0;
-		    case TSDBConstants.TSDB_DATA_TYPE_FLOAT:   return ((Float) obj).intValue();
-		    case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:  return ((Double)obj).intValue();
-		    case TSDBConstants.TSDB_DATA_TYPE_TINYINT: return (Byte) obj;
-		    case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:return (Short) obj;
-		    case TSDBConstants.TSDB_DATA_TYPE_INT:     return (Integer) obj;
-		    case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		    case TSDBConstants.TSDB_DATA_TYPE_BIGINT:  return ((Long) obj).intValue();
-		    case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-		    case TSDBConstants.TSDB_DATA_TYPE_BINARY:  return Integer.parseInt((String) obj);
-		}
+        switch (srcType) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return Boolean.TRUE.equals(obj) ? 1 : 0;
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return ((Float) obj).intValue();
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return ((Double) obj).intValue();
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return (Byte) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return (Short) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return (Integer) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return ((Long) obj).intValue();
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY:
+                return Integer.parseInt((String) obj);
+            case TSDBConstants.TSDB_DATA_TYPE_UTINYINT: {
+                Byte value = (byte) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return value;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_USMALLINT: {
+                short value = (short) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return value;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_UINT: {
+                int value = (int) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return value;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_UBIGINT: {
+                long value = (long) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return new Long(value).intValue();
+            }
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	public void setLong(int col, long value) {
-		data.set(col, value);
-	}
+    public void setLong(int col, long value) {
+        data.set(col, value);
+    }
 
-	public long getLong(int col, int srcType) throws SQLException {
-		Object obj = data.get(col);
+    public long getLong(int col, int srcType) throws SQLException {
+        Object obj = data.get(col);
 
-		switch(srcType) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:    return Boolean.TRUE.equals(obj)? 1:0;
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:   return ((Float) obj).longValue();
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:  return ((Double) obj).longValue();
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: return (Byte) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:return (Short) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_INT:     return (Integer) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:  return (Long) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-		case TSDBConstants.TSDB_DATA_TYPE_BINARY:  return Long.parseLong((String) obj);
-		}
+        switch (srcType) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return Boolean.TRUE.equals(obj) ? 1 : 0;
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return ((Float) obj).longValue();
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return ((Double) obj).longValue();
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return (Byte) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return (Short) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return (Integer) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return (Long) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY:
+                return Long.parseLong((String) obj);
+            case TSDBConstants.TSDB_DATA_TYPE_UTINYINT: {
+                Byte value = (byte) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return value;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_USMALLINT: {
+                short value = (short) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return value;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_UINT: {
+                int value = (int) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return value;
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_UBIGINT: {
+                long value = (long) obj;
+                if (value < 0)
+                    throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
+                return value;
+            }
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	public void setFloat(int col, float value) {
-		data.set(col, value);
-	}
+    public void setFloat(int col, float value) {
+        data.set(col, value);
+    }
 
-	public float getFloat(int col, int srcType) throws SQLException {
-		Object obj = data.get(col);
+    public float getFloat(int col, int srcType) throws SQLException {
+        Object obj = data.get(col);
 
-		switch(srcType) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:     return Boolean.TRUE.equals(obj)? 1:0;
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:    return (Float) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:   return ((Double) obj).floatValue();
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:  return (Byte) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: return (Short) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_INT:      return (Integer) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:   return (Long) obj;
-		}
+        switch (srcType) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return Boolean.TRUE.equals(obj) ? 1 : 0;
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return (Float) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return ((Double) obj).floatValue();
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return (Byte) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return (Short) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return (Integer) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return (Long) obj;
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	public void setDouble(int col, double value) {
-		data.set(col, value);
-	}
+    public void setDouble(int col, double value) {
+        data.set(col, value);
+    }
 
-	public double getDouble(int col, int srcType) throws SQLException {
-		Object obj = data.get(col);
+    public double getDouble(int col, int srcType) throws SQLException {
+        Object obj = data.get(col);
 
-		switch(srcType) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL:    return Boolean.TRUE.equals(obj)? 1:0;
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:   return (Float) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:  return (Double) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: return (Byte) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:return (Short) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_INT:     return (Integer) obj;
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:  return (Long) obj;
-		}
+        switch (srcType) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return Boolean.TRUE.equals(obj) ? 1 : 0;
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return (Float) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return (Double) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return (Byte) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return (Short) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return (Integer) obj;
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return (Long) obj;
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	public void setString(int col, String value) {
-		data.set(col, value);
-	}
+    public void setString(int col, String value) {
+        data.set(col, value);
+    }
 
-	public void setByteArray(int col, byte[] value) {
+    public void setByteArray(int col, byte[] value) {
         try {
             data.set(col, new String(value, TaosGlobalConfig.getCharset()));
         } catch (Exception e) {
             e.printStackTrace();
         }
-	}
+    }
 
-	/**
-	 * The original type may not be a string type, but will be converted to by calling this method
-	 * @param col column index
-	 * @return
-	 * @throws SQLException
-	 */
-	public String getString(int col, int srcType) throws SQLException {
-		if (srcType == TSDBConstants.TSDB_DATA_TYPE_BINARY || srcType == TSDBConstants.TSDB_DATA_TYPE_NCHAR) {
-			return (String) data.get(col);
-		} else {
-			return String.valueOf(data.get(col));
-		}
-	}
+    /**
+     * The original type may not be a string type, but will be converted to by calling this method
+     *
+     * @param col column index
+     * @return
+     * @throws SQLException
+     */
+    public String getString(int col, int srcType) throws SQLException {
+        switch (srcType) {
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY:
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+                return (String) data.get(col);
+            case TSDBConstants.TSDB_DATA_TYPE_UTINYINT: {
+                Byte value = new Byte(String.valueOf(data.get(col)));
+                if (value >= 0)
+                    return value.toString();
+                return Integer.toString(value & 0xff);
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_USMALLINT: {
+                Short value = new Short(String.valueOf(data.get(col)));
+                if (value >= 0)
+                    return value.toString();
+                return Integer.toString(value & 0xffff);
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_UINT: {
+                Integer value = new Integer(String.valueOf(data.get(col)));
+                if (value >= 0)
+                    return value.toString();
+                return Long.toString(value & 0xffffffffl);
+            }
+            case TSDBConstants.TSDB_DATA_TYPE_UBIGINT: {
+                Long value = new Long(String.valueOf(data.get(col)));
+                if (value >= 0)
+                    return value.toString();
+                long lowValue = value & 0x7fffffffffffffffL;
+                return BigDecimal.valueOf(lowValue).add(BigDecimal.valueOf(Long.MAX_VALUE)).add(BigDecimal.valueOf(1)).toString();
+            }
+            default:
+                return String.valueOf(data.get(col));
+        }
+    }
 
-	public void setTimestamp(int col, long ts) {
-		data.set(col, ts);
-	}
+    public void setTimestamp(int col, long ts) {
+        data.set(col, ts);
+    }
 
-	public Timestamp getTimestamp(int col) {
-		return new Timestamp((Long) data.get(col));
-	}
+    public Timestamp getTimestamp(int col) {
+        return new Timestamp((Long) data.get(col));
+    }
 
-	public Object get(int col) {
-		return data.get(col);
-	}
+    public Object get(int col) {
+        return data.get(col);
+    }
 
-	public int getColSize() {
-		return colSize;
-	}
+    public int getColSize() {
+        return colSize;
+    }
 
-	public void setColSize(int colSize) {
-		this.colSize = colSize;
-		this.clear();
-	}
+    public void setColSize(int colSize) {
+        this.colSize = colSize;
+        this.clear();
+    }
 
-	public ArrayList<Object> getData() {
-		return data;
-	}
+    public ArrayList<Object> getData() {
+        return data;
+    }
 
-	public void setData(ArrayList<Object> data) {
-		this.data = (ArrayList<Object>) data.clone();
-	}
+    public void setData(ArrayList<Object> data) {
+        this.data = (ArrayList<Object>) data.clone();
+    }
 }

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

@@ -51,7 +51,6 @@ public class TSDBStatement extends AbstractStatement {
             this.connector.freeResultSet(pSql);
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_WITH_EXECUTEQUERY);
         }
-
         TSDBResultSet res = new TSDBResultSet(this, this.connector, pSql);
         res.setBatchFetch(this.connection.getBatchFetch());
         return res;

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

@@ -21,27 +21,23 @@ public class TSDBSubscribe {
     private final long id;
 
     TSDBSubscribe(TSDBJNIConnector connecter, long id) throws SQLException {
-        if (null != connecter) {
-            this.connecter = connecter;
-            this.id = id;
-        } else {
-            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-        }
+        if (connecter == null)
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL);
+
+        this.connecter = connecter;
+        this.id = id;
     }
 
     /**
      * consume
-     *
      */
     public TSDBResultSet consume() throws SQLException {
-        if (this.connecter.isClosed()) {
-            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-        }
+        if (this.connecter.isClosed())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL);
 
         long resultSetPointer = this.connecter.consume(this.id);
-
         if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
-            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL);
         } else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
             return null;
         } else {
@@ -56,9 +52,9 @@ public class TSDBSubscribe {
      * @throws SQLException
      */
     public void close(boolean keepProgress) throws SQLException {
-        if (this.connecter.isClosed()) {
-            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-        }
+        if (this.connecter.isClosed())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL);
+
         this.connecter.unsubscribe(this.id, keepProgress);
     }
 }

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

@@ -27,7 +27,6 @@ public class RestfulConnection extends AbstractConnection {
     public Statement createStatement() throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
-        ;
 
         return new RestfulStatement(this, database);
     }

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

@@ -2,9 +2,7 @@ package com.taosdata.jdbc.rs;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.taosdata.jdbc.AbstractDriver;
-import com.taosdata.jdbc.TSDBConstants;
-import com.taosdata.jdbc.TSDBDriver;
+import com.taosdata.jdbc.*;
 import com.taosdata.jdbc.utils.HttpClientPoolUtil;
 
 import java.io.UnsupportedEncodingException;
@@ -21,15 +19,16 @@ public class RestfulDriver extends AbstractDriver {
         try {
             DriverManager.registerDriver(new RestfulDriver());
         } catch (SQLException e) {
-            throw new RuntimeException(TSDBConstants.WrapErrMsg("can not register Restful JDBC driver"), e);
+            throw TSDBError.createRuntimeException(TSDBErrorNumbers.ERROR_URL_NOT_SET, e);
         }
     }
 
     @Override
     public Connection connect(String url, Properties info) throws SQLException {
         // throw SQLException if url is null
-        if (url == null)
-            throw new SQLException(TSDBConstants.WrapErrMsg("url is not set!"));
+        if (url == null || url.trim().isEmpty() || url.trim().replaceAll("\\s", "").isEmpty())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_URL_NOT_SET);
+
         // return null if url is not be accepted
         if (!acceptsURL(url))
             return null;
@@ -61,14 +60,20 @@ public class RestfulDriver extends AbstractDriver {
             throw new SQLException(jsonResult.getString("desc"));
         }
 
-        return new RestfulConnection(host, port, props, database, url);
+        RestfulConnection conn = new RestfulConnection(host, port, props, database, url);
+        if (database != null && !database.trim().replaceAll("\\s", "").isEmpty()) {
+            Statement stmt = conn.createStatement();
+            stmt.execute("use " + database);
+            stmt.close();
+        }
+        return conn;
     }
 
     @Override
     public boolean acceptsURL(String url) throws SQLException {
         if (url == null)
-            throw new SQLException(TSDBConstants.WrapErrMsg("url is null"));
-        return (url != null && url.length() > 0 && url.trim().length() > 0) && url.startsWith(URL_PREFIX);
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_URL_NOT_SET);
+        return url.length() > 0 && url.trim().length() > 0 && url.startsWith(URL_PREFIX);
     }
 
     @Override

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

@@ -9,7 +9,6 @@ import com.taosdata.jdbc.TSDBErrorNumbers;
 
 import java.sql.*;
 import java.util.ArrayList;
-import java.util.List;
 
 public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     private volatile boolean isClosed;
@@ -17,8 +16,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
 
     private final String database;
     private final Statement statement;
+//    private final JSONObject resultJson;
     // data
-    private ArrayList<ArrayList<Object>> resultSet;
+    private final ArrayList<ArrayList<Object>> resultSet;
     // meta
     private ArrayList<String> columnNames;
     private ArrayList<Field> columns;
@@ -32,6 +32,8 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     public RestfulResultSet(String database, Statement statement, JSONObject resultJson) throws SQLException {
         this.database = database;
         this.statement = statement;
+//        this.resultJson = resultJson;
+
         // column metadata
         JSONArray columnMeta = resultJson.getJSONArray("column_meta");
         columnNames = new ArrayList<>();
@@ -39,10 +41,11 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         for (int colIndex = 0; colIndex < columnMeta.size(); colIndex++) {
             JSONArray col = columnMeta.getJSONArray(colIndex);
             String col_name = col.getString(0);
-            int col_type = TSDBConstants.taosType2JdbcType(col.getInteger(1));
+            int taos_type = col.getInteger(1);
+            int col_type = TSDBConstants.taosType2JdbcType(taos_type);
             int col_length = col.getInteger(2);
             columnNames.add(col_name);
-            columns.add(new Field(col_name, col_type, col_length, ""));
+            columns.add(new Field(col_name, col_type, col_length, "", taos_type));
         }
         this.metaData = new RestfulResultSetMetaData(this.database, columns, this);
 
@@ -53,105 +56,50 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             ArrayList row = new ArrayList();
             JSONArray jsonRow = data.getJSONArray(rowIndex);
             for (int colIndex = 0; colIndex < jsonRow.size(); colIndex++) {
-                row.add(parseColumnData(jsonRow, colIndex, columns.get(colIndex).type));
+                row.add(parseColumnData(jsonRow, colIndex, columns.get(colIndex).taos_type));
             }
             resultSet.add(row);
         }
-
-        /*
-        int columnIndex = 0;
-        for (; columnIndex < data.size(); columnIndex++) {
-            ArrayList oneRow = new ArrayList<>();
-            JSONArray one = data.getJSONArray(columnIndex);
-            for (int j = 0; j < one.size(); j++) {
-                oneRow.add(one.getString(j));
-            }
-            resultSet.add(oneRow);
-        }
-
-        // column only names
-        JSONArray head = resultJson.getJSONArray("head");
-        for (int i = 0; i < head.size(); i++) {
-            String name = head.getString(i);
-            columnNames.add(name);
-            columns.add(new Field(name, "", 0, ""));
-        }
-        this.metaData = new RestfulResultSetMetaData(this.database, columns, this);
-         */
     }
 
-    private Object parseColumnData(JSONArray row, int colIndex, int sqlType) {
-        switch (sqlType) {
-            case Types.NULL:
-                return null;
-            case Types.BOOLEAN:
+    private Object parseColumnData(JSONArray row, int colIndex, int taosType) {
+        switch (taosType) {
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
                 return row.getBoolean(colIndex);
-            case Types.TINYINT:
-            case Types.SMALLINT:
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return row.getByte(colIndex);
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
                 return row.getShort(colIndex);
-            case Types.INTEGER:
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
                 return row.getInteger(colIndex);
-            case Types.BIGINT:
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
                 return row.getBigInteger(colIndex);
-            case Types.FLOAT:
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
                 return row.getFloat(colIndex);
-            case Types.DOUBLE:
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
                 return row.getDouble(colIndex);
-            case Types.TIMESTAMP:
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
                 return new Timestamp(row.getDate(colIndex).getTime());
-            case Types.BINARY:
-            case Types.NCHAR:
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY:
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
             default:
                 return row.getString(colIndex);
         }
     }
 
-//    /**
-//     * 由多个resultSet的JSON构造结果集
-//     *
-//     * @param resultJson: 包含data信息的结果集，有sql返回的结果集
-//     * @param fieldJson:  包含多个（最多2个）meta信息的结果集，有describe xxx
-//     **/
-//    public RestfulResultSet(String database, Statement statement, JSONObject resultJson, List<JSONObject> fieldJson) throws SQLException {
-//        this(database, statement, resultJson);
-//        ArrayList<Field> newColumns = new ArrayList<>();
-//
-//        for (Field column : columns) {
-//            Field field = findField(column.name, fieldJson);
-//            if (field != null) {
-//                newColumns.add(field);
-//            } else {
-//                newColumns.add(column);
-//            }
-//        }
-//        this.columns = newColumns;
-//        this.metaData = new RestfulResultSetMetaData(this.database, this.columns, this);
-//    }
-
-//    public Field findField(String columnName, List<JSONObject> fieldJsonList) {
-//        for (JSONObject fieldJSON : fieldJsonList) {
-//            JSONArray fieldDataJson = fieldJSON.getJSONArray("data");
-//            for (int i = 0; i < fieldDataJson.size(); i++) {
-//                JSONArray field = fieldDataJson.getJSONArray(i);
-//                if (columnName.equalsIgnoreCase(field.getString(0))) {
-//                    return new Field(field.getString(0), field.getString(1), field.getInteger(2), field.getString(3));
-//                }
-//            }
-//        }
-//        return null;
-//    }
-
     public class Field {
         String name;
         int type;
         int length;
         String note;
+        int taos_type;
 
-        public Field(String name, int type, int length, String note) {
+        public Field(String name, int type, int length, String note, int taos_type) {
             this.name = name;
             this.type = type;
             this.length = length;
             this.note = note;
+            this.taos_type = taos_type;
         }
     }
 
@@ -184,10 +132,8 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     public String getString(int columnIndex) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
-
-        if (columnIndex > resultSet.get(pos).size()) {
-            throw new SQLException(TSDBConstants.WrapErrMsg("Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size()));
-        }
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
 
         columnIndex = getTrueColumnIndex(columnIndex);
         return resultSet.get(pos).get(columnIndex).toString();
@@ -197,40 +143,107 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     public boolean getBoolean(int columnIndex) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
 
         columnIndex = getTrueColumnIndex(columnIndex);
         int result = getInt(columnIndex);
         return result == 0 ? false : true;
     }
 
+    @Override
+    public byte getByte(int columnIndex) throws SQLException {
+        if (isClosed())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
+
+        columnIndex = getTrueColumnIndex(columnIndex);
+        Object value = resultSet.get(pos).get(columnIndex);
+        if (value == null)
+            return 0;
+        long valueAsLong = Long.parseLong(value.toString());
+        if (valueAsLong == Byte.MIN_VALUE)
+            return 0;
+        if (valueAsLong < Byte.MIN_VALUE || valueAsLong > Byte.MAX_VALUE)
+            throwRangeException(value.toString(), columnIndex, Types.TINYINT);
+
+        return (byte) valueAsLong;
+    }
+
+    private void throwRangeException(String valueAsString, int columnIndex, int jdbcType) throws SQLException {
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE,
+                "'" + valueAsString + "' in column '" + columnIndex + "' is outside valid range for the jdbcType " + TSDBConstants.jdbcType2TaosTypeName(jdbcType));
+    }
+
     @Override
     public short getShort(int columnIndex) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
+
         columnIndex = getTrueColumnIndex(columnIndex);
-        return Short.parseShort(resultSet.get(pos).get(columnIndex).toString());
+        Object value = resultSet.get(pos).get(columnIndex);
+        if (value == null)
+            return 0;
+        long valueAsLong = Long.parseLong(value.toString());
+        if (valueAsLong == Short.MIN_VALUE)
+            return 0;
+        if (valueAsLong < Short.MIN_VALUE || valueAsLong > Short.MAX_VALUE)
+            throwRangeException(value.toString(), columnIndex, Types.SMALLINT);
+        return (short) valueAsLong;
     }
 
     @Override
     public int getInt(int columnIndex) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
+
         columnIndex = getTrueColumnIndex(columnIndex);
-        return Integer.parseInt(resultSet.get(pos).get(columnIndex).toString());
+        Object value = resultSet.get(pos).get(columnIndex);
+        if (value == null)
+            return 0;
+        long valueAsLong = Long.parseLong(value.toString());
+        if (valueAsLong == Integer.MIN_VALUE)
+            return 0;
+        if (valueAsLong < Integer.MIN_VALUE || valueAsLong > Integer.MAX_VALUE)
+            throwRangeException(value.toString(), columnIndex, Types.INTEGER);
+        return (int) valueAsLong;
     }
 
     @Override
     public long getLong(int columnIndex) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
+
         columnIndex = getTrueColumnIndex(columnIndex);
-        return Long.parseLong(resultSet.get(pos).get(columnIndex).toString());
+        Object value = resultSet.get(pos).get(columnIndex);
+        if (value == null)
+            return 0;
+
+        long valueAsLong = 0;
+        try {
+            valueAsLong = Long.parseLong(value.toString());
+            if (valueAsLong == Long.MIN_VALUE)
+                return 0;
+        } catch (NumberFormatException e) {
+            throwRangeException(value.toString(), columnIndex, Types.BIGINT);
+        }
+        return valueAsLong;
     }
 
     @Override
     public float getFloat(int columnIndex) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
+
         columnIndex = getTrueColumnIndex(columnIndex);
         return Float.parseFloat(resultSet.get(pos).get(columnIndex).toString());
     }
@@ -239,6 +252,8 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     public double getDouble(int columnIndex) throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
+        if (columnIndex > resultSet.get(pos).size())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE, "Column Index out of range, " + columnIndex + " > " + resultSet.get(pos).size());
 
         columnIndex = getTrueColumnIndex(columnIndex);
         return Double.parseDouble(resultSet.get(pos).get(columnIndex).toString());
@@ -246,12 +261,14 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
 
     private int getTrueColumnIndex(int columnIndex) throws SQLException {
         if (columnIndex < 1) {
-            throw new SQLException("Column Index out of range, " + columnIndex + " < 1");
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE
+                    , "Column Index out of range, " + columnIndex + " < 1");
         }
 
         int numOfCols = resultSet.get(pos).size();
         if (columnIndex > numOfCols) {
-            throw new SQLException("Column Index out of range, " + columnIndex + " > " + numOfCols);
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_PARAMETER_INDEX_OUT_RANGE
+                    , "Column Index out of range, " + columnIndex + " > " + numOfCols);
         }
 
         return columnIndex - 1;

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

@@ -1,6 +1,7 @@
 package com.taosdata.jdbc.rs;
 
 import com.taosdata.jdbc.TSDBConstants;
+import com.taosdata.jdbc.WrapperImpl;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -8,7 +9,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.ArrayList;
 
-public class RestfulResultSetMetaData implements ResultSetMetaData {
+public class RestfulResultSetMetaData extends WrapperImpl implements ResultSetMetaData {
 
     private final String database;
     private ArrayList<RestfulResultSet.Field> fields;
@@ -20,6 +21,10 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
         this.resultSet = resultSet;
     }
 
+    public ArrayList<RestfulResultSet.Field> getFields() {
+        return fields;
+    }
+
     @Override
     public int getColumnCount() throws SQLException {
         return fields.size();
@@ -134,8 +139,8 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public String getColumnTypeName(int column) throws SQLException {
-        int type = fields.get(column - 1).type;
-        return TSDBConstants.jdbcType2TaosTypeName(type);
+        int taos_type = fields.get(column - 1).taos_type;
+        return TSDBConstants.taosType2JdbcTypeName(taos_type);
     }
 
     @Override
@@ -180,18 +185,4 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
         return columnClassName;
     }
 
-    @Override
-    public <T> T unwrap(Class<T> iface) throws SQLException {
-        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 iface.isInstance(this);
-    }
-
 }

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

@@ -4,17 +4,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.taosdata.jdbc.AbstractStatement;
-import com.taosdata.jdbc.TSDBConstants;
 import com.taosdata.jdbc.TSDBError;
 import com.taosdata.jdbc.TSDBErrorNumbers;
 import com.taosdata.jdbc.utils.HttpClientPoolUtil;
 import com.taosdata.jdbc.utils.SqlSyntaxValidator;
 
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class RestfulStatement extends AbstractStatement {
 
@@ -30,39 +27,6 @@ public class RestfulStatement extends AbstractStatement {
         this.database = database;
     }
 
-    protected String[] parseTableIdentifier(String sql) {
-        sql = sql.trim().toLowerCase();
-        String[] ret = null;
-        if (sql.contains("where"))
-            sql = sql.substring(0, sql.indexOf("where"));
-        if (sql.contains("interval"))
-            sql = sql.substring(0, sql.indexOf("interval"));
-        if (sql.contains("fill"))
-            sql = sql.substring(0, sql.indexOf("fill"));
-        if (sql.contains("sliding"))
-            sql = sql.substring(0, sql.indexOf("sliding"));
-        if (sql.contains("group by"))
-            sql = sql.substring(0, sql.indexOf("group by"));
-        if (sql.contains("order by"))
-            sql = sql.substring(0, sql.indexOf("order by"));
-        if (sql.contains("slimit"))
-            sql = sql.substring(0, sql.indexOf("slimit"));
-        if (sql.contains("limit"))
-            sql = sql.substring(0, sql.indexOf("limit"));
-        // parse
-        if (sql.contains("from")) {
-            sql = sql.substring(sql.indexOf("from") + 4).trim();
-            return Arrays.asList(sql.split(",")).stream()
-                    .map(tableIdentifier -> {
-                        tableIdentifier = tableIdentifier.trim();
-                        if (tableIdentifier.contains(" "))
-                            tableIdentifier = tableIdentifier.substring(0, tableIdentifier.indexOf(" "));
-                        return tableIdentifier;
-                    }).collect(Collectors.joining(",")).split(",");
-        }
-        return ret;
-    }
-
     @Override
     public ResultSet executeQuery(String sql) throws SQLException {
         if (isClosed())
@@ -75,9 +39,8 @@ public class RestfulStatement extends AbstractStatement {
             return executeOneQuery(url, sql);
         }
 
-//        if (this.database == null || this.database.isEmpty())
-//            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_DATABASE_NOT_SPECIFIED_OR_AVAILABLE);
-        HttpClientPoolUtil.execute(url, "use " + this.database);
+//        if (this.database != null && !this.database.trim().replaceAll("\\s","").isEmpty())
+//            HttpClientPoolUtil.execute(url, "use " + this.database);
         return executeOneQuery(url, sql);
     }
 
@@ -93,10 +56,8 @@ public class RestfulStatement extends AbstractStatement {
             return executeOneUpdate(url, sql);
         }
 
-//        if (this.database == null || this.database.isEmpty())
-//            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_DATABASE_NOT_SPECIFIED_OR_AVAILABLE);
-
-        HttpClientPoolUtil.execute(url, "use " + this.database);
+//        if (this.database != null && !this.database.trim().replaceAll("\\s", "").isEmpty())
+//            HttpClientPoolUtil.execute(url, "use " + this.database);
         return executeOneUpdate(url, sql);
     }
 
@@ -148,24 +109,9 @@ public class RestfulStatement extends AbstractStatement {
         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")));
+            throw TSDBError.createSQLException(resultJson.getInteger("code"), resultJson.getString("desc"));
         }
-        // parse table name from sql
-//        String[] tableIdentifiers = parseTableIdentifier(sql);
-//        if (tableIdentifiers != null) {
-//            List<JSONObject> fieldJsonList = new ArrayList<>();
-//            for (String tableIdentifier : tableIdentifiers) {
-//                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);
-//        }
         this.affectedRows = 0;
         return resultSet;
     }
@@ -177,7 +123,7 @@ public class RestfulStatement extends AbstractStatement {
         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")));
+            throw TSDBError.createSQLException(jsonObject.getInteger("code"), jsonObject.getString("desc"));
         }
         this.resultSet = null;
         this.affectedRows = checkJsonResultSet(jsonObject);

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

@@ -15,12 +15,12 @@ public class TSDBJNIConnectorTest {
     public void test() {
         try {
             // init
-            TSDBJNIConnector.init(null, null, null, null);
+            TSDBJNIConnector.init("/etc/taos/taos.cfg", null, null, null);
             // connect
             TSDBJNIConnector connector = new TSDBJNIConnector();
-            connector.connect("127.0.0.1", 6030, null, "root", "taosdata");
+            connector.connect("127.0.0.1", 6030, "unsign_jni", "root", "taosdata");
             // executeQuery
-            long pSql = connector.executeQuery("show variables");
+            long pSql = connector.executeQuery("select * from unsign_jni.us_table");
             if (connector.isUpdateQuery(pSql)) {
                 connector.freeResultSet(pSql);
                 throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_WITH_EXECUTEQUERY);
@@ -29,13 +29,13 @@ public class TSDBJNIConnectorTest {
             List<ColumnMetaData> columnMetaDataList = new ArrayList<>();
             int code = connector.getSchemaMetaData(pSql, columnMetaDataList);
             if (code == TSDBConstants.JNI_CONNECTION_NULL) {
-                throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_CONNECTION_NULL);
             }
             if (code == TSDBConstants.JNI_RESULT_SET_NULL) {
-                throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_RESULT_SET_NULL));
+                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_RESULT_SET_NULL);
             }
             if (code == TSDBConstants.JNI_NUM_OF_FIELDS_0) {
-                throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_NUM_OF_FIELDS_0));
+                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_NUM_OF_FIELDS_0);
             }
             int columnSize = columnMetaDataList.size();
             // print metadata

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

@@ -0,0 +1,92 @@
+package com.taosdata.jdbc.cases;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import java.sql.*;
+import java.util.Properties;
+import java.util.Random;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class InsertDbwithoutUseDbTest {
+
+    private static String host = "127.0.0.1";
+    //    private static String host = "master";
+    private static Properties properties;
+    private static Random random = new Random(System.currentTimeMillis());
+
+    @Test
+    public void case001() throws ClassNotFoundException, SQLException {
+        // prepare schema
+        Class.forName("com.taosdata.jdbc.TSDBDriver");
+        String url = "jdbc:TAOS://127.0.0.1:6030/?user=root&password=taosdata";
+        Connection conn = DriverManager.getConnection(url, properties);
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop database if exists inWithoutDb");
+            stmt.execute("create database if not exists inWithoutDb");
+            stmt.execute("create table inWithoutDb.weather(ts timestamp, f1 int)");
+        }
+        conn.close();
+
+        // execute insert
+        url = "jdbc:TAOS://127.0.0.1:6030/inWithoutDb?user=root&password=taosdata";
+        conn = DriverManager.getConnection(url, properties);
+        try (Statement stmt = conn.createStatement()) {
+            int affectedRow = stmt.executeUpdate("insert into weather(ts, f1) values(now," + random.nextInt(100) + ")");
+            Assert.assertEquals(1, affectedRow);
+            boolean flag = stmt.execute("insert into weather(ts, f1) values(now + 10s," + random.nextInt(100) + ")");
+            Assert.assertEquals(false, flag);
+            ResultSet rs = stmt.executeQuery("select count(*) from weather");
+            rs.next();
+            int count = rs.getInt("count(*)");
+            Assert.assertEquals(2, count);
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        conn.close();
+    }
+
+    @Test
+    public void case002() throws ClassNotFoundException, SQLException {
+        // prepare the schema
+        Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+        final String url = "jdbc:TAOS-RS://" + host + ":6041/inWithoutDb?user=root&password=taosdata";
+        Connection conn = DriverManager.getConnection(url, properties);
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop database if exists inWithoutDb");
+            stmt.execute("create database if not exists inWithoutDb");
+            stmt.execute("create table inWithoutDb.weather(ts timestamp, f1 int)");
+        }
+        conn.close();
+
+        // execute
+        conn = DriverManager.getConnection(url, properties);
+        try (Statement stmt = conn.createStatement()) {
+            int affectedRow = stmt.executeUpdate("insert into weather(ts, f1) values(now," + random.nextInt(100) + ")");
+            Assert.assertEquals(1, affectedRow);
+            boolean flag = stmt.execute("insert into weather(ts, f1) values(now + 10s," + random.nextInt(100) + ")");
+            Assert.assertEquals(false, flag);
+            ResultSet rs = stmt.executeQuery("select count(*) from weather");
+            rs.next();
+            int count = rs.getInt("count(*)");
+            Assert.assertEquals(2, count);
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+        properties = new Properties();
+        properties.setProperty("charset", "UTF-8");
+        properties.setProperty("locale", "en_US.UTF-8");
+        properties.setProperty("timezone", "UTC-8");
+    }
+
+}

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

@@ -0,0 +1,191 @@
+package com.taosdata.jdbc.cases;
+
+import com.taosdata.jdbc.TSDBDriver;
+import org.junit.*;
+import org.junit.runners.MethodSorters;
+
+import java.sql.*;
+import java.util.Properties;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class UnsignedNumberJniTest {
+    private static final String host = "127.0.0.1";
+    private static Connection conn;
+
+    @Test
+    public void testCase001() {
+        try (Statement stmt = conn.createStatement()) {
+            ResultSet rs = stmt.executeQuery("select * from us_table");
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
+                }
+                System.out.println();
+                Assert.assertEquals("127", rs.getString(2));
+                Assert.assertEquals("32767", rs.getString(3));
+                Assert.assertEquals("2147483647", rs.getString(4));
+                Assert.assertEquals("9223372036854775807", rs.getString(5));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testCase002() {
+        try (Statement stmt = conn.createStatement()) {
+            ResultSet rs = stmt.executeQuery("select * from us_table");
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+                Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals(32767, rs.getShort(3));
+                Assert.assertEquals(2147483647, rs.getInt(4));
+                Assert.assertEquals(9223372036854775807l, rs.getLong(5));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase003() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,2147483647, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+                Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals(32767, rs.getShort(3));
+                Assert.assertEquals(2147483647, rs.getInt(4));
+            }
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase004() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+                Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals(32767, rs.getShort(3));
+            }
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase005() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 65534,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+
+                Assert.assertEquals(127, rs.getByte(2));
+            }
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase006() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+            }
+        }
+    }
+
+    @Test
+    public void testCase007() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
+                }
+                System.out.println();
+                Assert.assertEquals("254", rs.getString(2));
+                Assert.assertEquals("65534", rs.getString(3));
+                Assert.assertEquals("4294967294", rs.getString(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+            }
+        }
+    }
+
+
+    @BeforeClass
+    public static void beforeClass() {
+        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");
+
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            final String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
+            conn = DriverManager.getConnection(url, properties);
+
+            Statement stmt = conn.createStatement();
+            stmt.execute("drop database if exists unsign_jni");
+            stmt.execute("create database if not exists unsign_jni");
+            stmt.execute("use unsign_jni");
+            stmt.execute("create table us_table(ts timestamp, f1 tinyint unsigned, f2 smallint unsigned, f3 int unsigned, f4 bigint unsigned)");
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(now, 127, 32767,2147483647, 9223372036854775807)");
+            stmt.close();
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

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

@@ -0,0 +1,177 @@
+package com.taosdata.jdbc.cases;
+
+import com.taosdata.jdbc.TSDBDriver;
+import org.junit.*;
+import org.junit.runners.MethodSorters;
+
+import java.sql.*;
+import java.util.Properties;
+
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class UnsignedNumberRestfulTest {
+    private static final String host = "127.0.0.1";
+//        private static final String host = "master";
+    private static Connection conn;
+
+    @Test
+    public void testCase001() {
+        try (Statement stmt = conn.createStatement()) {
+            ResultSet rs = stmt.executeQuery("select * from us_table");
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
+                }
+                System.out.println();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testCase002() {
+        try (Statement stmt = conn.createStatement()) {
+            ResultSet rs = stmt.executeQuery("select * from us_table");
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase003() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,2147483647, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+            }
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase004() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+            }
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase005() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 65534,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+            }
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testCase006() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
+                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
+                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
+                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
+                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
+                System.out.println();
+            }
+        }
+    }
+
+    @Test
+    public void testCase007() throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            long now = System.currentTimeMillis();
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
+            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
+                }
+                System.out.println();
+                Assert.assertEquals("254", rs.getString(2));
+                Assert.assertEquals("65534", rs.getString(3));
+                Assert.assertEquals("4294967294", rs.getString(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+            }
+        }
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+        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");
+
+        try {
+            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+            final String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata";
+            conn = DriverManager.getConnection(url, properties);
+
+            Statement stmt = conn.createStatement();
+            stmt.execute("drop database if exists unsign_restful");
+            stmt.execute("create database if not exists unsign_restful");
+            stmt.execute("use unsign_restful");
+            stmt.execute("create table us_table(ts timestamp, f1 tinyint unsigned, f2 smallint unsigned, f3 int unsigned, f4 bigint unsigned)");
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(now, 127, 32767,2147483647, 9223372036854775807)");
+            stmt.close();
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        try {
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

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

@@ -40,9 +40,12 @@ public class RestfulResultSetTest {
         Assert.assertEquals(true, f9);
     }
 
-    @Test(expected = SQLFeatureNotSupportedException.class)
+    @Test
     public void getByte() throws SQLException {
-        rs.getByte(1);
+        byte f8 = rs.getByte("f8");
+        Assert.assertEquals(10, f8);
+        f8 = rs.getByte(8);
+        Assert.assertEquals(10, f8);
     }
 
     @Test

src/dnode/src/dnodeVWrite.c

@@ -222,7 +222,7 @@ static void *dnodeProcessVWriteQueue(void *wparam) {
         dnodeSendRpcVWriteRsp(pVnode, pWrite, pWrite->code);
       } else {
         if (qtype == TAOS_QTYPE_FWD) {
-          vnodeConfirmForward(pVnode, pWrite->pHead.version, 0);
+          vnodeConfirmForward(pVnode, pWrite->pHead.version, 0, pWrite->pHead.msgType != TSDB_MSG_TYPE_SUBMIT);
         }
         if (pWrite->rspRet.rsp) {
           rpcFreeCont(pWrite->rspRet.rsp);

src/inc/query.h

@@ -28,7 +28,7 @@ typedef void* qinfo_t;
  * @param qinfo
  * @return
  */
-int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryTableMsg, qinfo_t* qinfo);
+int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryTableMsg, qinfo_t* qinfo, uint64_t *qId);
 
 
 /**
@@ -88,9 +88,10 @@ void* qOpenQueryMgmt(int32_t vgId);
 void  qQueryMgmtNotifyClosed(void* pExecutor);
 void  qQueryMgmtReOpen(void *pExecutor);
 void  qCleanupQueryMgmt(void* pExecutor);
-void** qRegisterQInfo(void* pMgmt, uint64_t qInfo);
+void** qRegisterQInfo(void* pMgmt, uint64_t qId, uint64_t qInfo);
 void** qAcquireQInfo(void* pMgmt, uint64_t key);
 void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle);
+bool checkQIdEqual(void *qHandle, uint64_t qId);
 
 #ifdef __cplusplus
 }

src/inc/tsync.h

@@ -79,6 +79,9 @@ typedef void     (*FStopSyncFile)(int32_t vgId, uint64_t fversion);
 // get file version
 typedef int32_t  (*FGetVersion)(int32_t vgId, uint64_t *fver, uint64_t *vver);
 
+// reset version
+typedef int32_t  (*FResetVersion)(int32_t vgId, uint64_t fver);
+
 typedef int32_t  (*FSendFile)(void *tsdb, SOCKET socketFd);
 typedef int32_t  (*FRecvFile)(void *tsdb, SOCKET socketFd);
 
@@ -96,6 +99,7 @@ typedef struct {
   FStartSyncFile    startSyncFileFp;
   FStopSyncFile     stopSyncFileFp;
   FGetVersion       getVersionFp;
+  FResetVersion     resetVersionFp;
   FSendFile         sendFileFp;
   FRecvFile         recvFileFp;
 } SSyncInfo;
@@ -108,8 +112,8 @@ void    syncCleanUp();
 int64_t syncStart(const SSyncInfo *);
 void    syncStop(int64_t rid);
 int32_t syncReconfig(int64_t rid, const SSyncCfg *);
-int32_t syncForwardToPeer(int64_t rid, void *pHead, void *mhandle, int32_t qtype);
-void    syncConfirmForward(int64_t rid, uint64_t version, int32_t code);
+int32_t syncForwardToPeer(int64_t rid, void *pHead, void *mhandle, int32_t qtype, bool force);
+void    syncConfirmForward(int64_t rid, uint64_t version, int32_t code, bool force);
 void    syncRecover(int64_t rid);  // recover from other nodes:
 int32_t syncGetNodesRole(int64_t rid, SNodesRole *);
 

src/inc/twal.h

@@ -65,6 +65,7 @@ void     walFsync(twalh, bool forceFsync);
 int32_t  walRestore(twalh, void *pVnode, FWalWrite writeFp);
 int32_t  walGetWalFile(twalh, char *fileName, int64_t *fileId);
 uint64_t walGetVersion(twalh);
+void     walResetVersion(twalh, uint64_t newVer);
 
 #ifdef __cplusplus
 }

src/inc/vnode.h

@@ -78,7 +78,7 @@ void    vnodeFreeFromWQueue(void *pVnode, SVWriteMsg *pWrite);
 int32_t vnodeProcessWrite(void *pVnode, void *pHead, int32_t qtype, void *pRspRet);
 
 // vnodeSync
-void    vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code);
+void    vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code, bool force);
 
 // vnodeRead
 int32_t vnodeWriteToRQueue(void *pVnode, void *pCont, int32_t contLen, int8_t qtype, void *rparam);

src/kit/shell/CMakeLists.txt

@@ -36,6 +36,7 @@ ELSEIF (TD_DARWIN)
   LIST(APPEND SRC ./src/shellDarwin.c)
   LIST(APPEND SRC ./src/shellCommand.c)
   LIST(APPEND SRC ./src/shellImport.c)
+  LIST(APPEND SRC ./src/shellCheck.c)
   ADD_EXECUTABLE(shell ${SRC})
   # linking with dylib
   TARGET_LINK_LIBRARIES(shell taos)

src/kit/shell/inc/shell.h

@@ -51,6 +51,7 @@ typedef struct SShellArguments {
   char  file[TSDB_FILENAME_LEN];
   char  dir[TSDB_FILENAME_LEN];
   int   threadNum;
+  int   check;
   char* commands;
   int   abort;
   int   port;
@@ -71,6 +72,7 @@ void read_history();
 void write_history();
 void source_file(TAOS* con, char* fptr);
 void source_dir(TAOS* con, SShellArguments* args);
+void shellCheck(TAOS* con, SShellArguments* args);
 void get_history_path(char* history);
 void cleanup_handler(void* arg);
 void exitShell();

src/kit/shell/src/shellCheck.c

@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE
+#define _DEFAULT_SOURCE
+
+#include "os.h"
+#include "shell.h"
+#include "shellCommand.h"
+#include "tglobal.h"
+#include "tutil.h"
+
+#define SHELL_SQL_LEN 1024
+static int32_t tbNum = 0;
+static int32_t tbMallocNum = 0;
+static char ** tbNames = NULL;
+static int32_t checkedNum = 0;
+static int32_t errorNum = 0;
+
+typedef struct {
+  pthread_t threadID;
+  int       threadIndex;
+  int       totalThreads;
+  void *    taos;
+  char *    db;
+} ShellThreadObj;
+
+static int32_t shellUseDb(TAOS *con, char *db) {
+  if (db == NULL) {
+    fprintf(stdout, "no dbname input\n");
+    return -1;
+  }
+
+  char sql[SHELL_SQL_LEN] = {0};
+  snprintf(sql, SHELL_SQL_LEN, "use %s", db);
+
+  TAOS_RES *pSql = taos_query(con, sql);
+  int32_t   code = taos_errno(pSql);
+  if (code != 0) {
+    fprintf(stdout, "failed to execute sql:%s since %s", sql, taos_errstr(pSql));
+  }
+
+  taos_free_result(pSql);
+  return code;
+}
+
+static int32_t shellShowTables(TAOS *con, char *db) {
+  char sql[SHELL_SQL_LEN] = {0};
+  snprintf(sql, SHELL_SQL_LEN, "show %s.tables", db);
+
+  TAOS_RES *pSql = taos_query(con, sql);
+  int32_t   code = taos_errno(pSql);
+
+  if (code != 0) {
+    fprintf(stdout, "failed to execute sql:%s since %s\n", sql, taos_errstr(pSql));
+  } else {
+    TAOS_ROW row;
+    while ((row = taos_fetch_row(pSql))) {
+      int32_t tbIndex = tbNum++;
+      if (tbMallocNum < tbNum) {
+        tbMallocNum = (tbMallocNum * 2 + 1);
+        tbNames = realloc(tbNames, tbMallocNum * sizeof(char *));
+        if (tbNames == NULL) {
+          fprintf(stdout, "failed to malloc tablenames, num:%d\n", tbMallocNum);
+          code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+          break;
+        }
+      }
+
+      tbNames[tbIndex] = malloc(TSDB_TABLE_NAME_LEN);
+      strncpy(tbNames[tbIndex], (const char *)row[0], TSDB_TABLE_NAME_LEN);
+      if (tbIndex % 100000 == 0 && tbIndex != 0) {
+        fprintf(stdout, "%d tablenames fetched\n", tbIndex);
+      }
+    }
+  }
+
+  taos_free_result(pSql);
+
+  fprintf(stdout, "total %d tablenames fetched, over\n", tbNum);
+  return code;
+}
+
+static void shellFreeTbnames() {
+  for (int32_t i = 0; i < tbNum; ++i) {
+    free(tbNames[i]);
+  }
+  free(tbNames);
+}
+
+static void *shellCheckThreadFp(void *arg) {
+  ShellThreadObj *pThread = (ShellThreadObj *)arg;
+
+  int32_t interval = tbNum / pThread->totalThreads + 1;
+  int32_t start = pThread->threadIndex * interval;
+  int32_t end = (pThread->threadIndex + 1) * interval;
+
+  if (end > tbNum) end = tbNum + 1;
+
+  char file[32] = {0};
+  snprintf(file, 32, "tb%d.txt", pThread->threadIndex);
+
+  FILE *fp = fopen(file, "w");
+  if (!fp) {
+    fprintf(stdout, "failed to open %s, reason:%s", file, strerror(errno));
+    return NULL;
+  }
+
+  char sql[SHELL_SQL_LEN];
+  for (int32_t t = start; t < end; ++t) {
+    char *tbname = tbNames[t];
+    if (tbname == NULL) break;
+
+    snprintf(sql, SHELL_SQL_LEN, "select * from %s limit 1", tbname);
+
+    TAOS_RES *pSql = taos_query(pThread->taos, sql);
+    int32_t   code = taos_errno(pSql);
+    if (code != 0) {
+      int32_t len = snprintf(sql, SHELL_SQL_LEN, "drop table %s.%s;\n", pThread->db, tbname);
+      fwrite(sql, 1, len, fp);
+      atomic_add_fetch_32(&errorNum, 1);
+    }
+
+    int32_t cnum = atomic_add_fetch_32(&checkedNum, 1);
+    if (cnum % 5000 == 0 && cnum != 0) {
+      fprintf(stdout, "%d tables checked\n", cnum);
+    }
+
+    taos_free_result(pSql);
+  }
+
+  fsync(fileno(fp));
+  fclose(fp);
+
+  return NULL;
+}
+
+static void shellRunCheckThreads(TAOS *con, SShellArguments *args) {
+  pthread_attr_t  thattr;
+  ShellThreadObj *threadObj = (ShellThreadObj *)calloc(args->threadNum, sizeof(ShellThreadObj));
+  for (int t = 0; t < args->threadNum; ++t) {
+    ShellThreadObj *pThread = threadObj + t;
+    pThread->threadIndex = t;
+    pThread->totalThreads = args->threadNum;
+    pThread->taos = con;
+    pThread->db = args->database;
+
+    pthread_attr_init(&thattr);
+    pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+
+    if (pthread_create(&(pThread->threadID), &thattr, shellCheckThreadFp, (void *)pThread) != 0) {
+      fprintf(stderr, "ERROR: thread:%d failed to start\n", pThread->threadIndex);
+      exit(0);
+    }
+  }
+
+  for (int t = 0; t < args->threadNum; ++t) {
+    pthread_join(threadObj[t].threadID, NULL);
+  }
+
+  for (int t = 0; t < args->threadNum; ++t) {
+    taos_close(threadObj[t].taos);
+  }
+  free(threadObj);
+}
+
+void shellCheck(TAOS *con, SShellArguments *args) {
+  int64_t start = taosGetTimestampMs();
+
+  if (shellUseDb(con, args->database) != 0) {
+    shellFreeTbnames();
+    return;
+  }
+
+  if (shellShowTables(con, args->database) != 0) {
+    shellFreeTbnames();
+    return;
+  }
+
+  fprintf(stdout, "total %d tables will be checked by %d threads\n", tbNum, args->threadNum);
+  shellRunCheckThreads(con, args);
+
+  int64_t end = taosGetTimestampMs();
+  fprintf(stdout, "total %d tables checked, failed:%d, time spent %.2f seconds\n", checkedNum, errorNum,
+          (end - start) / 1000.0);
+}

src/kit/shell/src/shellEngine.c

@@ -121,6 +121,12 @@ TAOS *shellInit(SShellArguments *args) {
     taos_close(con);
     exit(EXIT_SUCCESS);
   }
+
+  if (args->check != 0) {
+    shellCheck(con, args);
+    taos_close(con);
+    exit(EXIT_SUCCESS);
+  }
 #endif
 
   return con;
@@ -412,7 +418,7 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
 #ifdef WINDOWS
   if (tt < 0) tt = 0;
 #endif
-  if (tt < 0 && ms != 0) {
+  if (tt <= 0 && ms < 0) {
     tt--;
     if (precision == TSDB_TIME_PRECISION_MICRO) {
       ms += 1000000;

src/kit/shell/src/shellLinux.c

@@ -45,6 +45,7 @@ static struct argp_option options[] = {
   {"file",       'f', "FILE",       0,                   "Script to run without enter the shell."},
   {"directory",  'D', "DIRECTORY",  0,                   "Use multi-thread to import all SQL files in the directory separately."},
   {"thread",     'T', "THREADNUM",  0,                   "Number of threads when using multi-thread to import data."},
+  {"check",      'k', "CHECK",      0,                   "Check tables."},
   {"database",   'd', "DATABASE",   0,                   "Database to use when connecting to the server."},
   {"timezone",   't', "TIMEZONE",   0,                   "Time zone of the shell, default is local."},
   {"netrole",    'n', "NETROLE",    0,                   "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync."},
@@ -130,6 +131,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
         return -1;
       }
       break;
+    case 'k':
+      arguments->check = atoi(arg);
+      break;
     case 'd':
       arguments->database = arg;
       break;

src/kit/taosdemo/insert.json

@@ -1,60 +1,57 @@
 {
-	"filetype": "insert",
-	"cfgdir": "/etc/taos",
-	"host": "127.0.0.1",
-	"port": 6030,
-	"user": "root",
-	"password": "taosdata",
-	"thread_count": 4,
-	"thread_count_create_tbl": 4,
-	"result_file": "./insert_res.txt",
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
     "confirm_parameter_prompt": "no",
     "insert_interval": 0,
     "num_of_records_per_req": 100,
     "max_sql_len": 1024000,
-	"databases": [{
-		"dbinfo": {
-			"name": "db",
-			"drop": "yes",
-			"replica": 1,
-			"days": 10,
-			"cache": 16,
-			"blocks": 8,
-			"precision": "ms",
-			"keep": 365,
-			"minRows": 100,
-			"maxRows": 4096,
-			"comp":2,
-			"walLevel":1,
-			"cachelast":0,
-			"quorum":1,
-			"fsync":3000,
-			"update": 0
-		},
-		"super_tables": [{
-			"name": "stb",
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb",
             "child_table_exists":"no",
-			"childtable_count": 100,
-			"childtable_prefix": "stb_",
-			"auto_create_table": "no",
-			"data_source": "rand",
-			"insert_mode": "taosc",
-            "childtable_limit": 33,
-            "childtable_offset": 33,
-			"insert_rows": 1000,
-			"multi_thread_write_one_tbl": "no",
-			"number_of_tbl_in_one_sql": 0,
-			"rows_per_tbl": 100,
-			"max_sql_len": 1024000,
-			"disorder_ratio": 0,
-			"disorder_range": 1000,
-			"timestamp_step": 1,
-			"start_timestamp": "2020-10-01 00:00:00.000",
-			"sample_format": "csv",
-			"sample_file": "./sample.csv",
-			"tags_file": "",
-			"columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
-			"tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
-		}]
-	}]
+            "childtable_count": 10000,
+            "childtable_prefix": "stb_",
+            "auto_create_table": "no",
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 100000,
+            "multi_thread_write_one_tbl": "no",
+            "rows_per_tbl": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
 }

src/kit/taosdemo/taosdemo.c

@@ -23,7 +23,6 @@
 
 #ifdef LINUX
   #include <argp.h>
-  #include <assert.h>
   #include <inttypes.h>
   #ifndef _ALPINE
     #include <error.h>
@@ -39,11 +38,11 @@
   #include <wordexp.h>
   #include <regex.h>
 #else  
-  #include <assert.h>
   #include <regex.h>
   #include <stdio.h>
 #endif  
 
+#include <assert.h>
 #include <stdlib.h>
 #include "cJSON.h"
 
@@ -221,7 +220,6 @@ typedef struct SSuperTable_S {
   int           childTblOffset;
 
   int          multiThreadWriteOneTbl;   // 0: no, 1: yes
-  int          numberOfTblInOneSql;      // 0/1: one table, > 1: number of tbl
   int          rowsPerTbl;               // 
   int          disorderRatio;            // 0: no disorder, >0: x%
   int          disorderRange;            // ms or us by database precision
@@ -396,6 +394,8 @@ typedef struct SThreadInfo_S {
   uint64_t  et;
   int64_t  lastTs;
 
+  // sample data
+  int samplePos;
   // statistics
   int64_t totalInsertRows;
   int64_t totalAffectedRows;
@@ -1116,7 +1116,7 @@ static int printfInsertMeta() {
       if (g_Dbs.db[i].superTbls[j].childTblLimit > 0) {
         printf("      childTblLimit:     \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].childTblLimit);
       }
-      if (g_Dbs.db[i].superTbls[j].childTblOffset > 0) {
+      if (g_Dbs.db[i].superTbls[j].childTblOffset >= 0) {
         printf("      childTblOffset:    \033[33m%d\033[0m\n",  g_Dbs.db[i].superTbls[j].childTblOffset);
       }
       printf("      insertRows:        \033[33m%"PRId64"\033[0m\n", g_Dbs.db[i].superTbls[j].insertRows);
@@ -1126,8 +1126,6 @@ static int printfInsertMeta() {
       }else {
         printf("      multiThreadWriteOneTbl:  \033[33myes\033[0m\n");
       }
-      printf("      numberOfTblInOneSql:     \033[33m%d\033[0m\n",
-              g_Dbs.db[i].superTbls[j].numberOfTblInOneSql);
       printf("      rowsPerTbl:        \033[33m%d\033[0m\n",
               g_Dbs.db[i].superTbls[j].rowsPerTbl);
       printf("      disorderRange:     \033[33m%d\033[0m\n",
@@ -1287,7 +1285,6 @@ static void printfInsertMetaToFile(FILE* fp) {
       }else {
         fprintf(fp, "      multiThreadWriteOneTbl:  yes\n"); 
       }
-      fprintf(fp, "      numberOfTblInOneSql:     %d\n",  g_Dbs.db[i].superTbls[j].numberOfTblInOneSql);     
       fprintf(fp, "      rowsPerTbl:        %d\n",  g_Dbs.db[i].superTbls[j].rowsPerTbl);     
       fprintf(fp, "      disorderRange:     %d\n",  g_Dbs.db[i].superTbls[j].disorderRange);     
       fprintf(fp, "      disorderRatio:     %d\n",  g_Dbs.db[i].superTbls[j].disorderRatio);
@@ -1997,7 +1994,7 @@ static int getChildNameOfSuperTableWithLimitAndOffset(TAOS * taos,
 
   int childTblCount = (limit < 0)?10000:limit;
   int count = 0;
-  childTblName = (char*)calloc(1, childTblCount * TSDB_TABLE_NAME_LEN);
+//  childTblName = (char*)calloc(1, childTblCount * TSDB_TABLE_NAME_LEN);
   char* pTblName = childTblName;
   while ((row = taos_fetch_row(res)) != NULL) {
     int32_t* len = taos_fetch_lengths(res);
@@ -2103,6 +2100,12 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName,
 
   if (TBL_ALREADY_EXISTS == superTbls->childTblExists) {
     //get all child table name use cmd: select tbname from superTblName;  
+    int childTblCount = 10000;
+    superTbls->childTblName = (char*)calloc(1, childTblCount * TSDB_TABLE_NAME_LEN);
+    if (superTbls->childTblName == NULL) {
+      fprintf(stderr, "alloc memory failed!");
+      return -1;
+    }
     getAllChildNameOfSuperTable(taos, dbName,
             superTbls->sTblName,
             &superTbls->childTblName,
@@ -2329,7 +2332,8 @@ static int createDatabases() {
               " fsync %d", g_Dbs.db[i].dbCfg.fsync);
     }
     if ((0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "ms", strlen("ms")))
-            || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision, "us", strlen("us")))) {
+            || (0 == strncasecmp(g_Dbs.db[i].dbCfg.precision,
+                    "us", strlen("us")))) {
       dataLen += snprintf(command + dataLen, BUFFER_SIZE - dataLen,
               " precision \'%s\';", g_Dbs.db[i].dbCfg.precision);
     }
@@ -2345,14 +2349,17 @@ static int createDatabases() {
     debugPrint("%s() %d supertbl count:%d\n", __func__, __LINE__, g_Dbs.db[i].superTblCount);
     for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
       // describe super table, if exists
-      sprintf(command, "describe %s.%s;", g_Dbs.db[i].dbName, g_Dbs.db[i].superTbls[j].sTblName);
+      sprintf(command, "describe %s.%s;", g_Dbs.db[i].dbName,
+              g_Dbs.db[i].superTbls[j].sTblName);
       verbosePrint("%s() %d command: %s\n", __func__, __LINE__, command);
       if (0 != queryDbExec(taos, command, NO_INSERT_TYPE)) {
         g_Dbs.db[i].superTbls[j].superTblExists = TBL_NO_EXISTS;
-        ret = createSuperTable(taos, g_Dbs.db[i].dbName, &g_Dbs.db[i].superTbls[j], g_Dbs.use_metric);
+        ret = createSuperTable(taos, g_Dbs.db[i].dbName,
+                &g_Dbs.db[i].superTbls[j], g_Dbs.use_metric);
       } else {      
         g_Dbs.db[i].superTbls[j].superTblExists = TBL_ALREADY_EXISTS;
-        ret = getSuperTableFromServer(taos, g_Dbs.db[i].dbName, &g_Dbs.db[i].superTbls[j]);
+        ret = getSuperTableFromServer(taos, g_Dbs.db[i].dbName,
+                &g_Dbs.db[i].superTbls[j]);
       }
 
       if (0 != ret) {
@@ -2680,6 +2687,7 @@ static int readSampleFromCsvFileToMem(
       return -1;
   }
 
+  assert(superTblInfo->sampleDataBuf);
   memset(superTblInfo->sampleDataBuf, 0,
           MAX_SAMPLES_ONCE_FROM_FILE * superTblInfo->lenOfOneRow);
   while (1) {
@@ -2708,6 +2716,8 @@ static int readSampleFromCsvFileToMem(
       continue;
     }
 
+    verbosePrint("readLen=%ld stb->lenOfOneRow=%d getRows=%d\n", readLen, superTblInfo->lenOfOneRow, getRows);
+
     memcpy(superTblInfo->sampleDataBuf + getRows * superTblInfo->lenOfOneRow,
           line, readLen);
     getRows++;
@@ -3419,24 +3429,13 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
         printf("ERROR: failed to read json, multiThreadWriteOneTbl not found\n");
         goto PARSE_OVER;
       }
-
-      cJSON* numberOfTblInOneSql = cJSON_GetObjectItem(stbInfo, "number_of_tbl_in_one_sql");
-      if (numberOfTblInOneSql && numberOfTblInOneSql->type == cJSON_Number) {
-        g_Dbs.db[i].superTbls[j].numberOfTblInOneSql = numberOfTblInOneSql->valueint;
-      } else if (!numberOfTblInOneSql) {
-        g_Dbs.db[i].superTbls[j].numberOfTblInOneSql = 0;
-      } else {
-        printf("ERROR: failed to read json, numberOfTblInOneSql not found\n");
-        goto PARSE_OVER;
-      }      
-
       cJSON* rowsPerTbl = cJSON_GetObjectItem(stbInfo, "rows_per_tbl");
       if (rowsPerTbl && rowsPerTbl->type == cJSON_Number) {
         g_Dbs.db[i].superTbls[j].rowsPerTbl = rowsPerTbl->valueint;
       } else if (!rowsPerTbl) {
-        g_Dbs.db[i].superTbls[j].rowsPerTbl = 1;
+        g_Dbs.db[i].superTbls[j].rowsPerTbl = 0; // 0 means progressive mode, > 0 mean interlace mode. max value is less or equ num_of_records_per_req
       } else {
-        printf("ERROR: failed to read json, rowsPerTbl not found\n");
+        fprintf(stderr, "ERROR: failed to read json, rowsPerTbl input mistake\n");
         goto PARSE_OVER;
       }      
 
@@ -3894,7 +3893,7 @@ PARSE_OVER:
   return ret;
 }
 
-void prepareSampleData() {
+static void prepareSampleData() {
   for (int i = 0; i < g_Dbs.dbCount; i++) {    
     for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
       //if (0 == strncasecmp(g_Dbs.db[i].superTbls[j].dataSource, "sample", 6)) {
@@ -3908,7 +3907,7 @@ void prepareSampleData() {
   }
 }
 
-void postFreeResource() {
+static void postFreeResource() {
   tmfclose(g_fpOfInsertResult);
   for (int i = 0; i < g_Dbs.dbCount; i++) {    
     for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
@@ -3935,15 +3934,18 @@ void postFreeResource() {
 static int getRowDataFromSample(char*  dataBuf, int maxLen, int64_t timestamp,
       SSuperTable* superTblInfo, int* sampleUsePos) {
   if ((*sampleUsePos) == MAX_SAMPLES_ONCE_FROM_FILE) {
-    int ret = readSampleFromCsvFileToMem(superTblInfo);
+/*    int ret = readSampleFromCsvFileToMem(superTblInfo);
     if (0 != ret) {
       tmfree(superTblInfo->sampleDataBuf);
+      superTblInfo->sampleDataBuf = NULL;
       return -1;
     }
+*/
     *sampleUsePos = 0;
   }
 
   int    dataLen = 0;
+
   dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
           "(%" PRId64 ", ", timestamp);
   dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
@@ -3955,16 +3957,18 @@ static int getRowDataFromSample(char*  dataBuf, int maxLen, int64_t timestamp,
   return dataLen;
 }
 
-int generateRowData(char*  dataBuf, int maxLen, int64_t timestamp, SSuperTable* stbInfo) {
+static int generateRowData(char*  dataBuf, int maxLen, int64_t timestamp, SSuperTable* stbInfo) {
   int    dataLen = 0;
   dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "(%" PRId64 ", ", timestamp);
   for (int i = 0; i < stbInfo->columnCount; i++) {    
-    if ((0 == strncasecmp(stbInfo->columns[i].dataType, "binary", 6)) || (0 == strncasecmp(stbInfo->columns[i].dataType, "nchar", 5))) {
+    if ((0 == strncasecmp(stbInfo->columns[i].dataType, "binary", 6))
+            || (0 == strncasecmp(stbInfo->columns[i].dataType, "nchar", 5))) {
       if (stbInfo->columns[i].dataLen > TSDB_MAX_BINARY_LEN) {
-        printf("binary or nchar length overflow, max size:%u\n", (uint32_t)TSDB_MAX_BINARY_LEN);
+        printf("binary or nchar length overflow, max size:%u\n",
+                (uint32_t)TSDB_MAX_BINARY_LEN);
         return (-1);
       }
-    
+
       char* buf = (char*)calloc(stbInfo->columns[i].dataLen+1, 1);
       if (NULL == buf) {
         printf("calloc failed! size:%d\n", stbInfo->columns[i].dataLen);
@@ -3973,15 +3977,24 @@ int generateRowData(char*  dataBuf, int maxLen, int64_t timestamp, SSuperTable*
       rand_string(buf, stbInfo->columns[i].dataLen);
       dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "\'%s\', ", buf);
       tmfree(buf);
-    } else if (0 == strncasecmp(stbInfo->columns[i].dataType, "int", 3)) {
-      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "%d, ", rand_int());
-    } else if (0 == strncasecmp(stbInfo->columns[i].dataType, "bigint", 6)) {
-      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "%"PRId64", ", rand_bigint());
-    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType, "float", 5)) {
-      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "%f, ", rand_float());
-    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType, "double", 6)) {
-      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "%f, ", rand_double());
-    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType, "smallint", 8)) {
+    } else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                "int", 3)) {
+      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
+              "%d, ", rand_int());
+    } else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                "bigint", 6)) {
+      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
+              "%"PRId64", ", rand_bigint());
+    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                "float", 5)) {
+      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
+              "%f, ", rand_float());
+    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                "double", 6)) {
+      dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen,
+              "%f, ", rand_double());
+    }  else if (0 == strncasecmp(stbInfo->columns[i].dataType,
+                "smallint", 8)) {
       dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "%d, ", rand_smallint());
     }  else if (0 == strncasecmp(stbInfo->columns[i].dataType, "tinyint", 7)) {
       dataLen += snprintf(dataBuf + dataLen, maxLen - dataLen, "%d, ", rand_tinyint());
@@ -4001,255 +4014,6 @@ int generateRowData(char*  dataBuf, int maxLen, int64_t timestamp, SSuperTable*
   return dataLen;
 }
 
-static void syncWriteForNumberOfTblInOneSql(
-        threadInfo *winfo, char* sampleDataBuf) {
-  SSuperTable* superTblInfo = winfo->superTblInfo;
-
-  int   samplePos = 0;
-
-  //printf("========threadID[%d], table rang: %d - %d \n", winfo->threadID, winfo->start_table_id, winfo->end_table_id);
-  int64_t    lastPrintTime = taosGetTimestampMs();
-
-  char* buffer = calloc(superTblInfo->maxSqlLen+1, 1);
-  if (NULL == buffer) {
-    printf("========calloc size[ %d ] fail!\n", superTblInfo->maxSqlLen);
-    return;
-  }
-
-  int32_t  numberOfTblInOneSql = superTblInfo->numberOfTblInOneSql;
-  int32_t  tbls = winfo->end_table_id - winfo->start_table_id + 1;
-  if (numberOfTblInOneSql > tbls) {
-    numberOfTblInOneSql = tbls;
-  }
-
-  uint64_t time_counter = winfo->start_time;
-  int sampleUsePos;
-
-  int insert_interval = superTblInfo?superTblInfo->insertInterval:g_args.insert_interval;
-  int64_t st = 0;
-  int64_t et = 0xffffffff;
-
-  int64_t insertRows = (superTblInfo)?superTblInfo->insertRows:g_args.num_of_DPT;
-  for (int i = 0; i < insertRows;) {
-    int32_t  tbl_id = 0;
-    for (int tableSeq = winfo->start_table_id; tableSeq <= winfo->end_table_id; ) {
-      int64_t start_time = 0;
-      int inserted = i;
-
-      for (int k = 0; k < g_args.num_of_RPR;) {
-        int len = 0;
-        memset(buffer, 0, superTblInfo->maxSqlLen);
-        char *pstr = buffer;
-
-        int32_t  end_tbl_id = tableSeq + numberOfTblInOneSql;
-        if (end_tbl_id > winfo->end_table_id) {
-          end_tbl_id = winfo->end_table_id+1;
-        }
-
-        for (tbl_id = tableSeq ; tbl_id < end_tbl_id; tbl_id++) {  
-          sampleUsePos = samplePos;
-          if (AUTO_CREATE_SUBTBL == superTblInfo->autoCreateTable) {
-            char* tagsValBuf = NULL;
-            if (0 == superTblInfo->tagSource) {
-              tagsValBuf = generateTagVaulesForStb(superTblInfo);
-            } else {
-              tagsValBuf = getTagValueFromTagSample(
-                      superTblInfo, tbl_id % superTblInfo->tagSampleCount);
-            }
-            if (NULL == tagsValBuf) {
-              goto free_and_statistics;
-            }
-
-            if (0 == len) {
-              len += snprintf(pstr + len, 
-                      superTblInfo->maxSqlLen - len, 
-                      "insert into %s.%s%d using %s.%s tags %s values ",
-                      winfo->db_name, 
-                      superTblInfo->childTblPrefix, 
-                      tbl_id, 
-                      winfo->db_name, 
-                      superTblInfo->sTblName, 
-                      tagsValBuf);
-            } else {
-              len += snprintf(pstr + len, 
-                      superTblInfo->maxSqlLen - len, 
-                      " %s.%s%d using %s.%s tags %s values ",
-                      winfo->db_name, 
-                      superTblInfo->childTblPrefix, 
-                      tbl_id, 
-                      winfo->db_name, 
-                      superTblInfo->sTblName, 
-                      tagsValBuf);
-            }
-            tmfree(tagsValBuf);
-          } else if (TBL_ALREADY_EXISTS == superTblInfo->childTblExists) {
-            if (0 == len) {
-              len += snprintf(pstr + len, 
-                      superTblInfo->maxSqlLen - len, 
-                      "insert into %s.%s values ",
-                      winfo->db_name, 
-                      superTblInfo->childTblName + tbl_id * TSDB_TABLE_NAME_LEN);
-            } else {
-              len += snprintf(pstr + len, 
-                      superTblInfo->maxSqlLen - len, 
-                      " %s.%s values ",
-                      winfo->db_name, 
-                      superTblInfo->childTblName + tbl_id * TSDB_TABLE_NAME_LEN);
-            }
-          } else {  // pre-create child table
-            if (0 == len) {
-              len += snprintf(pstr + len, 
-                      superTblInfo->maxSqlLen - len, 
-                      "insert into %s.%s%d values ",
-                      winfo->db_name, 
-                      superTblInfo->childTblPrefix, 
-                      tbl_id);
-            } else {
-              len += snprintf(pstr + len, 
-                      superTblInfo->maxSqlLen - len, 
-                      " %s.%s%d values ",
-                      winfo->db_name, 
-                      superTblInfo->childTblPrefix, 
-                      tbl_id);
-            }            
-          }
-
-          start_time = time_counter;
-          for (int j = 0; j < superTblInfo->rowsPerTbl;) {
-            int retLen = 0;
-            if (0 == strncasecmp(superTblInfo->dataSource, 
-                        "sample", strlen("sample"))) {
-              retLen = getRowDataFromSample(pstr + len,
-                      superTblInfo->maxSqlLen - len,
-                      start_time += superTblInfo->timeStampStep,
-                      superTblInfo,
-                      &sampleUsePos);
-              if (retLen < 0) {
-                goto free_and_statistics;
-              }
-            } else if (0 == strncasecmp(
-                        superTblInfo->dataSource, "rand", strlen("rand"))) {
-              int rand_num = rand_tinyint() % 100;            
-              if (0 != superTblInfo->disorderRatio 
-                      && rand_num < superTblInfo->disorderRatio) {
-                int64_t d = start_time - taosRandom() % superTblInfo->disorderRange;
-                retLen = generateRowData(pstr + len,
-                        superTblInfo->maxSqlLen - len,
-                        d,
-                        superTblInfo);
-              } else {
-                retLen = generateRowData(pstr + len,
-                        superTblInfo->maxSqlLen - len,
-                        start_time += superTblInfo->timeStampStep,
-                        superTblInfo);
-              }
-              if (retLen < 0) {
-                goto free_and_statistics;
-              }
-            }
-            len += retLen;
-            //inserted++;
-            j++;
-            winfo->totalInsertRows++;
-
-            if (inserted >= superTblInfo->insertRows || 
-                    (superTblInfo->maxSqlLen - len) < (superTblInfo->lenOfOneRow + 128)) {
-              tableSeq = tbl_id + 1;
-              printf("config rowsPerTbl and numberOfTblInOneSql not match with max_sql_lenth, please reconfig![lenOfOneRow:%d]\n", 
-                      superTblInfo->lenOfOneRow);
-              goto send_to_server;
-            }
-          }
-        }
-
-        tableSeq = tbl_id;
-        inserted += superTblInfo->rowsPerTbl;
-
-send_to_server:
-        if (insert_interval) {
-            st = taosGetTimestampUs();
-
-          if (insert_interval > ((et - st)/1000)) {
-            int sleep_time = insert_interval - (et -st);
-            printf("sleep: %d ms insert interval\n", sleep_time);
-            taosMsleep(sleep_time); // ms
-          }
-        }
-
-        if (0 == strncasecmp(superTblInfo->insertMode, 
-                    "taosc", 
-                    strlen("taosc"))) {    
-          //printf("multi table===== sql: %s \n\n", buffer);
-          //int64_t t1 = taosGetTimestampMs();
-          int64_t startTs;
-          int64_t endTs;
-          startTs = taosGetTimestampUs();
-
-          debugPrint("%s() LN%d buff: %s\n", __func__, __LINE__, buffer);
-          int affectedRows = queryDbExec(
-                  winfo->taos, buffer, INSERT_TYPE);
-
-          if (0 < affectedRows) {
-            endTs = taosGetTimestampUs();
-            int64_t delay = endTs - startTs;
-            if (delay > winfo->maxDelay) winfo->maxDelay = delay;
-            if (delay < winfo->minDelay) winfo->minDelay = delay;
-            winfo->cntDelay++;
-            winfo->totalDelay += delay;
-            winfo->avgDelay = (double)winfo->totalDelay / winfo->cntDelay;
-            winfo->totalAffectedRows += affectedRows;
-          } else {
-            fprintf(stderr, "queryDbExec() buffer:\n%s\naffected rows is %d", buffer, affectedRows);
-            goto free_and_statistics;
-          }
-
-          int64_t  currentPrintTime = taosGetTimestampMs();
-          if (currentPrintTime - lastPrintTime > 30*1000) {
-            printf("thread[%d] has currently inserted rows: %"PRId64 ", affected rows: %"PRId64 "\n",
-                    winfo->threadID,
-                    winfo->totalInsertRows,
-                    winfo->totalAffectedRows);
-            lastPrintTime = currentPrintTime;
-          }
-          //int64_t t2 = taosGetTimestampMs();          
-          //printf("taosc insert sql return, Spent %.4f seconds \n", (double)(t2 - t1)/1000.0); 
-        } else {
-          //int64_t t1 = taosGetTimestampMs();
-          int retCode = postProceSql(g_Dbs.host, g_Dbs.port, buffer);
-          //int64_t t2 = taosGetTimestampMs();          
-          //printf("http insert sql return, Spent %ld ms \n", t2 - t1);
-
-          if (0 != retCode) {
-            printf("========restful return fail, threadID[%d]\n", winfo->threadID);
-            goto free_and_statistics;
-          }
-        }
-        if (insert_interval) {
-            et = taosGetTimestampUs();
-        }
-
-        break;
-      }
-
-      if (tableSeq > winfo->end_table_id) {
-        if (0 == strncasecmp(superTblInfo->dataSource, "sample", strlen("sample"))) {
-          samplePos = sampleUsePos;
-        }
-        i = inserted;
-        time_counter = start_time;
-      }
-    }   
-    
-    //printf("========loop %d childTables duration:%"PRId64 "========inserted rows:%d\n", winfo->end_table_id - winfo->start_table_id, et - st, i);
-  }
-
-free_and_statistics:
-  tmfree(buffer);    
-  printf("====thread[%d] completed total inserted rows: %"PRId64 ", affected rows: %"PRId64 "====\n",
-          winfo->threadID, winfo->totalInsertRows, winfo->totalAffectedRows);
-  return;
-}
-
 int32_t generateData(char *res, char **data_type,
         int num_of_cols, int64_t timestamp, int lenOfBinary) {
   memset(res, 0, MAX_DATA_SIZE);
@@ -4311,27 +4075,24 @@ int32_t generateData(char *res, char **data_type,
 static int prepareSampleDataForSTable(SSuperTable *superTblInfo) {
   char* sampleDataBuf = NULL;
 
-  // each thread read sample data from csv file 
-  if (0 == strncasecmp(superTblInfo->dataSource, 
-              "sample", 
-              strlen("sample"))) {
-    sampleDataBuf = calloc(
+  sampleDataBuf = calloc(
             superTblInfo->lenOfOneRow * MAX_SAMPLES_ONCE_FROM_FILE, 1);
-    if (sampleDataBuf == NULL) {
+  if (sampleDataBuf == NULL) {
       fprintf(stderr, "Failed to calloc %d Bytes, reason:%s\n", 
               superTblInfo->lenOfOneRow * MAX_SAMPLES_ONCE_FROM_FILE, 
               strerror(errno));
       return -1;
-    }
-
-    int ret = readSampleFromCsvFileToMem(superTblInfo);
-    if (0 != ret) {
-      tmfree(sampleDataBuf);
-      return -1;
-    }
   }
 
   superTblInfo->sampleDataBuf = sampleDataBuf;
+  int ret = readSampleFromCsvFileToMem(superTblInfo);
+
+  if (0 != ret) {
+      fprintf(stderr, "read sample from csv file failed.\n");
+      tmfree(sampleDataBuf);
+      superTblInfo->sampleDataBuf = NULL;
+      return -1;
+  }
 
   return 0;
 }
@@ -4343,26 +4104,22 @@ static int execInsert(threadInfo *winfo, char *buffer, int k)
 
   if (superTblInfo) {
     if (0 == strncasecmp(superTblInfo->insertMode, "taosc", strlen("taosc"))) {
-          verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
-          affectedRows = queryDbExec(winfo->taos, buffer, INSERT_TYPE);
+      verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
+      affectedRows = queryDbExec(winfo->taos, buffer, INSERT_TYPE);
     } else {
-          verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
-          int retCode = postProceSql(g_Dbs.host, g_Dbs.port, buffer);
+      verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
+      int retCode = postProceSql(g_Dbs.host, g_Dbs.port, buffer);
 
-          if (0 != retCode) {
-            affectedRows = -1;
-            printf("========restful return fail, threadID[%d]\n", winfo->threadID);
-          } else {
-          affectedRows = k;
-          }
+      if (0 != retCode) {
+        affectedRows = -1;
+        printf("========restful return fail, threadID[%d]\n", winfo->threadID);
+      } else {
+        affectedRows = k;
+      }
     }
   } else {
-        verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
-        affectedRows = queryDbExec(winfo->taos, buffer, 1);
-  }
-
-  if (0 > affectedRows){
-            return affectedRows;
+    verbosePrint("%s() LN%d %s\n", __func__, __LINE__, buffer);
+    affectedRows = queryDbExec(winfo->taos, buffer, 1);
   }
 
   return affectedRows;
@@ -4388,21 +4145,19 @@ static int generateDataBuffer(int32_t tableSeq,
   assert(buffer != NULL);
 
   char *pChildTblName;
-  int childTblCount;
 
-  if (superTblInfo && (superTblInfo->childTblOffset > 0)) {
-      // select tbname from stb limit 1 offset tableSeq
-    getChildNameOfSuperTableWithLimitAndOffset(pThreadInfo->taos,
-            pThreadInfo->db_name, superTblInfo->sTblName,
-            &pChildTblName, &childTblCount,
-            1, tableSeq);
+  pChildTblName = calloc(TSDB_TABLE_NAME_LEN, 1);
+  if (NULL == pChildTblName) {
+    fprintf(stderr, "failed to alloc memory %d\n", TSDB_TABLE_NAME_LEN);
+    return -1;
+  }
+
+  if (superTblInfo && (superTblInfo->childTblOffset >= 0)
+            && (superTblInfo->childTblLimit > 0)) {
+    snprintf(pChildTblName, TSDB_TABLE_NAME_LEN, "%s",
+        superTblInfo->childTblName + (tableSeq - superTblInfo->childTblOffset) * TSDB_TABLE_NAME_LEN);
   } else {
-      pChildTblName = calloc(TSDB_TABLE_NAME_LEN, 1);
-      if (NULL == pChildTblName) {
-          fprintf(stderr, "failed to alloc memory %d\n", TSDB_TABLE_NAME_LEN);
-          return -1;
-      }
-      snprintf(pChildTblName, TSDB_TABLE_NAME_LEN, "%s%d",
+    snprintf(pChildTblName, TSDB_TABLE_NAME_LEN, "%s%d",
         superTblInfo?superTblInfo->childTblPrefix:g_args.tb_prefix, tableSeq);
   }
 
@@ -4421,9 +4176,9 @@ static int generateDataBuffer(int32_t tableSeq,
                     tableSeq % superTblInfo->tagSampleCount);
       }
       if (NULL == tagsValBuf) {
-         fprintf(stderr, "tag buf failed to allocate  memory\n");
-         free(pChildTblName);
-         return -1;
+        free(pChildTblName);
+        fprintf(stderr, "tag buf failed to allocate  memory\n");
+        return -1;
       }
 
       pstr += snprintf(pstr,
@@ -4462,7 +4217,7 @@ static int generateDataBuffer(int32_t tableSeq,
   verbosePrint("%s() LN%d num_of_RPR=%d\n", __func__, __LINE__, g_args.num_of_RPR);
   for (k = 0; k < g_args.num_of_RPR;) {
     if (superTblInfo) {
-          int retLen = 0;
+        int retLen = 0;
 
         if (0 == strncasecmp(superTblInfo->dataSource,
                     "sample", strlen("sample"))) {
@@ -4483,22 +4238,26 @@ static int generateDataBuffer(int32_t tableSeq,
                       superTblInfo->maxSqlLen - len,
                       d, 
                       superTblInfo);
-              //printf("disorder rows, rand_num:%d, last ts:%"PRId64" current ts:%"PRId64"\n", rand_num, start_time, d);
-        } else {
-          retLen = generateRowData(
+          } else {
+            retLen = generateRowData(
                       pstr + len, 
                       superTblInfo->maxSqlLen - len, 
                       startTime + superTblInfo->timeStampStep * startFrom,
                       superTblInfo);
-        }
+          }
+       }
 
-        if (retLen < 0) {
-          free(pChildTblName);
-          return -1;
-        }
+       if (retLen < 0) {
+         free(pChildTblName);
+         return -1;
+       }
 
-        len += retLen;
-      }
+       len += retLen;
+
+       if (len >= (superTblInfo->maxSqlLen - 256)) {    // reserve for overwrite
+         k++;
+         break;
+       }
     } else {
       int rand_num = taosRandom() % 100;
           char data[MAX_DATA_SIZE];
@@ -4518,12 +4277,11 @@ static int generateDataBuffer(int32_t tableSeq,
                   lenOfBinary);
       }
 
-      //assert(len + pstr - buffer < BUFFER_SIZE);
-      if (len + pstr - buffer >= g_args.max_sql_len) { // too long
-            break;
-      }
-
       pstr += sprintf(pstr, " %s", data);
+      if (len + pstr - buffer >= (g_args.max_sql_len - 256)) { // too long
+          k++;
+          break;
+      }
     }
 
     verbosePrint("%s() LN%d len=%d k=%d \nbuffer=%s\n", __func__, __LINE__, len, k, buffer);
@@ -4535,7 +4293,8 @@ static int generateDataBuffer(int32_t tableSeq,
       break;
   }
 
-  free(pChildTblName);
+  if (pChildTblName)
+      free(pChildTblName);
 
   return k;
 }
@@ -4560,20 +4319,7 @@ static void* syncWrite(void *sarg) {
               strerror(errno));
     return NULL;
   }
-
-  if (superTblInfo) {
-    if (0 != prepareSampleDataForSTable(superTblInfo))
-        return NULL;
-
-    if (superTblInfo->numberOfTblInOneSql > 0) {
-      syncWriteForNumberOfTblInOneSql(winfo, superTblInfo->sampleDataBuf);
-      tmfree(superTblInfo->sampleDataBuf);
-      return NULL;
-    }
-  }
  
-  int   samplePos     = 0;
-
   int64_t lastPrintTime = taosGetTimestampMs();
   int64_t startTs = taosGetTimestampUs();
   int64_t endTs;
@@ -4586,7 +4332,7 @@ static void* syncWrite(void *sarg) {
   winfo->totalInsertRows = 0;
   winfo->totalAffectedRows = 0;
 
-  int sampleUsePos;
+  winfo->samplePos = 0;
 
   for (uint32_t tableSeq = winfo->start_table_id; tableSeq <= winfo->end_table_id;
         tableSeq ++) {
@@ -4600,10 +4346,8 @@ static void* syncWrite(void *sarg) {
             st = taosGetTimestampUs();
       }
 
-      sampleUsePos = samplePos;
-
       int generated = generateDataBuffer(tableSeq, winfo, buffer, insertRows,
-            i, start_time, &sampleUsePos);
+            i, start_time, &(winfo->samplePos));
       if (generated > 0)
         i += generated;
       else
@@ -4613,6 +4357,7 @@ static void* syncWrite(void *sarg) {
       if (affectedRows < 0)
         goto free_and_statistics_2;
 
+
       winfo->totalInsertRows += generated;
       winfo->totalAffectedRows += affectedRows;
 
@@ -4649,14 +4394,12 @@ static void* syncWrite(void *sarg) {
     if ((tableSeq == winfo->end_table_id) && superTblInfo &&
         (0 == strncasecmp(
                     superTblInfo->dataSource, "sample", strlen("sample")))) {
-          samplePos = sampleUsePos;
+          printf("%s() LN%d samplePos=%d\n", __func__, __LINE__, winfo->samplePos);
     }
   } // tableSeq
 
 free_and_statistics_2:
   tmfree(buffer);
-  if (superTblInfo)
-    tmfree(superTblInfo->sampleDataBuf);
 
   printf("====thread[%d] completed total inserted rows: %"PRId64 ", total affected rows: %"PRId64 "====\n", 
           winfo->threadID, 
@@ -4712,7 +4455,7 @@ void callBack(void *param, TAOS_RES *res, int code) {
       break;
     }
   }
-  
+
   if (insert_interval) {
     winfo->st = taosGetTimestampUs();
   }
@@ -4755,13 +4498,18 @@ static void startMultiThreadInsertData(int threads, char* db_name,
     memset(infos, 0, threads * sizeof(threadInfo));
 
     int ntables = 0;
-    if (superTblInfo)
-        if (superTblInfo->childTblOffset)
+    if (superTblInfo) {
+
+        if ((superTblInfo->childTblOffset >= 0) 
+            && (superTblInfo->childTblLimit > 0)) {
+
             ntables = superTblInfo->childTblLimit;
-        else
+        } else {
             ntables = superTblInfo->childTblCount;
-    else
+        }
+    } else {
         ntables = g_args.num_of_tables;
+    }
 
     int a = ntables / threads;
     if (a < 1) {
@@ -4817,11 +4565,50 @@ static void startMultiThreadInsertData(int threads, char* db_name,
  
   int last;
 
-  if ((superTblInfo) && (superTblInfo->childTblOffset))
+  if ((superTblInfo) && (superTblInfo->childTblOffset >= 0))
       last = superTblInfo->childTblOffset;
   else
       last = 0;
 
+  // read sample data from file first
+  if ((superTblInfo) && (0 == strncasecmp(superTblInfo->dataSource, 
+              "sample", strlen("sample")))) {
+    if (0 != prepareSampleDataForSTable(superTblInfo)) {
+      fprintf(stderr, "prepare sample data for stable failed!\n");
+      exit(-1);
+    }
+  }
+
+  if (superTblInfo && (superTblInfo->childTblOffset >= 0)
+            && (superTblInfo->childTblLimit > 0)) {
+
+    TAOS* taos = taos_connect(
+              g_Dbs.host, g_Dbs.user,
+              g_Dbs.password, db_name, g_Dbs.port);
+    if (NULL == taos) {
+        fprintf(stderr, "connect to server fail , reason: %s\n",
+                taos_errstr(NULL));
+        exit(-1);
+    }
+
+    superTblInfo->childTblName = (char*)calloc(1,
+        superTblInfo->childTblLimit * TSDB_TABLE_NAME_LEN);
+    if (superTblInfo->childTblName == NULL) {
+      fprintf(stderr, "alloc memory failed!");
+      taos_close(taos);
+      exit(-1);
+    }
+    int childTblCount;
+
+    getChildNameOfSuperTableWithLimitAndOffset(
+        taos,
+        db_name, superTblInfo->sTblName,
+        &superTblInfo->childTblName, &childTblCount,
+        superTblInfo->childTblLimit,
+        superTblInfo->childTblOffset);
+    taos_close(taos);
+  }
+
   for (int i = 0; i < threads; i++) {
     threadInfo *t_info = infos + i;
     t_info->threadID = i;

src/mnode/src/mnodeSdb.c

@@ -680,7 +680,7 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
   if (pRow != NULL) {
     // forward to peers
     pRow->processedCount = 0;
-    int32_t syncCode = syncForwardToPeer(tsSdbMgmt.sync, pHead, pRow, TAOS_QTYPE_RPC);
+    int32_t syncCode = syncForwardToPeer(tsSdbMgmt.sync, pHead, pRow, TAOS_QTYPE_RPC, false);
     if (syncCode <= 0) pRow->processedCount = 1;
 
     if (syncCode < 0) {
@@ -700,7 +700,7 @@ static int32_t sdbProcessWrite(void *wparam, void *hparam, int32_t qtype, void *
            actStr[action], sdbGetKeyStr(pTable, pHead->cont), pHead->version);
 
   // even it is WAL/FWD, it shall be called to update version in sync
-  syncForwardToPeer(tsSdbMgmt.sync, pHead, pRow, TAOS_QTYPE_RPC);
+  syncForwardToPeer(tsSdbMgmt.sync, pHead, pRow, TAOS_QTYPE_RPC, false);
 
   // from wal or forward msg, row not created, should add into hash
   if (action == SDB_ACTION_INSERT) {
@@ -1119,7 +1119,7 @@ static void *sdbWorkerFp(void *pWorker) {
         sdbConfirmForward(1, pRow, pRow->code);
       } else {
         if (qtype == TAOS_QTYPE_FWD) {
-          syncConfirmForward(tsSdbMgmt.sync, pRow->pHead.version, pRow->code);
+          syncConfirmForward(tsSdbMgmt.sync, pRow->pHead.version, pRow->code, false);
         }
         sdbFreeFromQueue(pRow);
       }

src/plugins/http/src/httpParser.c

@@ -110,7 +110,7 @@ static void httpCleanupString(HttpString *str) {
 static int32_t httpAppendString(HttpString *str, const char *s, int32_t len) {
   if (str->size == 0) {
     str->pos = 0;
-    str->size = 64;
+    str->size = len + 1;
     str->str = malloc(str->size);
   } else if (str->pos + len + 1 >= str->size) {
     str->size += len;
@@ -715,10 +715,12 @@ static int32_t httpParserOnVersion(HttpParser *parser, HTTP_PARSER_STATE state,
 
     if (parser->method) {
       ok = httpOnRequestLine(parser, parser->method, parser->target, parser->version);
+      /*
       if (parser->target) {
         free(parser->target);
         parser->target = NULL;
       }
+      */
     }
 
     httpClearString(&parser->str);

src/query/inc/qExecutor.h

@@ -308,6 +308,7 @@ enum {
 
 typedef struct SQInfo {
   void*            signature;
+  uint64_t         qId;
   int32_t          code;        // error code to returned to client
   int64_t          owner;       // if it is in execution
 
@@ -429,7 +430,7 @@ int32_t createIndirectQueryFuncExprFromMsg(SQueryTableMsg *pQueryMsg, int32_t nu
 
 SSqlGroupbyExpr *createGroupbyExprFromMsg(SQueryTableMsg *pQueryMsg, SColIndex *pColIndex, int32_t *code);
 SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGroupbyExpr, SExprInfo *pExprs,
-                        SExprInfo *pSecExprs, STableGroupInfo *pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery, char* sql);
+                        SExprInfo *pSecExprs, STableGroupInfo *pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery, char* sql, uint64_t *qId);
 int32_t initQInfo(SQueryTableMsg *pQueryMsg, void *tsdb, int32_t vgId, SQInfo *pQInfo, SQueryParam* param, bool isSTable);
 void freeColumnFilterInfo(SColumnFilterInfo* pFilter, int32_t numOfFilters);
 

src/query/inc/qSqlparser.h

@@ -27,168 +27,6 @@ extern "C" {
 #include "tvariant.h"
 
 #define ParseTOKENTYPE SStrToken
-extern char tTokenTypeSwitcher[13];
-
-#define toTSDBType(x)                          \
-  do {                                         \
-    if ((x) >= tListLen(tTokenTypeSwitcher)) { \
-      (x) = TSDB_DATA_TYPE_BINARY;             \
-    } else {                                   \
-      (x) = tTokenTypeSwitcher[(x)];           \
-    }                                          \
-  } while (0)
-
-typedef struct SLimitVal {
-  int64_t limit;
-  int64_t offset;
-} SLimitVal;
-
-typedef struct SOrderVal {
-  uint32_t order;
-  int32_t  orderColId;
-} SOrderVal;
-
-typedef struct tVariantListItem {
-  tVariant pVar;
-  uint8_t  sortOrder;
-} tVariantListItem;
-
-typedef struct SIntervalVal {
-  SStrToken interval;
-  SStrToken offset;
-} SIntervalVal;
-
-typedef struct SSessionWindowVal {
-  SStrToken col;
-  SStrToken gap;
-} SSessionWindowVal;
-
-typedef struct SQuerySQL {
-  struct tSQLExprList *pSelection;   // select clause
-  SArray *             from;         // from clause  SArray<tVariantListItem>
-  struct tSQLExpr *    pWhere;       // where clause [optional]
-  SArray *             pGroupby;     // groupby clause, only for tags[optional], SArray<tVariantListItem>
-  SArray *             pSortOrder;   // orderby [optional], SArray<tVariantListItem>
-  SIntervalVal         interval;     // (interval, interval_offset) [optional]
-  SSessionWindowVal    sessionVal;   // session window [optional]
-  SStrToken            sliding;      // sliding window [optional]
-  SLimitVal            limit;        // limit offset [optional]
-  SLimitVal            slimit;       // group limit offset [optional]
-  SArray *             fillType;     // fill type[optional], SArray<tVariantListItem>
-  SStrToken            selectToken;  // sql string
-} SQuerySQL;
-
-typedef struct SCreatedTableInfo {
-  SStrToken  name;        // table name token
-  SStrToken  stableName;  // super table name token , for using clause
-  SArray    *pTagNames;   // create by using super table, tag name
-  SArray    *pTagVals;    // create by using super table, tag value
-  char      *fullname;    // table full name
-  STagData   tagdata;     // true tag data, super table full name is in STagData
-  int8_t     igExist;     // ignore if exists
-} SCreatedTableInfo;
-
-typedef struct SCreateTableSQL {
-  SStrToken    name;  // table name, create table [name] xxx
-  int8_t       type;  // create normal table/from super table/ stream
-  bool         existCheck;
-
-  struct {
-    SArray    *pTagColumns; // SArray<TAOS_FIELD>
-    SArray    *pColumns;    // SArray<TAOS_FIELD>
-  } colInfo;
-
-  SArray      *childTableInfo;        // SArray<SCreatedTableInfo>
-  SQuerySQL   *pSelect;
-} SCreateTableSQL;
-
-typedef struct SAlterTableInfo {
-  SStrToken     name;
-  int16_t       tableType;
-  int16_t       type;
-  STagData      tagData;
-  SArray       *pAddColumns; // SArray<TAOS_FIELD>
-  SArray       *varList;  // set t=val or: change src dst, SArray<tVariantListItem>
-} SAlterTableInfo;
-
-typedef struct SCreateDbInfo {
-  SStrToken dbname;
-  int32_t   replica;
-  int32_t   cacheBlockSize;
-  int32_t   maxTablesPerVnode;
-  int32_t   numOfBlocks;
-  int32_t   daysPerFile;
-  int32_t   minRowsPerBlock;
-  int32_t   maxRowsPerBlock;
-  int32_t   fsyncPeriod;
-  int64_t   commitTime;
-  int32_t   walLevel;
-  int32_t   quorum;
-  int32_t   compressionLevel;
-  SStrToken precision;
-  bool      ignoreExists;
-  int8_t    update;
-  int8_t    cachelast; 
-  SArray    *keep;
-  int8_t    dbType;
-  int16_t   partitions;
-} SCreateDbInfo;
-
-typedef struct SCreateAcctInfo {
-  int32_t   maxUsers;
-  int32_t   maxDbs;
-  int32_t   maxTimeSeries;
-  int32_t   maxStreams;
-  int32_t   maxPointsPerSecond;
-  int64_t   maxStorage;
-  int64_t   maxQueryTime;
-  int32_t   maxConnections;
-  SStrToken stat;
-} SCreateAcctInfo;
-
-typedef struct SShowInfo {
-  uint8_t showType;
-  SStrToken prefix;
-  SStrToken pattern;
-} SShowInfo;
-
-typedef struct SUserInfo {
-  SStrToken user;
-  SStrToken passwd;
-  SStrToken privilege;
-  int16_t   type;
-} SUserInfo;
-
-typedef struct SMiscInfo {
-  SArray    *a;         // SArray<SStrToken>
-  bool       existsCheck;
-  int16_t    dbType;
-  int16_t    tableType;
-  SUserInfo  user;
-  union {
-    SCreateDbInfo   dbOpt;
-    SCreateAcctInfo acctOpt;
-    SShowInfo       showOpt;
-    SStrToken       id;
-  };
-} SMiscInfo;
-
-typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
-  SQuerySQL **pClause;
-  int32_t     numOfClause;
-} SSubclauseInfo;
-
-typedef struct SSqlInfo {
-  int32_t            type;
-  bool               valid;
-  SSubclauseInfo     subclauseInfo;
-  char               msg[256];
-  union {
-    SCreateTableSQL  *pCreateTableInfo;
-    SAlterTableInfo  *pAlterInfo;
-    SMiscInfo        *pMiscInfo;
-  };
-} SSqlInfo;
 
 #define NON_ARITHMEIC_EXPR 0
 #define NORMAL_ARITHMETIC  1
@@ -201,36 +39,278 @@ enum SQL_NODE_TYPE {
   SQL_NODE_EXPR        = 4,
 };
 
-typedef struct tSQLExpr {
-  uint16_t         type;       // sql node type
-  uint32_t         tokenId;    // TK_FUNCTION: sql function, TK_LE: less than(binary expr)
+enum SQL_NODE_FROM_TYPE {
+  SQL_NODE_FROM_SUBQUERY  = 1,
+  SQL_NODE_FROM_NAMELIST  = 2,
+};
+
+extern char tTokenTypeSwitcher[13];
+
+#define toTSDBType(x)                          \
+  do {                                         \
+    if ((x) >= tListLen(tTokenTypeSwitcher)) { \
+      (x) = TSDB_DATA_TYPE_BINARY;             \
+    } else {                                   \
+      (x) = tTokenTypeSwitcher[(x)];           \
+    }                                          \
+  } while (0)
+
+#define TPARSER_HAS_TOKEN(_t)      ((_t).n > 0)
+#define TPARSER_SET_NONE_TOKEN(_t) ((_t).n = 0)
+
+typedef struct SLimitVal {
+  int64_t            limit;
+  int64_t            offset;
+} SLimitVal;
+
+typedef struct SOrderVal {
+  uint32_t           order;
+  int32_t            orderColId;
+} SOrderVal;
+
+typedef struct tVariantListItem {
+  tVariant           pVar;
+  uint8_t            sortOrder;
+} tVariantListItem;
+
+typedef struct SIntervalVal {
+  SStrToken          interval;
+  SStrToken          offset;
+} SIntervalVal;
+
+typedef struct SSessionWindowVal {
+  SStrToken          col;
+  SStrToken          gap;
+} SSessionWindowVal;
+
+struct SFromInfo;
+
+typedef struct SQuerySqlNode {
+  struct SArray     *pSelectList;  // select clause
+  struct SFromInfo  *from;         // from clause SArray<SQuerySqlNode>
+  struct tSqlExpr   *pWhere;       // where clause [optional]
+  SArray            *pGroupby;     // groupby clause, only for tags[optional], SArray<tVariantListItem>
+  SArray            *pSortOrder;   // orderby [optional],  SArray<tVariantListItem>
+  SArray            *fillType;     // fill type[optional], SArray<tVariantListItem>
+  SIntervalVal       interval;     // (interval, interval_offset) [optional]
+  SSessionWindowVal  sessionVal;   // session window [optional]
+  SStrToken          sliding;      // sliding window [optional]
+  SLimitVal          limit;        // limit offset [optional]
+  SLimitVal          slimit;       // group limit offset [optional]
+  SStrToken          sqlstr;       // sql string in select clause
+} SQuerySqlNode;
+
+typedef struct STableNamePair {
+  SStrToken name;
+  SStrToken aliasName;
+} STableNamePair;
+
+typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
+  SQuerySqlNode    **pClause;
+  int32_t            numOfClause;
+} SSubclauseInfo;
+
+typedef struct SFromInfo {
+  int32_t            type;        // nested query|table name list
+  union {
+    SSubclauseInfo  *pNode;
+    SArray          *tableList;   // SArray<STableNamePair>
+  };
+} SFromInfo;
+
+typedef struct SCreatedTableInfo {
+  SStrToken          name;        // table name token
+  SStrToken          stableName;  // super table name token , for using clause
+  SArray            *pTagNames;   // create by using super table, tag name
+  SArray            *pTagVals;    // create by using super table, tag value
+  char              *fullname;    // table full name
+  STagData           tagdata;     // true tag data, super table full name is in STagData
+  int8_t             igExist;     // ignore if exists
+} SCreatedTableInfo;
+
+typedef struct SCreateTableSql {
+  SStrToken          name;  // table name, create table [name] xxx
+  int8_t             type;  // create normal table/from super table/ stream
+  bool               existCheck;
+
+  struct {
+    SArray          *pTagColumns; // SArray<TAOS_FIELD>
+    SArray          *pColumns;    // SArray<TAOS_FIELD>
+  } colInfo;
+
+  SArray            *childTableInfo;        // SArray<SCreatedTableInfo>
+  SQuerySqlNode     *pSelect;
+} SCreateTableSql;
+
+typedef struct SAlterTableInfo {
+  SStrToken          name;
+  int16_t            tableType;
+  int16_t            type;
+  STagData           tagData;
+  SArray            *pAddColumns; // SArray<TAOS_FIELD>
+  SArray            *varList;     // set t=val or: change src dst, SArray<tVariantListItem>
+} SAlterTableInfo;
+
+typedef struct SCreateDbInfo {
+  SStrToken          dbname;
+  int32_t            replica;
+  int32_t            cacheBlockSize;
+  int32_t            maxTablesPerVnode;
+  int32_t            numOfBlocks;
+  int32_t            daysPerFile;
+  int32_t            minRowsPerBlock;
+  int32_t            maxRowsPerBlock;
+  int32_t            fsyncPeriod;
+  int64_t            commitTime;
+  int32_t            walLevel;
+  int32_t            quorum;
+  int32_t            compressionLevel;
+  SStrToken          precision;
+  bool               ignoreExists;
+  int8_t             update;
+  int8_t             cachelast;
+  SArray            *keep;
+  int8_t             dbType;
+  int16_t            partitions;
+} SCreateDbInfo;
+
+typedef struct SCreateAcctInfo {
+  int32_t            maxUsers;
+  int32_t            maxDbs;
+  int32_t            maxTimeSeries;
+  int32_t            maxStreams;
+  int32_t            maxPointsPerSecond;
+  int64_t            maxStorage;
+  int64_t            maxQueryTime;
+  int32_t            maxConnections;
+  SStrToken          stat;
+} SCreateAcctInfo;
+
+typedef struct SShowInfo {
+  uint8_t            showType;
+  SStrToken          prefix;
+  SStrToken          pattern;
+} SShowInfo;
+
+typedef struct SUserInfo {
+  SStrToken          user;
+  SStrToken          passwd;
+  SStrToken          privilege;
+  int16_t            type;
+} SUserInfo;
+
+typedef struct SMiscInfo {
+  SArray            *a;         // SArray<SStrToken>
+  bool               existsCheck;
+  int16_t            dbType;
+  int16_t            tableType;
+  SUserInfo          user;
+  union {
+    SCreateDbInfo    dbOpt;
+    SCreateAcctInfo  acctOpt;
+    SShowInfo        showOpt;
+    SStrToken        id;
+  };
+} SMiscInfo;
+
+typedef struct SSqlInfo {
+  int32_t            type;
+  bool               valid;
+  SSubclauseInfo     subclauseInfo;
+  char               msg[256];
+  union {
+    SCreateTableSql *pCreateTableInfo;
+    SAlterTableInfo *pAlterInfo;
+    SMiscInfo       *pMiscInfo;
+  };
+} SSqlInfo;
+
+typedef struct tSqlExpr {
+  uint16_t           type;       // sql node type
+  uint32_t           tokenId;    // TK_LE: less than(binary expr)
 
   // the whole string of the function(col, param), while the function name is kept in token
-  SStrToken        operand;
-  uint32_t         functionId;  // function id
+  SStrToken          operand;
+  uint32_t           functionId;  // function id
 
-  SStrToken        colInfo;     // table column info
-  tVariant         value;       // the use input value
-  SStrToken        token;       // original sql expr string
+  SStrToken          colInfo;     // table column info
+  tVariant           value;       // the use input value
+  SStrToken          token;       // original sql expr string
 
-  struct tSQLExpr *pLeft;       // left child
-  struct tSQLExpr *pRight;      // right child
-  struct tSQLExprList *pParam;  // function parameters list
-} tSQLExpr;
+  struct tSqlExpr   *pLeft;       // left child
+  struct tSqlExpr   *pRight;      // right child
+  struct SArray     *pParam;      // function parameters list
+} tSqlExpr;
 
-// used in select clause. select <tSQLExprList> from xxx
+// used in select clause. select <SArray> from xxx
 typedef struct tSqlExprItem {
-  tSQLExpr *pNode;      // The list of expressions
-  char *    aliasName;  // alias name, null-terminated string
-  bool      distinct;
+  tSqlExpr          *pNode;      // The list of expressions
+  char              *aliasName;  // alias name, null-terminated string
+  bool               distinct;
 } tSqlExprItem;
 
-// todo refactor by using SArray
-typedef struct tSQLExprList {
-  int32_t       nExpr;  /* Number of expressions on the list */
-  int32_t       nAlloc; /* Number of entries allocated below */
-  tSqlExprItem *a;      /* One entry for each expression */
-} tSQLExprList;
+SArray *tVariantListAppend(SArray *pList, tVariant *pVar, uint8_t sortOrder);
+SArray *tVariantListInsert(SArray *pList, tVariant *pVar, uint8_t sortOrder, int32_t index);
+SArray *tVariantListAppendToken(SArray *pList, SStrToken *pAliasToken, uint8_t sortOrder);
+
+SFromInfo *setTableNameList(SFromInfo* pFromInfo, SStrToken *pName, SStrToken* pAlias);
+SFromInfo *setSubquery(SFromInfo* pFromInfo, SQuerySqlNode *pSqlNode);
+void      *destroyFromInfo(SFromInfo* pFromInfo);
+
+// sql expr leaf node
+tSqlExpr *tSqlExprCreateIdValue(SStrToken *pToken, int32_t optrType);
+tSqlExpr *tSqlExprCreateFunction(SArray *pParam, SStrToken *pFuncToken, SStrToken *endToken, int32_t optType);
+
+tSqlExpr *tSqlExprCreate(tSqlExpr *pLeft, tSqlExpr *pRight, int32_t optrType);
+tSqlExpr *tSqlExprClone(tSqlExpr *pSrc);
+void      tSqlExprCompact(tSqlExpr** pExpr);
+bool      tSqlExprIsLeaf(tSqlExpr* pExpr);
+bool      tSqlExprIsParentOfLeaf(tSqlExpr* pExpr);
+void      tSqlExprDestroy(tSqlExpr *pExpr);
+SArray   *tSqlExprListAppend(SArray *pList, tSqlExpr *pNode, SStrToken *pDistinct, SStrToken *pToken);
+void      tSqlExprListDestroy(SArray *pList);
+
+SQuerySqlNode *tSetQuerySqlNode(SStrToken *pSelectToken, SArray *pSelectList, SFromInfo *pFrom, tSqlExpr *pWhere,
+                                SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval, SSessionWindowVal *ps,
+                                SStrToken *pSliding, SArray *pFill, SLimitVal *pLimit, SLimitVal *pgLimit);
+
+SCreateTableSql *tSetCreateTableInfo(SArray *pCols, SArray *pTags, SQuerySqlNode *pSelect, int32_t type);
+
+SAlterTableInfo *tSetAlterTableInfo(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type, int16_t tableTable);
+SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagNames, SArray *pTagVals, SStrToken *pToken, SStrToken* igExists);
+
+void destroyAllSelectClause(SSubclauseInfo *pSql);
+void destroyQuerySqlNode(SQuerySqlNode *pSql);
+void freeCreateTableInfo(void* p);
+
+SSqlInfo       *setSqlInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SStrToken *pTableName, int32_t type);
+SSubclauseInfo *setSubclause(SSubclauseInfo *pClause, void *pSqlExprInfo);
+
+SSubclauseInfo *appendSelectClause(SSubclauseInfo *pInfo, void *pSubclause);
+
+void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pTableNameToken, SStrToken *pIfNotExists);
+
+void SqlInfoDestroy(SSqlInfo *pInfo);
+
+void setDCLSqlElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
+void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck,int16_t dbType,int16_t tableType);
+void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns);
+
+void setCreateDbInfo(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDbInfo *pDB, SStrToken *pIgExists);
+
+void setCreateAcctSql(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctInfo *pAcctInfo);
+void setCreateUserSql(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd);
+void setKillSql(SSqlInfo *pInfo, int32_t type, SStrToken *ip);
+void setAlterUserSql(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken* pPwd, SStrToken *pPrivilege);
+
+void setDefaultCreateDbOption(SCreateDbInfo *pDBInfo);
+void setDefaultCreateTopicOption(SCreateDbInfo *pDBInfo);
+
+// prefix show db.tables;
+void tSetDbName(SStrToken *pCpxName, SStrToken *pDb);
+
+void tSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType);
+void tSetColumnType(TAOS_FIELD *pField, SStrToken *type);
 
 /**
  *
@@ -247,72 +327,19 @@ void Parse(void *yyp, int yymajor, ParseTOKENTYPE yyminor, SSqlInfo *);
  */
 void ParseFree(void *p, void (*freeProc)(void *));
 
-SArray *tVariantListAppend(SArray *pList, tVariant *pVar, uint8_t sortOrder);
-SArray *tVariantListInsert(SArray *pList, tVariant *pVar, uint8_t sortOrder, int32_t index);
-SArray *tVariantListAppendToken(SArray *pList, SStrToken *pAliasToken, uint8_t sortOrder);
-
-tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType);
-
-tSQLExpr *tSqlExprClone(tSQLExpr *pSrc);
-
-void tSqlExprDestroy(tSQLExpr *pExpr);
-
-tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pDistinct, SStrToken *pToken);
-
-void tSqlExprListDestroy(tSQLExprList *pList);
-
-SQuerySQL *tSetQuerySqlNode(SStrToken *pSelectToken, tSQLExprList *pSelection, SArray *pFrom, tSQLExpr *pWhere,
-                             SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval, SSessionWindowVal *pSession,
-                             SStrToken *pSliding, SArray *pFill, SLimitVal *pLimit, SLimitVal *pGLimit);
-
-SCreateTableSQL *tSetCreateSqlElems(SArray *pCols, SArray *pTags, SQuerySQL *pSelect, int32_t type);
-
-void tSqlExprNodeDestroy(tSQLExpr *pExpr);
-
-SAlterTableInfo *  tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type, int16_t tableTable);
-SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagNames, SArray *pTagVals, SStrToken *pToken, SStrToken* igExists);
-
-void destroyAllSelectClause(SSubclauseInfo *pSql);
-void doDestroyQuerySql(SQuerySQL *pSql);
-void freeCreateTableInfo(void* p);
-
-SSqlInfo       *      setSqlInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SStrToken *pTableName, int32_t type);
-SSubclauseInfo *setSubclause(SSubclauseInfo *pClause, void *pSqlExprInfo);
-
-SSubclauseInfo *appendSelectClause(SSubclauseInfo *pInfo, void *pSubclause);
-
-void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pTableNameToken, SStrToken *pIfNotExists);
-
-void SqlInfoDestroy(SSqlInfo *pInfo);
-
-void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
-void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck,int16_t dbType,int16_t tableType);
-void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns);
-
-void setCreateDbInfo(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDbInfo *pDB, SStrToken *pIgExists);
-
-void setCreateAcctSql(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctInfo *pAcctInfo);
-void setCreateUserSql(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd);
-void setKillSql(SSqlInfo *pInfo, int32_t type, SStrToken *ip);
-void setAlterUserSql(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken* pPwd, SStrToken *pPrivilege);
-
-void setDefaultCreateDbOption(SCreateDbInfo *pDBInfo);
-void setDefaultCreateTopicOption(SCreateDbInfo *pDBInfo);
-
-// prefix show db.tables;
-void setDbName(SStrToken *pCpxName, SStrToken *pDb);
-
-tSQLExpr *tSqlExprIdValueCreate(SStrToken *pToken, int32_t optrType);
-
-tSQLExpr *tSqlExprCreateFunction(tSQLExprList *pList, SStrToken *pFuncToken, SStrToken *endToken, int32_t optType);
-
-void tSqlSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType);
-
-void tSqlSetColumnType(TAOS_FIELD *pField, SStrToken *type);
-
+/**
+ *
+ * @param mallocProc  The parser allocator
+ * @return
+ */
 void *ParseAlloc(void *(*mallocProc)(size_t));
 
-SSqlInfo qSQLParse(const char *str);
+/**
+ *
+ * @param str sql string
+ * @return sql ast
+ */
+SSqlInfo qSqlParse(const char *str);
 
 #ifdef __cplusplus
 }

src/query/inc/sql.y

@@ -92,11 +92,11 @@ cpxName(A) ::= DOT ids(Y).   {A = Y; A.n += 1;    }
 
 cmd ::= SHOW CREATE TABLE ids(X) cpxName(Y).    {
    X.n += Y.n;
-   setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &X);
+   setDCLSqlElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &X);
 }    
 
 cmd ::= SHOW CREATE DATABASE ids(X). {
-  setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_DATABASE, 1, &X);
+  setDCLSqlElems(pInfo, TSDB_SQL_SHOW_CREATE_DATABASE, 1, &X);
 } 
 
 cmd ::= SHOW dbPrefix(X) TABLES.         {
@@ -113,19 +113,19 @@ cmd ::= SHOW dbPrefix(X) STABLES.      {
 
 cmd ::= SHOW dbPrefix(X) STABLES LIKE ids(Y).      {
     SStrToken token;
-    setDbName(&token, &X);
+    tSetDbName(&token, &X);
     setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &Y);
 }
 
 cmd ::= SHOW dbPrefix(X) VGROUPS.    {
     SStrToken token;
-    setDbName(&token, &X);
+    tSetDbName(&token, &X);
     setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0);
 }
 
 cmd ::= SHOW dbPrefix(X) VGROUPS ids(Y).    {
     SStrToken token;
-    setDbName(&token, &X);
+    tSetDbName(&token, &X);
     setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &Y);
 }
 
@@ -144,26 +144,26 @@ cmd ::= DROP STABLE ifexists(Y) ids(X) cpxName(Z).   {
 cmd ::= DROP DATABASE ifexists(Y) ids(X).    { setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &X, &Y, TSDB_DB_TYPE_DEFAULT, -1); }
 cmd ::= DROP TOPIC ifexists(Y) ids(X).    { setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &X, &Y, TSDB_DB_TYPE_TOPIC, -1); }
 
-cmd ::= DROP DNODE ids(X).       { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &X);    }
-cmd ::= DROP USER ids(X).        { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &X);     }
-cmd ::= DROP ACCOUNT ids(X).     { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &X);  }
+cmd ::= DROP DNODE ids(X).       { setDCLSqlElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &X);    }
+cmd ::= DROP USER ids(X).        { setDCLSqlElems(pInfo, TSDB_SQL_DROP_USER, 1, &X);     }
+cmd ::= DROP ACCOUNT ids(X).     { setDCLSqlElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &X);  }
 
 /////////////////////////////////THE USE STATEMENT//////////////////////////////////////////
-cmd ::= USE ids(X).              { setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &X);}
+cmd ::= USE ids(X).              { setDCLSqlElems(pInfo, TSDB_SQL_USE_DB, 1, &X);}
 
 /////////////////////////////////THE DESCRIBE STATEMENT/////////////////////////////////////
 cmd ::= DESCRIBE ids(X) cpxName(Y). {
     X.n += Y.n;
-    setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &X);
+    setDCLSqlElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &X);
 }
 
 /////////////////////////////////THE ALTER STATEMENT////////////////////////////////////////
 cmd ::= ALTER USER ids(X) PASS ids(Y).          { setAlterUserSql(pInfo, TSDB_ALTER_USER_PASSWD, &X, &Y, NULL);    }
 cmd ::= ALTER USER ids(X) PRIVILEGE ids(Y).     { setAlterUserSql(pInfo, TSDB_ALTER_USER_PRIVILEGES, &X, NULL, &Y);}
-cmd ::= ALTER DNODE ids(X) ids(Y).              { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &X, &Y);          }
-cmd ::= ALTER DNODE ids(X) ids(Y) ids(Z).       { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &X, &Y, &Z);      }
-cmd ::= ALTER LOCAL ids(X).                     { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &X);              }
-cmd ::= ALTER LOCAL ids(X) ids(Y).              { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &X, &Y);          }
+cmd ::= ALTER DNODE ids(X) ids(Y).              { setDCLSqlElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &X, &Y);          }
+cmd ::= ALTER DNODE ids(X) ids(Y) ids(Z).       { setDCLSqlElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &X, &Y, &Z);      }
+cmd ::= ALTER LOCAL ids(X).                     { setDCLSqlElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &X);              }
+cmd ::= ALTER LOCAL ids(X) ids(Y).              { setDCLSqlElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &X, &Y);          }
 cmd ::= ALTER DATABASE ids(X) alter_db_optr(Y). { SStrToken t = {0};  setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &X, &Y, &t);}
 cmd ::= ALTER TOPIC ids(X) alter_topic_optr(Y). { SStrToken t = {0};  setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &X, &Y, &t);}
 
@@ -187,7 +187,7 @@ ifnotexists(X) ::= .                { X.n = 0;}
 
 /////////////////////////////////THE CREATE STATEMENT///////////////////////////////////////
 //create option for dnode/db/user/account
-cmd ::= CREATE DNODE   ids(X).     { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &X);}
+cmd ::= CREATE DNODE   ids(X).     { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &X);}
 cmd ::= CREATE ACCOUNT ids(X) PASS ids(Y) acct_optr(Z).
                                 { setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &X, &Y, &Z);}
 cmd ::= CREATE DATABASE ifnotexists(Z) ids(X) db_optr(Y).  { setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &X, &Y, &Z);}
@@ -299,17 +299,17 @@ alter_topic_optr(Y) ::= alter_topic_optr(Z) partitions(X).      { Y = Z; Y.parti
 %type typename {TAOS_FIELD}
 typename(A) ::= ids(X). { 
   X.type = 0;
-  tSqlSetColumnType (&A, &X);
+  tSetColumnType (&A, &X);
 }
 
 //define binary type, e.g., binary(10), nchar(10)
 typename(A) ::= ids(X) LP signed(Y) RP.    {
   if (Y <= 0) {
     X.type = 0;
-    tSqlSetColumnType(&A, &X);
+    tSetColumnType(&A, &X);
   } else {
     X.type = -Y;  // negative value of name length
-    tSqlSetColumnType(&A, &X);
+    tSetColumnType(&A, &X);
   }
 }
 
@@ -317,7 +317,7 @@ typename(A) ::= ids(X) LP signed(Y) RP.    {
 typename(A) ::= ids(X) UNSIGNED(Z). {
   X.type = 0;
   X.n = ((Z.z + Z.n) - X.z);
-  tSqlSetColumnType (&A, &X);
+  tSetColumnType (&A, &X);
 }
 
 %type signed {int64_t}
@@ -331,10 +331,10 @@ cmd ::= CREATE TABLE  create_stable_args. {}
 cmd ::= CREATE STABLE create_stable_args. {}
 cmd ::= CREATE TABLE create_table_list(Z). { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = Z;}
 
-%type create_table_list{SCreateTableSQL*}
+%type create_table_list{SCreateTableSql*}
 %destructor create_table_list{destroyCreateTableSql($$);}
 create_table_list(A) ::= create_from_stable(Z). {
-  SCreateTableSQL* pCreateTable = calloc(1, sizeof(SCreateTableSQL));
+  SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql));
   pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo));
 
   taosArrayPush(pCreateTable->childTableInfo, &Z);
@@ -347,9 +347,9 @@ create_table_list(A) ::= create_table_list(X) create_from_stable(Z). {
   A = X;
 }
 
-%type create_table_args{SCreateTableSQL*}
+%type create_table_args{SCreateTableSql*}
 create_table_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP. {
-  A = tSetCreateSqlElems(X, NULL, NULL, TSQL_CREATE_TABLE);
+  A = tSetCreateTableInfo(X, NULL, NULL, TSQL_CREATE_TABLE);
   setSqlInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
 
   V.n += Z.n;
@@ -357,9 +357,9 @@ create_table_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP. {
 }
 
 // create super table
-%type create_stable_args{SCreateTableSQL*}
+%type create_stable_args{SCreateTableSql*}
 create_stable_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP TAGS LP columnlist(Y) RP. {
-  A = tSetCreateSqlElems(X, Y, NULL, TSQL_CREATE_STABLE);
+  A = tSetCreateTableInfo(X, Y, NULL, TSQL_CREATE_STABLE);
   setSqlInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
 
   V.n += Z.n;
@@ -389,7 +389,7 @@ tagNamelist(A) ::= ids(X).                      {A = taosArrayInit(4, sizeof(SSt
 // create stream
 // create table table_name as select count(*) from super_table_name interval(time)
 create_table_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) AS select(S). {
-  A = tSetCreateSqlElems(NULL, NULL, S, TSQL_CREATE_STREAM);
+  A = tSetCreateTableInfo(NULL, NULL, S, TSQL_CREATE_STREAM);
   setSqlInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
 
   V.n += Z.n;
@@ -405,7 +405,7 @@ columnlist(A) ::= column(X).                      {A = taosArrayInit(4, sizeof(T
 // The information used for a column is the name and type of column:
 // tinyint smallint int bigint float double bool timestamp binary(x) nchar(x)
 column(A) ::= ids(X) typename(Y).          {
-  tSqlSetColumnInfo(&A, &X, &Y);
+  tSetColumnInfo(&A, &X, &Y);
 }
 
 %type tagitemlist {SArray*}
@@ -450,26 +450,26 @@ tagitem(A) ::= PLUS(X) FLOAT(Y).  {
 }
 
 //////////////////////// The SELECT statement /////////////////////////////////
-%type select {SQuerySQL*}
-%destructor select {doDestroyQuerySql($$);}
+%type select {SQuerySqlNode*}
+%destructor select {destroyQuerySqlNode($$);}
 select(A) ::= SELECT(T) selcollist(W) from(X) where_opt(Y) interval_opt(K) session_option(H) fill_opt(F) sliding_opt(S) groupby_opt(P) orderby_opt(Z) having_opt(N) slimit_opt(G) limit_opt(L). {
   A = tSetQuerySqlNode(&T, W, X, Y, P, Z, &K, &H, &S, F, &L, &G);
 }
 
+select(A) ::= LP select(B) RP. {A = B;}
+
 %type union {SSubclauseInfo*}
 %destructor union {destroyAllSelectClause($$);}
-
 union(Y) ::= select(X). { Y = setSubclause(NULL, X); }
-union(Y) ::= LP union(X) RP. { Y = X; }
 union(Y) ::= union(Z) UNION ALL select(X). { Y = appendSelectClause(Z, X); }
-union(Y) ::= union(Z) UNION ALL LP select(X) RP. { Y = appendSelectClause(Z, X); }
 
 cmd ::= union(X). { setSqlInfo(pInfo, X, NULL, TSDB_SQL_SELECT); }
 
 // Support for the SQL exprssion without from & where subclauses, e.g.,
-// select current_database(),
-// select server_version(), select client_version(),
-// select server_state();
+// select current_database()
+// select server_version()
+// select client_version()
+// select server_state()
 select(A) ::= SELECT(T) selcollist(W). {
   A = tSetQuerySqlNode(&T, W, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 }
@@ -477,10 +477,10 @@ select(A) ::= SELECT(T) selcollist(W). {
 // selcollist is a list of expressions that are to become the return
 // values of the SELECT statement.  The "*" in statements like
 // "SELECT * FROM ..." is encoded as a special expression with an opcode of TK_ALL.
-%type selcollist {tSQLExprList*}
+%type selcollist {SArray*}
 %destructor selcollist {tSqlExprListDestroy($$);}
 
-%type sclp {tSQLExprList*}
+%type sclp {SArray*}
 %destructor sclp {tSqlExprListDestroy($$);}
 sclp(A) ::= selcollist(X) COMMA.             {A = X;}
 sclp(A) ::= .                                {A = 0;}
@@ -489,13 +489,12 @@ selcollist(A) ::= sclp(P) distinct(Z) expr(X) as(Y).     {
 }
 
 selcollist(A) ::= sclp(P) STAR. {
-   tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL);
+   tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL);
    A = tSqlExprListAppend(P, pNode, 0, 0);
 }
 
 // An option "AS <id>" phrase that can follow one of the expressions that
 // define the result set, or one of the tables in the FROM clause.
-//
 %type as {SStrToken}
 as(X) ::= AS ids(Y).    { X = Y;    }
 as(X) ::= ids(Y).       { X = Y;    }
@@ -506,39 +505,36 @@ distinct(X) ::= DISTINCT(Y). { X = Y;  }
 distinct(X) ::= .            { X.n = 0;}
 
 // A complete FROM clause.
-%type from {SArray*}
-// current not support query from no-table
+%type from {SFromInfo*}
 from(A) ::= FROM tablelist(X).                 {A = X;}
+from(A) ::= FROM LP union(Y) RP.               {A = Y;}
 
 %type tablelist {SArray*}
 tablelist(A) ::= ids(X) cpxName(Y).                     {
   toTSDBType(X.type);
   X.n += Y.n;
-  A = tVariantListAppendToken(NULL, &X, -1);
-  A = tVariantListAppendToken(A, &X, -1);  // table alias name
+  A = setTableNameList(NULL, &X, NULL);
 }
 
 tablelist(A) ::= ids(X) cpxName(Y) ids(Z).             {
   toTSDBType(X.type);
   toTSDBType(Z.type);
   X.n += Y.n;
-  A = tVariantListAppendToken(NULL, &X, -1);
-  A = tVariantListAppendToken(A, &Z, -1);
+  A = setTableNameList(NULL, &X, &Z);
 }
 
 tablelist(A) ::= tablelist(Y) COMMA ids(X) cpxName(Z).  {
   toTSDBType(X.type);
   X.n += Z.n;
-  A = tVariantListAppendToken(Y, &X, -1);
-  A = tVariantListAppendToken(A, &X, -1);
+  A = setTableNameList(Y, &X, NULL);
 }
 
 tablelist(A) ::= tablelist(Y) COMMA ids(X) cpxName(Z) ids(F). {
   toTSDBType(X.type);
   toTSDBType(F.type);
   X.n += Z.n;
-  A = tVariantListAppendToken(Y, &X, -1);
-  A = tVariantListAppendToken(A, &F, -1);
+
+  A = setTableNameList(Y, &X, &F);
 }
 
 // The value of interval should be the form of "number+[a,s,m,h,d,n,y]" or "now"
@@ -630,7 +626,7 @@ grouplist(A) ::= item(X).                       {
 }
 
 //having clause, ignore the input condition in having
-%type having_opt {tSQLExpr*}
+%type having_opt {tSqlExpr*}
 %destructor having_opt {tSqlExprDestroy($$);}
 having_opt(A) ::=.                  {A = 0;}
 having_opt(A) ::= HAVING expr(X).   {A = X;}
@@ -652,7 +648,7 @@ slimit_opt(A) ::= SLIMIT signed(X) SOFFSET signed(Y).
 slimit_opt(A) ::= SLIMIT signed(X) COMMA  signed(Y).
                                        {A.limit = Y;  A.offset = X;}
 
-%type where_opt {tSQLExpr*}
+%type where_opt {tSqlExpr*}
 %destructor where_opt {tSqlExprDestroy($$);}
 
 where_opt(A) ::= .                    {A = 0;}
@@ -660,25 +656,25 @@ where_opt(A) ::= WHERE expr(X).       {A = X;}
 
 /////////////////////////// Expression Processing /////////////////////////////
 //
-%type expr {tSQLExpr*}
+%type expr {tSqlExpr*}
 %destructor expr {tSqlExprDestroy($$);}
 
 expr(A) ::= LP(X) expr(Y) RP(Z).       {A = Y; A->token.z = X.z; A->token.n = (Z.z - X.z + 1);}
 
-expr(A) ::= ID(X).               { A = tSqlExprIdValueCreate(&X, TK_ID);}
-expr(A) ::= ID(X) DOT ID(Y).     { X.n += (1+Y.n); A = tSqlExprIdValueCreate(&X, TK_ID);}
-expr(A) ::= ID(X) DOT STAR(Y).   { X.n += (1+Y.n); A = tSqlExprIdValueCreate(&X, TK_ALL);}
+expr(A) ::= ID(X).               { A = tSqlExprCreateIdValue(&X, TK_ID);}
+expr(A) ::= ID(X) DOT ID(Y).     { X.n += (1+Y.n); A = tSqlExprCreateIdValue(&X, TK_ID);}
+expr(A) ::= ID(X) DOT STAR(Y).   { X.n += (1+Y.n); A = tSqlExprCreateIdValue(&X, TK_ALL);}
 
-expr(A) ::= INTEGER(X).          { A = tSqlExprIdValueCreate(&X, TK_INTEGER);}
-expr(A) ::= MINUS(X) INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprIdValueCreate(&X, TK_INTEGER);}
-expr(A) ::= PLUS(X)  INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprIdValueCreate(&X, TK_INTEGER);}
-expr(A) ::= FLOAT(X).            { A = tSqlExprIdValueCreate(&X, TK_FLOAT);}
-expr(A) ::= MINUS(X) FLOAT(Y).   { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprIdValueCreate(&X, TK_FLOAT);}
-expr(A) ::= PLUS(X) FLOAT(Y).    { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprIdValueCreate(&X, TK_FLOAT);}
-expr(A) ::= STRING(X).           { A = tSqlExprIdValueCreate(&X, TK_STRING);}
-expr(A) ::= NOW(X).              { A = tSqlExprIdValueCreate(&X, TK_NOW); }
-expr(A) ::= VARIABLE(X).         { A = tSqlExprIdValueCreate(&X, TK_VARIABLE);}
-expr(A) ::= BOOL(X).             { A = tSqlExprIdValueCreate(&X, TK_BOOL);}
+expr(A) ::= INTEGER(X).          { A = tSqlExprCreateIdValue(&X, TK_INTEGER);}
+expr(A) ::= MINUS(X) INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprCreateIdValue(&X, TK_INTEGER);}
+expr(A) ::= PLUS(X)  INTEGER(Y). { X.n += Y.n; X.type = TK_INTEGER; A = tSqlExprCreateIdValue(&X, TK_INTEGER);}
+expr(A) ::= FLOAT(X).            { A = tSqlExprCreateIdValue(&X, TK_FLOAT);}
+expr(A) ::= MINUS(X) FLOAT(Y).   { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprCreateIdValue(&X, TK_FLOAT);}
+expr(A) ::= PLUS(X) FLOAT(Y).    { X.n += Y.n; X.type = TK_FLOAT; A = tSqlExprCreateIdValue(&X, TK_FLOAT);}
+expr(A) ::= STRING(X).           { A = tSqlExprCreateIdValue(&X, TK_STRING);}
+expr(A) ::= NOW(X).              { A = tSqlExprCreateIdValue(&X, TK_NOW); }
+expr(A) ::= VARIABLE(X).         { A = tSqlExprCreateIdValue(&X, TK_VARIABLE);}
+expr(A) ::= BOOL(X).             { A = tSqlExprCreateIdValue(&X, TK_BOOL);}
 
 // ordinary functions: min(x), max(x), top(k, 20)
 expr(A) ::= ID(X) LP exprlist(Y) RP(E). { A = tSqlExprCreateFunction(Y, &X, &E, X.type); }
@@ -698,7 +694,7 @@ expr(A) ::= expr(X) GE expr(Y).      {A = tSqlExprCreate(X, Y, TK_GE);}
 expr(A) ::= expr(X) NE expr(Y).      {A = tSqlExprCreate(X, Y, TK_NE);}
 expr(A) ::= expr(X) EQ expr(Y).      {A = tSqlExprCreate(X, Y, TK_EQ);}
 
-expr(A) ::= expr(X) BETWEEN expr(Y) AND expr(Z).      { tSQLExpr* X2 = tSqlExprClone(X); A = tSqlExprCreate(tSqlExprCreate(X, Y, TK_GE), tSqlExprCreate(X2, Z, TK_LE), TK_AND);}
+expr(A) ::= expr(X) BETWEEN expr(Y) AND expr(Z).      { tSqlExpr* X2 = tSqlExprClone(X); A = tSqlExprCreate(tSqlExprCreate(X, Y, TK_GE), tSqlExprCreate(X2, Z, TK_LE), TK_AND);}
 
 expr(A) ::= expr(X) AND expr(Y).     {A = tSqlExprCreate(X, Y, TK_AND);}
 expr(A) ::= expr(X) OR  expr(Y).     {A = tSqlExprCreate(X, Y, TK_OR); }
@@ -714,12 +710,12 @@ expr(A) ::= expr(X) REM   expr(Y).   {A = tSqlExprCreate(X, Y, TK_REM);   }
 expr(A) ::= expr(X) LIKE expr(Y).    {A = tSqlExprCreate(X, Y, TK_LIKE);  }
 
 //in expression
-expr(A) ::= expr(X) IN LP exprlist(Y) RP.   {A = tSqlExprCreate(X, (tSQLExpr*)Y, TK_IN); }
+expr(A) ::= expr(X) IN LP exprlist(Y) RP.   {A = tSqlExprCreate(X, (tSqlExpr*)Y, TK_IN); }
 
-%type exprlist {tSQLExprList*}
+%type exprlist {SArray*}
 %destructor exprlist {tSqlExprListDestroy($$);}
 
-%type expritem {tSQLExpr*}
+%type expritem {tSqlExpr*}
 %destructor expritem {tSqlExprDestroy($$);}
 
 exprlist(A) ::= exprlist(X) COMMA expritem(Y). {A = tSqlExprListAppend(X,Y,0, 0);}
@@ -728,12 +724,12 @@ expritem(A) ::= expr(X).                       {A = X;}
 expritem(A) ::= .                              {A = 0;}
 
 ///////////////////////////////////reset query cache//////////////////////////////////////
-cmd ::= RESET QUERY CACHE.  { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
+cmd ::= RESET QUERY CACHE.  { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
 
 ///////////////////////////////////ALTER TABLE statement//////////////////////////////////
 cmd ::= ALTER TABLE ids(X) cpxName(F) ADD COLUMN columnlist(A).     {
     X.n += F.n;
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -743,14 +739,14 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
     toTSDBType(A.type);
     SArray* K = tVariantListAppendToken(NULL, &A, -1);
 
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
 //////////////////////////////////ALTER TAGS statement/////////////////////////////////////
 cmd ::= ALTER TABLE ids(X) cpxName(Y) ADD TAG columnlist(A).        {
     X.n += Y.n;
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
@@ -759,7 +755,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
     toTSDBType(Y.type);
     SArray* A = tVariantListAppendToken(NULL, &Y, -1);
 
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -772,7 +768,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
     toTSDBType(Z.type);
     A = tVariantListAppendToken(A, &Z, -1);
 
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -783,7 +779,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
     SArray* A = tVariantListAppendToken(NULL, &Y, -1);
     A = tVariantListAppend(A, &Z, -1);
 
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -791,7 +787,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
 ///////////////////////////////////ALTER STABLE statement//////////////////////////////////
 cmd ::= ALTER STABLE ids(X) cpxName(F) ADD COLUMN columnlist(A).     {
     X.n += F.n;
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -801,14 +797,14 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
     toTSDBType(A.type);
     SArray* K = tVariantListAppendToken(NULL, &A, -1);
 
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
 //////////////////////////////////ALTER TAGS statement/////////////////////////////////////
 cmd ::= ALTER STABLE ids(X) cpxName(Y) ADD TAG columnlist(A).        {
     X.n += Y.n;
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 cmd ::= ALTER STABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
@@ -817,7 +813,7 @@ cmd ::= ALTER STABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
     toTSDBType(Y.type);
     SArray* A = tVariantListAppendToken(NULL, &Y, -1);
 
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -830,7 +826,7 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
     toTSDBType(Z.type);
     A = tVariantListAppendToken(A, &Z, -1);
 
-    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, TSDB_SUPER_TABLE);
+    SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 

src/query/src/qExecutor.c

@@ -98,6 +98,9 @@ static UNUSED_FUNC void* u_realloc(void* p, size_t __size) {
 #define GET_NUM_OF_TABLEGROUP(q)    taosArrayGetSize((q)->tableqinfoGroupInfo.pGroupList)
 #define QUERY_IS_INTERVAL_QUERY(_q) ((_q)->interval.interval > 0)
 
+
+uint64_t queryHandleId = 0;
+
 int32_t getMaximumIdleDurationSec() {
   return tsShellActivityTimer * 2;
 }
@@ -476,22 +479,41 @@ static SResultRow *doPrepareResultRowFromKey(SQueryRuntimeEnv *pRuntimeEnv, SRes
   return getResultRow(pResultRowInfo, pResultRowInfo->curIndex);
 }
 
+static void getInitialStartTimeWindow(SQuery* pQuery, TSKEY ts, STimeWindow* w) {
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    getAlignQueryTimeWindow(pQuery, ts, ts, pQuery->window.ekey, w);
+  } else {
+    // the start position of the first time window in the endpoint that spreads beyond the queried last timestamp
+    getAlignQueryTimeWindow(pQuery, ts, pQuery->window.ekey, ts, w);
+
+    int64_t key = w->skey;
+    while(key < ts) { // moving towards end
+      if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+        key = taosTimeAdd(key, pQuery->interval.sliding, pQuery->interval.slidingUnit, pQuery->precision);
+      } else {
+        key += pQuery->interval.sliding;
+      }
+
+      if (key >= ts) {
+        break;
+      }
+
+      w->skey = key;
+    }
+  }
+}
+
 // get the correct time window according to the handled timestamp
 static STimeWindow getActiveTimeWindow(SResultRowInfo * pResultRowInfo, int64_t ts, SQuery *pQuery) {
   STimeWindow w = {0};
 
  if (pResultRowInfo->curIndex == -1) {  // the first window, from the previous stored value
-   if (pResultRowInfo->prevSKey == TSKEY_INITIAL_VAL) {
-     if (QUERY_IS_ASC_QUERY(pQuery)) {
-       getAlignQueryTimeWindow(pQuery, ts, ts, pQuery->window.ekey, &w);
-     } else { // the start position of the first time window in the endpoint that spreads beyond the queried last timestamp
-       getAlignQueryTimeWindow(pQuery, ts, pQuery->window.ekey, ts, &w);
-     }
-
-     pResultRowInfo->prevSKey = w.skey;
-   } else {
-    w.skey = pResultRowInfo->prevSKey;
-   }
+    if (pResultRowInfo->prevSKey == TSKEY_INITIAL_VAL) {
+      getInitialStartTimeWindow(pQuery, ts, &w);
+      pResultRowInfo->prevSKey = w.skey;
+    } else {
+      w.skey = pResultRowInfo->prevSKey;
+    }
 
     if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
       w.ekey = taosTimeAdd(w.skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
@@ -2347,13 +2369,13 @@ static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, TSKEY key, bool asc
 }
 
 void filterRowsInDataBlock(SQueryRuntimeEnv* pRuntimeEnv, SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFilterCols,
-                        SSDataBlock* pBlock, STSBuf* pTsBuf, bool ascQuery) {
+                        SSDataBlock* pBlock, bool ascQuery) {
   int32_t numOfRows = pBlock->info.rows;
 
   int8_t *p = calloc(numOfRows, sizeof(int8_t));
   bool    all = true;
 
-  if (pTsBuf != NULL) {
+  if (pRuntimeEnv->pTsBuf != NULL) {
     SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, 0);
 
     TSKEY* k = (TSKEY*) pColInfoData->pData;
@@ -2374,6 +2396,9 @@ void filterRowsInDataBlock(SQueryRuntimeEnv* pRuntimeEnv, SSingleColumnFilterInf
         break;
       }
     }
+
+    // save the cursor status
+    pRuntimeEnv->pQuery->current->cur = tsBufGetCursor(pRuntimeEnv->pTsBuf);
   } else {
     for (int32_t i = 0; i < numOfRows; ++i) {
       bool qualified = false;
@@ -2634,8 +2659,7 @@ int32_t loadDataBlockOnDemand(SQueryRuntimeEnv* pRuntimeEnv, STableScanInfo* pTa
 
     doSetFilterColumnInfo(pQuery, pBlock);
     if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTsBuf != NULL) {
-      filterRowsInDataBlock(pRuntimeEnv, pQuery->pFilterInfo, pQuery->numOfFilterCols, pBlock, pRuntimeEnv->pTsBuf,
-                            ascQuery);
+      filterRowsInDataBlock(pRuntimeEnv, pQuery->pFilterInfo, pQuery->numOfFilterCols, pBlock, ascQuery);
     }
   }
 
@@ -2726,7 +2750,10 @@ static void doSetTagValueInParam(void* pTable, int32_t tagColId, tVariant *tag,
   }
 
   if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-    tVariantCreateFromBinary(tag, varDataVal(val), varDataLen(val), type);
+    int32_t maxLen = bytes - VARSTR_HEADER_SIZE;
+    int32_t len = (varDataLen(val) > maxLen)? maxLen:varDataLen(val);
+    tVariantCreateFromBinary(tag, varDataVal(val), len, type);
+    //tVariantCreateFromBinary(tag, varDataVal(val), varDataLen(val), type);
   } else {
     tVariantCreateFromBinary(tag, val, bytes, type);
   }
@@ -4149,8 +4176,10 @@ static SSDataBlock* doTableScan(void* param) {
       assert(ret);
     }
 
-    pResultRowInfo->curIndex = 0;
-    pResultRowInfo->prevSKey = pResultRowInfo->pResult[0]->win.skey;
+    if (pResultRowInfo->size > 0) {
+      pResultRowInfo->curIndex = 0;
+      pResultRowInfo->prevSKey = pResultRowInfo->pResult[0]->win.skey;
+    }
 
     qDebug("QInfo:%p start to repeat scan data blocks due to query func required, qrange:%" PRId64 "-%" PRId64,
            pRuntimeEnv->qinfo, cond.twindow.skey, cond.twindow.ekey);
@@ -4564,7 +4593,7 @@ static SSDataBlock* doOffset(void* param) {
 
     if (pRuntimeEnv->currentOffset == 0) {
       return pBlock;
-    } else if (pRuntimeEnv->currentOffset > pBlock->info.rows) {
+    } else if (pRuntimeEnv->currentOffset >= pBlock->info.rows) {
       pRuntimeEnv->currentOffset -= pBlock->info.rows;
     } else {
       int32_t remain = (int32_t)(pBlock->info.rows - pRuntimeEnv->currentOffset);
@@ -6085,9 +6114,13 @@ void setResultBufSize(SQuery* pQuery, SRspResultInfo* pResultInfo) {
   pResultInfo->total = 0;
 }
 
+FORCE_INLINE bool checkQIdEqual(void *qHandle, uint64_t qId) {
+  return ((SQInfo *)qHandle)->qId == qId;
+}
+
 SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SSqlGroupbyExpr* pGroupbyExpr, SExprInfo* pExprs,
                         SExprInfo* pSecExprs, STableGroupInfo* pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery,
-                        char* sql) {
+                        char* sql, uint64_t *qId) {
   int16_t numOfCols = pQueryMsg->numOfCols;
   int16_t numOfOutput = pQueryMsg->numOfOutput;
 
@@ -6228,7 +6261,9 @@ SQInfo* createQInfoImpl(SQueryTableMsg* pQueryMsg, SSqlGroupbyExpr* pGroupbyExpr
   // todo refactor
   pQInfo->query.queryBlockDist = (numOfOutput == 1 && pExprs[0].base.colInfo.colId == TSDB_BLOCK_DIST_COLUMN_INDEX);
 
-  qDebug("qmsg:%p QInfo:%p created", pQueryMsg, pQInfo);
+  pQInfo->qId = atomic_add_fetch_64(&queryHandleId, 1);
+  *qId = pQInfo->qId;
+  qDebug("qmsg:%p QInfo:%" PRIu64 "-%p created", pQueryMsg, pQInfo->qId, pQInfo);
   return pQInfo;
 
 _cleanup_qinfo:
@@ -6518,8 +6553,15 @@ static void doSetTagValueToResultBuf(char* output, const char* val, int16_t type
     return;
   }
 
-  if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-    memcpy(output, val, varDataTLen(val));
+  if (IS_VAR_DATA_TYPE(type)) {
+    // Binary data overflows for sort of unknown reasons. Let trim the overflow data
+    if (varDataTLen(val) > bytes) {
+      int32_t len = bytes - VARSTR_HEADER_SIZE;   // remain available space
+      memcpy(varDataVal(output), varDataVal(val), len);
+      varDataSetLen(output, len);
+    } else {
+      varDataCopy(output, val);
+    }
   } else {
     memcpy(output, val, bytes);
   }

src/query/src/qSqlParser.c

@@ -23,7 +23,7 @@
 #include "ttokendef.h"
 #include "tutil.h"
 
-SSqlInfo qSQLParse(const char *pStr) {
+SSqlInfo qSqlParse(const char *pStr) {
   void *pParser = ParseAlloc(malloc);
 
   SSqlInfo sqlInfo = {0};
@@ -80,53 +80,48 @@ abort_parse:
   return sqlInfo;
 }
 
-tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pDistinct, SStrToken *pToken) {
+SArray *tSqlExprListAppend(SArray *pList, tSqlExpr *pNode, SStrToken *pDistinct, SStrToken *pToken) {
   if (pList == NULL) {
-    pList = calloc(1, sizeof(tSQLExprList));
+    pList = taosArrayInit(4, sizeof(tSqlExprItem));
   }
 
-  if (pList->nAlloc <= pList->nExpr) {
-    pList->nAlloc = (pList->nAlloc << 1u) + 4;
-    pList->a = realloc(pList->a, pList->nAlloc * sizeof(pList->a[0]));
-    if (pList->a == 0) {
-      pList->nExpr = pList->nAlloc = 0;
-      return pList;
-    }
-  }
-  assert(pList->a != 0);
-
   if (pNode || pToken) {
-    struct tSqlExprItem *pItem = &pList->a[pList->nExpr++];
-    memset(pItem, 0, sizeof(*pItem));
-    pItem->pNode = pNode;
-    if (pToken) {  // set the as clause
-      pItem->aliasName = malloc(pToken->n + 1);
-      strncpy(pItem->aliasName, pToken->z, pToken->n);
-      pItem->aliasName[pToken->n] = 0;
+    struct tSqlExprItem item = {0};
 
-      strdequote(pItem->aliasName);
+    item.pNode = pNode;
+    item.distinct = (pDistinct != NULL);
+
+    if (pToken) {  // set the as clause
+      item.aliasName = malloc(pToken->n + 1);
+      strncpy(item.aliasName, pToken->z, pToken->n);
+      item.aliasName[pToken->n] = 0;
+
+      strdequote(item.aliasName);
     }
-    pItem->distinct = (pDistinct != NULL);
+
+    taosArrayPush(pList, &item);
   }
+
   return pList;
 }
 
-void tSqlExprListDestroy(tSQLExprList *pList) {
-  if (pList == NULL) return;
+static void freeExprElem(void* item) {
+  tSqlExprItem* exprItem = item;
 
-  for (int32_t i = 0; i < pList->nExpr; ++i) {
-    if (pList->a[i].aliasName != NULL) {
-      free(pList->a[i].aliasName);
-    }
-    tSqlExprDestroy(pList->a[i].pNode);
-  }
-
-  free(pList->a);
-  free(pList);
+  tfree(exprItem->aliasName);
+  tSqlExprDestroy(exprItem->pNode);
 }
 
-tSQLExpr *tSqlExprIdValueCreate(SStrToken *pToken, int32_t optrType) {
-  tSQLExpr *pSqlExpr = calloc(1, sizeof(tSQLExpr));
+void tSqlExprListDestroy(SArray *pList) {
+  if (pList == NULL) {
+    return;
+  }
+
+  taosArrayDestroyEx(pList, freeExprElem);
+}
+
+tSqlExpr *tSqlExprCreateIdValue(SStrToken *pToken, int32_t optrType) {
+  tSqlExpr *pSqlExpr = calloc(1, sizeof(tSqlExpr));
 
   if (pToken != NULL) {
     pSqlExpr->token = *pToken;
@@ -171,15 +166,15 @@ tSQLExpr *tSqlExprIdValueCreate(SStrToken *pToken, int32_t optrType) {
  * pList is the parameters for function with id(optType)
  * function name is denoted by pFunctionToken
  */
-tSQLExpr *tSqlExprCreateFunction(tSQLExprList *pList, SStrToken *pFuncToken, SStrToken *endToken, int32_t optType) {
+tSqlExpr *tSqlExprCreateFunction(SArray *pParam, SStrToken *pFuncToken, SStrToken *endToken, int32_t optType) {
   if (pFuncToken == NULL) {
     return NULL;
   }
 
-  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
+  tSqlExpr *pExpr = calloc(1, sizeof(tSqlExpr));
   pExpr->tokenId = optType;
   pExpr->type    = SQL_NODE_SQLFUNCTION;
-  pExpr->pParam  = pList;
+  pExpr->pParam  = pParam;
 
   int32_t len = (int32_t)((endToken->z + endToken->n) - pFuncToken->z);
   pExpr->operand = (*pFuncToken);
@@ -193,14 +188,14 @@ tSQLExpr *tSqlExprCreateFunction(tSQLExprList *pList, SStrToken *pFuncToken, SSt
 
 /*
  * create binary expression in this procedure
- * if the expr is arithmetic, calculate the result and set it to tSQLExpr Object
+ * if the expr is arithmetic, calculate the result and set it to tSqlExpr Object
  */
-tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
-  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
+tSqlExpr *tSqlExprCreate(tSqlExpr *pLeft, tSqlExpr *pRight, int32_t optrType) {
+  tSqlExpr *pExpr = calloc(1, sizeof(tSqlExpr));
 
   pExpr->type = SQL_NODE_EXPR;
   if (pLeft != NULL && pRight != NULL && (optrType != TK_IN)) {
-    char* endPos = pRight->token.z + pRight->token.n;
+    char* endPos   = pRight->token.z + pRight->token.n;
     pExpr->token.z = pLeft->token.z;
     pExpr->token.n = (uint32_t)(endPos - pExpr->token.z);
     pExpr->token.type = pLeft->token.type;
@@ -291,9 +286,9 @@ tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
     pExpr->tokenId = optrType;
     pExpr->pLeft = pLeft;
 
-    tSQLExpr *pRSub = calloc(1, sizeof(tSQLExpr));
+    tSqlExpr *pRSub = calloc(1, sizeof(tSqlExpr));
     pRSub->tokenId = TK_SET;  // TODO refactor .....
-    pRSub->pParam = (tSQLExprList *)pRight;
+    pRSub->pParam = (SArray *)pRight;
 
     pExpr->pRight = pRSub;
   } else {
@@ -301,7 +296,7 @@ tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
     pExpr->pLeft = pLeft;
 
     if (pLeft != NULL && pRight == NULL) {
-      pRight = calloc(1, sizeof(tSQLExpr));
+      pRight = calloc(1, sizeof(tSqlExpr));
     }
 
     pExpr->pRight = pRight;
@@ -310,10 +305,8 @@ tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
   return pExpr;
 }
 
-
-
-tSQLExpr *tSqlExprClone(tSQLExpr *pSrc) {
-  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
+tSqlExpr *tSqlExprClone(tSqlExpr *pSrc) {
+  tSqlExpr *pExpr = calloc(1, sizeof(tSqlExpr));
 
   memcpy(pExpr, pSrc, sizeof(*pSrc));
   
@@ -327,12 +320,51 @@ tSQLExpr *tSqlExprClone(tSQLExpr *pSrc) {
 
   //we don't clone pParam now because clone is only used for between/and
   assert(pSrc->pParam == NULL);
-
   return pExpr;
 }
 
+void tSqlExprCompact(tSqlExpr** pExpr) {
+  if (*pExpr == NULL || tSqlExprIsParentOfLeaf(*pExpr)) {
+    return;
+  }
 
-void tSqlExprNodeDestroy(tSQLExpr *pExpr) {
+  if ((*pExpr)->pLeft) {
+    tSqlExprCompact(&(*pExpr)->pLeft);
+  }
+
+  if ((*pExpr)->pRight) {
+    tSqlExprCompact(&(*pExpr)->pRight);
+  }
+
+  if ((*pExpr)->pLeft == NULL && (*pExpr)->pRight == NULL && ((*pExpr)->tokenId == TK_OR || (*pExpr)->tokenId == TK_AND)) {
+    tSqlExprDestroy(*pExpr);
+    *pExpr = NULL;
+  } else if ((*pExpr)->pLeft == NULL && (*pExpr)->pRight != NULL) {
+    tSqlExpr* tmpPtr = (*pExpr)->pRight;
+    (*pExpr)->pRight = NULL;
+
+    tSqlExprDestroy(*pExpr);
+    (*pExpr) = tmpPtr;
+  } else if ((*pExpr)->pRight == NULL && (*pExpr)->pLeft != NULL) {
+    tSqlExpr* tmpPtr = (*pExpr)->pLeft;
+    (*pExpr)->pLeft = NULL;
+
+    tSqlExprDestroy(*pExpr);
+    (*pExpr) = tmpPtr;
+  }
+}
+
+bool tSqlExprIsLeaf(tSqlExpr* pExpr) {
+  return (pExpr->pRight == NULL && pExpr->pLeft == NULL) &&
+         (pExpr->tokenId == 0 || pExpr->tokenId == TK_ID || (pExpr->tokenId >= TK_BOOL && pExpr->tokenId <= TK_NCHAR) || pExpr->tokenId == TK_SET);
+}
+
+bool tSqlExprIsParentOfLeaf(tSqlExpr* pExpr) {
+  return (pExpr->pLeft != NULL && pExpr->pRight != NULL) &&
+         (tSqlExprIsLeaf(pExpr->pLeft) && tSqlExprIsLeaf(pExpr->pRight));
+}
+
+static void doDestroySqlExprNode(tSqlExpr *pExpr) {
   if (pExpr == NULL) {
     return;
   }
@@ -342,11 +374,10 @@ void tSqlExprNodeDestroy(tSQLExpr *pExpr) {
   }
 
   tSqlExprListDestroy(pExpr->pParam);
-
   free(pExpr);
 }
 
-void tSqlExprDestroy(tSQLExpr *pExpr) {
+void tSqlExprDestroy(tSqlExpr *pExpr) {
   if (pExpr == NULL) {
     return;
   }
@@ -355,7 +386,8 @@ void tSqlExprDestroy(tSQLExpr *pExpr) {
   pExpr->pLeft = NULL;
   tSqlExprDestroy(pExpr->pRight);
   pExpr->pRight = NULL;
-  tSqlExprNodeDestroy(pExpr);
+
+  doDestroySqlExprNode(pExpr);
 }
 
 SArray *tVariantListAppendToken(SArray *pList, SStrToken *pToken, uint8_t order) {
@@ -411,13 +443,59 @@ SArray *tVariantListInsert(SArray *pList, tVariant *pVar, uint8_t sortOrder, int
   return pList;
 }
 
-void setDbName(SStrToken *pCpxName, SStrToken *pDb) {
+SFromInfo *setTableNameList(SFromInfo* pFromInfo, SStrToken *pName, SStrToken* pAlias) {
+  if (pFromInfo == NULL) {
+    pFromInfo = calloc(1, sizeof(SFromInfo));
+    pFromInfo->tableList = taosArrayInit(4, sizeof(STableNamePair));
+  }
+
+  pFromInfo->type = SQL_NODE_FROM_NAMELIST;
+  STableNamePair p = {.name = *pName};
+  if (pAlias != NULL) {
+    p.aliasName = *pAlias;
+  } else {
+    TPARSER_SET_NONE_TOKEN(p.aliasName);
+  }
+
+  taosArrayPush(pFromInfo->tableList, &p);
+
+  return pFromInfo;
+}
+
+SFromInfo *setSubquery(SFromInfo* pFromInfo, SQuerySqlNode* pSqlNode) {
+  if (pFromInfo == NULL) {
+    pFromInfo = calloc(1, sizeof(SFromInfo));
+  }
+
+  pFromInfo->type = SQL_NODE_FROM_SUBQUERY;
+  pFromInfo->pNode->pClause[pFromInfo->pNode->numOfClause - 1] = pSqlNode;
+
+  return pFromInfo;
+}
+
+void* destroyFromInfo(SFromInfo* pFromInfo) {
+  if (pFromInfo == NULL) {
+    return NULL;
+  }
+
+  if (pFromInfo->type == SQL_NODE_FROM_NAMELIST) {
+    taosArrayDestroy(pFromInfo->tableList);
+  } else {
+    destroyAllSelectClause(pFromInfo->pNode);
+  }
+
+  tfree(pFromInfo);
+  return NULL;
+}
+
+
+void tSetDbName(SStrToken *pCpxName, SStrToken *pDb) {
   pCpxName->type = pDb->type;
   pCpxName->z = pDb->z;
   pCpxName->n = pDb->n;
 }
 
-void tSqlSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType) {
+void tSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType) {
   int32_t maxLen = sizeof(pField->name) / sizeof(pField->name[0]);
   
   // truncate the column name
@@ -485,7 +563,7 @@ static int32_t tryParseNameTwoParts(SStrToken *type) {
   }
 }
 
-void tSqlSetColumnType(TAOS_FIELD *pField, SStrToken *type) {
+void tSetColumnType(TAOS_FIELD *pField, SStrToken *type) {
   // set the field type invalid
   pField->type = -1;
   pField->name[0] = 0;
@@ -550,43 +628,60 @@ void tSqlSetColumnType(TAOS_FIELD *pField, SStrToken *type) {
 /*
  * extract the select info out of sql string
  */
-SQuerySQL *tSetQuerySqlNode(SStrToken *pSelectToken, tSQLExprList *pSelection, SArray *pFrom, tSQLExpr *pWhere,
-                             SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval, SSessionWindowVal *pSession,
-                             SStrToken *pSliding, SArray *pFill, SLimitVal *pLimit, SLimitVal *pGLimit) {
-  assert(pSelection != NULL);
+SQuerySqlNode *tSetQuerySqlNode(SStrToken *pSelectToken, SArray *pSelectList, SFromInfo *pFrom, tSqlExpr *pWhere,
+                                SArray *pGroupby, SArray *pSortOrder, SIntervalVal *pInterval,
+                                SSessionWindowVal *pSession, SStrToken *pSliding, SArray *pFill, SLimitVal *pLimit,
+                                SLimitVal *psLimit) {
+  assert(pSelectList != NULL);
 
-  SQuerySQL *pQuery = calloc(1, sizeof(SQuerySQL));
-  pQuery->selectToken = *pSelectToken;
-  pQuery->selectToken.n = (uint32_t)strlen(pQuery->selectToken.z);  // all later sql string are belonged to the stream sql
+  SQuerySqlNode *pSqlNode = calloc(1, sizeof(SQuerySqlNode));
 
-  pQuery->pSelection = pSelection;
-  pQuery->from = pFrom;
-  pQuery->pGroupby = pGroupby;
-  pQuery->pSortOrder = pSortOrder;
-  pQuery->pWhere = pWhere;
+  // all later sql string are belonged to the stream sql
+  pSqlNode->sqlstr   = *pSelectToken;
+  pSqlNode->sqlstr.n = (uint32_t)strlen(pSqlNode->sqlstr.z);
+
+  pSqlNode->pSelectList = pSelectList;
+  pSqlNode->from        = pFrom;
+  pSqlNode->pGroupby    = pGroupby;
+  pSqlNode->pSortOrder  = pSortOrder;
+  pSqlNode->pWhere      = pWhere;
+  pSqlNode->fillType    = pFill;
 
   if (pLimit != NULL) {
-    pQuery->limit = *pLimit;
+    pSqlNode->limit = *pLimit;
+  } else {
+    pSqlNode->limit.limit = -1;
+    pSqlNode->limit.offset = 0;
   }
 
-  if (pGLimit != NULL) {
-    pQuery->slimit = *pGLimit;
+  if (psLimit != NULL) {
+    pSqlNode->slimit = *psLimit;
+  } else {
+    pSqlNode->slimit.limit = -1;
+    pSqlNode->slimit.offset = 0;
   }
 
   if (pInterval != NULL) {
-    pQuery->interval = *pInterval;
+    pSqlNode->interval = *pInterval;
+  } else {
+    TPARSER_SET_NONE_TOKEN(pSqlNode->interval.interval);
+    TPARSER_SET_NONE_TOKEN(pSqlNode->interval.offset);
   }
 
   if (pSliding != NULL) {
-    pQuery->sliding = *pSliding;
+    pSqlNode->sliding = *pSliding;
+  } else {
+    TPARSER_SET_NONE_TOKEN(pSqlNode->sliding);
   }
 
   if (pSession != NULL) {
-    pQuery->sessionVal = *pSession;
+    pSqlNode->sessionVal = *pSession;
+  } else {
+    TPARSER_SET_NONE_TOKEN(pSqlNode->sessionVal.gap);
+    TPARSER_SET_NONE_TOKEN(pSqlNode->sessionVal.col);
   }
 
-  pQuery->fillType = pFill;
-  return pQuery;
+  return pSqlNode;
 }
 
 static void freeVariant(void *pItem) {
@@ -602,14 +697,14 @@ void freeCreateTableInfo(void* p) {
   tfree(pInfo->tagdata.data);
 }
 
-void doDestroyQuerySql(SQuerySQL *pQuerySql) {
+void destroyQuerySqlNode(SQuerySqlNode *pQuerySql) {
   if (pQuerySql == NULL) {
     return;
   }
 
-  tSqlExprListDestroy(pQuerySql->pSelection);
+  tSqlExprListDestroy(pQuerySql->pSelectList);
   
-  pQuerySql->pSelection = NULL;
+  pQuerySql->pSelectList = NULL;
 
   tSqlExprDestroy(pQuerySql->pWhere);
   pQuerySql->pWhere = NULL;
@@ -620,8 +715,7 @@ void doDestroyQuerySql(SQuerySQL *pQuerySql) {
   taosArrayDestroyEx(pQuerySql->pGroupby, freeVariant);
   pQuerySql->pGroupby = NULL;
 
-  taosArrayDestroyEx(pQuerySql->from, freeVariant);
-  pQuerySql->from = NULL;
+  pQuerySql->from = destroyFromInfo(pQuerySql->from);
 
   taosArrayDestroyEx(pQuerySql->fillType, freeVariant);
   pQuerySql->fillType = NULL;
@@ -635,15 +729,15 @@ void destroyAllSelectClause(SSubclauseInfo *pClause) {
   }
 
   for(int32_t i = 0; i < pClause->numOfClause; ++i) {
-    SQuerySQL *pQuerySql = pClause->pClause[i];
-    doDestroyQuerySql(pQuerySql);
+    SQuerySqlNode *pQuerySql = pClause->pClause[i];
+    destroyQuerySqlNode(pQuerySql);
   }
   
   tfree(pClause->pClause);
 }
 
-SCreateTableSQL *tSetCreateSqlElems(SArray *pCols, SArray *pTags, SQuerySQL *pSelect, int32_t type) {
-  SCreateTableSQL *pCreate = calloc(1, sizeof(SCreateTableSQL));
+SCreateTableSql *tSetCreateTableInfo(SArray *pCols, SArray *pTags, SQuerySqlNode *pSelect, int32_t type) {
+  SCreateTableSql *pCreate = calloc(1, sizeof(SCreateTableSql));
 
   switch (type) {
     case TSQL_CREATE_TABLE: {
@@ -687,7 +781,7 @@ SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagNam
   return info;
 }
 
-SAlterTableInfo *tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type, int16_t tableType) {
+SAlterTableInfo *tSetAlterTableInfo(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type, int16_t tableType) {
   SAlterTableInfo *pAlterTable = calloc(1, sizeof(SAlterTableInfo));
   
   pAlterTable->name = *pTableName;
@@ -709,8 +803,8 @@ SAlterTableInfo *tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArra
   return pAlterTable;
 }
 
-void* destroyCreateTableSql(SCreateTableSQL* pCreate) {
-  doDestroyQuerySql(pCreate->pSelect);
+void* destroyCreateTableSql(SCreateTableSql* pCreate) {
+  destroyQuerySqlNode(pCreate->pSelect);
 
   taosArrayDestroy(pCreate->colInfo.pColumns);
   taosArrayDestroy(pCreate->colInfo.pTagColumns);
@@ -757,7 +851,7 @@ SSubclauseInfo* setSubclause(SSubclauseInfo* pSubclause, void *pSqlExprInfo) {
     return pSubclause;
   }
   
-  pSubclause->pClause = (SQuerySQL**) tmp;
+  pSubclause->pClause = (SQuerySqlNode**) tmp;
   
   pSubclause->pClause[newSize - 1] = pSqlExprInfo;
   pSubclause->numOfClause++;
@@ -765,7 +859,7 @@ SSubclauseInfo* setSubclause(SSubclauseInfo* pSubclause, void *pSqlExprInfo) {
   return pSubclause;
 }
 
-SSqlInfo*setSqlInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SStrToken *pTableName, int32_t type) {
+SSqlInfo* setSqlInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SStrToken *pTableName, int32_t type) {
   pInfo->type = type;
   
   if (type == TSDB_SQL_SELECT) {
@@ -788,7 +882,7 @@ SSubclauseInfo* appendSelectClause(SSubclauseInfo *pQueryInfo, void *pSubclause)
     return pQueryInfo;
   }
   
-  pQueryInfo->pClause = (SQuerySQL**) tmp;
+  pQueryInfo->pClause = (SQuerySqlNode**) tmp;
   pQueryInfo->pClause[pQueryInfo->numOfClause++] = pSubclause;
   
   return pQueryInfo;
@@ -799,7 +893,7 @@ void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pTableNameToken, SStrToken
   pInfo->pCreateTableInfo->existCheck = (pIfNotExists->n != 0);
 }
 
-void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParam, ...) {
+void setDCLSqlElems(SSqlInfo *pInfo, int32_t type, int32_t nParam, ...) {
   pInfo->type = type;
   if (nParam == 0) {
     return;

src/query/src/queryMain.c

@@ -68,7 +68,7 @@ void freeParam(SQueryParam *param) {
   tfree(param->prevResult);
 }
 
-int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qinfo_t* pQInfo) {
+int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qinfo_t* pQInfo, uint64_t *qId) {
   assert(pQueryMsg != NULL && tsdb != NULL);
 
   int32_t code = TSDB_CODE_SUCCESS;
@@ -158,7 +158,7 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qi
     goto _over;
   }
 
-  (*pQInfo) = createQInfoImpl(pQueryMsg, param.pGroupbyExpr, param.pExprs, param.pSecExprs, &tableGroupInfo, param.pTagColumnInfo, isSTableQuery, param.sql);
+  (*pQInfo) = createQInfoImpl(pQueryMsg, param.pGroupbyExpr, param.pExprs, param.pSecExprs, &tableGroupInfo, param.pTagColumnInfo, isSTableQuery, param.sql, qId);
 
   param.sql    = NULL;
   param.pExprs = NULL;
@@ -472,7 +472,7 @@ void qCleanupQueryMgmt(void* pQMgmt) {
   qDebug("vgId:%d, queryMgmt cleanup completed", vgId);
 }
 
-void** qRegisterQInfo(void* pMgmt, uint64_t qInfo) {
+void** qRegisterQInfo(void* pMgmt, uint64_t qId, uint64_t qInfo) {
   if (pMgmt == NULL) {
     terrno = TSDB_CODE_VND_INVALID_VGROUP_ID;
     return NULL;
@@ -492,8 +492,7 @@ void** qRegisterQInfo(void* pMgmt, uint64_t qInfo) {
     terrno = TSDB_CODE_VND_INVALID_VGROUP_ID;
     return NULL;
   } else {
-    TSDB_CACHE_PTR_TYPE handleVal = (TSDB_CACHE_PTR_TYPE) qInfo;
-    void** handle = taosCachePut(pQueryMgmt->qinfoPool, &handleVal, sizeof(TSDB_CACHE_PTR_TYPE), &qInfo, sizeof(TSDB_CACHE_PTR_TYPE),
+    void** handle = taosCachePut(pQueryMgmt->qinfoPool, &qId, sizeof(qId), &qInfo, sizeof(TSDB_CACHE_PTR_TYPE),
                                  (getMaximumIdleDurationSec()*1000));
     pthread_mutex_unlock(&pQueryMgmt->lock);
 

src/sync/inc/syncInt.h

@@ -117,6 +117,7 @@ typedef struct SSyncNode {
   FStartSyncFile    startSyncFileFp;
   FStopSyncFile     stopSyncFileFp;
   FGetVersion       getVersionFp;
+  FResetVersion     resetVersionFp;
   FSendFile         sendFileFp;
   FRecvFile         recvFileFp;
   pthread_mutex_t   mutex;

src/sync/src/syncMain.c

@@ -56,7 +56,7 @@ static void    syncMonitorNodeRole(void *param, void *tmrId);
 static void    syncProcessFwdAck(SSyncNode *pNode, SFwdInfo *pFwdInfo, int32_t code);
 static int32_t syncSaveFwdInfo(SSyncNode *pNode, uint64_t version, void *mhandle);
 static void    syncRestartPeer(SSyncPeer *pPeer);
-static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle, int32_t qtyp);
+static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle, int32_t qtype, bool force);
 
 static SSyncPeer *syncAddPeer(SSyncNode *pNode, const SNodeInfo *pInfo);
 static void       syncStartCheckPeerConn(SSyncPeer *pPeer);
@@ -182,6 +182,7 @@ int64_t syncStart(const SSyncInfo *pInfo) {
   pNode->startSyncFileFp = pInfo->startSyncFileFp;
   pNode->stopSyncFileFp = pInfo->stopSyncFileFp;
   pNode->getVersionFp = pInfo->getVersionFp;
+  pNode->resetVersionFp = pInfo->resetVersionFp;
   pNode->sendFileFp = pInfo->sendFileFp;
   pNode->recvFileFp = pInfo->recvFileFp;
 
@@ -377,24 +378,24 @@ int32_t syncReconfig(int64_t rid, const SSyncCfg *pNewCfg) {
   return 0;
 }
 
-int32_t syncForwardToPeer(int64_t rid, void *data, void *mhandle, int32_t qtype) {
+int32_t syncForwardToPeer(int64_t rid, void *data, void *mhandle, int32_t qtype, bool force) {
   if (rid <= 0) return 0;
 
   SSyncNode *pNode = syncAcquireNode(rid);
   if (pNode == NULL) return 0;
 
-  int32_t code = syncForwardToPeerImpl(pNode, data, mhandle, qtype);
+  int32_t code = syncForwardToPeerImpl(pNode, data, mhandle, qtype, force);
 
   syncReleaseNode(pNode);
   return code;
 }
 
-void syncConfirmForward(int64_t rid, uint64_t version, int32_t code) {
+void syncConfirmForward(int64_t rid, uint64_t version, int32_t code, bool force) {
   SSyncNode *pNode = syncAcquireNode(rid);
   if (pNode == NULL) return;
 
   SSyncPeer *pPeer = pNode->pMaster;
-  if (pPeer && pNode->quorum > 1) {
+  if (pPeer && (pNode->quorum > 1 || force)) {
     SFwdRsp rsp;
     syncBuildSyncFwdRsp(&rsp, pNode->vgId, version, code);
 
@@ -1413,7 +1414,7 @@ static void syncMonitorFwdInfos(void *param, void *tmrId) {
   syncReleaseNode(pNode);
 }
 
-static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle, int32_t qtype) {
+static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle, int32_t qtype, bool force) {
   SSyncPeer *pPeer;
   SSyncHead *pSyncHead;
   SWalHead * pWalHead = data;
@@ -1457,7 +1458,7 @@ static int32_t syncForwardToPeerImpl(SSyncNode *pNode, void *data, void *mhandle
     if (pPeer == NULL || pPeer->peerFd < 0) continue;
     if (pPeer->role != TAOS_SYNC_ROLE_SLAVE && pPeer->sstatus != TAOS_SYNC_STATUS_CACHE) continue;
 
-    if (pNode->quorum > 1 && code == 0) {
+    if ((pNode->quorum > 1 || force) && code == 0) {
       code = syncSaveFwdInfo(pNode, pWalHead->version, mhandle);
       if (code >= 0) code = 1;
     }

src/sync/src/syncRestore.c

@@ -238,6 +238,7 @@ static int32_t syncRestoreDataStepByStep(SSyncPeer *pPeer) {
 
   (*pNode->stopSyncFileFp)(pNode->vgId, fversion);
   nodeVersion = fversion;
+  if (pNode->resetVersionFp) (*pNode->resetVersionFp)(pNode->vgId, fversion);
 
   sInfo("%s, start to restore wal, fver:%" PRIu64, pPeer->id, nodeVersion);
   uint64_t wver = 0;

src/tsdb/src/tsdbRead.c

@@ -1021,6 +1021,14 @@ static int32_t doLoadFileDataBlock(STsdbQueryHandle* pQueryHandle, SBlock* pBloc
 
   pBlock->numOfRows = pCols->numOfRows;
 
+  // Convert from TKEY to TSKEY for primary timestamp column if current block has timestamp before 1970-01-01T00:00:00Z
+  if(pBlock->keyFirst < 0 && colIds[0] == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+    int64_t* src = pCols->cols[0].pData;
+    for(int32_t i = 0; i < pBlock->numOfRows; ++i) {
+      src[i] = tdGetKey(src[i]);
+    }
+  }
+
   int64_t elapsedTime = (taosGetTimestampUs() - st);
   pQueryHandle->cost.blockLoadTime += elapsedTime;
 
@@ -1277,13 +1285,7 @@ int32_t doCopyRowsFromFileBlock(STsdbQueryHandle* pQueryHandle, int32_t capacity
     }
 
     if (pColInfo->info.colId == src->colId) {
-
-      if (pColInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
-        for (int32_t n = 0; n < num; n++) {
-          TKEY tkey = *(TKEY *)((char*)src->pData + bytes * start + n * sizeof(TKEY));
-          *(TSKEY *)(pData + n * sizeof(TSKEY)) = tdGetKey(tkey);
-        }
-      } else if (pColInfo->info.type != TSDB_DATA_TYPE_BINARY && pColInfo->info.type != TSDB_DATA_TYPE_NCHAR) {
+      if (pColInfo->info.type != TSDB_DATA_TYPE_BINARY && pColInfo->info.type != TSDB_DATA_TYPE_NCHAR) {
         memmove(pData, (char*)src->pData + bytes * start, bytes * num);
       } else {  // handle the var-string
         char* dst = pData;

src/vnode/inc/vnodeSync.h

@@ -30,8 +30,9 @@ void     vnodeStopSyncFile(int32_t vgId, uint64_t fversion);
 void     vnodeConfirmForard(int32_t vgId, void *wparam, int32_t code);
 int32_t  vnodeWriteToCache(int32_t vgId, void *wparam, int32_t qtype, void *rparam);
 int32_t  vnodeGetVersion(int32_t vgId, uint64_t *fver, uint64_t *wver);
+int32_t  vnodeResetVersion(int32_t vgId, uint64_t fver);
 
-void     vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code);
+void     vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code, bool force);
 
 #ifdef __cplusplus
 }

src/vnode/src/vnodeMain.c

@@ -110,31 +110,78 @@ int32_t vnodeDrop(int32_t vgId) {
 }
 
 static int32_t vnodeAlterImp(SVnodeObj *pVnode, SCreateVnodeMsg *pVnodeCfg) {
+  STsdbCfg tsdbCfg = pVnode->tsdbCfg;
+  SSyncCfg syncCfg = pVnode->syncCfg;
+  int32_t  dbCfgVersion = pVnode->dbCfgVersion;
+  int32_t  vgCfgVersion = pVnode->vgCfgVersion;
+
   int32_t code = vnodeWriteCfg(pVnodeCfg);
   if (code != TSDB_CODE_SUCCESS) {
-    return code; 
+    pVnode->dbCfgVersion = dbCfgVersion;
+    pVnode->vgCfgVersion = vgCfgVersion;
+    pVnode->syncCfg = syncCfg;
+    pVnode->tsdbCfg = tsdbCfg;
+    return code;
   }
 
   code = vnodeReadCfg(pVnode);
   if (code != TSDB_CODE_SUCCESS) {
-    return code; 
+    pVnode->dbCfgVersion = dbCfgVersion;
+    pVnode->vgCfgVersion = vgCfgVersion;
+    pVnode->syncCfg = syncCfg;
+    pVnode->tsdbCfg = tsdbCfg;
+    return code;
   }
 
   code = walAlter(pVnode->wal, &pVnode->walCfg);
   if (code != TSDB_CODE_SUCCESS) {
+    pVnode->dbCfgVersion = dbCfgVersion;
+    pVnode->vgCfgVersion = vgCfgVersion;
+    pVnode->syncCfg = syncCfg;
+    pVnode->tsdbCfg = tsdbCfg;
     return code;
   }
 
-  code = syncReconfig(pVnode->sync, &pVnode->syncCfg);
-  if (code != TSDB_CODE_SUCCESS) {
-    return code; 
-  }
+  bool tsdbCfgChanged = (memcmp(&tsdbCfg, &pVnode->tsdbCfg, sizeof(STsdbCfg)) != 0);
+  bool syncCfgChanged = (memcmp(&syncCfg, &pVnode->syncCfg, sizeof(SSyncCfg)) != 0);
 
-  if (pVnode->tsdb) {
-    code = tsdbConfigRepo(pVnode->tsdb, &pVnode->tsdbCfg);
+  vDebug("vgId:%d, tsdbchanged:%d syncchanged:%d while alter vnode", pVnode->vgId, tsdbCfgChanged, syncCfgChanged);
+
+  if (tsdbCfgChanged || syncCfgChanged) {
+    // vnode in non-ready state and still needs to return success instead of TSDB_CODE_VND_INVALID_STATUS
+    // dbCfgVersion can be corrected by status msg
+    if (!vnodeSetUpdatingStatus(pVnode)) {
+      vDebug("vgId:%d, vnode is not ready, do alter operation later", pVnode->vgId);
+      pVnode->dbCfgVersion = dbCfgVersion;
+      pVnode->vgCfgVersion = vgCfgVersion;
+      pVnode->syncCfg = syncCfg;
+      pVnode->tsdbCfg = tsdbCfg;
+      return TSDB_CODE_SUCCESS;
+    }
+
+    code = syncReconfig(pVnode->sync, &pVnode->syncCfg);
     if (code != TSDB_CODE_SUCCESS) {
+      pVnode->dbCfgVersion = dbCfgVersion;
+      pVnode->vgCfgVersion = vgCfgVersion;
+      pVnode->syncCfg = syncCfg;
+      pVnode->tsdbCfg = tsdbCfg;
+      vnodeSetReadyStatus(pVnode);
       return code;
     }
+
+    if (pVnode->tsdb) {
+      code = tsdbConfigRepo(pVnode->tsdb, &pVnode->tsdbCfg);
+      if (code != TSDB_CODE_SUCCESS) {
+        pVnode->dbCfgVersion = dbCfgVersion;
+        pVnode->vgCfgVersion = vgCfgVersion;
+        pVnode->syncCfg = syncCfg;
+        pVnode->tsdbCfg = tsdbCfg;
+        vnodeSetReadyStatus(pVnode);
+        return code;
+      }
+    }
+
+    vnodeSetReadyStatus(pVnode);
   }
 
   return 0;
@@ -142,21 +189,16 @@ static int32_t vnodeAlterImp(SVnodeObj *pVnode, SCreateVnodeMsg *pVnodeCfg) {
 
 int32_t vnodeAlter(void *vparam, SCreateVnodeMsg *pVnodeCfg) {
   SVnodeObj *pVnode = vparam;
-  if (pVnode->dbCfgVersion == pVnodeCfg->cfg.dbCfgVersion && pVnode->vgCfgVersion == pVnodeCfg->cfg.vgCfgVersion) {
-    vDebug("vgId:%d, dbCfgVersion:%d and vgCfgVersion:%d not change", pVnode->vgId, pVnode->dbCfgVersion,
-           pVnode->vgCfgVersion);
-    return TSDB_CODE_SUCCESS;
-  }
 
-  // vnode in non-ready state and still needs to return success instead of TSDB_CODE_VND_INVALID_STATUS
-  // dbCfgVersion can be corrected by status msg
-  if (!vnodeSetUpdatingStatus(pVnode)) {
-    vDebug("vgId:%d, vnode is not ready, do alter operation later", pVnode->vgId);
+  vDebug("vgId:%d, current dbCfgVersion:%d vgCfgVersion:%d, input dbCfgVersion:%d vgCfgVersion:%d", pVnode->vgId,
+         pVnode->dbCfgVersion, pVnode->vgCfgVersion, pVnodeCfg->cfg.dbCfgVersion, pVnodeCfg->cfg.vgCfgVersion);
+
+  if (pVnode->dbCfgVersion == pVnodeCfg->cfg.dbCfgVersion && pVnode->vgCfgVersion == pVnodeCfg->cfg.vgCfgVersion) {
+    vDebug("vgId:%d, cfg not change", pVnode->vgId);
     return TSDB_CODE_SUCCESS;
   }
 
   int32_t code = vnodeAlterImp(pVnode, pVnodeCfg);
-  vnodeSetReadyStatus(pVnode);
 
   if (code != 0) {
     vError("vgId:%d, failed to alter vnode, code:0x%x", pVnode->vgId, code);
@@ -305,6 +347,7 @@ int32_t vnodeOpen(int32_t vgId) {
   syncInfo.startSyncFileFp = vnodeStartSyncFile;
   syncInfo.stopSyncFileFp = vnodeStopSyncFile;
   syncInfo.getVersionFp = vnodeGetVersion;
+  syncInfo.resetVersionFp = vnodeResetVersion;
   syncInfo.sendFileFp = tsdbSyncSend;
   syncInfo.recvFileFp = tsdbSyncRecv;
   syncInfo.pTsdb = pVnode->tsdb;

src/vnode/src/vnodeRead.c

@@ -247,7 +247,8 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
 
   if (contLen != 0) {
     qinfo_t pQInfo = NULL;
-    code = qCreateQueryInfo(pVnode->tsdb, pVnode->vgId, pQueryTableMsg, &pQInfo);
+    uint64_t qId = 0;
+    code = qCreateQueryInfo(pVnode->tsdb, pVnode->vgId, pQueryTableMsg, &pQInfo, &qId);
 
     SQueryTableRsp *pRsp = (SQueryTableRsp *)rpcMallocCont(sizeof(SQueryTableRsp));
     pRsp->code = code;
@@ -259,22 +260,22 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
 
     // current connect is broken
     if (code == TSDB_CODE_SUCCESS) {
-      handle = qRegisterQInfo(pVnode->qMgmt, (uint64_t)pQInfo);
+      handle = qRegisterQInfo(pVnode->qMgmt, qId, (uint64_t)pQInfo);
       if (handle == NULL) {  // failed to register qhandle
         pRsp->code = terrno;
         terrno = 0;
-        vError("vgId:%d, QInfo:%p register qhandle failed, return to app, code:%s", pVnode->vgId, (void *)pQInfo,
+        vError("vgId:%d, QInfo:%"PRIu64 "-%p register qhandle failed, return to app, code:%s", pVnode->vgId, qId, (void *)pQInfo,
                tstrerror(pRsp->code));
         qDestroyQueryInfo(pQInfo);  // destroy it directly
         return pRsp->code;
       } else {
         assert(*handle == pQInfo);
-        pRsp->qhandle = htobe64((uint64_t)pQInfo);
+        pRsp->qhandle = htobe64(qId);
       }
 
       if (handle != NULL &&
           vnodeNotifyCurrentQhandle(pRead->rpcHandle, *handle, pVnode->vgId) != TSDB_CODE_SUCCESS) {
-        vError("vgId:%d, QInfo:%p, query discarded since link is broken, %p", pVnode->vgId, *handle,
+        vError("vgId:%d, QInfo:%"PRIu64 "-%p, query discarded since link is broken, %p", pVnode->vgId, qId, *handle,
                pRead->rpcHandle);
         pRsp->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
         qReleaseQInfo(pVnode->qMgmt, (void **)&handle, true);
@@ -285,7 +286,7 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
     }
 
     if (handle != NULL) {
-      vTrace("vgId:%d, QInfo:%p, dnode query msg disposed, create qhandle and returns to app", vgId, *handle);
+      vTrace("vgId:%d, QInfo:%"PRIu64 "-%p, dnode query msg disposed, create qhandle and returns to app", vgId, qId, *handle);
       code = vnodePutItemIntoReadQueue(pVnode, handle, pRead->rpcHandle);
       if (code != TSDB_CODE_SUCCESS) {
         pRsp->code = code;
@@ -349,7 +350,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
   pRetrieve->free = htons(pRetrieve->free);
   pRetrieve->qhandle = htobe64(pRetrieve->qhandle);
 
-  vTrace("vgId:%d, QInfo:%p, retrieve msg is disposed, free:%d, conn:%p", pVnode->vgId, (void *)pRetrieve->qhandle,
+  vTrace("vgId:%d, QInfo:%" PRIu64 ", retrieve msg is disposed, free:%d, conn:%p", pVnode->vgId, pRetrieve->qhandle,
          pRetrieve->free, pRead->rpcHandle);
 
   memset(pRet, 0, sizeof(SRspRet));
@@ -360,19 +361,19 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
   if (handle == NULL) {
     code = terrno;
     terrno = TSDB_CODE_SUCCESS;
-  } else if ((*handle) != (void *)pRetrieve->qhandle) {
+  } else if (!checkQIdEqual(*handle, pRetrieve->qhandle)) {
     code = TSDB_CODE_QRY_INVALID_QHANDLE;
   }
 
   if (code != TSDB_CODE_SUCCESS) {
-    vError("vgId:%d, invalid handle in retrieving result, code:%s, QInfo:%p", pVnode->vgId, tstrerror(code), (void *)pRetrieve->qhandle);
+    vError("vgId:%d, invalid handle in retrieving result, code:%s, QInfo:%" PRIu64, pVnode->vgId, tstrerror(code), pRetrieve->qhandle);
     vnodeBuildNoResultQueryRsp(pRet);
     return code;
   }
 
   // kill current query and free corresponding resources.
   if (pRetrieve->free == 1) {
-    vDebug("vgId:%d, QInfo:%p, retrieve msg received to kill query and free qhandle", pVnode->vgId, *handle);
+    vWarn("vgId:%d, QInfo:%"PRIu64 "-%p, retrieve msg received to kill query and free qhandle", pVnode->vgId, pRetrieve->qhandle, *handle);
     qKillQuery(*handle);
     qReleaseQInfo(pVnode->qMgmt, (void **)&handle, true);
 
@@ -383,7 +384,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SVReadMsg *pRead) {
 
   // register the qhandle to connect to quit query immediate if connection is broken
   if (vnodeNotifyCurrentQhandle(pRead->rpcHandle, *handle, pVnode->vgId) != TSDB_CODE_SUCCESS) {
-    vError("vgId:%d, QInfo:%p, retrieve discarded since link is broken, %p", pVnode->vgId, *handle, pRead->rpcHandle);
+    vError("vgId:%d, QInfo:%"PRIu64 "-%p, retrieve discarded since link is broken, %p", pVnode->vgId, pRetrieve->qhandle, *handle, pRead->rpcHandle);
     code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
     qKillQuery(*handle);
     qReleaseQInfo(pVnode->qMgmt, (void **)&handle, true);
@@ -441,4 +442,4 @@ void vnodeWaitReadCompleted(SVnodeObj *pVnode) {
     vTrace("vgId:%d, queued rmsg num:%d", pVnode->vgId, pVnode->queuedRMsg);
     taosMsleep(10);
   }
-}
+}

src/vnode/src/vnodeSync.c

@@ -158,7 +158,23 @@ int32_t vnodeGetVersion(int32_t vgId, uint64_t *fver, uint64_t *wver) {
   return code;
 }
 
-void vnodeConfirmForward(void *vparam, uint64_t version, int32_t code) {
-  SVnodeObj *pVnode = vparam;
-  syncConfirmForward(pVnode->sync, version, code);
+int32_t vnodeResetVersion(int32_t vgId, uint64_t fver) {
+  SVnodeObj *pVnode = vnodeAcquire(vgId);
+  if (pVnode == NULL) {
+    vError("vgId:%d, vnode not found while reset version", vgId);
+    return -1;
+  }
+
+  pVnode->fversion = fver;
+  pVnode->version = fver;
+  walResetVersion(pVnode->wal, fver);
+  vDebug("vgId:%d, version reset to %" PRIu64, vgId, fver);
+
+  vnodeRelease(pVnode);
+  return 0;
 }
+
+void vnodeConfirmForward(void *vparam, uint64_t version, int32_t code, bool force) {
+  SVnodeObj *pVnode = vparam;
+  syncConfirmForward(pVnode->sync, version, code, force);
+}

src/vnode/src/vnodeWrite.c

@@ -89,7 +89,8 @@ int32_t vnodeProcessWrite(void *vparam, void *wparam, int32_t qtype, void *rpara
 
   // forward to peers, even it is WAL/FWD, it shall be called to update version in sync
   int32_t syncCode = 0;
-  syncCode = syncForwardToPeer(pVnode->sync, pHead, pWrite, qtype);
+  bool    force = (pWrite == NULL ? false : pWrite->pHead.msgType != TSDB_MSG_TYPE_SUBMIT);
+  syncCode = syncForwardToPeer(pVnode->sync, pHead, pWrite, qtype, force);
   if (syncCode < 0) return syncCode;
 
   // write into WAL

src/wal/src/walWrite.c

@@ -446,3 +446,16 @@ uint64_t walGetVersion(twalh param) {
 
   return pWal->version;
 }
+
+// Wal version in slave (dnode1) must be reset. 
+// Because after the data file is recovered from peer (dnode2), the new file version in dnode1 may become smaller than origin.
+// Some new wal record cannot be written to the wal file in dnode1 for wal version not reset, then fversion and the record in wal file may inconsistent, 
+// At this time, if dnode2 down, dnode1 switched to master. After dnode2 start and restore data from dnode1, data loss will occur
+
+void walResetVersion(twalh param, uint64_t newVer) {
+  SWal *pWal = param;
+  if (pWal == 0) return;
+  wDebug("vgId:%d, version reset from %" PRIu64 " to %" PRIu64, pWal->vgId, pWal->version, newVer);
+
+  pWal->version = newVer;
+}

tests/pytest/fulltest.sh

@@ -243,10 +243,13 @@ python3 ./test.py -f query/last_row_cache.py
 python3 ./test.py -f query/last_cache.py
 
 # tools
-python3 test.py -f tools/taosdemoTest.py
 python3 test.py -f tools/taosdumpTest.py
 python3 test.py -f tools/lowaTest.py
+python3 test.py -f tools/taosdemoTest.py
 python3 test.py -f tools/taosdemoTest2.py
+python3 test.py -f tools/taosdemoTestWithoutMetric.py
+python3 test.py -f tools/taosdemoTestLimitOffset.py
+python3 test.py -f tools/taosdemoTestSampleData.py
 
 # subscribe
 python3 test.py -f subscribe/singlemeter.py
@@ -272,4 +275,4 @@ python3 ./test.py -f update/bug_td2279.py
 python3 ./test.py -f wal/addOldWalTest.py
 
 # account
-python3 ./test.py -f account/account_create.py
+python3 ./test.py -f account/account_create.py

tests/pytest/functions/function_percentile2.py

@@ -28,13 +28,13 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
 
-        tdSql.execute("create table test(ts timestamp, col1 int, col2 float)")
+        tdSql.execute("create table test(ts timestamp, col1 int, col2 float, col3 double)")
         for i in range(1000):
             sql = "insert into test values"
             batchSize = int (self.rowNum / 1000)            
             for j in range (batchSize):                
                 currTime = self.ts + batchSize * i + j
-                sql += "(%d, 1, 2.37)" % currTime
+                sql += "(%d, 1, 2.37, 3.1415926)" % currTime
             tdSql.execute(sql)
 
         tdSql.query("select percentile(col1, 20) from test")
@@ -43,12 +43,18 @@ class TDTestCase:
         tdSql.query("select percentile(col2, 20) from test")
         tdSql.checkData(0, 0, 2.3699998)
 
+        tdSql.query("select percentile(col3, 20) from test")
+        tdSql.checkData(0, 0, 3.1415926)
+
         tdSql.query("select apercentile(col1, 20) from test")
         tdSql.checkData(0, 0, 1)
 
         tdSql.query("select apercentile(col2, 20) from test")
         tdSql.checkData(0, 0, 2.3699998)
 
+        tdSql.query("select apercentile(col3, 20) from test")
+        tdSql.checkData(0, 0, 3.1415926)
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/functions/function_stddev.py

@@ -113,6 +113,12 @@ class TDTestCase:
         for i in range(13):
             tdSql.query('select stddev(c4) from s group by t%s' % str(i+1) )
 
+        #add for td-3223
+        for i in range(13):
+            if i == 1 or i == 5 or i == 6 or i == 7 or i == 9 or i == 8 :continue
+            tdSql.query('select stddev(c%d),stddev(c%d) from s group by c%d' %( i+1 , i+1 , i+1  ) )
+        
+
         
             
     def stop(self):

tests/pytest/pytest_3.sh

@@ -78,10 +78,12 @@ python3 test.py -f query/queryInterval.py
 python3 test.py -f query/queryFillTest.py
 
 # tools
+python3 test.py -f tools/lowaTest.py
 python3 test.py -f tools/taosdemoTest.py
 python3 test.py -f tools/taosdemoTestWithoutMetric.py
+python3 test.py -f tools/taosdemoTestLimitOffset.py
+python3 test.py -f tools/taosdemoTestSampleData.py
 python3 test.py -f tools/taosdumpTest.py
-python3 test.py -f tools/lowaTest.py
 #python3 test.py -f tools/taosdemoTest2.py
 
 # subscribe

tests/pytest/query/queryNormal.py

@@ -94,8 +94,9 @@ class TDTestCase:
         tdSql.query("select * from stb1 limit 2 offset 3")
         tdSql.checkRows(1)
 
-        # query ... alias for table ---- bug
-        tdSql.error("select t.ts from tb1 t")        
+        # query ... alias for table
+        tdSql.query("select t.ts from tb1 t")
+        tdSql.checkRows(2)
 
         # query ... tbname
         tdSql.query("select tbname from stb1")

tests/pytest/tools/insert-tblimit-tboffset.json

@@ -0,0 +1,59 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "num_of_records_per_req": 100,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb",
+            "child_table_exists":"no",
+            "childtable_count": 100,
+            "childtable_prefix": "stb_",
+            "auto_create_table": "no",
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 1000,
+            "childtable_limit": 33,
+            "childtable_offset": 33,
+            "multi_thread_write_one_tbl": "no",
+            "number_of_tbl_in_one_sql": 0,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/pytest/tools/insert-tblimit-tboffset0.json

@@ -0,0 +1,60 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "thread_count": 4,
+    "thread_count_create_tbl": 4,
+    "result_file": "./insert_res.txt",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "num_of_records_per_req": 100,
+    "max_sql_len": 1024000,
+    "databases": [{
+        "dbinfo": {
+            "name": "db",
+            "drop": "yes",
+            "replica": 1,
+            "days": 10,
+            "cache": 16,
+            "blocks": 8,
+            "precision": "ms",
+            "keep": 365,
+            "minRows": 100,
+            "maxRows": 4096,
+            "comp":2,
+            "walLevel":1,
+            "cachelast":0,
+            "quorum":1,
+            "fsync":3000,
+            "update": 0
+        },
+        "super_tables": [{
+            "name": "stb",
+            "child_table_exists":"no",
+            "childtable_count": 100,
+            "childtable_prefix": "stb_",
+            "auto_create_table": "no",
+            "data_source": "rand",
+            "insert_mode": "taosc",
+            "insert_rows": 1000,
+            "childtable_limit": 20,
+            "childtable_offset": 0,
+            "multi_thread_write_one_tbl": "no",
+            "number_of_tbl_in_one_sql": 0,
+            "rows_per_tbl": 100,
+            "max_sql_len": 1024000,
+            "disorder_ratio": 0,
+            "disorder_range": 1000,
+            "timestamp_step": 1,
+            "start_timestamp": "2020-10-01 00:00:00.000",
+            "sample_format": "csv",
+            "sample_file": "./sample.csv",
+            "tags_file": "",
+            "columns": [{"type": "INT"}, {"type": "DOUBLE", "count":10}, {"type": "BINARY", "len": 16, "count":3}, {"type": "BINARY", "len": 32, "count":6}],
+            "tags": [{"type": "TINYINT", "count":2}, {"type": "BINARY", "len": 16, "count":5}]
+        }]
+    }]
+}

tests/pytest/tools/sampledata.csv

@@ -0,0 +1,3 @@
+1
+2
+3

tests/pytest/tools/taosdemo-sampledata.json

@@ -0,0 +1,39 @@
+{
+	"filetype": "insert",
+	"cfgdir": "/etc/taos",
+	"host": "127.0.0.1",
+	"port": 6030,
+	"user": "root",
+	"password": "taosdata",
+	"thread_count": 10,
+    "confirm_parameter_prompt": "no",
+	"databases": [{
+		"dbinfo": {
+			"name": "db",
+			"drop": "yes"
+		},
+		"super_tables": [{
+			"name": "stb",
+			"child_table_exists":"no",
+			"childtable_count": 20,
+			"childtable_limit": 10,
+			"childtable_offset": 0,
+			"childtable_prefix": "t_",
+			"auto_create_table": "no",
+			"data_source": "sample",
+			"insert_mode": "taosc",
+			"insert_rate": 0,
+			"insert_rows": 20,
+			"multi_thread_write_one_tbl": "no",
+			"number_of_tbl_in_one_sql": 0,
+			"max_sql_len": 1048000,
+			"timestamp_step": 1000,
+			"start_timestamp": "2020-1-1 00:00:00",
+			"sample_format": "csv",
+			"sample_file": "./tools/sampledata.csv",
+            "columns": [{"type": "INT"}],
+            "tags": [{"type": "INT", "count":1}]
+		}]
+	}]
+
+}

tests/pytest/tools/taosdemoTestLimitOffset.py

@@ -0,0 +1,77 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.numberOfTables = 10000
+        self.numberOfRecords = 100
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    def run(self):
+        tdSql.prepare()
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+        binPath = buildPath+ "/build/bin/"
+        os.system("%staosdemo -f tools/insert-tblimit-tboffset.json" % binPath)
+
+        tdSql.execute("use db")
+        tdSql.query("select count(tbname) from db.stb")
+        tdSql.checkData(0, 0, 100)
+        tdSql.query("select count(*) from db.stb")
+        tdSql.checkData(0, 0, 33000)
+
+        os.system("%staosdemo -f tools/insert-tblimit-tboffset0.json" % binPath)
+
+        tdSql.execute("reset query cache")
+        tdSql.execute("use db")
+        tdSql.query("select count(tbname) from db.stb")
+        tdSql.checkData(0, 0, 100)
+        tdSql.query("select count(*) from db.stb")
+        tdSql.checkData(0, 0, 20000)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/tools/taosdemoTestSampleData.py

@@ -0,0 +1,68 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.numberOfTables = 10000
+        self.numberOfRecords = 100
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    def run(self):
+        tdSql.prepare()
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+        binPath = buildPath+ "/build/bin/"
+        os.system("%staosdemo -f tools/taosdemo-sampledata.json" % binPath)
+
+        tdSql.execute("use db")
+        tdSql.query("select count(tbname) from db.stb")
+        tdSql.checkData(0, 0, 20)
+        tdSql.query("select count(*) from db.stb")
+        tdSql.checkData(0, 0, 200)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/script/general/parser/join.sim

@@ -448,7 +448,7 @@ endi
 sql select first(join_tb0.c8),first(join_tb0.c9) from join_tb1 , join_tb0 where join_tb1.ts = join_tb0.ts and join_tb1.ts <= 100002 and join_tb0.c7 = true
 
 #====================group by=========================================
-
+print =================>"group by not supported"
 
 
 

tests/script/general/parser/join_manyblocks.sim

@@ -0,0 +1,93 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 100
+
+$dbPrefix = join_m_db
+$tbPrefix = join_tb
+$mtPrefix = join_mt
+$tbNum = 3
+$rowNum = 20000
+$totalNum = $tbNum * $rowNum
+
+print =============== join_manyBlocks.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 100000
+
+sql drop database if exists $db -x step1
+step1:
+sql create database if not exists $db keep 36500
+
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
+
+$mt1 = $mtPrefix . 1 . $i
+sql create table $mt1 (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12), t3 int)
+
+$i = 0
+$tbPrefix1 = join_1_tb
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tg2 = ' . abc
+  $tg2 = $tg2 . '
+  sql create table $tb using $mt tags( $i , $tg2 )
+
+  $tb1 = $tbPrefix1 . $i
+  $c = $i
+  $t3 = $i + 1
+
+  $binary = ' . abc
+  $binary = $binary . $i
+  $binary = $binary . '
+
+  print $binary
+  sql create table $tb1 using $mt1 tags( $i , $binary , $t3 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar ) $tb1 values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 100000
+endw
+
+sleep 100
+
+print ===============join_manyblocks.sim
+print ==============> td-3313
+sql select join_mt0.ts,join_mt0.ts,join_mt0.t1 from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1;
+
+print $row
+if $row != 60000 then
+  print expect 60000, actual: $row
+  return -1
+endi
+
+print ======= second tags join

tests/script/general/parser/sliding.sim

@@ -469,11 +469,12 @@ if $data25 != 33 then
 endi
 
 sql select count(*),stddev(c1),count(c1),first(c2),last(c3) from sliding_tb0 where ts>'2000-1-1 00:00:00' and ts<'2000-1-1 00:00:01.002' and c2 >= 0 interval(30s) sliding(10s) order by ts desc limit 1000;
-if $row != 1 then
+if $row != 3 then
  return -1
 endi
 
-if $data00 != @99-12-31 23:59:40.000@ then
+if $data00 != @00-01-01 00:00:00.000@ then
+ print expect 00-01-01 00:00:00.000, actual: $data00
  return -1
 endi
 
@@ -489,7 +490,28 @@ if $data03 != 33 then
  return -1
 endi
 
-print check boundary check crash at client side
+if $data10 != @99-12-31 23:59:50.000@ then
+ return -1
+endi
+
+if $data11 != 33 then
+ return -1
+endi
+if $data12 != 9.521904571 then
+ return -1
+endi
+
+if $data20 != @99-12-31 23:59:40.000@ then
+ return -1
+endi
+if $data21 != 33 then
+ return -1
+endi
+if $data22 != 9.521904571 then
+ return -1
+endi
+
+print ====================>check boundary check crash at client side
 sql select count(*) from sliding_mt0 where ts>now and ts < now-1h;
 
 print ========================query on super table

tests/script/general/parser/testSuite.sim

@@ -1,112 +1,58 @@
 run general/parser/alter.sim
-sleep 100
 run general/parser/alter1.sim
-sleep 100
 run general/parser/alter_stable.sim
-sleep 100
 run general/parser/auto_create_tb.sim
-sleep 100
 run general/parser/auto_create_tb_drop_tb.sim
-sleep 100
 run general/parser/col_arithmetic_operation.sim
-sleep 100
 run general/parser/columnValue.sim
-sleep 100
 run general/parser/commit.sim
-sleep 100
 run general/parser/create_db.sim
-sleep 100
 run general/parser/create_mt.sim
-sleep 100
 run general/parser/create_tb.sim
-sleep 100
 run general/parser/dbtbnameValidate.sim
-sleep 100
 run general/parser/fill.sim
-sleep 100
 run general/parser/fill_stb.sim
-sleep 100
 #run general/parser/fill_us.sim               #
-sleep 100
 run general/parser/first_last.sim
-sleep 100
 run general/parser/import_commit1.sim
-sleep 100
 run general/parser/import_commit2.sim
-sleep 100
 run general/parser/import_commit3.sim
-sleep 100
 #run general/parser/import_file.sim
-sleep 100
 run general/parser/insert_tb.sim
-sleep 100
 run general/parser/tags_dynamically_specifiy.sim
-sleep 100
 run general/parser/interp.sim
-sleep 100
 run general/parser/lastrow.sim
-sleep 100
 run general/parser/limit.sim
-sleep 100
 run general/parser/limit1.sim
-sleep 100
 run general/parser/limit1_tblocks100.sim
-sleep 100
 run general/parser/limit2.sim
-sleep 100
 run general/parser/mixed_blocks.sim
-sleep 100
 run general/parser/nchar.sim
-sleep 100
 run general/parser/null_char.sim
-sleep 100
 run general/parser/selectResNum.sim
-sleep 100
 run general/parser/select_across_vnodes.sim
-sleep 100
 run general/parser/select_from_cache_disk.sim
-sleep 100
 run general/parser/set_tag_vals.sim
-sleep 100
 run general/parser/single_row_in_tb.sim
-sleep 100
 run general/parser/slimit.sim
-sleep 100
 run general/parser/slimit1.sim
-sleep 100
 run general/parser/slimit_alter_tags.sim
-sleep 100
 run general/parser/tbnameIn.sim
-sleep 100
 run general/parser/slimit_alter_tags.sim  # persistent failed
-sleep 100
 run general/parser/join.sim
-sleep 100
 run general/parser/join_multivnode.sim
-sleep 100
+run general/parser/join_manyblocks.sim
 run general/parser/projection_limit_offset.sim
-sleep 100
 run general/parser/select_with_tags.sim
-sleep 100
 run general/parser/groupby.sim
-sleep 100
 run general/parser/tags_filter.sim
-sleep 100
 run general/parser/topbot.sim
-sleep 100
 run general/parser/union.sim
-sleep 100
 run general/parser/constCol.sim
-sleep 100
 run general/parser/where.sim
-sleep 100
 run general/parser/timestamp.sim
-sleep 100
 run general/parser/sliding.sim
-sleep 100
 run general/parser/function.sim
-sleep 100
 run general/parser/stableOp.sim
-sleep 100
 run general/parser/slimit_alter_tags.sim
 

tests/script/general/parser/where.sim

@@ -350,5 +350,13 @@ if $rows != 0 then
   return -1
 endi
 
+print ==========================>td-3318
+sql create table tu(ts timestamp,  k int, b binary(12))
+sql insert into tu values(now, 1, 'abc')
+sql select stddev(k) from tu where b <>'abc' interval(1s)
+if $rows != 0 then
+ return -1
+endi
+
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/table/delete_writing.sim

@@ -41,7 +41,7 @@ while $x < 15
 
 	sql create table db.tb (ts timestamp, i int)
 
-	sleep 2000
+	sleep 1000
 	
 	$x = $x + 1
 endw

tests/script/issue/TD-3300.sim

@@ -0,0 +1,556 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ============== step2: start dnode2/dnode3
+system sh/exec.sh -n dnode2 -s start 
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+
+$x = 0
+step2: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+
+if $data4_1 != ready then
+  goto step2
+endi
+if $data4_2 != ready then
+  goto step2
+endi
+if $data4_3 != ready then
+  goto step2
+endi
+
+sleep 1000
+
+print ============== step3
+sql create database db replica 2
+sql use db
+
+sql create table stb (ts timestamp, c1 int, c2 int) tags(t1 int)
+sql create table t1 using stb tags(1)
+sql insert into t1 values(1577980800000, 1, 5)
+sql insert into t1 values(1577980800001, 2, 4)
+sql insert into t1 values(1577980800002, 3, 3)
+sql insert into t1 values(1577980800003, 4, 2)
+sql insert into t1 values(1577980800004, 5, 1)
+
+sql show db.vgroups
+if $data04 != 3 then
+	return -1
+endi
+if $data06 != 2 then
+	return -1
+endi
+if $data05 != master then
+	return -1
+endi
+if $data07 != slave then
+	return -1
+endi
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGKILL
+system sh/exec.sh -n dnode3 -s stop -x SIGKILL
+
+print ============== step4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+step4: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+
+if $data4_1 != ready then
+  goto step4
+endi
+if $data4_2 != ready then
+  goto step4
+endi
+if $data4_3 != ready then
+  goto step4
+endi
+
+sql show db.vgroups
+if $data04 != 3 then
+	goto step4
+endi
+if $data06 != 2 then
+	goto step4
+endi
+if $data05 != master then
+	goto step4
+endi
+if $data07 != slave then
+	goto step4
+endi
+
+sql create table t2 using stb tags(1)
+sql insert into t2 values(1577980800000, 1, 5)
+sql insert into t2 values(1577980800001, 2, 4)
+sql insert into t2 values(1577980800002, 3, 3)
+sql insert into t2 values(1577980800003, 4, 2)
+sql insert into t2 values(1577980800004, 5, 1)
+
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+
+print ============== step5
+system sh/exec.sh -n dnode3 -s stop  -x SIGKILL
+
+$x = 0
+step5: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+
+if $data4_1 != ready then
+  goto step5
+endi
+if $data4_2 != ready then
+  goto step5
+endi
+if $data4_3 != offline then
+  goto step5
+endi
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+
+sql show db.vgroups
+if $data04 != 3 then
+	goto step5
+endi
+if $data06 != 2 then
+	goto step5
+endi
+if $data05 != offline then
+	goto step5
+endi
+if $data07 != master then
+	goto step5
+endi
+
+print ============== step6
+sql create table t3 using stb tags(1)
+sql insert into t3 values(1577980800000, 1, 5)
+sql insert into t3 values(1577980800001, 2, 4)
+sql insert into t3 values(1577980800002, 3, 3)
+sql insert into t3 values(1577980800003, 4, 2)
+sql insert into t3 values(1577980800004, 5, 1)
+sql insert into t3 values(1577980800010, 11, 5)
+sql insert into t3 values(1577980800011, 12, 4)
+sql insert into t3 values(1577980800012, 13, 3)
+sql insert into t3 values(1577980800013, 14, 2)
+sql insert into t3 values(1577980800014, 15, 1)
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+step6: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+
+if $data4_1 != ready then
+  goto step6
+endi
+if $data4_2 != ready then
+  goto step6
+endi
+if $data4_3 != ready then
+  goto step6
+endi
+
+sql show db.vgroups
+if $data04 != 3 then
+	goto step6
+endi
+if $data06 != 2 then
+	goto step6
+endi
+if $data05 != slave then
+	goto step6
+endi
+if $data07 != master then
+	goto step6
+endi
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then
+	return -1
+endi
+
+print ============== step7
+sql create table t4 using stb tags(1)
+sql insert into t4 values(1577980800000, 1, 5)
+sql insert into t4 values(1577980800001, 2, 4)
+sql insert into t4 values(1577980800002, 3, 3)
+sql insert into t4 values(1577980800003, 4, 2)
+sql insert into t4 values(1577980800004, 5, 1)
+sql insert into t4 values(1577980800010, 11, 5)
+sql insert into t4 values(1577980800011, 12, 4)
+sql insert into t4 values(1577980800012, 13, 3)
+sql insert into t4 values(1577980800013, 14, 2)
+sql insert into t4 values(1577980800014, 15, 1)
+sql insert into t4 values(1577980800020, 21, 5)
+sql insert into t4 values(1577980800021, 22, 4)
+sql insert into t4 values(1577980800022, 23, 3)
+sql insert into t4 values(1577980800023, 24, 2)
+sql insert into t4 values(1577980800024, 25, 1)
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then
+	return -1
+endi
+sql select * from t4
+if $rows != 15 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGKILL
+$x = 0
+step7: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+
+if $data4_1 != ready then
+  goto step7
+endi
+if $data4_2 != offline then
+  goto step7
+endi
+if $data4_3 !=  ready then
+  goto step7
+endi
+
+sql show db.vgroups
+if $data04 != 3 then
+	goto step7
+endi
+if $data06 != 2 then
+	goto step7
+endi
+if $data05 != master then
+	goto step7
+endi
+if $data07 != offline then
+	goto step7
+endi
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then
+	return -1
+endi
+sql select * from t4
+if $rows != 15 then
+	return -1
+endi
+
+print ============== step8
+sql create table t5 using stb tags(1)
+sql insert into t5 values(1577980800000, 1, 5)
+sql insert into t5 values(1577980800001, 2, 4)
+sql insert into t5 values(1577980800002, 3, 3)
+sql insert into t5 values(1577980800003, 4, 2)
+sql insert into t5 values(1577980800004, 5, 1)
+sql insert into t5 values(1577980800010, 11, 5)
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then
+	return -1
+endi
+sql select * from t4
+if $rows != 15 then
+	return -1
+endi
+sql select * from t5
+if $rows != 6 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+step8: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+
+if $data4_1 != ready then
+  goto step8
+endi
+if $data4_2 != ready then
+  goto step8
+endi
+if $data4_3 != ready then
+  goto step8
+endi
+
+sql show db.vgroups
+if $data04 != 3 then
+	goto step8
+endi
+if $data06 != 2 then
+	goto step8
+endi
+if $data05 != master then
+	goto step8
+endi
+if $data07 != slave then
+	goto step8
+endi
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then
+	return -1
+endi
+sql select * from t4
+if $rows != 15 then
+	return -1
+endi
+sql select * from t5
+if $rows != 6 then
+	return -1
+endi
+
+print ============== step9
+sql create table t6 using stb tags(1)
+sql insert into t6 values(1577980800000, 1, 5)
+sql insert into t6 values(1577980800001, 2, 4)
+sql insert into t6 values(1577980800002, 3, 3)
+sql insert into t6 values(1577980800003, 4, 2)
+sql insert into t6 values(1577980800004, 5, 1)
+sql insert into t6 values(1577980800010, 11, 5)
+sql insert into t6 values(1577980800011, 12, 4)
+
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then
+	return -1
+endi
+sql select * from t4
+if $rows != 15 then
+	return -1
+endi
+sql select * from t5
+if $rows != 6 then
+	return -1
+endi
+sql select * from t6
+if $rows != 7 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode3 -s stop -x SIGKILL
+$x = 0
+step9: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+
+if $data4_1 != ready then
+  goto step9
+endi
+if $data4_2 != ready then
+  goto step9
+endi
+if $data4_3 != offline then
+  goto step9
+endi
+
+print ============== 2
+sql show db.vgroups
+
+if $data04 != 3 then
+	goto step7
+endi
+if $data06 != 2 then
+	goto step7
+endi
+if $data05 != offline then
+	goto step7
+endi
+if $data07 != master then
+	goto step7
+endi
+
+print ============== 3
+sql select * from t1
+if $rows != 5 then
+	return -1
+endi
+sql select * from t2
+if $rows != 5 then
+	return -1
+endi
+sql select * from t3
+if $rows != 10 then	
+	return -1
+endi
+sql select * from t4
+if $rows != 15 then
+	return -1
+endi
+sql select * from t5
+if $rows != 6 then
+	return -1
+endi
+sql select * from t6
+if $rows != 7 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+system sh/exec.sh -n dnode3 -s stop

tests/script/jenkins/basic.txt

@@ -162,6 +162,10 @@ cd ../../../debug; make
 ./test.sh -f general/parser/topbot.sim
 ./test.sh -f general/parser/function.sim
 ./test.sh -f general/parser/select_distinct_tag.sim
+./test.sh -f general/parser/join_manyblocks.sim
+./test.sh -f general/parser/stableOp.sim
+./test.sh -f general/parser/timestamp.sim
+./test.sh -f general/parser/sliding.sim
 
 ./test.sh -f general/stable/disk.sim
 ./test.sh -f general/stable/dnode3.sim

tests/test-all.sh

@@ -24,11 +24,16 @@ function stopTaosd {
 
 function dohavecore(){
   corefile=`find $corepath -mmin 1`  
+  core_file=`echo $corefile|cut -d " " -f2`
+  echo $core_file
+  proc=`echo $corefile|cut -d "_" -f3`
   if [ -n "$corefile" ];then
-  echo 'taosd or taos has generated core'
-  if [[ $1 == 1 ]];then
-    exit 8
-  fi
+    echo 'taosd or taos has generated core'
+    tar -zcvPf $corepath'taos_'`date "+%Y_%m_%d_%H_%M_%S"`.tar.gz /usr/local/taos/
+    if [[ $1 == 1 ]];then
+      echo '\n'|gdb /usr/local/taos/bin/$proc $core_file -ex "bt 10" -ex quit
+      exit 8
+    fi
   fi
 }
 function runSimCaseOneByOne {