Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "deps/jemalloc"]
 	path = deps/jemalloc
 	url = https://github.com/jemalloc/jemalloc
+[submodule "deps/TSZ"]
+	path = deps/TSZ
+	url = https://github.com/taosdata/TSZ.git

cmake/input.inc

@@ -91,3 +91,12 @@ SET(TD_MEMORY_SANITIZER FALSE)
 IF (${MEMORY_SANITIZER} MATCHES "true")
   SET(TD_MEMORY_SANITIZER TRUE)
 ENDIF ()
+
+IF (${TSZ_ENABLED} MATCHES "true")
+  # define add 
+  MESSAGE(STATUS "build with TSZ enabled")
+  ADD_DEFINITIONS(-DTD_TSZ)
+  set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz" )
+ELSE()
+  set(VAR_TSZ "" CACHE INTERNAL "global variant empty" )
+ENDIF()  

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

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.1.4.1")
+  SET(TD_VER_NUMBER "2.1.5.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

deps/CMakeLists.txt

@@ -15,7 +15,6 @@ ADD_SUBDIRECTORY(cJson)
 ADD_SUBDIRECTORY(wepoll)
 ADD_SUBDIRECTORY(MsvcLibX)
 ADD_SUBDIRECTORY(rmonotonic)
-
 ADD_SUBDIRECTORY(lua)
 
 IF (TD_LINUX AND TD_MQTT)
@@ -38,3 +37,7 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
     BUILD_COMMAND       ${MAKE}
   )
 ENDIF ()
+
+IF (${TSZ_ENABLED} MATCHES "true")
+  ADD_SUBDIRECTORY(TSZ)  
+ENDIF()
\ No newline at end of file

TSZ @ 0ca5b15a

+Subproject commit 0ca5b15a8eac40327dd737be52c926fa5675712c

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

@@ -1338,7 +1338,7 @@ SELECT function_list FROM stb_name
 - 查询过滤、聚合等操作按照每个切分窗口为独立的单位执行。聚合查询目前支持三种窗口的划分方式：
   1. 时间窗口：聚合时间段的窗口宽度由关键词 INTERVAL 指定，最短时间间隔 10 毫秒（10a）；并且支持偏移 offset（偏移必须小于间隔），也即时间窗口划分与“UTC 时刻 0”相比的偏移量。SLIDING 语句用于指定聚合时间段的前向增量，也即每次窗口向前滑动的时长。当 SLIDING 与 INTERVAL 取值相等的时候，滑动窗口即为翻转窗口。
     * 从 2.1.5.0 版本开始，INTERVAL 语句允许的最短时间间隔调整为 1 微秒（1u），当然如果所查询的 DATABASE 的时间精度设置为毫秒级，那么允许的最短时间间隔为 1 毫秒（1a）。
-  2. 状态窗口：使用整数（布尔值）或字符串来标识产生记录时设备的状态量，产生的记录如果具有相同的状态量取值则归属于同一个状态窗口，数值改变后该窗口关闭。状态量所对应的列作为 STATE_WINDOW 语句的参数来指定。
+  2. 状态窗口：使用整数或布尔值来标识产生记录时设备的状态量，产生的记录如果具有相同的状态量取值则归属于同一个状态窗口，数值改变后该窗口关闭。状态量所对应的列作为 STATE_WINDOW 语句的参数来指定。
   3. 会话窗口：时间戳所在的列由 SESSION 语句的 ts_col 参数指定，会话窗口根据相邻两条记录的时间戳差值来确定是否属于同一个会话——如果时间戳差异在 tol_val 以内，则认为记录仍属于同一个窗口；如果时间变化超过 tol_val，则自动开启下一个窗口。
 - WHERE 语句可以指定查询的起止时间和其他过滤条件。
 - FILL 语句指定某一窗口区间数据缺失的情况下的填充模式。填充模式包括以下几种：

packaging/docker/dockerManifest.sh

@@ -44,6 +44,7 @@ echo "version=${version}"
 #docker manifest rm tdengine/tdengine
 #docker manifest rm tdengine/tdengine:${version}
 if [ "$verType" == "beta" ]; then
+  docker manifest rm tdengine/tdengine:latest
   docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
   docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
   docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
@@ -51,11 +52,12 @@ if [ "$verType" == "beta" ]; then
   docker manifest push tdengine/tdengine-beta:${version}
 
 elif [ "$verType" == "stable" ]; then
+  docker manifest rm tdengine/tdengine:latest
   docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
   docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
   docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
   docker manifest push tdengine/tdengine:latest
-    docker manifest push tdengine/tdengine:${version}
+  docker manifest push tdengine/tdengine:${version}
 
 else
   echo "unknow verType, nor stabel or beta"

packaging/docker/dockerbuild.sh

@@ -67,8 +67,10 @@ done
 
 if [ "$verType" == "beta" ]; then
   dockername=${cpuType}-${verType}
+  dirName=${pkgFile%-beta*}
 elif [ "$verType" == "stable" ]; then
   dockername=${cpuType}
+  dirName=${pkgFile%-Linux*}
 else
   echo "unknow verType, nor stabel or beta"
   exit 1
@@ -84,11 +86,10 @@ comunityArchiveDir=/nas/TDengine/v$version/community   # community version’pac
 cd ${scriptDir}
 cp -f ${comunityArchiveDir}/${pkgFile}  .
 
-dirName=${pkgFile%-Linux*}
 echo "dirName=${dirName}"
 
 
-docker build --rm -f "Dockerfile" -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
+docker build --rm -f "Dockerfile"  --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
 docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
 docker push tdengine/tdengine-${dockername}:${version}
 

packaging/tools/makeclient.sh

@@ -195,15 +195,6 @@ if [ "$pagMode" == "lite" ]; then
   pkg_name=${pkg_name}-Lite
 fi
 
-if [ "$verType" == "beta" ]; then
-  pkg_name=${pkg_name}-${verType}
-elif [ "$verType" == "stable" ]; then
-  pkg_name=${pkg_name}
-else
-  echo "unknow verType, nor stable or beta"
-  exit 1
-fi
-
 if [ "$osType" != "Darwin" ]; then
     tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
 else

snap/snapcraft.yaml

 name: tdengine
 base: core18
-version: '2.1.4.1'
+version: '2.1.5.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +72,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.1.4.1
+      - usr/lib/libtaos.so.2.1.5.0
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 

src/client/CMakeLists.txt

@@ -11,7 +11,7 @@ IF (TD_LINUX)
 
   # set the static lib name
   ADD_LIBRARY(taos_static STATIC ${SRC})
-  TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt)
+  TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt ${VAR_TSZ})
   SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static")
   SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 

src/client/inc/tsclient.h

@@ -412,6 +412,7 @@ int32_t tscSQLSyntaxErrMsg(char* msg, const char* additionalInfo,  const char* s
 
 int32_t tscValidateSqlInfo(SSqlObj *pSql, struct SSqlInfo *pInfo);
 
+int32_t tsSetBlockInfo(SSubmitBlk *pBlocks, const STableMeta *pTableMeta, int32_t numOfRows);
 extern int32_t    sentinel;
 extern SHashObj  *tscVgroupMap;
 extern SHashObj  *tscTableMetaInfo;

src/client/src/TSDBJNIConnector.c

@@ -946,3 +946,34 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setTableNameTagsI
 
   return JNI_SUCCESS;
 }
+
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_insertLinesImp(JNIEnv *env, jobject jobj,
+                                                                                jobjectArray lines, jlong conn) {
+  TAOS *taos = (TAOS *)conn;
+  if (taos == NULL) {
+    jniError("jobj:%p, connection already closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+
+  int numLines = (*env)->GetArrayLength(env, lines);
+  char** c_lines = calloc(numLines, sizeof(char*));
+
+  for (int i = 0; i < numLines; ++i) {
+    jstring line = (jstring) ((*env)->GetObjectArrayElement(env, lines, i));
+    c_lines[i] = (char*)(*env)->GetStringUTFChars(env, line, 0);
+  }
+
+  int code = taos_insert_lines(taos, c_lines, numLines);
+
+  for (int i = 0; i < numLines; ++i) {
+    jstring line = (jstring) ((*env)->GetObjectArrayElement(env, lines, i));
+    (*env)->ReleaseStringUTFChars(env, line, c_lines[i]);
+  }
+
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s", jobj, taos, tstrerror(code));
+    return JNI_TDENGINE_ERROR;
+  }
+
+  return code;
+}
\ No newline at end of file

src/client/src/tscParseInsert.c

@@ -1904,7 +1904,6 @@ int tsInsertInitialCheck(SSqlObj *pSql) {
 int tsParseSql(SSqlObj *pSql, bool initial) {
   int32_t ret = TSDB_CODE_SUCCESS;
   SSqlCmd* pCmd = &pSql->cmd;
-
   if (!initial) {
     tscDebug("0x%"PRIx64" resume to parse sql: %s", pSql->self, pCmd->insertParam.sql);
   }

src/client/src/tscPrepare.c

@@ -1617,6 +1617,8 @@ int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags
       (*t1)->prevTS = INT64_MIN;
     }
 
+    tsSetBlockInfo(pBlk, (*t1)->pTableMeta, pBlk->numOfRows);
+
     taosHashPut(pCmd->insertParam.pTableBlockHashList, (void *)&pStmt->mtb.currentUid, sizeof(pStmt->mtb.currentUid), (void*)t1, POINTER_BYTES);
 
     tscDebug("0x%"PRIx64" table:%s is already prepared, uid:%" PRIu64, pSql->self, name, pStmt->mtb.currentUid);

src/client/src/tscProfile.c

@@ -16,6 +16,7 @@
 #include "os.h"
 #include "tscLog.h"
 #include "tsclient.h"
+#include "tsocket.h"
 #include "ttimer.h"
 #include "tutil.h"
 #include "taosmsg.h"
@@ -228,7 +229,7 @@ int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
   SHeartBeatMsg *pHeartbeat = pMsg;
   int allocedQueriesNum = pHeartbeat->numOfQueries;
   int allocedStreamsNum = pHeartbeat->numOfStreams;
-  
+
   pHeartbeat->numOfQueries = 0;
   SQueryDesc *pQdesc = (SQueryDesc *)pHeartbeat->pData;
 
@@ -252,6 +253,16 @@ int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
     //pQdesc->useconds = htobe64(pSql->res.useconds);
     pQdesc->useconds = htobe64(now - pSql->stime);
     pQdesc->qId = htobe64(pSql->res.qId);
+    pQdesc->sqlObjId = htobe64(pSql->self);
+    pQdesc->pid = pHeartbeat->pid;
+    if (pSql->cmd.pQueryInfo->stableQuery == true) {
+      pQdesc->numOfSub = pSql->subState.numOfSub;
+    } else {
+      pQdesc->numOfSub = 1;
+    }
+    pQdesc->numOfSub = htonl(pQdesc->numOfSub);
+
+    taosGetFqdn(pQdesc->fqdn);
 
     pHeartbeat->numOfQueries++;
     pQdesc++;

src/client/src/tscSQLParser.c

@@ -2023,6 +2023,11 @@ static int32_t checkForUdf(SSqlObj* pSql, SQueryInfo* pQueryInfo, SArray* pSelec
 */
 
 static SUdfInfo* isValidUdf(SArray* pUdfInfo, const char* name, int32_t len) {
+  if(pUdfInfo == NULL){
+    tscError("udfinfo is null");
+    return NULL;
+  }
+  
   size_t t = taosArrayGetSize(pUdfInfo);
   for(int32_t i = 0; i < t; ++i) {
     SUdfInfo* pUdf = taosArrayGet(pUdfInfo, i);

src/client/src/tscUtil.c

@@ -3561,6 +3561,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   pNew->pTscObj   = pSql->pTscObj;
   pNew->signature = pNew;
   pNew->sqlstr    = strdup(pSql->sqlstr);
+  tsem_init(&pNew->rspSem, 0, 0);
 
   SSqlCmd* pnCmd  = &pNew->cmd;
   memcpy(pnCmd, pCmd, sizeof(SSqlCmd));
@@ -4770,15 +4771,6 @@ static void freeContent(void* p) {
   tfree(ptr);
 }
 
-static int32_t contCompare(const void* p1, const void* p2) {
-  int32_t ret = strcmp(p1, p2);
-  if (ret == 0) {
-    return 0;
-  } else {
-    return ret > 0 ? 1:-1;
-  }
-}
-
 int tscTransferTableNameList(SSqlObj *pSql, const char *pNameList, int32_t length, SArray* pNameArray) {
   SSqlCmd *pCmd = &pSql->cmd;
 
@@ -4826,7 +4818,7 @@ int tscTransferTableNameList(SSqlObj *pSql, const char *pNameList, int32_t lengt
   }
 
   taosArraySort(pNameArray, nameComparFn);
-  taosArrayRemoveDuplicate(pNameArray, contCompare, freeContent);
+  taosArrayRemoveDuplicate(pNameArray, nameComparFn, freeContent);
   return TSDB_CODE_SUCCESS;
 }
 

src/common/inc/tglobal.h

@@ -205,6 +205,16 @@ extern int32_t wDebugFlag;
 extern int32_t cqDebugFlag;
 extern int32_t debugFlag;
 
+#ifdef TD_TSZ
+// lossy 
+extern char lossyColumns[];
+extern double fPrecision;
+extern double dPrecision;
+extern uint32_t maxRange;
+extern uint32_t curRange;
+extern char Compressor[];
+#endif
+
 typedef struct {
   char dir[TSDB_FILENAME_LEN];
   int  level;

src/common/src/tglobal.c

@@ -244,6 +244,19 @@ int32_t tsdbDebugFlag = 131;
 int32_t cqDebugFlag = 131;
 int32_t fsDebugFlag = 135;
 
+#ifdef TD_TSZ
+//
+// lossy compress 6
+//
+char lossyColumns[32] = "";  // "float|double" means all float and double columns can be lossy compressed.  set empty can close lossy compress.
+// below option can take effect when tsLossyColumns not empty 
+double   fPrecision   = 1E-8;   // float column precision
+double   dPrecision   = 1E-16;  // double column precision
+uint32_t maxRange     = 500;    // max range
+uint32_t curRange     = 100;    // range
+char     Compressor[32] = "ZSTD_COMPRESSOR"; // ZSTD_COMPRESSOR or GZIP_COMPRESSOR 
+#endif
+
 int32_t (*monStartSystemFp)() = NULL;
 void (*monStopSystemFp)() = NULL;
 void (*monExecuteSQLFp)(char *sql) = NULL;
@@ -1517,6 +1530,62 @@ static void doInitGlobalConfig(void) {
   cfg.ptrLength = tListLen(tsTempDir);
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
+
+#ifdef TD_TSZ
+  // lossy compress
+  cfg.option = "lossyColumns";
+  cfg.ptr = lossyColumns;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = tListLen(lossyColumns);
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "fPrecision";
+  cfg.ptr = &fPrecision;
+  cfg.valType = TAOS_CFG_VTYPE_DOUBLE;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = MIN_FLOAT;
+  cfg.maxValue = MAX_FLOAT;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+
+  
+  taosInitConfigOption(cfg);
+
+  cfg.option = "dPrecision";
+  cfg.ptr = &dPrecision;
+  cfg.valType = TAOS_CFG_VTYPE_DOUBLE;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = MIN_FLOAT;
+  cfg.maxValue = MAX_FLOAT;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxRange";
+  cfg.ptr = &maxRange;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 65536;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "range";
+  cfg.ptr = &curRange;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 65536;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+#endif
+
 }
 
 void taosInitGlobalCfg() {

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-*-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.33-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.32</version>
+  <version>2.0.33</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>

src/connector/jdbc/pom.xml

@@ -37,13 +37,6 @@
         <maven.test.jvmargs></maven.test.jvmargs>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- for restful -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -52,12 +45,18 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.58</version>
+            <version>1.2.76</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.0-jre</version>
+            <version>30.1.1-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

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

@@ -171,11 +171,7 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
         // do nothing
     }
 
-    @Override
-    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
-        if (isClosed())
-            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
-
+    private void checkResultSetTypeAndResultSetConcurrency(int resultSetType, int resultSetConcurrency) throws SQLException {
         switch (resultSetType) {
             case ResultSet.TYPE_FORWARD_ONLY:
                 break;
@@ -194,7 +190,14 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
             default:
                 throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
         }
+    }
 
+    @Override
+    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
+        if (isClosed())
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
+
+        checkResultSetTypeAndResultSetConcurrency(resultSetType, resultSetConcurrency);
         return createStatement();
     }
 
@@ -203,24 +206,7 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
 
-        switch (resultSetType) {
-            case ResultSet.TYPE_FORWARD_ONLY:
-                break;
-            case ResultSet.TYPE_SCROLL_INSENSITIVE:
-            case ResultSet.TYPE_SCROLL_SENSITIVE:
-                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
-            default:
-                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
-        }
-
-        switch (resultSetConcurrency) {
-            case ResultSet.CONCUR_READ_ONLY:
-                break;
-            case ResultSet.CONCUR_UPDATABLE:
-                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
-            default:
-                throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
-        }
+        checkResultSetTypeAndResultSetConcurrency(resultSetType, resultSetConcurrency);
         return prepareStatement(sql);
     }
 

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

@@ -326,7 +326,7 @@ public class EmptyResultSet implements ResultSet {
 
     @Override
     public int getFetchDirection() throws SQLException {
-        return 0;
+        return ResultSet.FETCH_FORWARD;
     }
 
     @Override
@@ -341,12 +341,12 @@ public class EmptyResultSet implements ResultSet {
 
     @Override
     public int getType() throws SQLException {
-        return 0;
+        return ResultSet.TYPE_FORWARD_ONLY;
     }
 
     @Override
     public int getConcurrency() throws SQLException {
-        return 0;
+        return ResultSet.CONCUR_READ_ONLY;
     }
 
     @Override
@@ -746,7 +746,7 @@ public class EmptyResultSet implements ResultSet {
 
     @Override
     public int getHoldability() throws SQLException {
-        return 0;
+        return ResultSet.CLOSE_CURSORS_AT_COMMIT;
     }
 
     @Override

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

@@ -40,7 +40,7 @@ public class TSDBErrorNumbers {
     public static final int ERROR_JNI_FETCH_END = 0x2358;       // fetch to the end of resultSet
     public static final int ERROR_JNI_OUT_OF_MEMORY = 0x2359;   // JNI alloc memory failed
 
-    private static final Set<Integer> errorNumbers = new HashSet();
+    private static final Set<Integer> errorNumbers = new HashSet<>();
 
     static {
         errorNumbers.add(ERROR_CONNECTION_CLOSED);

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

@@ -348,4 +348,13 @@ public class TSDBJNIConnector {
     }
 
     private native int closeStmt(long stmt, long con);
+
+    public void insertLines(String[] lines) throws SQLException {
+        int code = insertLinesImp(lines, this.taos);
+        if (code != TSDBConstants.JNI_SUCCESS) {
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN, "failed to insertLines");
+        }
+    }
+
+    private native int insertLinesImp(String[] lines, long conn);
 }

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

@@ -61,7 +61,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return;
         // parse row data
         for (int rowIndex = 0; rowIndex < data.size(); rowIndex++) {
-            List<Object> row = new ArrayList();
+            List<Object> row = new ArrayList<>();
             JSONArray jsonRow = data.getJSONArray(rowIndex);
             for (int colIndex = 0; colIndex < this.metaData.getColumnCount(); colIndex++) {
                 row.add(parseColumnData(jsonRow, colIndex, columns.get(colIndex).taos_type));

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

@@ -9,6 +9,7 @@ import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHeaderElementIterator;
@@ -34,7 +35,11 @@ public class HttpClientPoolUtil {
             PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
             connectionManager.setDefaultMaxPerRoute(DEFAULT_MAX_PER_ROUTE);
             connectionManager.setMaxTotal(DEFAULT_MAX_TOTAL);
-            httpClient = HttpClients.custom().setKeepAliveStrategy(DEFAULT_KEEP_ALIVE_STRATEGY).setConnectionManager(connectionManager).build();
+            httpClient = HttpClients.custom()
+                    .setKeepAliveStrategy(DEFAULT_KEEP_ALIVE_STRATEGY)
+                    .setConnectionManager(connectionManager)
+                    .setRetryHandler(new DefaultHttpRequestRetryHandler(3, true))
+                    .build();
         }
     }
 

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

@@ -4,14 +4,14 @@ public class OSUtils {
     private static final String OS = System.getProperty("os.name").toLowerCase();
 
     public static boolean isWindows() {
-        return OS.indexOf("win") >= 0;
+        return OS.contains("win");
     }
 
     public static boolean isMac() {
-        return OS.indexOf("mac") >= 0;
+        return OS.contains("mac");
     }
 
     public static boolean isLinux() {
-        return OS.indexOf("nux") >= 0;
+        return OS.contains("nux");
     }
 }

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

@@ -16,7 +16,7 @@ package com.taosdata.jdbc.utils;
 
 public class SqlSyntaxValidator {
 
-    private static final String[] SQL = {"select", "insert", "import", "create", "use", "alter", "drop", "set", "show", "describe"};
+    private static final String[] SQL = {"select", "insert", "import", "create", "use", "alter", "drop", "set", "show", "describe", "reset"};
     private static final String[] updateSQL = {"insert", "import", "create", "use", "alter", "drop", "set"};
     private static final String[] querySQL = {"select", "show", "describe"};
 
@@ -61,29 +61,11 @@ public class SqlSyntaxValidator {
 
     public static boolean isUseSql(String sql) {
         return sql.trim().toLowerCase().startsWith("use");
-//                || sql.trim().toLowerCase().matches("create\\s*database.*") || sql.toLowerCase().toLowerCase().matches("drop\\s*database.*");
-    }
-
-    public static boolean isShowSql(String sql) {
-        return sql.trim().toLowerCase().startsWith("show");
-    }
-
-    public static boolean isDescribeSql(String sql) {
-        return sql.trim().toLowerCase().startsWith("describe");
-    }
-
-
-    public static boolean isInsertSql(String sql) {
-        return sql.trim().toLowerCase().startsWith("insert") || sql.trim().toLowerCase().startsWith("import");
     }
 
     public static boolean isSelectSql(String sql) {
         return sql.trim().toLowerCase().startsWith("select");
     }
 
-    public static boolean isShowDatabaseSql(String sql) {
-        return sql.trim().toLowerCase().matches("show\\s*databases");
-    }
-
 
 }

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

@@ -7,9 +7,9 @@ import java.util.concurrent.atomic.AtomicLong;
 public class TaosInfo implements TaosInfoMBean {
 
     private static volatile TaosInfo instance;
-    private AtomicLong connect_open = new AtomicLong();
-    private AtomicLong connect_close = new AtomicLong();
-    private AtomicLong statement_count = new AtomicLong();
+    private final AtomicLong connect_open = new AtomicLong();
+    private final AtomicLong connect_close = new AtomicLong();
+    private final AtomicLong statement_count = new AtomicLong();
 
     static {
         try {

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

@@ -22,8 +22,7 @@ import java.util.stream.IntStream;
 
 public class Utils {
 
-    private static Pattern ptn = Pattern.compile(".*?'");
-
+    private static final Pattern ptn = Pattern.compile(".*?'");
     private static final DateTimeFormatter milliSecFormatter = new DateTimeFormatterBuilder().appendPattern("yyyy-MM-dd HH:mm:ss.SSS").toFormatter();
     private static final DateTimeFormatter microSecFormatter = new DateTimeFormatterBuilder().appendPattern("yyyy-MM-dd HH:mm:ss.SSSSSS").toFormatter();
     private static final DateTimeFormatter nanoSecFormatter = new DateTimeFormatterBuilder().appendPattern("yyyy-MM-dd HH:mm:ss.SSSSSSSSS").toFormatter();
@@ -74,7 +73,7 @@ public class Utils {
 
     public static String escapeSingleQuota(String origin) {
         Matcher m = ptn.matcher(origin);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int end = 0;
         while (m.find()) {
             end = m.end();
@@ -87,7 +86,7 @@ public class Utils {
                     sb.append(seg);
                 }
             } else { // len > 1
-                sb.append(seg.substring(0, seg.length() - 2));
+                sb.append(seg, 0, seg.length() - 2);
                 char lastcSec = seg.charAt(seg.length() - 2);
                 if (lastcSec == '\\') {
                     sb.append("\\'");
@@ -195,7 +194,7 @@ public class Utils {
 
     public static String formatTimestamp(Timestamp timestamp) {
         int nanos = timestamp.getNanos();
-        if (nanos % 1000000l != 0)
+        if (nanos % 1000000L != 0)
             return timestamp.toLocalDateTime().format(microSecFormatter);
         return timestamp.toLocalDateTime().format(milliSecFormatter);
     }

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

@@ -5,7 +5,6 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.management.OperationsException;
 import java.sql.*;
 import java.util.Properties;
 

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

 package com.taosdata.jdbc;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.util.ArrayList;
 import java.util.List;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.lang.management.ThreadMXBean;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class TSDBJNIConnectorTest {
 
@@ -114,6 +114,10 @@ public class TSDBJNIConnectorTest {
                 throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_JNI_RESULT_SET_NULL);
             }
             // close statement
+            connector.executeQuery("use d");
+            String[] lines = new String[] {"st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
+                                           "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns"};
+            connector.insertLines(lines);
 
             // close connection
             connector.closeConnection();

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

 package com.taosdata.jdbc;
 
-import com.taosdata.jdbc.rs.RestfulParameterMetaData;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;

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

@@ -2,7 +2,6 @@ package com.taosdata.jdbc;
 
 import org.junit.*;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.ArrayList;
@@ -26,7 +25,7 @@ public class TSDBPreparedStatementTest {
         long ts = System.currentTimeMillis();
         pstmt_insert.setTimestamp(1, new Timestamp(ts));
         pstmt_insert.setInt(2, 2);
-        pstmt_insert.setLong(3, 3l);
+        pstmt_insert.setLong(3, 3L);
         pstmt_insert.setFloat(4, 3.14f);
         pstmt_insert.setDouble(5, 3.1415);
         pstmt_insert.setShort(6, (short) 6);
@@ -53,8 +52,8 @@ public class TSDBPreparedStatementTest {
             Assert.assertEquals(ts, rs.getTimestamp(1).getTime());
             Assert.assertEquals(2, rs.getInt(2));
             Assert.assertEquals(2, rs.getInt("f1"));
-            Assert.assertEquals(3l, rs.getLong(3));
-            Assert.assertEquals(3l, rs.getLong("f2"));
+            Assert.assertEquals(3L, rs.getLong(3));
+            Assert.assertEquals(3L, rs.getLong("f2"));
             Assert.assertEquals(3.14f, rs.getFloat(4), 0.0);
             Assert.assertEquals(3.14f, rs.getFloat("f3"), 0.0);
             Assert.assertEquals(3.1415, rs.getDouble(5), 0.0);
@@ -312,14 +311,14 @@ public class TSDBPreparedStatementTest {
             Random r = new Random();
             s.setTableName("weather_test");
 
-            ArrayList<Long> ts = new ArrayList<Long>();
+            ArrayList<Long> ts = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 ts.add(System.currentTimeMillis() + i);
             }
             s.setTimestamp(0, ts);
 
             int random = 10 + r.nextInt(5);
-            ArrayList<String> s2 = new ArrayList<String>();
+            ArrayList<String> s2 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 if (i % random == 0) {
                     s2.add(null);
@@ -330,7 +329,7 @@ public class TSDBPreparedStatementTest {
             s.setNString(1, s2, 4);
 
             random = 10 + r.nextInt(5);
-            ArrayList<Float> s3 = new ArrayList<Float>();
+            ArrayList<Float> s3 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 if (i % random == 0) {
                     s3.add(null);
@@ -341,7 +340,7 @@ public class TSDBPreparedStatementTest {
             s.setFloat(2, s3);
 
             random = 10 + r.nextInt(5);
-            ArrayList<Double> s4 = new ArrayList<Double>();
+            ArrayList<Double> s4 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 if (i % random == 0) {
                     s4.add(null);
@@ -352,7 +351,7 @@ public class TSDBPreparedStatementTest {
             s.setDouble(3, s4);
 
             random = 10 + r.nextInt(5);
-            ArrayList<Long> ts2 = new ArrayList<Long>();
+            ArrayList<Long> ts2 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 if (i % random == 0) {
                     ts2.add(null);
@@ -379,13 +378,13 @@ public class TSDBPreparedStatementTest {
                 if (i % random == 0) {
                     sb.add(null);
                 } else {
-                    sb.add(i % 2 == 0 ? true : false);
+                    sb.add(i % 2 == 0);
                 }
             }
             s.setBoolean(6, sb);
 
             random = 10 + r.nextInt(5);
-            ArrayList<String> s5 = new ArrayList<String>();
+            ArrayList<String> s5 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 if (i % random == 0) {
                     s5.add(null);
@@ -424,14 +423,14 @@ public class TSDBPreparedStatementTest {
             Random r = new Random();
             s.setTableName("weather_test");
 
-            ArrayList<Long> ts = new ArrayList<Long>();
+            ArrayList<Long> ts = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 ts.add(System.currentTimeMillis() + i);
             }
             s.setTimestamp(0, ts);
 
             int random = 10 + r.nextInt(5);
-            ArrayList<String> s2 = new ArrayList<String>();
+            ArrayList<String> s2 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 if (i % random == 0) {
                     s2.add(null);
@@ -442,7 +441,7 @@ public class TSDBPreparedStatementTest {
             s.setNString(1, s2, 4);
 
             random = 10 + r.nextInt(5);
-            ArrayList<String> s3 = new ArrayList<String>();
+            ArrayList<String> s3 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 if (i % random == 0) {
                     s3.add(null);
@@ -471,7 +470,7 @@ public class TSDBPreparedStatementTest {
     public void bindDataWithSingleTagTest() throws SQLException {
         Statement stmt = conn.createStatement();
 
-        String types[] = new String[]{"tinyint", "smallint", "int", "bigint", "bool", "float", "double", "binary(10)", "nchar(10)"};
+        String[] types = new String[]{"tinyint", "smallint", "int", "bigint", "bool", "float", "double", "binary(10)", "nchar(10)"};
 
         for (String type : types) {
             stmt.execute("drop table if exists weather_test");
@@ -510,21 +509,21 @@ public class TSDBPreparedStatementTest {
             }
 
 
-            ArrayList<Long> ts = new ArrayList<Long>();
+            ArrayList<Long> ts = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 ts.add(System.currentTimeMillis() + i);
             }
             s.setTimestamp(0, ts);
 
             int random = 10 + r.nextInt(5);
-            ArrayList<String> s2 = new ArrayList<String>();
+            ArrayList<String> s2 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 s2.add("分支" + i % 4);
             }
             s.setNString(1, s2, 10);
 
             random = 10 + r.nextInt(5);
-            ArrayList<String> s3 = new ArrayList<String>();
+            ArrayList<String> s3 = new ArrayList<>();
             for (int i = 0; i < numOfRows; i++) {
                 s3.add("test" + i % 4);
             }
@@ -561,13 +560,13 @@ public class TSDBPreparedStatementTest {
         s.setTagString(1, "test");
 
 
-        ArrayList<Long> ts = new ArrayList<Long>();
+        ArrayList<Long> ts = new ArrayList<>();
         for (int i = 0; i < numOfRows; i++) {
             ts.add(System.currentTimeMillis() + i);
         }
         s.setTimestamp(0, ts);
 
-        ArrayList<String> s2 = new ArrayList<String>();
+        ArrayList<String> s2 = new ArrayList<>();
         for (int i = 0; i < numOfRows; i++) {
             s2.add("test" + i % 4);
         }
@@ -788,7 +787,7 @@ public class TSDBPreparedStatementTest {
     public void setBigDecimal() throws SQLException {
         // given
         long ts = System.currentTimeMillis();
-        BigDecimal bigDecimal = new BigDecimal(3.14444);
+        BigDecimal bigDecimal = new BigDecimal("3.14444");
 
         // when
         pstmt_insert.setTimestamp(1, new Timestamp(ts));
@@ -999,7 +998,7 @@ public class TSDBPreparedStatementTest {
         long ts = System.currentTimeMillis();
         pstmt_insert.setTimestamp(1, new Timestamp(ts));
         pstmt_insert.setInt(2, 2);
-        pstmt_insert.setLong(3, 3l);
+        pstmt_insert.setLong(3, 3L);
         pstmt_insert.setFloat(4, 3.14f);
         pstmt_insert.setDouble(5, 3.1415);
         pstmt_insert.setShort(6, (short) 6);

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

@@ -95,13 +95,13 @@ public class TSDBResultSetTest {
     @Test
     public void getBigDecimal() throws SQLException {
         BigDecimal f1 = rs.getBigDecimal("f1");
-        Assert.assertEquals(1609430400000l, f1.longValue());
+        Assert.assertEquals(1609430400000L, f1.longValue());
 
         BigDecimal f2 = rs.getBigDecimal("f2");
         Assert.assertEquals(1, f2.intValue());
 
         BigDecimal f3 = rs.getBigDecimal("f3");
-        Assert.assertEquals(100l, f3.longValue());
+        Assert.assertEquals(100L, f3.longValue());
 
         BigDecimal f4 = rs.getBigDecimal("f4");
         Assert.assertEquals(3.1415f, f4.floatValue(), 0.00000f);
@@ -125,13 +125,13 @@ public class TSDBResultSetTest {
         Assert.assertEquals(1, Ints.fromByteArray(f2));
 
         byte[] f3 = rs.getBytes("f3");
-        Assert.assertEquals(100l, Longs.fromByteArray(f3));
+        Assert.assertEquals(100L, Longs.fromByteArray(f3));
 
         byte[] f4 = rs.getBytes("f4");
-        Assert.assertEquals(3.1415f, Float.valueOf(new String(f4)), 0.000000f);
+        Assert.assertEquals(3.1415f, Float.parseFloat(new String(f4)), 0.000000f);
 
         byte[] f5 = rs.getBytes("f5");
-        Assert.assertEquals(3.1415926, Double.valueOf(new String(f5)), 0.000000f);
+        Assert.assertEquals(3.1415926, Double.parseDouble(new String(f5)), 0.000000f);
 
         byte[] f6 = rs.getBytes("f6");
         Assert.assertTrue(Arrays.equals("abc".getBytes(), f6));
@@ -223,7 +223,7 @@ public class TSDBResultSetTest {
 
         Object f3 = rs.getObject("f3");
         Assert.assertEquals(Long.class, f3.getClass());
-        Assert.assertEquals(100l, f3);
+        Assert.assertEquals(100L, f3);
 
         Object f4 = rs.getObject("f4");
         Assert.assertEquals(Float.class, f4.getClass());
@@ -421,7 +421,7 @@ public class TSDBResultSetTest {
 
     @Test(expected = SQLFeatureNotSupportedException.class)
     public void updateLong() throws SQLException {
-        rs.updateLong(1, 1l);
+        rs.updateLong(1, 1L);
     }
 
     @Test(expected = SQLFeatureNotSupportedException.class)

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

@@ -3,12 +3,13 @@ package com.taosdata.jdbc.cases;
 
 import com.taosdata.jdbc.TSDBDriver;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import java.io.IOException;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Properties;
 
 public class BadLocaleSettingTest {

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

 package com.taosdata.jdbc.cases;
 
 import com.taosdata.jdbc.TSDBDriver;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -9,13 +10,13 @@ import java.util.Properties;
 
 public class ConnectMultiTaosdByRestfulWithDifferentTokenTest {
 
-    private static String host1 = "192.168.17.156";
-    private static String user1 = "root";
-    private static String password1 = "tqueue";
+    private static final String host1 = "192.168.17.156";
+    private static final String user1 = "root";
+    private static final String password1 = "tqueue";
     private Connection conn1;
-    private static String host2 = "192.168.17.82";
-    private static String user2 = "root";
-    private static String password2 = "taosdata";
+    private static final String host2 = "192.168.17.82";
+    private static final String user2 = "root";
+    private static final String password2 = "taosdata";
     private Connection conn2;
 
     @Test
@@ -30,6 +31,7 @@ public class ConnectMultiTaosdByRestfulWithDifferentTokenTest {
         try (Statement stmt = connection.createStatement()) {
             ResultSet rs = stmt.executeQuery("select server_status()");
             ResultSetMetaData meta = rs.getMetaData();
+            Assert.assertNotNull(meta);
             while (rs.next()) {
             }
         } catch (SQLException e) {

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

@@ -13,7 +13,7 @@ import java.util.Properties;
 public class DriverAutoloadTest {
 
     private Properties properties;
-    private String host = "127.0.0.1";
+    private final String host = "127.0.0.1";
 
     @Test
     public void testRestful() throws SQLException {

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

@@ -13,9 +13,9 @@ import java.util.Random;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class InsertDbwithoutUseDbTest {
 
-    private static String host = "127.0.0.1";
+    private static final String host = "127.0.0.1";
     private static Properties properties;
-    private static Random random = new Random(System.currentTimeMillis());
+    private static final Random random = new Random(System.currentTimeMillis());
 
     @Test
     public void case001() throws ClassNotFoundException, SQLException {

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

@@ -8,14 +8,14 @@ public class InsertSpecialCharacterJniTest {
 
     private static final String host = "127.0.0.1";
     private static Connection conn;
-    private static String dbName = "spec_char_test";
-    private static String tbname1 = "test";
-    private static String tbname2 = "weather";
-    private static String special_character_str_1 = "$asd$$fsfsf$";
-    private static String special_character_str_2 = "\\\\asdfsfsf\\\\";
-    private static String special_character_str_3 = "\\\\asdfsfsf\\";
-    private static String special_character_str_4 = "?asd??fsf?sf?";
-    private static String special_character_str_5 = "?#sd@$f(('<(s[P)>\"){]}f?s[]{}%vaew|\"fsfs^a&d*jhg)(j))(f@~!?$";
+    private static final String dbName = "spec_char_test";
+    private static final String tbname1 = "test";
+    private static final String tbname2 = "weather";
+    private static final String special_character_str_1 = "$asd$$fsfsf$";
+    private static final String special_character_str_2 = "\\\\asdfsfsf\\\\";
+    private static final String special_character_str_3 = "\\\\asdfsfsf\\";
+    private static final String special_character_str_4 = "?asd??fsf?sf?";
+    private static final String special_character_str_5 = "?#sd@$f(('<(s[P)>\"){]}f?s[]{}%vaew|\"fsfs^a&d*jhg)(j))(f@~!?$";
 
     @Test
     public void testCase01() throws SQLException {

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

@@ -8,14 +8,14 @@ public class InsertSpecialCharacterRestfulTest {
 
     private static final String host = "127.0.0.1";
     private static Connection conn;
-    private static String dbName = "spec_char_test";
-    private static String tbname1 = "test";
-    private static String tbname2 = "weather";
-    private static String special_character_str_1 = "$asd$$fsfsf$";
-    private static String special_character_str_2 = "\\\\asdfsfsf\\\\";
-    private static String special_character_str_3 = "\\\\asdfsfsf\\";
-    private static String special_character_str_4 = "?asd??fsf?sf?";
-    private static String special_character_str_5 = "?#sd@$f(('<(s[P)>\"){]}f?s[]{}%vaew|\"fsfs^a&d*jhg)(j))(f@~!?$";
+    private static final String dbName = "spec_char_test";
+    private static final String tbname1 = "test";
+    private static final String tbname2 = "weather";
+    private static final String special_character_str_1 = "$asd$$fsfsf$";
+    private static final String special_character_str_2 = "\\\\asdfsfsf\\\\";
+    private static final String special_character_str_3 = "\\\\asdfsfsf\\";
+    private static final String special_character_str_4 = "?asd??fsf?sf?";
+    private static final String special_character_str_5 = "?#sd@$f(('<(s[P)>\"){]}f?s[]{}%vaew|\"fsfs^a&d*jhg)(j))(f@~!?$";
 
     @Test
     public void testCase01() throws SQLException {

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

@@ -8,13 +8,13 @@ import java.util.Properties;
 
 public class InvalidResultSetPointerTest {
 
-    private static String host = "127.0.0.1";
+    private static final String host = "127.0.0.1";
     private static final String dbName = "test";
     private static final String stbName = "stb";
     private static final String tbName = "tb";
     private static Connection connection;
-    private static int numOfSTb = 30000;
-    private static int numOfTb = 3;
+    private static final int numOfSTb = 30000;
+    private static final int numOfTb = 3;
     private static int numOfThreads = 100;
 
     @Test
@@ -74,7 +74,7 @@ public class InvalidResultSetPointerTest {
             b = numOfSTb % numOfThreads;
         }
 
-        multiThreadingClass instance[] = new multiThreadingClass[numOfThreads];
+        multiThreadingClass[] instance = new multiThreadingClass[numOfThreads];
 
         int last = 0;
         for (int i = 0; i < numOfThreads; i++) {

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

@@ -9,8 +9,7 @@ import java.util.concurrent.TimeUnit;
 
 public class MultiThreadsWithSameStatementTest {
 
-
-    private class Service {
+    private static class Service {
         public Connection conn;
         public Statement stmt;
 

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

@@ -16,9 +16,9 @@ import static org.junit.Assert.assertEquals;
 public class StableTest {
 
     private static Connection connection;
-    private static String dbName = "test";
-    private static String stbName = "st";
-    private static String host = "127.0.0.1";
+    private static final String dbName = "test";
+    private static final String stbName = "st";
+    private static final String host = "127.0.0.1";
 
     @BeforeClass
     public static void createDatabase() {

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

@@ -25,7 +25,7 @@ public class TaosInfoMonitorTest {
             return null;
         }).collect(Collectors.toList());
 
-        connectionList.stream().forEach(conn -> {
+        connectionList.forEach(conn -> {
             try (Statement stmt = conn.createStatement()) {
                 ResultSet rs = stmt.executeQuery("show databases");
                 while (rs.next()) {
@@ -37,7 +37,7 @@ public class TaosInfoMonitorTest {
             }
         });
 
-        connectionList.stream().forEach(conn -> {
+        connectionList.forEach(conn -> {
             try {
                 conn.close();
                 TimeUnit.MILLISECONDS.sleep(100);

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

@@ -22,7 +22,7 @@ public class TimestampPrecisionInNanoInJniTest {
     private static final long timestamp3 = (timestamp1 + 10) * 1000_000 + 123456;
     private static final Format format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
     private static final String date1 = format.format(new Date(timestamp1));
-    private static final String date4 = format.format(new Date(timestamp1 + 10l));
+    private static final String date4 = format.format(new Date(timestamp1 + 10L));
     private static final String date2 = date1 + "123455";
     private static final String date3 = date4 + "123456";
     

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

@@ -44,7 +44,7 @@ public class UnsignedNumberJniTest {
                 Assert.assertEquals(127, rs.getByte(2));
                 Assert.assertEquals(32767, rs.getShort(3));
                 Assert.assertEquals(2147483647, rs.getInt(4));
-                Assert.assertEquals(9223372036854775807l, rs.getLong(5));
+                Assert.assertEquals(9223372036854775807L, rs.getLong(5));
             }
         } catch (SQLException e) {
             e.printStackTrace();

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

@@ -45,7 +45,7 @@ public class UnsignedNumberRestfulTest {
                 Assert.assertEquals(127, rs.getByte(2));
                 Assert.assertEquals(32767, rs.getShort(3));
                 Assert.assertEquals(2147483647, rs.getInt(4));
-                Assert.assertEquals(9223372036854775807l, rs.getLong(5));
+                Assert.assertEquals(9223372036854775807L, rs.getLong(5));
             }
         } catch (SQLException e) {
             e.printStackTrace();

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

@@ -95,13 +95,13 @@ public class RestfulResultSetTest {
     public void getBigDecimal() throws SQLException {
         BigDecimal f1 = rs.getBigDecimal("f1");
         long actual = (f1 == null) ? 0 : f1.longValue();
-        Assert.assertEquals(1609430400000l, actual);
+        Assert.assertEquals(1609430400000L, actual);
 
         BigDecimal f2 = rs.getBigDecimal("f2");
         Assert.assertEquals(1, f2.intValue());
 
         BigDecimal f3 = rs.getBigDecimal("f3");
-        Assert.assertEquals(100l, f3.longValue());
+        Assert.assertEquals(100L, f3.longValue());
 
         BigDecimal f4 = rs.getBigDecimal("f4");
         Assert.assertEquals(3.1415f, f4.floatValue(), 0.00000f);
@@ -125,13 +125,13 @@ public class RestfulResultSetTest {
         Assert.assertEquals(1, Ints.fromByteArray(f2));
 
         byte[] f3 = rs.getBytes("f3");
-        Assert.assertEquals(100l, Longs.fromByteArray(f3));
+        Assert.assertEquals(100L, Longs.fromByteArray(f3));
 
         byte[] f4 = rs.getBytes("f4");
-        Assert.assertEquals(3.1415f, Float.valueOf(new String(f4)), 0.000000f);
+        Assert.assertEquals(3.1415f, Float.parseFloat(new String(f4)), 0.000000f);
 
         byte[] f5 = rs.getBytes("f5");
-        Assert.assertEquals(3.1415926, Double.valueOf(new String(f5)), 0.000000f);
+        Assert.assertEquals(3.1415926, Double.parseDouble(new String(f5)), 0.000000f);
 
         byte[] f6 = rs.getBytes("f6");
         Assert.assertEquals("abc", new String(f6));
@@ -222,7 +222,7 @@ public class RestfulResultSetTest {
 
         Object f3 = rs.getObject("f3");
         Assert.assertEquals(Long.class, f3.getClass());
-        Assert.assertEquals(100l, f3);
+        Assert.assertEquals(100L, f3);
 
         Object f4 = rs.getObject("f4");
         Assert.assertEquals(Float.class, f4.getClass());
@@ -434,7 +434,7 @@ public class RestfulResultSetTest {
 
     @Test(expected = SQLFeatureNotSupportedException.class)
     public void updateLong() throws SQLException {
-        rs.updateLong(1, 1l);
+        rs.updateLong(1, 1L);
     }
 
     @Test(expected = SQLFeatureNotSupportedException.class)

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

@@ -10,17 +10,17 @@ public class OSUtilsTest {
 
     @Test
     public void inWindows() {
-        Assert.assertEquals(OS.indexOf("win") >= 0, OSUtils.isWindows());
+        Assert.assertEquals(OS.contains("win"), OSUtils.isWindows());
     }
 
     @Test
     public void isMac() {
-        Assert.assertEquals(OS.indexOf("mac") >= 0, OSUtils.isMac());
+        Assert.assertEquals(OS.contains("mac"), OSUtils.isMac());
     }
 
     @Test
     public void isLinux() {
-        Assert.assertEquals(OS.indexOf("nux") >= 0, OSUtils.isLinux());
+        Assert.assertEquals(OS.contains("nux"), OSUtils.isLinux());
     }
 
     @Before

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

@@ -21,47 +21,4 @@ public class TimestampUtil {
         SimpleDateFormat sdf = new SimpleDateFormat(datetimeFormat);
         return sdf.format(new Date(time));
     }
-
-    public static class TimeTuple {
-        public Long start;
-        public Long end;
-        public Long timeGap;
-
-        TimeTuple(long start, long end, long timeGap) {
-            this.start = start;
-            this.end = end;
-            this.timeGap = timeGap;
-        }
-    }
-
-    public static TimeTuple range(long start, long timeGap, long size) {
-        long now = System.currentTimeMillis();
-        if (timeGap < 1)
-            timeGap = 1;
-        if (start == 0)
-            start = now - size * timeGap;
-
-        // 如果size小于1异常
-        if (size < 1)
-            throw new IllegalArgumentException("size less than 1.");
-        // 如果timeGap为1，已经超长，需要前移start
-        if (start + size > now) {
-            start = now - size;
-            return new TimeTuple(start, now, 1);
-        }
-        long end = start + (long) (timeGap * size);
-        if (end > now) {
-            //压缩timeGap
-            end = now;
-            double gap = (end - start) / (size * 1.0f);
-            if (gap < 1.0f) {
-                timeGap = 1;
-                start = end - size;
-            } else {
-                timeGap = (long) gap;
-                end = start + (long) (timeGap * size);
-            }
-        }
-        return new TimeTuple(start, end, timeGap);
-    }
 }

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

@@ -3,8 +3,6 @@ package com.taosdata.jdbc.utils;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 public class UtilsTest {
@@ -19,14 +17,14 @@ public class UtilsTest {
         Assert.assertEquals("\\'\\'\\'\\'\\'a\\'", news);
 
         // given
-        s = "\'''''a\\'";
+        s = "'''''a\\'";
         // when
         news = Utils.escapeSingleQuota(s);
         // then
         Assert.assertEquals("\\'\\'\\'\\'\\'a\\'", news);
 
         // given
-        s = "\'\'\'\''a\\'";
+        s = "'''''a\\'";
         // when
         news = Utils.escapeSingleQuota(s);
         // then

src/connector/python/taos/cinterface.py

@@ -403,6 +403,20 @@ class CTaosInterface(object):
         """
         return CTaosInterface.libtaos.taos_affected_rows(result)
 
+    @staticmethod
+    def insertLines(connection, lines):
+        '''
+            insert through lines protocol
+            @lines: list of str
+            @rtype: tsdb error codes 
+        '''
+        numLines = len(lines)
+        c_lines_type = ctypes.c_char_p*numLines
+        c_lines = c_lines_type()
+        for i in range(numLines):
+            c_lines[i] = ctypes.c_char_p(lines[i].encode('utf-8'))
+        return CTaosInterface.libtaos.taos_insert_lines(connection, c_lines, ctypes.c_int(numLines))
+
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
         """Create a subscription

src/connector/python/taos/connection.py

@@ -66,6 +66,14 @@ class TDengineConnection(object):
             self._conn, restart, topic, sql, interval)
         return TDengineSubscription(sub)
 
+    def insertLines(self, lines):
+        """
+        insert lines through line protocol
+        """
+        if self._conn is None:
+            return None
+        return CTaosInterface.insertLines(self._conn, lines)
+        
     def cursor(self):
         """Return a new Cursor object using the connection.
         """

src/dnode/src/dnodeMain.c

@@ -42,6 +42,7 @@
 #include "module.h"
 #include "qScript.h"
 #include "mnode.h"
+#include "tscompression.h"
 
 #if !defined(_MODULE) || !defined(_TD_LINUX)
 int32_t moduleStart() { return 0; }
@@ -236,6 +237,12 @@ static void dnodeCheckDataDirOpenned(char *dir) {
 }
 
 static int32_t dnodeInitStorage() {
+#ifdef TD_TSZ
+  // compress module init
+  tsCompressInit();
+#endif
+
+  // storage module init
   if (tsDiskCfgNum == 1 && dnodeCreateDir(tsDataDir) < 0) {
     dError("failed to create dir: %s, reason: %s", tsDataDir, strerror(errno));
     return -1;
@@ -311,7 +318,15 @@ static int32_t dnodeInitStorage() {
   return 0;
 }
 
-static void dnodeCleanupStorage() { tfsDestroy(); }
+static void dnodeCleanupStorage() {
+  // storage destroy
+  tfsDestroy(); 
+
+ #ifdef TD_TSZ 
+  // compress destroy
+  tsCompressExit();
+ #endif 
+}
 
 bool  dnodeIsFirstDeploy() {
   return strcmp(tsFirst, tsLocalEp) == 0;

src/inc/taoserror.h

@@ -101,6 +101,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_TSC_INVALID_TABLE_NAME        TAOS_DEF_ERROR_CODE(0, 0x0218)  //"Table does not exist")
 #define TSDB_CODE_TSC_EXCEED_SQL_LIMIT          TAOS_DEF_ERROR_CODE(0, 0x0219)  //"SQL statement too long check maxSQLLength config")
 #define TSDB_CODE_TSC_FILE_EMPTY                TAOS_DEF_ERROR_CODE(0, 0x021A)  //"File is empty")
+#define TSDB_CODE_TSC_LINE_SYNTAX_ERROR         TAOS_DEF_ERROR_CODE(0, 0x021B)  //"Syntax error in Line")
 
 // mnode
 #define TSDB_CODE_MND_MSG_NOT_PROCESSED         TAOS_DEF_ERROR_CODE(0, 0x0300)  //"Message not processed")

src/inc/taosmsg.h

@@ -874,6 +874,10 @@ typedef struct {
   int64_t  useconds;
   int64_t  stime;
   uint64_t qId;
+  uint64_t sqlObjId;
+  int32_t  pid;
+  char     fqdn[TSDB_FQDN_LEN];
+  int32_t  numOfSub;
 } SQueryDesc;
 
 typedef struct {

src/kit/CMakeLists.txt

@@ -4,3 +4,4 @@ PROJECT(TDengine)
 ADD_SUBDIRECTORY(shell)
 ADD_SUBDIRECTORY(taosdemo)
 ADD_SUBDIRECTORY(taosdump)
+ADD_SUBDIRECTORY(taospack)

src/kit/taosdump/taosdump.c

@@ -600,7 +600,7 @@ static void parse_timestamp(
                 tmpEpoch = atoll(tmp);
             }
 
-            sprintf(argv[i], "%"PRId64"", tmpEpoch);
+            sprintf(argv[i+1], "%"PRId64"", tmpEpoch);
             debugPrint("%s() LN%d, tmp is: %s, argv[%d]: %s\n",
                     __func__, __LINE__, tmp, i, argv[i]);
             free(tmp);

src/kit/taospack/CMakeLists.txt

+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/os/inc)
+INCLUDE_DIRECTORIES(inc)
+
+IF (TD_LINUX)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(taospack ${SRC})
+  TARGET_LINK_LIBRARIES(taospack os tutil tsdb ${VAR_TSZ})
+ELSEIF (TD_WINDOWS)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(taospack ${SRC})
+  TARGET_LINK_LIBRARIES(taospack)
+ELSEIF (TD_DARWIN)
+  # MAC
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(taospack ${SRC})
+  TARGET_LINK_LIBRARIES(taospack os tutil tsdb)
+ENDIF ()
\ No newline at end of file

src/mnode/src/mnodeDnode.c

@@ -1146,6 +1146,7 @@ static int32_t mnodeRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, v
         numOfRows++;
         break;
       case TAOS_CFG_VTYPE_FLOAT:
+      case TAOS_CFG_VTYPE_DOUBLE:
         t = snprintf(varDataVal(pWrite), TSDB_CFG_VALUE_LEN, "%f", *((float *)cfg->ptr));
         varDataSetLen(pWrite, t);
         numOfRows++;

src/mnode/src/mnodeProfile.c

@@ -32,6 +32,7 @@
 #define CONN_KEEP_TIME  (tsShellActivityTimer * 3)
 #define CONN_CHECK_TIME (tsShellActivityTimer * 2)
 #define QUERY_ID_SIZE   20
+#define QUERY_OBJ_ID_SIZE   10
 #define QUERY_STREAM_SAVE_SIZE 20
 
 static SCacheObj *tsMnodeConnCache = NULL;
@@ -361,6 +362,30 @@ static int32_t mnodeGetQueryMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
+  pShow->bytes[cols] = QUERY_OBJ_ID_SIZE + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "sql_obj_id");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "pid");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_EP_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "ep");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "sub_queries");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
   pShow->bytes[cols] = TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE;
   pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
   strcpy(pSchema[cols].name, "sql");
@@ -434,6 +459,29 @@ static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, v
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
       *(int64_t *)pWrite = htobe64(pDesc->useconds);
       cols++;
+      /*
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int64_t *)pWrite = htobe64(pDesc->sqlObjId);
+      cols++;
+      */
+      snprintf(str, tListLen(str), "0x%08" PRIx64, htobe64(pDesc->sqlObjId));
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, str, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = htonl(pDesc->pid);
+      cols++;
+
+      char epBuf[TSDB_EP_LEN + 1] = {0};
+      snprintf(epBuf, tListLen(epBuf), "%s:%u", pDesc->fqdn, pConnObj->port);
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, epBuf, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = htonl(pDesc->numOfSub);
+      cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
       STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pDesc->sql, pShow->bytes[cols]);

src/query/inc/qSqlparser.h

@@ -254,7 +254,7 @@ typedef struct tSqlExpr {
     struct SArray   *paramList;      // function parameters list
   } Expr;
 
-  uint32_t           functionId;  // function id, todo remove it
+  int32_t            functionId;  // function id, todo remove it
   SStrToken          columnName;  // table column info
   tVariant           value;       // the use input value
   SStrToken          exprToken;   // original sql expr string

src/query/src/qExecutor.c

@@ -2427,7 +2427,7 @@ static void updateDataCheckOrder(SQInfo *pQInfo, SQueryTableMsg* pQueryMsg, bool
 
   if (pQueryAttr->pointInterpQuery && pQueryAttr->interval.interval == 0) {
     if (!QUERY_IS_ASC_QUERY(pQueryAttr)) {
-      qDebug(msg, pQInfo, "interp", pQueryAttr->order.order, TSDB_ORDER_ASC, pQueryAttr->window.skey, pQueryAttr->window.ekey, pQueryAttr->window.ekey, pQueryAttr->window.skey);
+      qDebug(msg, pQInfo->qId, "interp", pQueryAttr->order.order, TSDB_ORDER_ASC, pQueryAttr->window.skey, pQueryAttr->window.ekey, pQueryAttr->window.ekey, pQueryAttr->window.skey);
       SWAP(pQueryAttr->window.skey, pQueryAttr->window.ekey, TSKEY);
     }
 
@@ -2438,7 +2438,7 @@ static void updateDataCheckOrder(SQInfo *pQInfo, SQueryTableMsg* pQueryMsg, bool
   if (pQueryAttr->interval.interval == 0) {
     if (onlyFirstQuery(pQueryAttr)) {
       if (!QUERY_IS_ASC_QUERY(pQueryAttr)) {
-        qDebug(msg, pQInfo, "only-first", pQueryAttr->order.order, TSDB_ORDER_ASC, pQueryAttr->window.skey,
+        qDebug(msg, pQInfo->qId, "only-first", pQueryAttr->order.order, TSDB_ORDER_ASC, pQueryAttr->window.skey,
                pQueryAttr->window.ekey, pQueryAttr->window.ekey, pQueryAttr->window.skey);
 
         SWAP(pQueryAttr->window.skey, pQueryAttr->window.ekey, TSKEY);
@@ -2449,7 +2449,7 @@ static void updateDataCheckOrder(SQInfo *pQInfo, SQueryTableMsg* pQueryMsg, bool
       pQueryAttr->needReverseScan = false;
     } else if (onlyLastQuery(pQueryAttr) && notContainSessionOrStateWindow(pQueryAttr)) {
       if (QUERY_IS_ASC_QUERY(pQueryAttr)) {
-        qDebug(msg, pQInfo, "only-last", pQueryAttr->order.order, TSDB_ORDER_DESC, pQueryAttr->window.skey,
+        qDebug(msg, pQInfo->qId, "only-last", pQueryAttr->order.order, TSDB_ORDER_DESC, pQueryAttr->window.skey,
                pQueryAttr->window.ekey, pQueryAttr->window.ekey, pQueryAttr->window.skey);
 
         SWAP(pQueryAttr->window.skey, pQueryAttr->window.ekey, TSKEY);
@@ -2464,7 +2464,7 @@ static void updateDataCheckOrder(SQInfo *pQInfo, SQueryTableMsg* pQueryMsg, bool
     if (stableQuery) {
       if (onlyFirstQuery(pQueryAttr)) {
         if (!QUERY_IS_ASC_QUERY(pQueryAttr)) {
-          qDebug(msg, pQInfo, "only-first stable", pQueryAttr->order.order, TSDB_ORDER_ASC,
+          qDebug(msg, pQInfo->qId, "only-first stable", pQueryAttr->order.order, TSDB_ORDER_ASC,
                  pQueryAttr->window.skey, pQueryAttr->window.ekey, pQueryAttr->window.ekey, pQueryAttr->window.skey);
 
           SWAP(pQueryAttr->window.skey, pQueryAttr->window.ekey, TSKEY);
@@ -2475,7 +2475,7 @@ static void updateDataCheckOrder(SQInfo *pQInfo, SQueryTableMsg* pQueryMsg, bool
         pQueryAttr->needReverseScan = false;
       } else if (onlyLastQuery(pQueryAttr)) {
         if (QUERY_IS_ASC_QUERY(pQueryAttr)) {
-          qDebug(msg, pQInfo, "only-last stable", pQueryAttr->order.order, TSDB_ORDER_DESC,
+          qDebug(msg, pQInfo->qId, "only-last stable", pQueryAttr->order.order, TSDB_ORDER_DESC,
                  pQueryAttr->window.skey, pQueryAttr->window.ekey, pQueryAttr->window.ekey, pQueryAttr->window.skey);
 
           SWAP(pQueryAttr->window.skey, pQueryAttr->window.ekey, TSKEY);
@@ -6594,10 +6594,19 @@ static SSDataBlock* hashDistinct(void* param, bool* newgroup) {
       if (isNull(val, type)) {
         continue;
       }
-      int dummy; 
-      void* res = taosHashGet(pInfo->pSet, val, bytes);
+
+      size_t keyLen = 0;
+      if (IS_VAR_DATA_TYPE(pOperator->pExpr->base.colType)) {
+        tstr* var = (tstr*)(val);
+        keyLen = varDataLen(var);
+      } else {
+        keyLen = bytes;
+      }
+
+      int dummy;
+      void* res = taosHashGet(pInfo->pSet, val, keyLen);
       if (res == NULL) {
-        taosHashPut(pInfo->pSet, val, bytes, &dummy, sizeof(dummy));
+        taosHashPut(pInfo->pSet, val, keyLen, &dummy, sizeof(dummy));
         char* start = pResultColInfoData->pData + bytes * pInfo->pRes->info.rows;
         memcpy(start, val, bytes);
         pRes->info.rows += 1;
@@ -6624,6 +6633,7 @@ SOperatorInfo* createDistinctOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperat
   pOperator->blockingOptr = false;
   pOperator->status       = OP_IN_EXECUTING;
   pOperator->operatorType = OP_Distinct;
+  pOperator->pExpr        = pExpr;
   pOperator->numOfOutput  = numOfOutput;
   pOperator->info         = pInfo;
   pOperator->pRuntimeEnv  = pRuntimeEnv;

src/util/CMakeLists.txt

@@ -4,10 +4,14 @@ PROJECT(TDengine)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/rpc/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/sync/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/rmonotonic/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/TSZ/sz/include)
 
 AUX_SOURCE_DIRECTORY(src SRC)
 ADD_LIBRARY(tutil ${SRC})
-TARGET_LINK_LIBRARIES(tutil pthread os lz4 z rmonotonic)
+
+TARGET_LINK_LIBRARIES(tutil pthread os lz4 z rmonotonic ${VAR_TSZ} )
+
+
 
 IF (TD_LINUX)
   TARGET_LINK_LIBRARIES(tutil m rt)
@@ -37,4 +41,4 @@ ENDIF()
 
 IF (TD_STORAGE)
   TARGET_LINK_LIBRARIES(tutil storage)
-ENDIF ()
\ No newline at end of file
+ENDIF ()

src/util/inc/tconfig.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define TSDB_CFG_MAX_NUM    110
+#define TSDB_CFG_MAX_NUM    116  // 110 + 6 with lossy option
 #define TSDB_CFG_PRINT_LEN  23
 #define TSDB_CFG_OPTION_LEN 24
 #define TSDB_CFG_VALUE_LEN  41
@@ -32,6 +32,9 @@ extern "C" {
 #define TSDB_CFG_CTYPE_B_OPTION    16U  // can be configured by taos_options function
 #define TSDB_CFG_CTYPE_B_NOT_PRINT 32U  // such as password
 
+#define MAX_FLOAT    100000
+#define MIN_FLOAT    0
+
 enum {
   TAOS_CFG_CSTATUS_NONE,     // not configured
   TAOS_CFG_CSTATUS_DEFAULT,  // use system default value
@@ -50,6 +53,7 @@ enum {
   TAOS_CFG_VTYPE_IPSTR,
   TAOS_CFG_VTYPE_DIRECTORY,
   TAOS_CFG_VTYPE_DATA_DIRCTORY,
+  TAOS_CFG_VTYPE_DOUBLE,
 };
 
 enum {

src/util/inc/tscompression.h

@@ -34,6 +34,22 @@ extern "C" {
 #define ONE_STAGE_COMP 1
 #define TWO_STAGE_COMP 2
 
+//
+// compressed data first byte foramt
+//   ------ 7 bit ---- | ---- 1 bit ----
+//        algorithm           mode
+//
+
+// compression data mode save first byte lower 1 bit
+#define MODE_NOCOMPRESS  0  // original data
+#define MODE_COMPRESS    1  // compatible old compress
+
+// compression algorithm save first byte higher 7 bit
+#define ALGO_SZ_LOSSY     1 // SZ compress 
+
+#define HEAD_MODE(x)  x%2
+#define HEAD_ALGO(x)  x/2
+
 extern int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type);
 extern int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type);
 extern int tsCompressBoolImp(const char *const input, const int nelements, char *const output);
@@ -46,6 +62,20 @@ extern int tsCompressDoubleImp(const char *const input, const int nelements, cha
 extern int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output);
 extern int tsCompressFloatImp(const char *const input, const int nelements, char *const output);
 extern int tsDecompressFloatImp(const char *const input, const int nelements, char *const output);
+// lossy
+extern int tsCompressFloatLossyImp(const char * input, const int nelements, char *const output);
+extern int tsDecompressFloatLossyImp(const char * input, int compressedSize, const int nelements, char *const output);
+extern int tsCompressDoubleLossyImp(const char * input, const int nelements, char *const output);
+extern int tsDecompressDoubleLossyImp(const char * input, int compressedSize, const int nelements, char *const output);
+
+#ifdef TD_TSZ
+extern bool lossyFloat;
+extern bool lossyDouble;
+// init call
+int tsCompressInit();
+// exit call
+void tsCompressExit();
+#endif
 
 static FORCE_INLINE int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
                       char *const buffer, int bufferSize) {
@@ -189,56 +219,123 @@ static FORCE_INLINE int tsDecompressString(const char *const input, int compress
 
 static FORCE_INLINE int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
                     char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressFloatImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressFloatImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
+#ifdef TD_TSZ
+  // lossy mode
+  if(lossyFloat) {
+    return tsCompressFloatLossyImp(input, nelements, output);
+  // lossless mode  
   } else {
-    assert(0);
-    return -1;
+#endif    
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsCompressFloatImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      int len = tsCompressFloatImp(input, nelements, buffer);
+      return tsCompressStringImp(buffer, len, output, outputSize);
+    } else {
+      assert(0);
+      return -1;
+    }    
+#ifdef TD_TSZ  
   }
+#endif
 }
 
 static FORCE_INLINE int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output,
                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressFloatImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressFloatImp(buffer, nelements, output);
+#ifdef TD_TSZ
+  if(HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY){
+    // decompress lossy
+    return tsDecompressFloatLossyImp(input, compressedSize, nelements, output);
   } else {
-    assert(0);
-    return -1;
+#endif    
+    // decompress lossless
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsDecompressFloatImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+      return tsDecompressFloatImp(buffer, nelements, output);
+    } else {
+      assert(0);
+      return -1;
+    }
+#ifdef TD_TSZ  
   }
+#endif
 }
 
+
 static FORCE_INLINE int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
                      char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressDoubleImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressDoubleImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
+#ifdef TD_TSZ  
+  if(lossyDouble){
+    // lossy mode
+    return tsCompressDoubleLossyImp(input, nelements, output);
   } else {
-    assert(0);
-    return -1;
+#endif    
+    // lossless mode
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsCompressDoubleImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      int len = tsCompressDoubleImp(input, nelements, buffer);
+      return tsCompressStringImp(buffer, len, output, outputSize);
+    } else {
+      assert(0);
+      return -1;
+    }
+#ifdef TD_TSZ      
   }
+#endif  
 }
 
 static FORCE_INLINE int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output,
                        int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressDoubleImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
-    return tsDecompressDoubleImp(buffer, nelements, output);
+  #ifdef TD_TSZ  
+  if(HEAD_ALGO(input[0]) == ALGO_SZ_LOSSY){
+    // decompress lossy
+    return tsDecompressDoubleLossyImp(input, compressedSize, nelements, output);
   } else {
-    assert(0);
-    return -1;
+  #endif  
+    // decompress lossless
+    if (algorithm == ONE_STAGE_COMP) {
+      return tsDecompressDoubleImp(input, nelements, output);
+    } else if (algorithm == TWO_STAGE_COMP) {
+      if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+      return tsDecompressDoubleImp(buffer, nelements, output);
+    } else {
+      assert(0);
+      return -1;
+    }
+#ifdef TD_TSZ      
   }
+#endif  
+}
+
+#ifdef TD_TSZ  
+//
+//  lossy float double
+//
+static FORCE_INLINE int tsCompressFloatLossy(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                    char algorithm, char *const buffer, int bufferSize) {
+  return tsCompressFloatLossyImp(input, nelements, output);
+}
+
+static FORCE_INLINE int tsDecompressFloatLossy(const char *const input, int compressedSize, const int nelements, char *const output,
+                      int outputSize, char algorithm, char *const buffer, int bufferSize){
+  return tsDecompressFloatLossyImp(input, compressedSize, nelements, output);
+}
+
+static FORCE_INLINE int tsCompressDoubleLossy(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize){
+  return tsCompressDoubleLossyImp(input, nelements, output);
+}
+
+static FORCE_INLINE int tsDecompressDoubleLossy(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize){
+  return tsDecompressDoubleLossyImp(input, compressedSize, nelements, output);
 }
 
+#endif
+
 static FORCE_INLINE int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
                         char algorithm, char *const buffer, int bufferSize) {
   if (algorithm == ONE_STAGE_COMP) {

src/util/src/tcompression.c

@@ -49,9 +49,14 @@
 
 #include "os.h"
 #include "lz4.h"
+#ifdef TD_TSZ  
+  #include "td_sz.h"
+#endif
 #include "taosdef.h"
 #include "tscompression.h"
 #include "tulog.h"
+#include "tglobal.h"
+
 
 static const int TEST_NUMBER = 1;
 #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0)
@@ -61,6 +66,39 @@ static const int TEST_NUMBER = 1;
 #define ZIGZAG_ENCODE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
 #define ZIGZAG_DECODE(T, v) ((v) >> 1) ^ -((T)((v)&1))                                 // zigzag decode
 
+#ifdef TD_TSZ
+bool lossyFloat  = false;
+bool lossyDouble = false;
+
+// init call
+int tsCompressInit(){
+  // config 
+  if(lossyColumns[0] == 0){
+    lossyFloat = false;
+    lossyDouble = false;
+    return 0;
+  }
+
+  lossyFloat  = strstr(lossyColumns, "float") != NULL;
+  lossyDouble = strstr(lossyColumns, "double") != NULL;
+
+  if(lossyFloat == false && lossyDouble == false)
+        return 0;
+  
+  tdszInit(fPrecision, dPrecision, maxRange, curRange, Compressor);
+  if(lossyFloat)
+     uInfo("lossy compression float  is opened. ");
+  if(lossyDouble)
+     uInfo("lossy compression double is opened. ");
+  return 1;
+}
+// exit call
+void tsCompressExit(){
+   tdszExit();
+}
+
+#endif
+
 /*
  * Compress Integer (Simple8B).
  */
@@ -410,6 +448,7 @@ int tsCompressStringImp(const char *const input, int inputSize, char *const outp
 
 int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize) {
   // compressedSize is the size of data after compression.
+  
   if (input[0] == 1) {
     /* It is compressed by LZ4 algorithm */
     const int decompressed_size = LZ4_decompress_safe(input + 1, output, compressedSize - 1, outputSize);
@@ -886,3 +925,72 @@ int tsDecompressFloatImp(const char *const input, const int nelements, char *con
 
   return nelements * FLOAT_BYTES;
 }
+
+#ifdef TD_TSZ  
+//
+//   ----------  float double lossy  -----------
+//
+int tsCompressFloatLossyImp(const char * input, const int nelements, char *const output){
+  // compress with sz 
+  int compressedSize = tdszCompress(SZ_FLOAT, input, nelements, output + 1);
+  unsigned char algo = ALGO_SZ_LOSSY << 1;
+  if (compressedSize == 0 || compressedSize >= nelements*sizeof(float)){
+    // compressed error or large than original
+    output[0] = MODE_NOCOMPRESS | algo;
+    memcpy(output + 1, input, nelements * sizeof(float));
+    compressedSize = 1 + nelements * sizeof(float);
+  } else {
+    // compressed successfully
+    output[0] = MODE_COMPRESS | algo;
+    compressedSize += 1;
+  }
+
+  return compressedSize;
+}
+
+int tsDecompressFloatLossyImp(const char * input, int compressedSize, const int nelements, char *const output){
+  int decompressedSize  = 0;
+  if( HEAD_MODE(input[0]) == MODE_NOCOMPRESS){
+    // orginal so memcpy directly
+    decompressedSize = nelements * sizeof(float);
+    memcpy(output, input + 1, decompressedSize);
+
+    return decompressedSize;
+  } 
+
+  // decompressed with sz
+  return tdszDecompress(SZ_FLOAT, input + 1, compressedSize - 1, nelements, output);
+}
+
+int tsCompressDoubleLossyImp(const char * input, const int nelements, char *const output){
+   // compress with sz 
+  int compressedSize = tdszCompress(SZ_DOUBLE, input, nelements, output + 1);
+  unsigned char algo = ALGO_SZ_LOSSY << 1;
+  if (compressedSize == 0 || compressedSize >= nelements*sizeof(double)) {
+    // compressed error or large than original
+    output[0] = MODE_NOCOMPRESS | algo;
+    memcpy(output + 1, input, nelements * sizeof(double));
+    compressedSize = 1 + nelements * sizeof(double);
+  } else {
+    // compressed successfully
+    output[0] = MODE_COMPRESS | algo;
+    compressedSize += 1;
+  }
+
+  return compressedSize; 
+}
+
+int tsDecompressDoubleLossyImp(const char * input, int compressedSize, const int nelements, char *const output){
+  int decompressedSize  = 0;
+  if( HEAD_MODE(input[0]) == MODE_NOCOMPRESS){
+    // orginal so memcpy directly
+    decompressedSize = nelements * sizeof(double);
+    memcpy(output, input + 1, decompressedSize);
+
+    return decompressedSize;
+  } 
+
+  // decompressed with sz
+  return tdszDecompress(SZ_DOUBLE, input + 1, compressedSize - 1, nelements, output);
+}
+#endif
\ No newline at end of file

src/util/src/tconfig.c

@@ -61,6 +61,24 @@ static void taosReadFloatConfig(SGlobalCfg *cfg, char *input_value) {
   }
 }
 
+static void taosReadDoubleConfig(SGlobalCfg *cfg, char *input_value) {
+  double  value = atof(input_value);
+  double *option = (double *)cfg->ptr;
+  if (value < cfg->minValue || value > cfg->maxValue) {
+    uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%f",
+           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      *option = value;
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %f", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], *option);
+    }
+  }
+}
+
+
 static void taosReadInt32Config(SGlobalCfg *cfg, char *input_value) {
   int32_t  value = atoi(input_value);
   int32_t *option = (int32_t *)cfg->ptr;
@@ -262,6 +280,9 @@ static void taosReadConfigOption(const char *option, char *value, char *value2,
       case TAOS_CFG_VTYPE_FLOAT:
         taosReadFloatConfig(cfg, value);
         break;
+      case TAOS_CFG_VTYPE_DOUBLE:
+        taosReadDoubleConfig(cfg, value);
+        break;
       case TAOS_CFG_VTYPE_STRING:
         taosReadStringConfig(cfg, value);
         break;
@@ -463,6 +484,9 @@ void taosPrintGlobalCfg() {
       case TAOS_CFG_VTYPE_FLOAT:
         uInfo(" %s:%s%f%s", cfg->option, blank, *((float *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
         break;
+      case TAOS_CFG_VTYPE_DOUBLE:
+        uInfo(" %s:%s%f%s", cfg->option, blank, *((double *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
+        break;
       case TAOS_CFG_VTYPE_STRING:
       case TAOS_CFG_VTYPE_IPSTR:
       case TAOS_CFG_VTYPE_DIRECTORY:

tests/examples/c/CMakeLists.txt

@@ -5,6 +5,8 @@ IF (TD_LINUX)
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(demo apitest.c)
   TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread )
+  ADD_EXECUTABLE(sml schemaless.c)
+  TARGET_LINK_LIBRARIES(sml taos_static trpc tutil pthread )
   ADD_EXECUTABLE(subscribe subscribe.c)
   TARGET_LINK_LIBRARIES(subscribe taos_static trpc tutil pthread )
   ADD_EXECUTABLE(epoll epoll.c)

tests/examples/c/apitest.c

@@ -964,21 +964,31 @@ int32_t verify_schema_less(TAOS* taos) {
   usleep(100000);
 
   char* lines[] = {
-      "st,t1=3i,t2=4,t3=\"t3\" c1=3i,c3=L\"passit\",c2=false,c4=4 1626006833639000000",
-      "st,t1=4i,t3=\"t4\",t2=5,t4=5 c1=3i,c3=L\"passitagin\",c2=true,c4=5,c5=5 1626006833640000000",
-      "ste,t2=5,t3=L\"ste\" c1=true,c2=4,c3=\"iam\" 1626056811823316532",
-      "st,t1=4i,t2=5,t3=\"t4\" c1=3i,c3=L\"passitagain\",c2=true,c4=5 1626006833642000000",
-      "ste,t2=5,t3=L\"ste2\" c3=\"iamszhou\",c4=false 1626056811843316532",
-      "ste,t2=5,t3=L\"ste2\" c3=\"iamszhou\",c4=false,c5=32b,c6=64s,c7=32w,c8=88.88f 1626056812843316532",
-      "st,t1=4i,t3=\"t4\",t2=5,t4=5 c1=3i,c3=L\"passitagin\",c2=true,c4=5,c5=5,c6=7u 1626006933640000000",
-      "stf,t1=4i,t3=\"t4\",t2=5,t4=5 c1=3i,c3=L\"passitagin\",c2=true,c4=5,c5=5,c6=7u 1626006933640000000",
-      "stf,t1=4i,t3=\"t4\",t2=5,t4=5 c1=3i,c3=L\"passitagin_stf\",c2=false,c5=5,c6=7u 1626006933641a"
+      "st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
+      "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns",
+      "ste,t2=5f64,t3=L\"ste\" c1=true,c2=4i64,c3=\"iam\" 1626056811823316532ns",
+      "st,t1=4i64,t2=5f64,t3=\"t4\" c1=3i64,c3=L\"passitagain\",c2=true,c4=5f64 1626006833642000000ns",
+      "ste,t2=5f64,t3=L\"ste2\" c3=\"iamszhou\",c4=false 1626056811843316532ns",
+      "ste,t2=5f64,t3=L\"ste2\" c3=\"iamszhou\",c4=false,c5=32i8,c6=64i16,c7=32i32,c8=88.88f32 1626056812843316532ns",
+      "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns",
+      "stf,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns",
+      "stf,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641000000ns"
   };
 
-//  int code = taos_insert_lines(taos, lines , sizeof(lines)/sizeof(char*));
-  int code = taos_insert_lines(taos, &lines[0], 1);
-  code = taos_insert_lines(taos, &lines[1], 1);
+  int code = 0;
+  code = taos_insert_lines(taos, lines , sizeof(lines)/sizeof(char*));
+  char* lines2[] = {
+      "stg,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
+      "stg,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns"
+  };
+  code = taos_insert_lines(taos, &lines2[0], 1);
+  code = taos_insert_lines(taos, &lines2[1], 1);
 
+  char* lines3[] = {
+      "sth,t1=4i64,t2=5f64,t4=5f64,ID=\"childtable\" c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641ms",
+      "sth,t1=4i64,t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933654ms"
+  };
+  code = taos_insert_lines(taos, lines3, 2);
   return code;
 }
 
@@ -1000,10 +1010,8 @@ int main(int argc, char *argv[]) {
   printf("client info: %s\n", info);
 
   printf("************  verify shemaless  *************\n");
-  int code = verify_schema_less(taos);
-  if (code == 0) {
-    return code;
-  }
+  verify_schema_less(taos);
+
 
   printf("************  verify query  *************\n");
   verify_query(taos);

tests/examples/c/schemaless.c

+#include "taos.h"
+#include "taoserror.h"
+#include "os.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+int numSuperTables = 8;
+int numChildTables = 1024;
+int numRowsPerChildTable = 128;
+
+void shuffle(char**lines, size_t n)
+{
+  if (n > 1)
+  {
+    size_t i;
+    for (i = 0; i < n - 1; i++)
+    {
+      size_t j = i + rand() / (RAND_MAX / (n - i) + 1);
+      char* t = lines[j];
+      lines[j] = lines[i];
+      lines[i] = t;
+    }
+  }
+}
+
+static int64_t getTimeInUs() {
+  struct timeval systemTime;
+  gettimeofday(&systemTime, NULL);
+  return (int64_t)systemTime.tv_sec * 1000000L + (int64_t)systemTime.tv_usec;
+}
+
+int main(int argc, char* argv[]) {
+  TAOS_RES *result;
+  const char* host = "127.0.0.1";
+  const char* user = "root";
+  const char* passwd = "taosdata";
+
+  taos_options(TSDB_OPTION_TIMEZONE, "GMT-8");
+  TAOS* taos = taos_connect(host, user, passwd, "", 0);
+  if (taos == NULL) {
+    printf("\033[31mfailed to connect to db, reason:%s\033[0m\n", taos_errstr(taos));
+    exit(1);
+  }
+
+  char* info = taos_get_server_info(taos);
+  printf("server info: %s\n", info);
+  info = taos_get_client_info(taos);
+  printf("client info: %s\n", info);
+  result = taos_query(taos, "drop database if exists db;");
+  taos_free_result(result);
+  usleep(100000);
+  result = taos_query(taos, "create database db precision 'ms';");
+  taos_free_result(result);
+  usleep(100000);
+
+  (void)taos_select_db(taos, "db");
+
+  time_t ct = time(0);
+  int64_t ts = ct * 1000;
+  char* lineFormat = "sta%d,t0=true,t1=127i8,t2=32767i16,t3=%di32,t4=9223372036854775807i64,t9=11.12345f32,t10=22.123456789f64,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c0=true,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=255u8,c6=32770u16,c7=2147483699u32,c8=9223372036854775899u64,c9=11.12345f32,c10=22.123456789f64,c11=\"binaryValue\",c12=L\"ncharValue\" %lldms";
+
+  char** lines = calloc(numSuperTables * numChildTables * numRowsPerChildTable, sizeof(char*));
+  int l = 0;
+  for (int i = 0; i < numSuperTables; ++i) {
+    for (int j = 0; j < numChildTables; ++j) {
+      for (int k = 0; k < numRowsPerChildTable; ++k) {
+        char* line = calloc(512, 1);
+        snprintf(line, 512, lineFormat, i, j, ts + 10 * l);
+        lines[l] = line;
+        ++l;
+      }
+    }
+  }
+  shuffle(lines, numSuperTables * numChildTables * numRowsPerChildTable);
+
+  printf("%s\n", "begin taos_insert_lines");
+  int64_t  begin = getTimeInUs();
+  int32_t code = taos_insert_lines(taos, lines, numSuperTables * numChildTables * numRowsPerChildTable);
+  int64_t end = getTimeInUs();
+  printf("code: %d, %s. time used: %"PRId64"\n", code, tstrerror(code), end-begin);
+
+  char* lines_000_0[] = {
+      "sta1,id=sta1_1,t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=255u8,t6=32770u16,t7=2147483699u32,t8=9223372036854775899u64,t9=11.12345f32,t10=22.123456789f64,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c0=true,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=255u8,c6=32770u16,c7=2147483699u32,c8=9223372036854775899u64,c9=11.12345f32,c10=22.123456789f64,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006833639000us"
+  };
+
+  code = taos_insert_lines(taos, lines_000_0 , sizeof(lines_000_0)/sizeof(char*));
+  if (0 == code) {
+    printf("taos_insert_lines() lines_000_0 should return error\n");
+    return -1;
+  }
+
+  char* lines_000_1[] = {
+      "sta2,id=\"sta2_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=255u8,t6=32770u16,t7=2147483699u32,t8=9223372036854775899u64,t9=11.12345f32,t10=22.123456789f64,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c0=true,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=255u8,c6=32770u16,c7=2147483699u32,c8=9223372036854775899u64,c9=11.12345f32,c10=22.123456789f64,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006833639001"
+  };
+
+  code = taos_insert_lines(taos, lines_000_1 , sizeof(lines_000_1)/sizeof(char*));
+  if (0 == code) {
+    printf("taos_insert_lines() lines_000_1 should return error\n");
+    return -1;
+  }
+
+  char* lines_000_2[] = {
+      "sta3,id=\"sta3_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t9=11.12345f32,t10=22.123456789f64,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c0=true,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=255u8,c6=32770u16,c7=2147483699u32,c8=9223372036854775899u64,c9=11.12345f32,c10=22.123456789f64,c11=\"binaryValue\",c12=L\"ncharValue\" 0"
+  };
+
+  code = taos_insert_lines(taos, lines_000_2 , sizeof(lines_000_2)/sizeof(char*));
+  if (0 != code) {
+    printf("taos_insert_lines() lines_000_2 return code:%d (%s)\n", code, (char*)tstrerror(code));
+    return -1;
+  }
+
+  char* lines_001_0[] = {
+      "sta4,t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t9=11.12345f32,t10=22.123456789f64,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c0=true,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c9=11.12345f32,c10=22.123456789f64,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006833639000us",
+
+  };
+
+  code = taos_insert_lines(taos, lines_001_0 , sizeof(lines_001_0)/sizeof(char*));
+  if (0 != code) {
+    printf("taos_insert_lines() lines_001_0 return code:%d (%s)\n", code, (char*)tstrerror(code));
+    return -1;
+  }
+
+  char* lines_001_1[] = {
+      "sta5,id=\"sta5_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t9=11.12345f32,t10=22.123456789f64,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c0=true,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c9=11.12345f32,c10=22.123456789f64,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006833639001"
+  };
+
+  code = taos_insert_lines(taos, lines_001_1 , sizeof(lines_001_1)/sizeof(char*));
+  if (0 != code) {
+    printf("taos_insert_lines() lines_001_1 return code:%d (%s)\n", code, (char*)tstrerror(code));
+    return -1;
+  }
+
+  char* lines_001_2[] = {
+      "sta6,id=\"sta6_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t9=11.12345f32,t10=22.123456789f64,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c0=true,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c9=11.12345f32,c10=22.123456789f64,c11=\"binaryValue\",c12=L\"ncharValue\" 0"
+  };
+
+  code = taos_insert_lines(taos, lines_001_2 , sizeof(lines_001_2)/sizeof(char*));
+  if (0 != code) {
+    printf("taos_insert_lines() lines_001_2 return code:%d (%s)\n", code, (char*)tstrerror(code));
+    return -1;
+  }
+
+  char* lines_002[] = {
+      "stb,id=\"stb_1\",t20=t,t21=T,t22=true,t23=True,t24=TRUE,t25=f,t26=F,t27=false,t28=False,t29=FALSE,t10=33.12345,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c20=t,c21=T,c22=true,c23=True,c24=TRUE,c25=f,c26=F,c27=false,c28=False,c29=FALSE,c10=33.12345,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006833639000000ns",
+      "stc,id=\"stc_1\",t20=t,t21=T,t22=true,t23=True,t24=TRUE,t25=f,t26=F,t27=false,t28=False,t29=FALSE,t10=33.12345,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c20=t,c21=T,c22=true,c23=True,c24=TRUE,c25=f,c26=F,c27=false,c28=False,c29=FALSE,c10=33.12345,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006833639019us",
+      "stc,id=\"stc_1\",t20=t,t21=T,t22=true,t23=True,t24=TRUE,t25=f,t26=F,t27=false,t28=False,t29=FALSE,t10=33.12345,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c20=t,c21=T,c22=true,c23=True,c24=TRUE,c25=f,c26=F,c27=false,c28=False,c29=FALSE,c10=33.12345,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006833640ms",
+      "stc,id=\"stc_1\",t20=t,t21=T,t22=true,t23=True,t24=TRUE,t25=f,t26=F,t27=false,t28=False,t29=FALSE,t10=33.12345,t11=\"binaryTagValue\",t12=L\"ncharTagValue\" c20=t,c21=T,c22=true,c23=True,c24=TRUE,c25=f,c26=F,c27=false,c28=False,c29=FALSE,c10=33.12345,c11=\"binaryValue\",c12=L\"ncharValue\" 1626006834s"
+  };
+
+  code = taos_insert_lines(taos, lines_002 , sizeof(lines_002)/sizeof(char*));
+  if (0 != code) {
+    printf("taos_insert_lines() lines_002 return code:%d (%s)\n", code, (char*)tstrerror(code));
+    return -1;
+  }
+
+  return 0;
+}

tests/pytest/fulltest.sh

@@ -27,6 +27,7 @@ python3 ./test.py -f insert/bug3654.py
 python3 ./test.py -f insert/insertDynamicColBeforeVal.py
 python3 ./test.py -f insert/in_function.py
 python3 ./test.py -f insert/modify_column.py
+python3 ./test.py -f insert/line_insert.py
 
 #table
 python3 ./test.py -f table/alter_wal0.py

tests/pytest/insert/line_insert.py

+###################################################################
+#           Copyright (c) 2021 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
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self._conn = conn 
+
+    def run(self):
+        print("running {}".format(__file__))
+        tdSql.execute("drop database if exists test")
+        tdSql.execute("create database if not exists test precision 'us'")
+        tdSql.execute('use test')
+
+        tdSql.execute('create stable ste(ts timestamp, f int) tags(t1 bigint)')
+
+        lines = [   "st,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
+                    "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns",
+                    "ste,t2=5f64,t3=L\"ste\" c1=true,c2=4i64,c3=\"iam\" 1626056811823316532ns",
+                    "stf,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns",
+                    "st,t1=4i64,t2=5f64,t3=\"t4\" c1=3i64,c3=L\"passitagain\",c2=true,c4=5f64 1626006833642000000ns",
+                    "ste,t2=5f64,t3=L\"ste2\" c3=\"iamszhou\",c4=false 1626056811843316532ns",
+                    "ste,t2=5f64,t3=L\"ste2\" c3=\"iamszhou\",c4=false,c5=32i8,c6=64i16,c7=32i32,c8=88.88f32 1626056812843316532ns",
+                    "st,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns",
+                    "stf,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641000000ns"
+                ]
+
+        code = self._conn.insertLines(lines)
+        print("insertLines result {}".format(code))
+
+        lines2 = [  "stg,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns",
+                    "stg,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns"
+                ]
+        
+        code = self._conn.insertLines([ lines2[0] ])
+        print("insertLines result {}".format(code))
+
+        self._conn.insertLines([ lines2[1] ])
+        print("insertLines result {}".format(code))
+
+        tdSql.query("select * from st")
+        tdSql.checkRows(4)
+
+        tdSql.query("select * from ste")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from stf")
+        tdSql.checkRows(2)
+
+        tdSql.query("select * from stg")
+        tdSql.checkRows(2)
+
+        tdSql.query("show tables")
+        tdSql.checkRows(8)
+
+        tdSql.query("describe stf")
+        tdSql.checkData(2, 2, 14)
+
+        self._conn.insertLines([
+                                "sth,t1=4i64,t2=5f64,t4=5f64,ID=\"childtable\" c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641ms",
+                                "sth,t1=4i64,t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933654ms"                    
+                                ])
+        tdSql.query('select tbname, * from sth')
+        tdSql.checkRows(2)
+
+        tdSql.query('select tbname, * from childtable')
+        tdSql.checkRows(1)
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/robust/cluster.sh

@@ -23,7 +23,9 @@ menu(){
     echo "=============================="
     echo "3 arbitrator"
     echo "=============================="
-    echo "4 exit"
+    echo "4 alter replica"
+    echo "=============================="
+    echo "5 exit"
     echo "=============================="
 }
 
@@ -310,6 +312,7 @@ do
         2)
             var=`ps -ef | grep tarbitrator | awk '{print $2}' | head -n 1`
             kill -9 $var
+            echo -e "\033[32mSuccessfully stop arbitrator $3 \033[0m"
             break
         ;;
         3)
@@ -318,6 +321,13 @@ do
         esac
     ;;
     4)
+        read -p "Enter replica number: " rep
+        read -p "Enter database name: " db
+        taos -s "alter database $db replica $rep"
+        echo -e "\033[32mSuccessfully change $db's replica to $rep \033[0m"
+        break
+    ;;
+    5)
         break
     ;;
     esac

tests/robust/monitor.sh

+while :
+do
+    dlog=`taos -s "show dnodes"`
+    mlog=`taos -s "show mnodes"`
+    echo "$dlog" | tee -a dnode.log
+    echo "$mlog" | tee -a mnode.log
+    sleep 1s
+done
\ No newline at end of file

tests/script/fullGeneralSuite.sim

@@ -105,6 +105,7 @@ run general/parser/import_commit2.sim
 run general/parser/import_commit3.sim
 run general/parser/insert_tb.sim
 run general/parser/first_last.sim
+run general/parser/line_insert.sim
 #unsupport run general/parser/import_file.sim
 run general/parser/lastrow.sim
 run general/parser/nchar.sim

tests/script/general/parser/line_insert.sim

@@ -16,11 +16,10 @@ sql create database $db precision 'us'
 sql use $db
 sql create stable $mte (ts timestamp, f int) TAGS(t1 bigint)
 
-line_insert st,t1=3i,t2=4,t3="t3" c1=3i,c3=L"passit",c2=false,c4=4 1626006833639000000
-line_insert st,t1=4i,t3="t41",t2=5 c1=3i,c3=L"passiT",c2=true,c4=5 1626006833640000000
-line_insert stf,t1=4i,t2=5,t3="t4" c1=3i,c3=L"passitagain",c2=true,c4=5 1626006833642000000  
-line_insert ste,t2=5,t3=L"ste" c1=true,c2=4,c3="iam" 1626056811823316532
-
+line_insert st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000ns
+line_insert st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64 1626006833640000000ns
+line_insert ste,t2=5f64,t3=L"ste" c1=true,c2=4i64,c3="iam" 1626056811823316532ns
+line_insert stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns
 sql select * from st
 if $rows != 2 then
   return -1
@@ -30,7 +29,7 @@ if $data00 != @21-07-11 20:33:53.639000@ then
   return -1
 endi
 
-if $data03 != @passit@ then
+if $data02 != @passit@ then
   return -1
 endi