Merge branch 'develop' into szhou/feature/support-math-functions

cmake/define.inc

@@ -135,6 +135,8 @@ IF ("${BUILD_HTTP}" STREQUAL "")
     ELSE ()
       SET(BUILD_HTTP "false")
     ENDIF ()
+  ELSEIF (TD_DARWIN)
+    SET(BUILD_HTTP "false")
   ELSE ()
     SET(BUILD_HTTP "true")
   ENDIF ()

cmake/platform.inc

@@ -36,7 +36,13 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   # Get OS information and store in variable TD_OS_INFO.
   #
   execute_process(COMMAND chmod 777 ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh)
+  execute_process(COMMAND readlink /bin/sh OUTPUT_VARIABLE SHELL_LINK)
+  MESSAGE(STATUS "The shell is: " ${SHELL_LINK})
+  IF (${SHELL_LINK} MATCHES "dash")
+    execute_process(COMMAND ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh "" OUTPUT_VARIABLE TD_OS_INFO)
+  ELSE ()
     execute_process(COMMAND sh ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh "" OUTPUT_VARIABLE TD_OS_INFO)
+  ENDIF()
   MESSAGE(STATUS "The current os is " ${TD_OS_INFO})
 
   SET(TD_LINUX TRUE)

deps/CMakeLists.txt

@@ -55,6 +55,7 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
   MESSAGE("")
   MESSAGE("setup deps/jemalloc, current source dir:" ${CMAKE_CURRENT_SOURCE_DIR})
   MESSAGE("binary dir:" ${CMAKE_BINARY_DIR})
+  include(ExternalProject)
   ExternalProject_Add(jemalloc
     PREFIX        "jemalloc"
     SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
@@ -62,6 +63,7 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
     CONFIGURE_COMMAND   ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
     BUILD_COMMAND       ${MAKE}
   )
+  INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
 ENDIF ()
 
 IF (${TSZ_ENABLED} MATCHES "true")

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

@@ -719,7 +719,7 @@ Query OK, 1 row(s) in set (0.001091s)
   * 暂不支持含列名的四则运算表达式用于条件过滤算子（例如，不支持 `where a*2>6;`，但可以写 `where a>6/2;`）。
   * 暂不支持含列名的四则运算表达式作为 SQL 函数的应用对象（例如，不支持 `select min(2*a) from t;`，但可以写 `select 2*min(a) from t;`）。
 - WHERE 语句可以使用各种逻辑判断来过滤数字值，或使用通配符来过滤字符串。
-- 输出结果缺省按首列时间戳升序排序，但可以指定按降序排序( _c0 指首列时间戳)。使用 ORDER BY 对其他字段进行排序为非法操作。
+- 输出结果缺省按首列时间戳升序排序，但可以指定按降序排序( _c0 指首列时间戳)。使用 ORDER BY 对其他字段进行排序,排序结果顺序不确定。
 - 参数 LIMIT 控制输出条数，OFFSET 指定从第几条开始输出。LIMIT/OFFSET 对结果集的执行顺序在 ORDER BY 之后。且 `LIMIT 5 OFFSET 2` 可以简写为 `LIMIT 2, 5`。
   * 在有 GROUP BY 子句的情况下，LIMIT 参数控制的是每个分组中至多允许输出的条数。
 - 参数 SLIMIT 控制由 GROUP BY 指令划分的分组中，至多允许输出几个分组的数据。且 `SLIMIT 5 SOFFSET 2` 可以简写为 `SLIMIT 2, 5`。
@@ -743,7 +743,7 @@ Query OK, 1 row(s) in set (0.001091s)
 
 1. <> 算子也可以写为 != ，请注意，这个算子不能用于数据表第一列的 timestamp 字段。
 2. like 算子使用通配符字符串进行匹配检查。
-  * 在通配符字符串中：'%'（百分号）匹配 0 到任意个字符；'\_'（下划线）匹配单个任意字符。
+  * 在通配符字符串中：'%'（百分号）匹配 0 到任意个字符；'\_'（下划线）匹配单个任意ASCII字符。
     * 如果希望匹配字符串中原本就带有的 \_（下划线）字符，那么可以在通配符字符串中写作 `\_`，也即加一个反斜线来进行转义。（从 2.2.0.0 版本开始支持）
   * 通配符字符串最长不能超过 20 字节。（从 2.1.6.1 版本开始，通配符字符串的长度放宽到了 100 字节，并可以通过 taos.cfg 中的 maxWildCardsLength 参数来配置这一长度限制。但不建议使用太长的通配符字符串，将有可能严重影响 LIKE 操作的执行性能。）
 3. 同时进行多个字段的范围过滤，需要使用关键词 AND 来连接不同的查询条件，暂不支持 OR 连接的不同列之间的查询过滤条件。

packaging/release.sh

@@ -213,7 +213,12 @@ else
   exit 1
 fi
 
-make -j8 && ${csudo} make install
+if [[ "$allocator" == "jemalloc" ]]; then
+    # jemalloc need compile first, so disable parallel build
+    make V=1 && ${csudo} make install
+else
+    make -j8 && ${csudo} make install
+fi
 
 cd ${curr_dir}
 

packaging/tools/make_install.sh

@@ -62,12 +62,14 @@ NC='\033[0m'
 
 csudo=""
 
+service_mod=2
+os_type=0
+
 if [ "$osType" != "Darwin" ]; then
     if command -v sudo > /dev/null; then
     csudo="sudo"
     fi
     initd_mod=0
-    service_mod=2
     if pidof systemd &> /dev/null; then
         service_mod=0
     elif $(which service &> /dev/null); then
@@ -91,7 +93,6 @@ if [ "$osType" != "Darwin" ]; then
     #osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
     osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)
     #echo "osinfo: ${osinfo}"
-    os_type=0
     if echo $osinfo | grep -qwi "ubuntu" ; then
         echo "this is ubuntu system"
         os_type=1
@@ -122,7 +123,8 @@ function kill_taosadapter() {
 }
 
 function kill_taosd() {
-    pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
+    ps -ef | grep "taosd"
+    pid=$(ps -ef | grep -w "taosd" | grep -v "grep" | awk '{print $2}')
     if [ -n "$pid" ]; then
         ${csudo} kill -9 $pid   || :
     fi
@@ -202,31 +204,31 @@ function install_jemalloc() {
         /usr/bin/install -c -d /usr/local/bin
 
         if [ -f "${binary_dir}/build/bin/jemalloc-config" ]; then
-            /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc-config /usr/local/bin
+            ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc-config /usr/local/bin
         fi
         if [ -f "${binary_dir}/build/bin/jemalloc.sh" ]; then
-            /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc.sh /usr/local/bin
+            ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jemalloc.sh /usr/local/bin
         fi
         if [ -f "${binary_dir}/build/bin/jeprof" ]; then
-            /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jeprof /usr/local/bin
+            ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/bin/jeprof /usr/local/bin
         fi
         if [ -f "${binary_dir}/build/include/jemalloc/jemalloc.h" ]; then
-            /usr/bin/install -c -d /usr/local/include/jemalloc
-            /usr/bin/install -c -m 644 ${binary_dir}/build/include/jemalloc/jemalloc.h\
+            ${csudo} /usr/bin/install -c -d /usr/local/include/jemalloc
+            ${csudo} /usr/bin/install -c -m 644 ${binary_dir}/build/include/jemalloc/jemalloc.h\
                 /usr/local/include/jemalloc
         fi
         if [ -f "${binary_dir}/build/lib/libjemalloc.so.2" ]; then
-            /usr/bin/install -c -d /usr/local/lib
-            /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.so.2 /usr/local/lib
-            ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
-            /usr/bin/install -c -d /usr/local/lib
+            ${csudo} /usr/bin/install -c -d /usr/local/lib
+            ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.so.2 /usr/local/lib
+            ${csudo} ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+            ${csudo} /usr/bin/install -c -d /usr/local/lib
             [ -f ${binary_dir}/build/lib/libjemalloc.a ] &&
-                /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.a /usr/local/lib
+                ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.a /usr/local/lib
             [ -f ${binary_dir}/build/lib/libjemalloc_pic.a ] &&
-                /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc_pic.a /usr/local/lib
+                ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc_pic.a /usr/local/lib
             if [ -f "${binary_dir}/build/lib/pkgconfig/jemalloc.pc" ]; then
-                /usr/bin/install -c -d /usr/local/lib/pkgconfig
-                /usr/bin/install -c -m 644 ${binary_dir}/build/lib/pkgconfig/jemalloc.pc\
+                ${csudo} /usr/bin/install -c -d /usr/local/lib/pkgconfig
+                ${csudo} /usr/bin/install -c -m 644 ${binary_dir}/build/lib/pkgconfig/jemalloc.pc\
                     /usr/local/lib/pkgconfig
             fi
             if [ -d /etc/ld.so.conf.d ]; then
@@ -237,29 +239,28 @@ function install_jemalloc() {
             fi
         fi
         if [ -f "${binary_dir}/build/share/doc/jemalloc/jemalloc.html" ]; then
-            /usr/bin/install -c -d /usr/local/share/doc/jemalloc
-            /usr/bin/install -c -m 644 ${binary_dir}/build/share/doc/jemalloc/jemalloc.html\
+            ${csudo} /usr/bin/install -c -d /usr/local/share/doc/jemalloc
+            ${csudo} /usr/bin/install -c -m 644 ${binary_dir}/build/share/doc/jemalloc/jemalloc.html\
                 /usr/local/share/doc/jemalloc
         fi
         if [ -f "${binary_dir}/build/share/man/man3/jemalloc.3" ]; then
-            /usr/bin/install -c -d /usr/local/share/man/man3
-            /usr/bin/install -c -m 644 ${binary_dir}/build/share/man/man3/jemalloc.3\
+            ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
+            ${csudo} /usr/bin/install -c -m 644 ${binary_dir}/build/share/man/man3/jemalloc.3\
                 /usr/local/share/man/man3
         fi
-
     fi
 }
 
 function install_avro() {
     if [ "$osType" != "Darwin" ]; then
         if [ -f "${binary_dir}/build/$1/libavro.so.23.0.0" ]; then
-            /usr/bin/install -c -d /usr/local/$1
-            /usr/bin/install -c -m 755 ${binary_dir}/build/$1/libavro.so.23.0.0 /usr/local/$1
-            ln -sf libavro.so.23.0.0 /usr/local/$1/libavro.so.23
-            ln -sf libavro.so.23 /usr/local/$1/libavro.so
-            /usr/bin/install -c -d /usr/local/$1
+            ${csudo} /usr/bin/install -c -d /usr/local/$1
+            ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/$1/libavro.so.23.0.0 /usr/local/$1
+            ${csudo} ln -sf libavro.so.23.0.0 /usr/local/$1/libavro.so.23
+            ${csudo} ln -sf libavro.so.23 /usr/local/$1/libavro.so
+            ${csudo} /usr/bin/install -c -d /usr/local/$1
             [ -f ${binary_dir}/build/$1/libavro.a ] &&
-                /usr/bin/install -c -m 755 ${binary_dir}/build/$1/libavro.a /usr/local/$1
+                ${csudo} /usr/bin/install -c -m 755 ${binary_dir}/build/$1/libavro.a /usr/local/$1
 
             if [ -d /etc/ld.so.conf.d ]; then
                 echo "/usr/local/$1" | ${csudo} tee /etc/ld.so.conf.d/libavro.conf
@@ -543,7 +544,6 @@ function update_TDengine() {
     echo -e "${GREEN}Start to update TDengine...${NC}"
     # Stop the service if running
 
-    if [ "$osType" != "Darwin" ]; then
       if pidof taosd &> /dev/null; then
         if ((${service_mod}==0)); then
             ${csudo} systemctl stop taosd || :
@@ -555,7 +555,6 @@ function update_TDengine() {
         fi
         sleep 1
       fi
-    fi
 
     install_main_path
 
@@ -566,50 +565,35 @@ function update_TDengine() {
     install_examples
     install_bin
 
-    if [ "$osType" != "Darwin" ]; then
     install_service
     install_taosadapter_service
-    fi
 
     install_config
     install_taosadapter_config
 
-    if [ "$osType" != "Darwin" ]; then
     echo
     echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
     echo
 
     echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
-        echo -e "${GREEN_DARK}To configure taosadapter (if has) ${NC}: edit /etc/taos/taosadapter.toml"
+    echo -e "${GREEN_DARK}To configure Taos Adapter (if has) ${NC}: edit /etc/taos/taosadapter.toml"
     if ((${service_mod}==0)); then
         echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
     elif ((${service_mod}==1)); then
         echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} service taosd start${NC}"
     else
-            echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
+        echo -e "${GREEN_DARK}To start Taos Adapter (if has)${NC}: taosadapter &${NC}"
+        echo -e "${GREEN_DARK}To start TDengine     ${NC}: taosd${NC}"
     fi
 
     echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
     echo
     echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
-    else
-        echo
-        echo -e "\033[44;32;1mTDengine Client is updated successfully!${NC}"
-        echo
-
-        echo -e "${GREEN_DARK}To access TDengine Client   ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-        echo
-        echo -e "\033[44;32;1mTDengine Client is updated successfully!${NC}"
-    fi
 }
 
 function install_TDengine() {
     # Start to install
-    if [ "$osType" != "Darwin" ]; then
-        echo -e "${GREEN}Start to install TDEngine...${NC}"
-    else
-        echo -e "${GREEN}Start to install TDEngine Client ...${NC}"
-    fi
+    echo -e "${GREEN}Start to install TDengine...${NC}"
 
     install_main_path
 
@@ -621,15 +605,12 @@ function install_TDengine() {
     install_examples
     install_bin
 
-    if [ "$osType" != "Darwin" ]; then
     install_service
     install_taosadapter_service
-    fi
 
     install_config
     install_taosadapter_config
 
-    if [ "$osType" != "Darwin" ]; then
     # Ask if to start the service
     echo
     echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
@@ -647,11 +628,6 @@ function install_TDengine() {
     echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
     echo
     echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
-    else
-        echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-        echo
-        echo -e "\033[44;32;1mTDengine Client is installed successfully!${NC}"
-    fi
 }
 
 ## ==============================Main program starts from here============================

src/client/src/tscParseInsert.c

@@ -1417,6 +1417,11 @@ int tsParseInsertSql(SSqlObj *pSql) {
         goto _clean;
       }
 
+      if (sToken.type == TK_ILLEGAL) {  // ,,,, like => insert into t values(now,1),,,,(now+1s,2);
+        code = tscSQLSyntaxErrMsg(pInsertParam->msg, NULL, str);
+        goto _clean;
+      }
+
       /*
        * if no data has been generated during parsing the sql string, error msg will return
        * Otherwise, create the first submit block and submit to virtual node.

src/client/src/tscSQLParser.c

@@ -3786,6 +3786,10 @@ int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd
 
     SStrToken token = {pVar->nLen, pVar->nType, pVar->pz};
 
+    if (pVar->nType != TSDB_DATA_TYPE_BINARY){
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    }
+
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
     if (getColumnIndexByName(&token, pQueryInfo, &index, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
@@ -5558,7 +5562,7 @@ int32_t validateWhereNode(SQueryInfo* pQueryInfo, tSqlExpr** pExpr, SSqlObj* pSq
 
   if (taosArrayGetSize(pQueryInfo->pUpstream) > 0 && condExpr.pTimewindow != NULL) {
     setNormalExprToCond(&condExpr.pColumnCond, condExpr.pTimewindow, TK_AND);
-    condExpr.pTimewindow = NULL;
+    condExpr.pTimewindow = tSqlExprClone(condExpr.pTimewindow);
   }
 
   tSqlExprCompact(pExpr);

src/client/src/tscServer.c

@@ -975,7 +975,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   if (pQueryInfo->colCond && taosArrayGetSize(pQueryInfo->colCond) > 0 && !onlyQueryTags(&query) ) {
     STblCond *pCond = tsGetTableFilter(pQueryInfo->colCond, pTableMeta->id.uid, 0);
     if (pCond != NULL && pCond->cond != NULL) {
-      pQueryMsg->colCondLen = htons(pCond->len);
+      pQueryMsg->colCondLen = htonl(pCond->len);
       memcpy(pMsg, pCond->cond, pCond->len);
 
       pMsg += pCond->len;
@@ -1056,7 +1056,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
     SCond *pCond = tsGetSTableQueryCond(pTagCond, pTableMeta->id.uid);
     if (pCond != NULL && pCond->cond != NULL) {
-      pQueryMsg->tagCondLen = htons(pCond->len);
+      pQueryMsg->tagCondLen = htonl(pCond->len);
       memcpy(pMsg, pCond->cond, pCond->len);
 
       pMsg += pCond->len;

src/client/src/tscUtil.c

@@ -944,23 +944,30 @@ SSDataBlock* doGetDataBlock(void* param, bool* newgroup) {
   pBlock->info.rows = pRes->numOfRows;
   if (pRes->numOfRows != 0) {
     doSetupSDataBlock(pRes, pBlock, pInput->pFilterInfo);
+    if (pBlock->info.rows > 0) {
       *newgroup = false;
       return pBlock;
     }
+  }
 
+  SSDataBlock* result = NULL;
+  do {
     // No data block exists. So retrieve and transfer it into to SSDataBlock
     TAOS_ROW pRow = NULL;
     taos_fetch_block(pSql, &pRow);
 
     if (pRes->numOfRows == 0) {
       pOperator->status = OP_EXEC_DONE;
-    return NULL;
+      result = NULL;
+      break;
     }
-
     pBlock->info.rows = pRes->numOfRows;
     doSetupSDataBlock(pRes, pBlock, pInput->pFilterInfo);
     *newgroup = false;
-  return pBlock;
+    result = pBlock;
+  } while (result->info.rows == 0);
+
+  return result;
 }
 
 static void fetchNextBlockIfCompleted(SOperatorInfo* pOperator, bool* newgroup) {
@@ -2955,6 +2962,11 @@ int32_t tscValidateName(SStrToken* pToken, bool escapeEnabled, bool *dbIncluded)
       }
     } else if (pToken->type == TK_ID) {
       tscRmEscapeAndTrimToken(pToken);
+
+      if (pToken->n == 0) {
+        return TSDB_CODE_TSC_INVALID_OPERATION;
+      }
+
       return TSDB_CODE_SUCCESS;
     } else {
       if (isNumber(pToken)) {

src/connector/C#/TDengineDriver.cs

@@ -163,8 +163,12 @@ namespace TDengineDriver
 
         [DllImport("taos", EntryPoint = "taos_close", CallingConvention = CallingConvention.Cdecl)]
         static extern public int Close(IntPtr taos);
-        //get precisionin parameter restultset
+         //get precision in  restultset
         [DllImport("taos", EntryPoint = "taos_result_precision", CallingConvention = CallingConvention.Cdecl)]
         static extern public int ResultPrecision(IntPtr taos);
+
+        //schemaless API 
+        [DllImport("taos",SetLastError = true, EntryPoint = "taos_schemaless_insert", CallingConvention = CallingConvention.Cdecl)]
+        static extern public IntPtr SchemalessInsert(IntPtr taos, string[] lines, int numLines, int protocol, int precision);
     }
 }

src/inc/taosmsg.h

@@ -485,8 +485,8 @@ typedef struct {
   int16_t     numOfCols;        // the number of columns will be load from vnode
   SInterval   interval;
   SSessionWindow sw;            // session window
-  uint16_t    tagCondLen;       // tag length in current query
-  uint16_t    colCondLen;       // column length in current query
+  uint32_t    tagCondLen;       // tag length in current query
+  int32_t    colCondLen;       // column length in current query
   int16_t     numOfGroupCols;   // num of group by columns
   int16_t     orderByIdx;
   int16_t     orderType;        // used in group by xx order by xxx

src/kit/taosdemo/CMakeLists.txt

@@ -2,12 +2,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0...3.20)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(inc)
 
 FIND_PACKAGE(Git)
 IF (GIT_FOUND)
     MESSAGE("Git found")
     EXECUTE_PROCESS(
-        COMMAND ${GIT_EXECUTABLE} log --pretty=oneline -n 1 ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
+        COMMAND ${GIT_EXECUTABLE} log --pretty=oneline -n 1 ${CMAKE_CURRENT_LIST_DIR}
         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
         RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_COMMIT_SHA1)
@@ -18,7 +19,7 @@ IF (GIT_FOUND)
         STRING(STRIP "${TAOSDEMO_COMMIT_SHA1}" TAOSDEMO_COMMIT_SHA1)
     ENDIF ()
     EXECUTE_PROCESS(
-        COMMAND ${GIT_EXECUTABLE} status -z -s ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
+        COMMAND ${GIT_EXECUTABLE} status -z -s ${CMAKE_CURRENT_LIST_DIR}
         RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_STATUS)
     IF (TD_LINUX)
@@ -64,7 +65,7 @@ ELSE ()
 ENDIF ()
 
 IF (TD_LINUX)
-  AUX_SOURCE_DIRECTORY(. SRC)
+  AUX_SOURCE_DIRECTORY(./src SRC)
   ADD_EXECUTABLE(taosdemo ${SRC})
 
   IF (TD_SOMODE_STATIC)
@@ -73,9 +74,9 @@ IF (TD_LINUX)
       TARGET_LINK_LIBRARIES(taosdemo taos cJson ${LINK_JEMALLOC})
   ENDIF ()
 ELSEIF (TD_WINDOWS)
-  AUX_SOURCE_DIRECTORY(. SRC)
+  AUX_SOURCE_DIRECTORY(./src SRC)
   ADD_EXECUTABLE(taosdemo ${SRC})
-  SET_SOURCE_FILES_PROPERTIES(./taosdemo.c PROPERTIES COMPILE_FLAGS -w)
+  SET_SOURCE_FILES_PROPERTIES(./src/demoUtil.c PROPERTIES COMPILE_FLAGS -w)
   IF (TD_SOMODE_STATIC)
     TARGET_LINK_LIBRARIES(taosdemo taos_static cJson lua)
   ELSE ()
@@ -83,7 +84,7 @@ ELSEIF (TD_WINDOWS)
   ENDIF ()
 ELSEIF (TD_DARWIN)
   # missing a few dependencies, such as <argp.h>
-  AUX_SOURCE_DIRECTORY(. SRC)
+  AUX_SOURCE_DIRECTORY(./src SRC)
   ADD_EXECUTABLE(taosdemo ${SRC})
   
   IF (TD_SOMODE_STATIC)

src/kit/taosdemo/inc/demo.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DEMO__
+#define __DEMO__
+
+#include <stdint.h>
+#include <taos.h>
+#include <taoserror.h>
+#define _GNU_SOURCE
+#define CURL_STATICLIB
+
+#ifdef LINUX
+#include <argp.h>
+#include <inttypes.h>
+#ifndef _ALPINE
+#include <error.h>
+#endif
+#include <pthread.h>
+#include <regex.h>
+#include <semaphore.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#include <wordexp.h>
+#else
+#include <regex.h>
+#include <stdio.h>
+#endif
+
+#include <assert.h>
+#include <stdlib.h>
+
+// #include "os.h"
+#include "taos.h"
+#include "taoserror.h"
+#include "tutil.h"
+
+#define REQ_EXTRA_BUF_LEN 1024
+#define RESP_BUF_LEN 4096
+#define SQL_BUFF_LEN 1024
+
+extern char configDir[];
+
+#define STR_INSERT_INTO "INSERT INTO "
+
+#define MAX_RECORDS_PER_REQ 32766
+
+#define HEAD_BUFF_LEN \
+    TSDB_MAX_COLUMNS * 24  // 16*MAX_COLUMNS + (192+32)*2 + insert into ..
+
+#define BUFFER_SIZE TSDB_MAX_ALLOWED_SQL_LEN
+#define FETCH_BUFFER_SIZE 100 * TSDB_MAX_ALLOWED_SQL_LEN
+#define COND_BUF_LEN (BUFFER_SIZE - 30)
+#define COL_BUFFER_LEN ((TSDB_COL_NAME_LEN + 15) * TSDB_MAX_COLUMNS)
+
+#define MAX_USERNAME_SIZE 64
+#define MAX_HOSTNAME_SIZE \
+    253  // https://man7.org/linux/man-pages/man7/hostname.7.html
+#define MAX_TB_NAME_SIZE 64
+#define MAX_DATA_SIZE \
+    (16 * TSDB_MAX_COLUMNS) + 20  // max record len: 16*MAX_COLUMNS, timestamp
+                                  // string and ,('') need extra space
+#define OPT_ABORT 1               /* –abort */
+#define MAX_FILE_NAME_LEN 256     // max file name length on linux is 255.
+#define MAX_PATH_LEN 4096
+
+#define DEFAULT_START_TIME 1500000000000
+
+#define MAX_PREPARED_RAND 1000000
+#define INT_BUFF_LEN 12
+#define BIGINT_BUFF_LEN 21
+#define SMALLINT_BUFF_LEN 7
+#define TINYINT_BUFF_LEN 5
+#define BOOL_BUFF_LEN 6
+#define FLOAT_BUFF_LEN 22
+#define DOUBLE_BUFF_LEN 42
+#define TIMESTAMP_BUFF_LEN 21
+#define PRINT_STAT_INTERVAL 30 * 1000
+
+#define MAX_SAMPLES 10000
+#define MAX_NUM_COLUMNS \
+    (TSDB_MAX_COLUMNS - 1)  // exclude first column timestamp
+
+#define MAX_DB_COUNT 8
+#define MAX_SUPER_TABLE_COUNT 200
+
+#define MAX_QUERY_SQL_COUNT 100
+
+#define MAX_DATABASE_COUNT 256
+#define MAX_JSON_BUFF 6400000
+
+#define INPUT_BUF_LEN 256
+#define EXTRA_SQL_LEN 256
+#define TBNAME_PREFIX_LEN \
+    (TSDB_TABLE_NAME_LEN - 20)  // 20 characters reserved for seq
+#define SMALL_BUFF_LEN 8
+#define DATATYPE_BUFF_LEN (SMALL_BUFF_LEN * 3)
+#define NOTE_BUFF_LEN (SMALL_BUFF_LEN * 16)
+
+#define DEFAULT_NTHREADS 8
+#define DEFAULT_TIMESTAMP_STEP 1
+#define DEFAULT_INTERLACE_ROWS 0
+#define DEFAULT_DATATYPE_NUM 1
+#define DEFAULT_CHILDTABLES 10000
+#define DEFAULT_TEST_MODE 0
+#define DEFAULT_METAFILE NULL
+#define DEFAULT_SQLFILE NULL
+#define DEFAULT_HOST "localhost"
+#define DEFAULT_PORT 6030
+#define DEFAULT_IFACE INTERFACE_BUT
+#define DEFAULT_DATABASE "test"
+#define DEFAULT_REPLICA 1
+#define DEFAULT_TB_PREFIX "d"
+#define DEFAULT_ESCAPE_CHAR false
+#define DEFAULT_USE_METRIC true
+#define DEFAULT_DROP_DB true
+#define DEFAULT_AGGR_FUNC false
+#define DEFAULT_DEBUG false
+#define DEFAULT_VERBOSE false
+#define DEFAULT_PERF_STAT false
+#define DEFAULT_ANS_YES false
+#define DEFAULT_OUTPUT "./output.txt"
+#define DEFAULT_SYNC_MODE 0
+#define DEFAULT_DATA_TYPE \
+    { TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT }
+#define DEFAULT_DATATYPE \
+    { "FLOAT", "INT", "FLOAT" }
+#define DEFAULT_BINWIDTH 64
+#define DEFAULT_COL_COUNT 4
+#define DEFAULT_LEN_ONE_ROW 76
+#define DEFAULT_INSERT_INTERVAL 0
+#define DEFAULT_QUERY_TIME 1
+#define DEFAULT_PREPARED_RAND 10000
+#define DEFAULT_REQ_PER_REQ 30000
+#define DEFAULT_INSERT_ROWS 10000
+#define DEFAULT_ABORT 0
+#define DEFAULT_RATIO 0
+#define DEFAULT_DISORDER_RANGE 1000
+#define DEFAULT_METHOD_DEL 1
+#define DEFAULT_TOTAL_INSERT 0
+#define DEFAULT_TOTAL_AFFECT 0
+#define DEFAULT_DEMO_MODE true
+#define DEFAULT_CREATE_BATCH 10
+#define DEFAULT_SUB_INTERVAL 10000
+#define DEFAULT_QUERY_INTERVAL 10000
+
+#define SML_LINE_SQL_SYNTAX_OFFSET 7
+
+#if _MSC_VER <= 1900
+#define __func__ __FUNCTION__
+#endif
+
+#define debugPrint(fmt, ...)                            \
+    do {                                                \
+        if (g_args.debug_print || g_args.verbose_print) \
+            fprintf(stderr, "DEBG: " fmt, __VA_ARGS__); \
+    } while (0)
+
+#define verbosePrint(fmt, ...)                                                \
+    do {                                                                      \
+        if (g_args.verbose_print) fprintf(stderr, "VERB: " fmt, __VA_ARGS__); \
+    } while (0)
+
+#define performancePrint(fmt, ...)                      \
+    do {                                                \
+        if (g_args.performance_print)                   \
+            fprintf(stderr, "PERF: " fmt, __VA_ARGS__); \
+    } while (0)
+
+#define errorPrint(fmt, ...)                            \
+    do {                                                \
+        fprintf(stderr, "\033[31m");                    \
+        fprintf(stderr, "%s(%d) ", __FILE__, __LINE__); \
+        fprintf(stderr, "ERROR: " fmt, __VA_ARGS__);    \
+        fprintf(stderr, "\033[0m");                     \
+    } while (0)
+
+enum TEST_MODE {
+    INSERT_TEST,     // 0
+    QUERY_TEST,      // 1
+    SUBSCRIBE_TEST,  // 2
+    INVAID_TEST
+};
+
+typedef enum CREATE_SUB_TABLE_MOD_EN {
+    PRE_CREATE_SUBTBL,
+    AUTO_CREATE_SUBTBL,
+    NO_CREATE_SUBTBL
+} CREATE_SUB_TABLE_MOD_EN;
+
+typedef enum TABLE_EXISTS_EN {
+    TBL_NO_EXISTS,
+    TBL_ALREADY_EXISTS,
+    TBL_EXISTS_BUTT
+} TABLE_EXISTS_EN;
+
+enum enumSYNC_MODE { SYNC_MODE, ASYNC_MODE, MODE_BUT };
+
+enum enum_TAOS_INTERFACE {
+    TAOSC_IFACE,
+    REST_IFACE,
+    STMT_IFACE,
+    SML_IFACE,
+    INTERFACE_BUT
+};
+
+typedef enum enumQUERY_CLASS {
+    SPECIFIED_CLASS,
+    STABLE_CLASS,
+    CLASS_BUT
+} QUERY_CLASS;
+
+typedef enum enum_PROGRESSIVE_OR_INTERLACE {
+    PROGRESSIVE_INSERT_MODE,
+    INTERLACE_INSERT_MODE,
+    INVALID_INSERT_MODE
+} PROG_OR_INTERLACE_MODE;
+
+typedef enum enumQUERY_TYPE {
+    NO_INSERT_TYPE,
+    INSERT_TYPE,
+    QUERY_TYPE_BUT
+} QUERY_TYPE;
+
+enum _show_db_index {
+    TSDB_SHOW_DB_NAME_INDEX,
+    TSDB_SHOW_DB_CREATED_TIME_INDEX,
+    TSDB_SHOW_DB_NTABLES_INDEX,
+    TSDB_SHOW_DB_VGROUPS_INDEX,
+    TSDB_SHOW_DB_REPLICA_INDEX,
+    TSDB_SHOW_DB_QUORUM_INDEX,
+    TSDB_SHOW_DB_DAYS_INDEX,
+    TSDB_SHOW_DB_KEEP_INDEX,
+    TSDB_SHOW_DB_CACHE_INDEX,
+    TSDB_SHOW_DB_BLOCKS_INDEX,
+    TSDB_SHOW_DB_MINROWS_INDEX,
+    TSDB_SHOW_DB_MAXROWS_INDEX,
+    TSDB_SHOW_DB_WALLEVEL_INDEX,
+    TSDB_SHOW_DB_FSYNC_INDEX,
+    TSDB_SHOW_DB_COMP_INDEX,
+    TSDB_SHOW_DB_CACHELAST_INDEX,
+    TSDB_SHOW_DB_PRECISION_INDEX,
+    TSDB_SHOW_DB_UPDATE_INDEX,
+    TSDB_SHOW_DB_STATUS_INDEX,
+    TSDB_MAX_SHOW_DB
+};
+
+// -----------------------------------------SHOW TABLES CONFIGURE
+// -------------------------------------
+enum _show_stables_index {
+    TSDB_SHOW_STABLES_NAME_INDEX,
+    TSDB_SHOW_STABLES_CREATED_TIME_INDEX,
+    TSDB_SHOW_STABLES_COLUMNS_INDEX,
+    TSDB_SHOW_STABLES_METRIC_INDEX,
+    TSDB_SHOW_STABLES_UID_INDEX,
+    TSDB_SHOW_STABLES_TID_INDEX,
+    TSDB_SHOW_STABLES_VGID_INDEX,
+    TSDB_MAX_SHOW_STABLES
+};
+
+enum _describe_table_index {
+    TSDB_DESCRIBE_METRIC_FIELD_INDEX,
+    TSDB_DESCRIBE_METRIC_TYPE_INDEX,
+    TSDB_DESCRIBE_METRIC_LENGTH_INDEX,
+    TSDB_DESCRIBE_METRIC_NOTE_INDEX,
+    TSDB_MAX_DESCRIBE_METRIC
+};
+
+typedef struct SArguments_S {
+    char *   metaFile;
+    uint32_t test_mode;
+    char *   host;
+    uint16_t port;
+    uint16_t iface;
+    char *   user;
+    char     password[SHELL_MAX_PASSWORD_LEN];
+    char *   database;
+    int      replica;
+    char *   tb_prefix;
+    bool     escapeChar;
+    char *   sqlFile;
+    bool     use_metric;
+    bool     drop_database;
+    bool     aggr_func;
+    bool     answer_yes;
+    bool     debug_print;
+    bool     verbose_print;
+    bool     performance_print;
+    char *   output_file;
+    bool     async_mode;
+    char     data_type[MAX_NUM_COLUMNS + 1];
+    char *   dataType[MAX_NUM_COLUMNS + 1];
+    uint32_t binwidth;
+    uint32_t columnCount;
+    uint64_t lenOfOneRow;
+    uint32_t nthreads;
+    uint64_t insert_interval;
+    uint64_t timestamp_step;
+    int64_t  query_times;
+    int64_t  prepared_rand;
+    uint32_t interlaceRows;
+    uint32_t reqPerReq;  // num_of_records_per_req
+    uint64_t max_sql_len;
+    int64_t  ntables;
+    int64_t  insertRows;
+    int      abort;
+    uint32_t disorderRatio;  // 0: no disorder, >0: x%
+    int      disorderRange;  // ms, us or ns. according to database precision
+    uint32_t method_of_delete;
+    uint64_t totalInsertRows;
+    uint64_t totalAffectedRows;
+    bool     demo_mode;  // use default column name and semi-random data
+} SArguments;
+
+typedef struct SColumn_S {
+    char     field[TSDB_COL_NAME_LEN];
+    char     data_type;
+    char     dataType[DATATYPE_BUFF_LEN];
+    uint32_t dataLen;
+    char     note[NOTE_BUFF_LEN];
+} StrColumn;
+
+typedef struct SSuperTable_S {
+    char     stbName[TSDB_TABLE_NAME_LEN];
+    char     dataSource[SMALL_BUFF_LEN];  // rand_gen or sample
+    char     childTblPrefix[TBNAME_PREFIX_LEN];
+    uint16_t childTblExists;
+    int64_t  childTblCount;
+    uint64_t batchCreateTableNum;  // 0: no batch,  > 0: batch table number in
+                                   // one sql
+    uint8_t  autoCreateTable;  // 0: create sub table, 1: auto create sub table
+    uint16_t iface;            // 0: taosc, 1: rest, 2: stmt
+    uint16_t lineProtocol;
+    int64_t  childTblLimit;
+    uint64_t childTblOffset;
+
+    //  int          multiThreadWriteOneTbl;  // 0: no, 1: yes
+    uint32_t interlaceRows;  //
+    int      disorderRatio;  // 0: no disorder, >0: x%
+    int      disorderRange;  // ms, us or ns. according to database precision
+    uint64_t maxSqlLen;      //
+
+    uint64_t insertInterval;  // insert interval, will override global insert
+                              // interval
+    int64_t insertRows;
+    int64_t timeStampStep;
+    int     tsPrecision;
+    char    startTimestamp[MAX_TB_NAME_SIZE];
+    char    sampleFormat[SMALL_BUFF_LEN];  // csv, json
+    char    sampleFile[MAX_FILE_NAME_LEN];
+    char    tagsFile[MAX_FILE_NAME_LEN];
+
+    uint32_t  columnCount;
+    StrColumn columns[TSDB_MAX_COLUMNS];
+    uint32_t  tagCount;
+    StrColumn tags[TSDB_MAX_TAGS];
+
+    char *   childTblName;
+    bool     escapeChar;
+    char *   colsOfCreateChildTable;
+    uint64_t lenOfOneRow;
+    uint64_t lenOfTagOfOneRow;
+
+    char *sampleDataBuf;
+    bool  useSampleTs;
+
+    uint32_t tagSource;  // 0: rand, 1: tag sample
+    char *   tagDataBuf;
+    uint32_t tagSampleCount;
+    uint32_t tagUsePos;
+
+    // bind param batch
+    char *sampleBindBatchArray;
+    // statistics
+    uint64_t totalInsertRows;
+    uint64_t totalAffectedRows;
+} SSuperTable;
+
+typedef struct {
+    char    name[TSDB_DB_NAME_LEN];
+    char    create_time[32];
+    int64_t ntables;
+    int32_t vgroups;
+    int16_t replica;
+    int16_t quorum;
+    int16_t days;
+    char    keeplist[64];
+    int32_t cache;  // MB
+    int32_t blocks;
+    int32_t minrows;
+    int32_t maxrows;
+    int8_t  wallevel;
+    int32_t fsync;
+    int8_t  comp;
+    int8_t  cachelast;
+    char    precision[SMALL_BUFF_LEN];  // time resolution
+    int8_t  update;
+    char    status[16];
+} SDbInfo;
+
+typedef struct SDbCfg_S {
+    //  int       maxtablesPerVnode;
+    uint32_t minRows;  // 0 means default
+    uint32_t maxRows;  // 0 means default
+    int      comp;
+    int      walLevel;
+    int      cacheLast;
+    int      fsync;
+    int      replica;
+    int      update;
+    int      keep;
+    int      days;
+    int      cache;
+    int      blocks;
+    int      quorum;
+    char     precision[SMALL_BUFF_LEN];
+} SDbCfg;
+
+typedef struct SDataBase_S {
+    char         dbName[TSDB_DB_NAME_LEN];
+    bool         drop;  // 0: use exists, 1: if exists, drop then new create
+    SDbCfg       dbCfg;
+    uint64_t     superTblCount;
+    SSuperTable *superTbls;
+} SDataBase;
+
+typedef struct SDbs_S {
+    char               cfgDir[MAX_FILE_NAME_LEN];
+    char               host[MAX_HOSTNAME_SIZE];
+    struct sockaddr_in serv_addr;
+
+    uint16_t port;
+    char     user[MAX_USERNAME_SIZE];
+    char     password[SHELL_MAX_PASSWORD_LEN];
+    char     resultFile[MAX_FILE_NAME_LEN];
+    bool     use_metric;
+    bool     aggr_func;
+    bool     asyncMode;
+
+    uint32_t threadCount;
+    uint32_t threadCountForCreateTbl;
+    uint32_t dbCount;
+    // statistics
+    uint64_t totalInsertRows;
+    uint64_t totalAffectedRows;
+
+    SDataBase *db;
+} SDbs;
+
+typedef struct SpecifiedQueryInfo_S {
+    uint64_t  queryInterval;  // 0: unlimited  > 0   loop/s
+    uint32_t  concurrent;
+    int       sqlCount;
+    uint32_t  asyncMode;          // 0: sync, 1: async
+    uint64_t  subscribeInterval;  // ms
+    uint64_t  queryTimes;
+    bool      subscribeRestart;
+    int       subscribeKeepProgress;
+    char      sql[MAX_QUERY_SQL_COUNT][BUFFER_SIZE + 1];
+    char      result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN];
+    int       resubAfterConsume[MAX_QUERY_SQL_COUNT];
+    int       endAfterConsume[MAX_QUERY_SQL_COUNT];
+    TAOS_SUB *tsub[MAX_QUERY_SQL_COUNT];
+    char      topic[MAX_QUERY_SQL_COUNT][32];
+    int       consumed[MAX_QUERY_SQL_COUNT];
+    TAOS_RES *res[MAX_QUERY_SQL_COUNT];
+    uint64_t  totalQueried;
+} SpecifiedQueryInfo;
+
+typedef struct SuperQueryInfo_S {
+    char     stbName[TSDB_TABLE_NAME_LEN];
+    uint64_t queryInterval;  // 0: unlimited  > 0   loop/s
+    uint32_t threadCnt;
+    uint32_t asyncMode;          // 0: sync, 1: async
+    uint64_t subscribeInterval;  // ms
+    bool     subscribeRestart;
+    int      subscribeKeepProgress;
+    uint64_t queryTimes;
+    int64_t  childTblCount;
+    char childTblPrefix[TBNAME_PREFIX_LEN];  // 20 characters reserved for seq
+    int  sqlCount;
+    char sql[MAX_QUERY_SQL_COUNT][BUFFER_SIZE + 1];
+    char result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN];
+    int  resubAfterConsume;
+    int  endAfterConsume;
+    TAOS_SUB *tsub[MAX_QUERY_SQL_COUNT];
+    char *    childTblName;
+    uint64_t  totalQueried;
+} SuperQueryInfo;
+
+typedef struct SQueryMetaInfo_S {
+    char               cfgDir[MAX_FILE_NAME_LEN];
+    char               host[MAX_HOSTNAME_SIZE];
+    uint16_t           port;
+    struct sockaddr_in serv_addr;
+    char               user[MAX_USERNAME_SIZE];
+    char               password[SHELL_MAX_PASSWORD_LEN];
+    char               dbName[TSDB_DB_NAME_LEN];
+    char               queryMode[SMALL_BUFF_LEN];  // taosc, rest
+    SpecifiedQueryInfo specifiedQueryInfo;
+    SuperQueryInfo     superQueryInfo;
+    uint64_t           totalQueried;
+} SQueryMetaInfo;
+
+typedef struct SThreadInfo_S {
+    TAOS *       taos;
+    TAOS_STMT *  stmt;
+    int64_t *    bind_ts;
+    int64_t *    bind_ts_array;
+    char *       bindParams;
+    char *       is_null;
+    int          threadID;
+    char         db_name[TSDB_DB_NAME_LEN];
+    uint32_t     time_precision;
+    char         filePath[MAX_PATH_LEN];
+    FILE *       fp;
+    char         tb_prefix[TSDB_TABLE_NAME_LEN];
+    uint64_t     start_table_from;
+    uint64_t     end_table_to;
+    int64_t      ntables;
+    int64_t      tables_created;
+    uint64_t     data_of_rate;
+    int64_t      start_time;
+    char *       cols;
+    bool         use_metric;
+    SSuperTable *stbInfo;
+    char *       buffer;  // sql cmd buffer
+
+    // for async insert
+    tsem_t   lock_sem;
+    int64_t  counter;
+    uint64_t st;
+    uint64_t et;
+    uint64_t lastTs;
+
+    // sample data
+    int64_t samplePos;
+    // statistics
+    uint64_t totalInsertRows;
+    uint64_t totalAffectedRows;
+
+    // insert delay statistics
+    uint64_t cntDelay;
+    uint64_t totalDelay;
+    uint64_t avgDelay;
+    uint64_t maxDelay;
+    uint64_t minDelay;
+
+    // seq of query or subscribe
+    uint64_t  querySeq;  // sequence number of sql command
+    TAOS_SUB *tsub;
+
+    char **lines;
+    SOCKET sockfd;
+} threadInfo;
+
+/* ************ Global variables ************  */
+extern char *         g_aggreFuncDemo[];
+extern char *         g_aggreFunc[];
+extern SArguments     g_args;
+extern SDbs           g_Dbs;
+extern char *         g_dupstr;
+extern int64_t        g_totalChildTables;
+extern int64_t        g_actualChildTables;
+extern SQueryMetaInfo g_queryInfo;
+extern FILE *         g_fpOfInsertResult;
+
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+
+/* ************ Function declares ************  */
+/* demoCommandOpt.c */
+int  parse_args(int argc, char *argv[]);
+void setParaFromArg();
+void querySqlFile(TAOS *taos, char *sqlFile);
+void testCmdLine();
+/* demoJsonOpt.c */
+int getInfoFromJsonFile(char *file);
+int testMetaFile();
+/* demoUtil.c */
+int   isCommentLine(char *line);
+void  replaceChildTblName(char *inSql, char *outSql, int tblIndex);
+void  setupForAnsiEscape(void);
+void  resetAfterAnsiEscape(void);
+int   taosRandom();
+void  tmfree(void *buf);
+void  tmfclose(FILE *fp);
+void  fetchResult(TAOS_RES *res, threadInfo *pThreadInfo);
+void  prompt();
+void  ERROR_EXIT(const char *msg);
+int   postProceSql(char *host, uint16_t port, char *sqlstr,
+                   threadInfo *pThreadInfo);
+int   queryDbExec(TAOS *taos, char *command, QUERY_TYPE type, bool quiet);
+int   regexMatch(const char *s, const char *reg, int cflags);
+int   convertHostToServAddr(char *host, uint16_t port,
+                            struct sockaddr_in *serv_addr);
+char *formatTimestamp(char *buf, int64_t val, int precision);
+void  errorWrongValue(char *program, char *wrong_arg, char *wrong_value);
+void  errorUnrecognized(char *program, char *wrong_arg);
+void  errorPrintReqArg(char *program, char *wrong_arg);
+void  errorPrintReqArg2(char *program, char *wrong_arg);
+void  errorPrintReqArg3(char *program, char *wrong_arg);
+bool  isStringNumber(char *input);
+int   getAllChildNameOfSuperTable(TAOS *taos, char *dbName, char *stbName,
+                                  char **  childTblNameOfSuperTbl,
+                                  int64_t *childTblCountOfSuperTbl);
+int   getChildNameOfSuperTableWithLimitAndOffset(TAOS *taos, char *dbName,
+                                                 char *   stbName,
+                                                 char **  childTblNameOfSuperTbl,
+                                                 int64_t *childTblCountOfSuperTbl,
+                                                 int64_t limit, uint64_t offset,
+                                                 bool escapChar);
+/* demoInsert.c */
+int  insertTestProcess();
+void postFreeResource();
+/* demoOutput.c */
+void printVersion();
+void printfInsertMeta();
+void printfInsertMetaToFile(FILE *fp);
+void printStatPerThread(threadInfo *pThreadInfo);
+void appendResultBufToFile(char *resultBuf, threadInfo *pThreadInfo);
+void printfQueryMeta();
+void printHelp();
+void printfQuerySystemInfo(TAOS *taos);
+/* demoQuery.c */
+int queryTestProcess();
+/* demoSubscribe.c */
+int subscribeTestProcess();
+#endif
\ No newline at end of file

src/kit/taosdemo/inc/demoData.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DEMODATA__
+#define __DEMODATA__
+#include "cJSON.h"
+#include "demo.h"
+/***** Global variables ******/
+
+extern char *    g_sampleDataBuf;
+extern char *    g_sampleBindBatchArray;
+extern int32_t * g_randint;
+extern uint32_t *g_randuint;
+extern int64_t * g_randbigint;
+extern uint64_t *g_randubigint;
+extern float *   g_randfloat;
+extern double *  g_randdouble;
+extern char *    g_randbool_buff;
+extern char *    g_randint_buff;
+extern char *    g_randuint_buff;
+extern char *    g_rand_voltage_buff;
+extern char *    g_randbigint_buff;
+extern char *    g_randubigint_buff;
+extern char *    g_randsmallint_buff;
+extern char *    g_randusmallint_buff;
+extern char *    g_randtinyint_buff;
+extern char *    g_randutinyint_buff;
+extern char *    g_randfloat_buff;
+extern char *    g_rand_current_buff;
+extern char *    g_rand_phase_buff;
+extern char *    g_randdouble_buff;
+/***** Declare functions *****/
+int                 init_rand_data();
+char *              rand_bool_str();
+int32_t             rand_bool();
+char *              rand_tinyint_str();
+int32_t             rand_tinyint();
+char *              rand_utinyint_str();
+int32_t             rand_utinyint();
+char *              rand_smallint_str();
+int32_t             rand_smallint();
+char *              rand_usmallint_str();
+int32_t             rand_usmallint();
+char *              rand_int_str();
+int32_t             rand_int();
+char *              rand_uint_str();
+int32_t             rand_uint();
+char *              rand_bigint_str();
+int64_t             rand_bigint();
+char *              rand_ubigint_str();
+int64_t             rand_ubigint();
+char *              rand_float_str();
+float               rand_float();
+char *              demo_current_float_str();
+float UNUSED_FUNC   demo_current_float();
+char *              demo_voltage_int_str();
+int32_t UNUSED_FUNC demo_voltage_int();
+char *              demo_phase_float_str();
+float UNUSED_FUNC   demo_phase_float();
+void                rand_string(char *str, int size);
+char *              rand_double_str();
+double              rand_double();
+
+int     generateTagValuesForStb(SSuperTable *stbInfo, int64_t tableSeq,
+                                char *tagsValBuf);
+int64_t getTSRandTail(int64_t timeStampStep, int32_t seq, int disorderRatio,
+                      int disorderRange);
+int32_t prepareStbStmtBindTag(char *bindArray, SSuperTable *stbInfo,
+                              char *tagsVal, int32_t timePrec);
+int32_t prepareStmtWithoutStb(threadInfo *pThreadInfo, char *tableName,
+                              uint32_t batch, int64_t insertRows,
+                              int64_t recordFrom, int64_t startTime);
+int32_t generateStbInterlaceData(threadInfo *pThreadInfo, char *tableName,
+                                 uint32_t batchPerTbl, uint64_t i,
+                                 uint32_t batchPerTblTimes, uint64_t tableSeq,
+                                 char *buffer, int64_t insertRows,
+                                 int64_t startTime, uint64_t *pRemainderBufLen);
+int64_t generateInterlaceDataWithoutStb(char *tableName, uint32_t batch,
+                                        uint64_t tableSeq, char *dbName,
+                                        char *buffer, int64_t insertRows,
+                                        int64_t   startTime,
+                                        uint64_t *pRemainderBufLen);
+int32_t generateStbProgressiveData(SSuperTable *stbInfo, char *tableName,
+                                   int64_t tableSeq, char *dbName, char *buffer,
+                                   int64_t insertRows, uint64_t recordFrom,
+                                   int64_t startTime, int64_t *pSamplePos,
+                                   int64_t *pRemainderBufLen);
+int32_t generateProgressiveDataWithoutStb(
+    char *tableName, threadInfo *pThreadInfo, char *buffer, int64_t insertRows,
+    uint64_t recordFrom, int64_t startTime, int64_t *pRemainderBufLen);
+int64_t generateStbRowData(SSuperTable *stbInfo, char *recBuf,
+                           int64_t remainderBufLen, int64_t timestamp);
+int     prepareSampleForStb(SSuperTable *stbInfo);
+int     prepareSampleForNtb();
+int     parseSamplefileToStmtBatch(SSuperTable *stbInfo);
+int     parseStbSampleToStmtBatchForThread(threadInfo * pThreadInfo,
+                                           SSuperTable *stbInfo, uint32_t timePrec,
+                                           uint32_t batch);
+int     parseNtbSampleToStmtBatchForThread(threadInfo *pThreadInfo,
+                                           uint32_t timePrec, uint32_t batch);
+int     prepareSampleData();
+int32_t generateSmlConstPart(char *sml, SSuperTable *stbInfo,
+                             threadInfo *pThreadInfo, int tbSeq);
+
+int32_t generateSmlMutablePart(char *line, char *sml, SSuperTable *stbInfo,
+                               threadInfo *pThreadInfo, int64_t timestamp);
+int32_t generateSmlJsonTags(cJSON *tagsList, SSuperTable *stbInfo,
+                            threadInfo *pThreadInfo, int tbSeq);
+int32_t generateSmlJsonCols(cJSON *array, cJSON *tag, SSuperTable *stbInfo,
+                            threadInfo *pThreadInfo, int64_t timestamp);
+#endif
\ No newline at end of file

src/kit/taosdemo/insert.json

@@ -21,7 +21,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

src/kit/taosdemo/src/demoMain.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "demo.h"
+int64_t        g_totalChildTables = DEFAULT_CHILDTABLES;
+int64_t        g_actualChildTables = 0;
+FILE *         g_fpOfInsertResult = NULL;
+char *         g_dupstr = NULL;
+SDbs           g_Dbs;
+SQueryMetaInfo g_queryInfo;
+
+SArguments g_args = {
+    DEFAULT_METAFILE,          // metaFile
+    DEFAULT_TEST_MODE,         // test_mode
+    DEFAULT_HOST,              // host
+    DEFAULT_PORT,              // port
+    DEFAULT_IFACE,             // iface
+    TSDB_DEFAULT_USER,         // user
+    TSDB_DEFAULT_PASS,         // password
+    DEFAULT_DATABASE,          // database
+    DEFAULT_REPLICA,           // replica
+    DEFAULT_TB_PREFIX,         // tb_prefix
+    DEFAULT_ESCAPE_CHAR,       // escapeChar
+    DEFAULT_SQLFILE,           // sqlFile
+    DEFAULT_USE_METRIC,        // use_metric
+    DEFAULT_DROP_DB,           // drop_database
+    DEFAULT_AGGR_FUNC,         // aggr_func
+    DEFAULT_DEBUG,             // debug_print
+    DEFAULT_VERBOSE,           // verbose_print
+    DEFAULT_PERF_STAT,         // performance statistic print
+    DEFAULT_ANS_YES,           // answer_yes;
+    DEFAULT_OUTPUT,            // output_file
+    DEFAULT_SYNC_MODE,         // mode : sync or async
+    DEFAULT_DATA_TYPE,         // data_type
+    DEFAULT_DATATYPE,          // dataType
+    DEFAULT_BINWIDTH,          // binwidth
+    DEFAULT_COL_COUNT,         // columnCount, timestamp + float + int + float
+    DEFAULT_LEN_ONE_ROW,       // lenOfOneRow
+    DEFAULT_NTHREADS,          // nthreads
+    DEFAULT_INSERT_INTERVAL,   // insert_interval
+    DEFAULT_TIMESTAMP_STEP,    // timestamp_step
+    DEFAULT_QUERY_TIME,        // query_times
+    DEFAULT_PREPARED_RAND,     // prepared_rand
+    DEFAULT_INTERLACE_ROWS,    // interlaceRows;
+    DEFAULT_REQ_PER_REQ,       // reqPerReq
+    TSDB_MAX_ALLOWED_SQL_LEN,  // max_sql_len
+    DEFAULT_CHILDTABLES,       // ntables
+    DEFAULT_INSERT_ROWS,       // insertRows
+    DEFAULT_ABORT,             // abort
+    DEFAULT_RATIO,             // disorderRatio
+    DEFAULT_DISORDER_RANGE,    // disorderRange
+    DEFAULT_METHOD_DEL,        // method_of_delete
+    DEFAULT_TOTAL_INSERT,      // totalInsertRows;
+    DEFAULT_TOTAL_AFFECT,      // totalAffectedRows;
+    DEFAULT_DEMO_MODE,         // demo_mode;
+};
+
+int main(int argc, char *argv[]) {
+    if (parse_args(argc, argv)) {
+        exit(EXIT_FAILURE);
+    }
+    debugPrint("meta file: %s\n", g_args.metaFile);
+
+    if (g_args.metaFile) {
+        g_totalChildTables = 0;
+        if (getInfoFromJsonFile(g_args.metaFile)) {
+            exit(EXIT_FAILURE);
+        }
+        if (testMetaFile()) {
+            exit(EXIT_FAILURE);
+        }
+    } else {
+        memset(&g_Dbs, 0, sizeof(SDbs));
+        g_Dbs.db = calloc(1, sizeof(SDataBase));
+        if (NULL == g_Dbs.db) {
+            errorPrint("%s", "failed to allocate memory\n");
+        }
+
+        g_Dbs.db[0].superTbls = calloc(1, sizeof(SSuperTable));
+        if (NULL == g_Dbs.db[0].superTbls) {
+            errorPrint("%s", "failed to allocate memory\n");
+        }
+
+        setParaFromArg();
+
+        if (NULL != g_args.sqlFile) {
+            TAOS *qtaos = taos_connect(g_Dbs.host, g_Dbs.user, g_Dbs.password,
+                                       g_Dbs.db[0].dbName, g_Dbs.port);
+            querySqlFile(qtaos, g_args.sqlFile);
+            taos_close(qtaos);
+        } else {
+            testCmdLine();
+        }
+    }
+    postFreeResource();
+
+    return 0;
+}
\ No newline at end of file

src/mnode/src/mnodeUser.c

@@ -276,10 +276,10 @@ int32_t mnodeCreateUser(SAcctObj *pAcct, char *name, char *pass, void *pMsg) {
 
   code = sdbInsertRow(&row);
   if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
-    mError("user:%s, failed to create by %s, reason:%s", pUser->user, mnodeGetUserFromMsg(pMsg), tstrerror(code));
+    mError("user:%s, failed to create, reason:%s", pUser->user, tstrerror(code));
     tfree(pUser);
   } else {
-    mLInfo("user:%s, is created by %s", pUser->user, mnodeGetUserFromMsg(pMsg));
+    mLInfo("user:%s, is created successfully", pUser->user);
   }
 
   return code;

src/plugins/CMakeLists.txt

@@ -29,6 +29,8 @@ ELSE ()
   EXECUTE_PROCESS(
       COMMAND cd ..
       )
+
+  IF (TD_LINUX)
       include(ExternalProject)
       ExternalProject_Add(taosadapter
           PREFIX        "taosadapter"
@@ -47,6 +49,27 @@ ELSE ()
           COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
           COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
           )
+  ELSEIF (TD_DARWIN)
+      include(ExternalProject)
+      ExternalProject_Add(taosadapter
+          PREFIX        "taosadapter"
+          SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+          BUILD_ALWAYS         off
+          DEPENDS             taos
+          BUILD_IN_SOURCE     1
+          CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
+          PATCH_COMMAND
+          COMMAND     git clean -f -d
+          BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
+          INSTALL_COMMAND
+          COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
+          COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
+          COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
+          COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
+          )
+  ELSE ()
+      MESSAGE("${Yellow} Windows system still use original embedded httpd ${ColourReset}")
+  ENDIF ()
 ENDIF ()
 
 IF (TD_LINUX AND TD_MQTT)

src/plugins/http/inc/httpInt.h

@@ -147,7 +147,7 @@ typedef struct HttpContext {
   int32_t            state;
   uint8_t            reqType;
   uint8_t            parsed;
-  uint8_t            error;
+  bool               error;
   char               ipstr[22];
   char               user[TSDB_USER_LEN];  // parsed from auth token or login message
   char               pass[HTTP_PASSWORD_LEN];

src/plugins/http/src/httpContext.c

@@ -120,6 +120,7 @@ HttpContext *httpCreateContext(SOCKET fd) {
   pContext->lastAccessTime = taosGetTimestampSec();
   pContext->state = HTTP_CONTEXT_STATE_READY;
   pContext->parser = httpCreateParser(pContext);
+  pContext->error = false;
 
   TSDB_CACHE_PTR_TYPE handleVal = (TSDB_CACHE_PTR_TYPE)pContext;
   HttpContext **ppContext = taosCachePut(tsHttpServer.contextCache, &handleVal, sizeof(TSDB_CACHE_PTR_TYPE), &pContext,

src/plugins/http/src/httpResp.c

@@ -24,7 +24,7 @@
 
 const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"};
 
-const char *httpVersionStr[] = {"HTTP/1.0", "HTTP/1.1", "HTTP/1.2"};
+const char *httpVersionStr[] = {"HTTP/1.0", "HTTP/1.1", "HTTP/2.0"}; /* There is no version 1.2 */
 
 const char *httpRespTemplate[] = {
     // HTTP_RESPONSE_JSON_OK
@@ -52,8 +52,14 @@ static void httpSendErrorRespImp(HttpContext *pContext, int32_t httpCode, char *
 
   int8_t httpVersion = 0;
   int8_t keepAlive = 0;
+
   if (pContext->parser != NULL) {
     httpVersion = pContext->parser->httpVersion;
+  }
+
+  if (pContext->error == true) {
+    keepAlive = HTTP_KEEPALIVE_DISABLE;
+  } else if (pContext->parser != NULL) {
     keepAlive = pContext->parser->keepAlive;
   }
 

src/query/inc/qExecutor.h

@@ -649,7 +649,7 @@ int32_t createQueryFunc(SQueriedTableInfo* pTableInfo, int32_t numOfOutput, SExp
 int32_t createIndirectQueryFuncExprFromMsg(SQueryTableMsg *pQueryMsg, int32_t numOfOutput, SExprInfo **pExprInfo,
                                            SSqlExpr **pExpr, SExprInfo *prevExpr, SUdfInfo *pUdfInfo);
 
-int32_t createQueryFilter(char *data, uint16_t len, void** pFilters);
+int32_t createQueryFilter(char *data, int32_t len, void** pFilters);
 
 SGroupbyExpr *createGroupbyExprFromMsg(SQueryTableMsg *pQueryMsg, SColIndex *pColIndex, int32_t *code);
 SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SGroupbyExpr *pGroupbyExpr, SExprInfo *pExprs,