Merge branch '3.0' into cpwu/3.0

9840c85d · cpwu · 1efcb6db · 944a9c6e · 9840c85d · 9840c85d
355 changed file
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -117,27 +117,29 @@ def pre_test(){
 def pre_test_win(){
    bat '''
        hostname
+        ipconfig
+        set
        date /t
        time /t
-        taskkill /f /t /im python.exe
-        taskkill /f /t /im bash.exe
        rd /s /Q C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug
-        exit 0
    '''
    bat '''
        cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
        git reset --hard
        git fetch || git fetch
+    '''
+    bat '''
        cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
        git reset --hard
        git fetch || git fetch
-        git checkout -f
    '''
    script {
        if (env.CHANGE_TARGET == 'master') {
            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
                git checkout master
+            '''
+            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
                git checkout master
            '''
@@ -145,6 +147,8 @@ def pre_test_win(){
            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
                git checkout 2.0
+            '''
+            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
                git checkout 2.0
            '''
@@ -152,6 +156,8 @@ def pre_test_win(){
            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
                git checkout 3.0
+            '''
+            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
                git checkout 3.0
            '''
@@ -159,6 +165,8 @@ def pre_test_win(){
            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
                git checkout develop
+            '''
+            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
                git checkout develop
            '''
@@ -169,30 +177,52 @@ def pre_test_win(){
            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
                git pull
-                git log -5
+            '''
+            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
                git pull
-                git fetch origin +refs/pull/${CHANGE_ID}/merge
+            '''
+            bat '''
+                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
+                git fetch origin +refs/pull/%CHANGE_ID%/merge
+            '''
+            bat '''
+                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
                git checkout -qf FETCH_HEAD
-                git log -5
            '''
        } else if (env.CHANGE_URL =~ /\/TDinternal\//) {
            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
                git pull
-                git fetch origin +refs/pull/${CHANGE_ID}/merge
+            '''
+            bat '''
+                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
+                git fetch origin +refs/pull/%CHANGE_ID%/merge
+            '''
+            bat '''
+                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
                git checkout -qf FETCH_HEAD
-                git log -5
+            '''
+            bat '''
                cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
                git pull
-                git log -5
            '''
        } else {
-            sh '''
+            bat '''
-                echo "unmatched reposiotry ${CHANGE_URL}"
+                echo "unmatched reposiotry %CHANGE_URL%"
            '''
        }
    }
+    bat '''
+        cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
+        git branch
+        git log -5
+    '''
+    bat '''
+        cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
+        git branch
+        git log -5
+    '''
    bat '''
        cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community
        git submodule update --init --recursive
@@ -205,10 +235,15 @@ def pre_test_build_win() {
        cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal
        mkdir debug
        cd debug
+        time /t
        call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
        set CL=/MP8
-        cmake .. -G "NMake Makefiles JOM"
+        echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> cmake"
-        jom -j 4 || exit 8
+        time /t
+        cmake .. -G "NMake Makefiles JOM" || exit 7
+        echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> jom -j 6"
+        time /t
+        jom -j 6 || exit 8
        time /t
    '''
    return 1
@@ -226,6 +261,13 @@ pipeline {
    stages {
        stage('run test') {
            parallel {
+                stage('windows test') {
+                    agent{label " windows10_01 || windows10_02 || windows10_03 || windows10_04 "}
+                    steps {
+                        pre_test_win()
+                        pre_test_build_win()
+                    }
+                }
                stage('linux test') {
                    agent{label " slave3_0 || slave15 || slave16 || slave17 "}
                    options { skipDefaultCheckout() } 

--- a/cmake/cmake.install
+++ b/cmake/cmake.install
@@ -5,22 +5,27 @@ IF (TD_LINUX)
 ELSEIF (TD_WINDOWS)
  SET(CMAKE_INSTALL_PREFIX C:/TDengine)
-  INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/go     DESTINATION connector)
+  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/go     DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/nodejs DESTINATION connector)
+  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/nodejs DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/python DESTINATION connector)
+  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/python DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/C\# DESTINATION connector)
+  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/C\# DESTINATION connector)
-  INSTALL(DIRECTORY ${TD_SOURCE_DIR}/examples DESTINATION .)
+  # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/examples DESTINATION .)
  INSTALL(FILES ${TD_SOURCE_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
-  INSTALL(FILES ${TD_SOURCE_DIR}/src/inc/taos.h DESTINATION include)
+  INSTALL(FILES ${TD_SOURCE_DIR}/include/client/taos.h DESTINATION include)
-  INSTALL(FILES ${TD_SOURCE_DIR}/src/inc/taoserror.h DESTINATION include)
+  INSTALL(FILES ${TD_SOURCE_DIR}/include/util/taoserror.h DESTINATION include)
  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.lib DESTINATION driver)
  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos_static.lib DESTINATION driver)
-  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.exp DESTINATION driver)
  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos.dll DESTINATION driver)
+  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
+  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosd.exe DESTINATION .)
+  INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/udfd.exe DESTINATION .)
  IF (TD_MVN_INSTALLED)
    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.38-dist.jar DESTINATION connector/jdbc)
  ENDIF ()
+  SET(TD_MAKE_INSTALL_SH "${TD_SOURCE_DIR}/packaging/tools/make_install.bat")
+  INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
+  INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} :needAdmin ${TD_SOURCE_DIR} ${PROJECT_BINARY_DIR} Windows ${TD_VER_NUMBER})")
 ELSEIF (TD_DARWIN)
  SET(TD_MAKE_INSTALL_SH "${TD_SOURCE_DIR}/packaging/tools/make_install.sh")
  INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")

--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -226,10 +226,10 @@ endif(${BUILD_WITH_NURAFT})
 if(${BUILD_PTHREAD})
    set(CMAKE_BUILD_TYPE release)
    add_definitions(-DPTW32_STATIC_LIB)
-    add_subdirectory(pthread)
+    add_subdirectory(pthread EXCLUDE_FROM_ALL)
    set_target_properties(libpthreadVC3 PROPERTIES OUTPUT_NAME pthread)
-    add_library(pthread STATIC IMPORTED GLOBAL)
+    add_library(pthread INTERFACE)
-    SET_PROPERTY(TARGET pthread PROPERTY IMPORTED_LOCATION ${LIBRARY_OUTPUT_PATH}/pthread.lib)
+    target_link_libraries(pthread INTERFACE libpthreadVC3)
 endif()
 # iconv

--- a/example/src/tmq.c
+++ b/example/src/tmq.c
@@ -167,7 +167,7 @@ tmq_t* build_consumer() {
  tmq_conf_set(conf, "td.connect.pass", "taosdata");
  /*tmq_conf_set(conf, "td.connect.db", "abc1");*/
  tmq_conf_set(conf, "msg.with.table.name", "true");
-  tmq_conf_set_offset_commit_cb(conf, tmq_commit_cb_print, NULL);
+  tmq_conf_set_auto_commit_cb(conf, tmq_commit_cb_print, NULL);
  tmq_t* tmq = tmq_consumer_new(conf, NULL, 0);
  assert(tmq);
  return tmq;
@@ -176,6 +176,7 @@ tmq_t* build_consumer() {
 tmq_list_t* build_topic_list() {
  tmq_list_t* topic_list = tmq_list_new();
  tmq_list_append(topic_list, "topic_ctb_column");
+  /*tmq_list_append(topic_list, "tmq_test_db_multi_insert_topic");*/
  return topic_list;
 }
@@ -190,7 +191,7 @@ void basic_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
  int32_t cnt = 0;
  /*clock_t startTime = clock();*/
  while (running) {
-    TAOS_RES* tmqmessage = tmq_consumer_poll(tmq, 500);
+    TAOS_RES* tmqmessage = tmq_consumer_poll(tmq, 0);
    if (tmqmessage) {
      cnt++;
      /*printf("get data\n");*/
@@ -238,7 +239,7 @@ void sync_consume_loop(tmq_t* tmq, tmq_list_t* topics) {
      msg_process(tmqmessage);
      taos_free_result(tmqmessage);
-      tmq_commit(tmq, NULL, 1);
+      tmq_commit_async(tmq, NULL, tmq_commit_cb_print, NULL);
      /*if ((++msg_count % MIN_COMMIT_COUNT) == 0) tmq_commit(tmq, NULL, 0);*/
    }
  }

--- a/include/client/taos.h
+++ b/include/client/taos.h
@@ -232,9 +232,11 @@ DLL_EXPORT tmq_resp_err_t tmq_unsubscribe(tmq_t *tmq);
 DLL_EXPORT tmq_resp_err_t tmq_subscription(tmq_t *tmq, tmq_list_t **topics);
 DLL_EXPORT TAOS_RES      *tmq_consumer_poll(tmq_t *tmq, int64_t wait_time);
 DLL_EXPORT tmq_resp_err_t tmq_consumer_close(tmq_t *tmq);
-DLL_EXPORT tmq_resp_err_t tmq_commit(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets, int32_t async);
+DLL_EXPORT tmq_resp_err_t tmq_commit_sync(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets);
+DLL_EXPORT void tmq_commit_async(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets, tmq_commit_cb *cb, void *param);
 #if 0
-DLL_EXPORT tmq_resp_err_t tmq_commit_message(tmq_t* tmq, const tmq_message_t* tmqmessage, int32_t async);
+DLL_EXPORT tmq_resp_err_t tmq_commit(tmq_t *tmq, const tmq_topic_vgroup_list_t *offsets, int32_t async);
 DLL_EXPORT tmq_resp_err_t tmq_seek(tmq_t *tmq, const tmq_topic_vgroup_t *offset);
 #endif
@@ -251,7 +253,7 @@ typedef enum tmq_conf_res_t tmq_conf_res_t;
 DLL_EXPORT tmq_conf_t    *tmq_conf_new();
 DLL_EXPORT tmq_conf_res_t tmq_conf_set(tmq_conf_t *conf, const char *key, const char *value);
 DLL_EXPORT void           tmq_conf_destroy(tmq_conf_t *conf);
-DLL_EXPORT void           tmq_conf_set_offset_commit_cb(tmq_conf_t *conf, tmq_commit_cb *cb, void *param);
+DLL_EXPORT void           tmq_conf_set_auto_commit_cb(tmq_conf_t *conf, tmq_commit_cb *cb, void *param);
 /* -------------------------TMQ MSG HANDLE INTERFACE---------------------- */

--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
@@ -29,27 +29,42 @@ extern "C" {
 typedef struct SSchema       SSchema;
 typedef struct STColumn      STColumn;
 typedef struct STSchema      STSchema;
+typedef struct SColVal       SColVal;
 typedef struct STSRow2       STSRow2;
 typedef struct STSRowBuilder STSRowBuilder;
-typedef struct SKVIdx        SKVIdx;
+typedef struct STagVal       STagVal;
+typedef struct STag          STag;
-// STSchema
-// STSRow2
-int32_t tEncodeTSRow(SEncoder *pEncoder, const STSRow2 *pRow);
-int32_t tDecodeTSRow(SDecoder *pDecoder, STSRow2 *pRow);
 // STSchema
 int32_t tTSchemaCreate(int32_t sver, SSchema *pSchema, int32_t nCols, STSchema **ppTSchema);
 void    tTSchemaDestroy(STSchema *pTSchema);
+// SColVal
+#define ColValNONE               ((SColVal){.type = COL_VAL_NONE, .nData = 0, .pData = NULL})
+#define ColValNULL               ((SColVal){.type = COL_VAL_NULL, .nData = 0, .pData = NULL})
+#define ColValDATA(nData, pData) ((SColVal){.type = COL_VAL_DATA, .nData = (nData), .pData = (pData)})
+// STSRow2
+int32_t tPutTSRow(uint8_t *p, STSRow2 *pRow);
+int32_t tGetTSRow(uint8_t *p, STSRow2 *pRow);
+int32_t tTSRowDup(const STSRow2 *pRow, STSRow2 **ppRow);
+void    tTSRowFree(STSRow2 *pRow);
+int32_t tTSRowGet(const STSRow2 *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal);
 // STSRowBuilder
-int32_t tTSRowBuilderInit(STSRowBuilder *pBuilder, int32_t sver, SSchema *pSchema, int32_t nCols);
+int32_t tTSRowBuilderInit(STSRowBuilder *pBuilder, int32_t sver, int32_t nCols, SSchema *pSchema);
 void    tTSRowBuilderClear(STSRowBuilder *pBuilder);
 void    tTSRowBuilderReset(STSRowBuilder *pBuilder);
-int32_t tTSRowBuilderPut(STSRowBuilder *pBuilder, int32_t cid, const uint8_t *pData, uint32_t nData);
+int32_t tTSRowBuilderPut(STSRowBuilder *pBuilder, int32_t cid, uint8_t *pData, uint32_t nData);
 int32_t tTSRowBuilderGetRow(STSRowBuilder *pBuilder, const STSRow2 **ppRow);
+// STag
+int32_t tTagNew(STagVal *pTagVals, int16_t nTag, STag **ppTag);
+void    tTagFree(STag *pTag);
+void    tTagGet(STag *pTag, int16_t cid, int8_t type, uint8_t **ppData, int32_t *nData);
+int32_t tEncodeTag(SEncoder *pEncoder, STag *pTag);
+int32_t tDecodeTag(SDecoder *pDecoder, const STag **ppTag);
 // STRUCT =================
 struct STColumn {
  col_id_t colId;
@@ -68,31 +83,47 @@ struct STSchema {
  STColumn columns[];
 };
+#define TSROW_HAS_NONE ((uint8_t)0x1)
+#define TSROW_HAS_NULL ((uint8_t)0x2U)
+#define TSROW_HAS_VAL  ((uint8_t)0x4U)
+#define TSROW_KV_ROW   ((uint8_t)0x10U)
 struct STSRow2 {
  TSKEY    ts;
-  uint32_t flags;
+  uint8_t  flags;
-  union {
+  int32_t  sver;
-    int32_t sver;
+  uint32_t nData;
-    int32_t ncols;
+  uint8_t *pData;
-  };
-  uint32_t       nData;
-  const uint8_t *pData;
 };
 struct STSRowBuilder {
-  STColumn *pTColumn;
  STSchema *pTSchema;
+  int32_t   szBitMap1;
+  int32_t   szBitMap2;
  int32_t   szKVBuf;
  uint8_t  *pKVBuf;
  int32_t   szTPBuf;
  uint8_t  *pTPBuf;
-  int32_t   nCols;
+  int32_t   iCol;
-  int32_t   kvVLen;
+  int32_t   vlenKV;
-  int32_t   tpVLen;
+  int32_t   vlenTP;
  STSRow2   row;
 };
-#if 1  //====================================
+typedef enum { COL_VAL_NONE = 0, COL_VAL_NULL = 1, COL_VAL_DATA = 2 } EColValT;
+struct SColVal {
+  EColValT type;
+  uint32_t nData;
+  uint8_t *pData;
+};
+struct STagVal {
+  int16_t  cid;
+  int8_t   type;
+  uint32_t nData;
+  uint8_t *pData;
+};
+#if 1  //================================================================================================================================================
 // Imported since 3.0 and use bitmap to demonstrate None/Null/Norm, while use Null/Norm below 3.0 without of bitmap.
 #define TD_SUPPORT_BITMAP
 #define TD_SUPPORT_READ2

--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -32,6 +32,7 @@ extern char     tsLocalEp[];
 extern uint16_t tsServerPort;
 extern int32_t  tsVersion;
 extern int32_t  tsStatusInterval;
+extern int32_t  tsNumOfSupportVnodes;
 // common
 extern int32_t tsMaxShellConns;
@@ -45,7 +46,7 @@ extern bool    tsPrintAuth;
 extern int64_t tsTickPerMin[3];
 // multi-process
-extern bool    tsMultiProcess;
+extern int32_t tsMultiProcess;
 extern int32_t tsMnodeShmSize;
 extern int32_t tsVnodeShmSize;
 extern int32_t tsQnodeShmSize;

--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -258,6 +258,7 @@ typedef struct {
  char*   tblFName;
  int32_t numOfRows;
  int32_t affectedRows;
+  int64_t sver;
 } SSubmitBlkRsp;
 typedef struct {
@@ -274,10 +275,10 @@ int32_t tEncodeSSubmitRsp(SEncoder* pEncoder, const SSubmitRsp* pRsp);
 int32_t tDecodeSSubmitRsp(SDecoder* pDecoder, SSubmitRsp* pRsp);
 void    tFreeSSubmitRsp(SSubmitRsp* pRsp);
-#define COL_SMA_ON  ((int8_t)0x1)
+#define COL_SMA_ON   ((int8_t)0x1)
-#define COL_IDX_ON  ((int8_t)0x2)
+#define COL_IDX_ON   ((int8_t)0x2)
-#define COL_VAL_SET ((int8_t)0x4)
+#define COL_SET_NULL ((int8_t)0x10)
+#define COL_SET_VAL  ((int8_t)0x20)
 typedef struct SSchema {
  int8_t   type;
  int8_t   flags;
@@ -286,6 +287,9 @@ typedef struct SSchema {
  char     name[TSDB_COL_NAME_LEN];
 } SSchema;
+#define COL_IS_SET(FLG)  ((FLG) & (COL_SET_VAL | COL_SET_NULL) != 0)
+#define COL_CLR_SET(FLG) ((FLG) &= (~(COL_SET_VAL | COL_SET_NULL)))
 #define IS_BSMA_ON(s) (((s)->flags & 0x01) == COL_SMA_ON)
 #define SSCHMEA_TYPE(s)  ((s)->type)
@@ -297,6 +301,8 @@ typedef struct SSchema {
 typedef struct {
  int32_t  nCols;
  int32_t  sver;
+  int32_t  tagVer;
+  int32_t  colVer;
  SSchema* pSchema;
 } SSchemaWrapper;
@@ -305,6 +311,8 @@ static FORCE_INLINE SSchemaWrapper* tCloneSSchemaWrapper(const SSchemaWrapper* p
  if (pSW == NULL) return pSW;
  pSW->nCols = pSchemaWrapper->nCols;
  pSW->sver = pSchemaWrapper->sver;
+  pSW->tagVer = pSchemaWrapper->tagVer;
+  pSW->colVer = pSchemaWrapper->colVer;
  pSW->pSchema = (SSchema*)taosMemoryCalloc(pSW->nCols, sizeof(SSchema));
  if (pSW->pSchema == NULL) {
    taosMemoryFree(pSW);
@@ -360,6 +368,8 @@ static FORCE_INLINE int32_t taosEncodeSSchemaWrapper(void** buf, const SSchemaWr
  int32_t tlen = 0;
  tlen += taosEncodeVariantI32(buf, pSW->nCols);
  tlen += taosEncodeVariantI32(buf, pSW->sver);
+  tlen += taosEncodeVariantI32(buf, pSW->tagVer);
+  tlen += taosEncodeVariantI32(buf, pSW->colVer);
  for (int32_t i = 0; i < pSW->nCols; i++) {
    tlen += taosEncodeSSchema(buf, &pSW->pSchema[i]);
  }
@@ -369,6 +379,8 @@ static FORCE_INLINE int32_t taosEncodeSSchemaWrapper(void** buf, const SSchemaWr
 static FORCE_INLINE void* taosDecodeSSchemaWrapper(const void* buf, SSchemaWrapper* pSW) {
  buf = taosDecodeVariantI32(buf, &pSW->nCols);
  buf = taosDecodeVariantI32(buf, &pSW->sver);
+  buf = taosDecodeVariantI32(buf, &pSW->tagVer);
+  buf = taosDecodeVariantI32(buf, &pSW->colVer);
  pSW->pSchema = (SSchema*)taosMemoryCalloc(pSW->nCols, sizeof(SSchema));
  if (pSW->pSchema == NULL) {
    return NULL;
@@ -383,6 +395,8 @@ static FORCE_INLINE void* taosDecodeSSchemaWrapper(const void* buf, SSchemaWrapp
 static FORCE_INLINE int32_t tEncodeSSchemaWrapper(SEncoder* pEncoder, const SSchemaWrapper* pSW) {
  if (tEncodeI32v(pEncoder, pSW->nCols) < 0) return -1;
  if (tEncodeI32v(pEncoder, pSW->sver) < 0) return -1;
+  if (tEncodeI32v(pEncoder, pSW->tagVer) < 0) return -1;
+  if (tEncodeI32v(pEncoder, pSW->colVer) < 0) return -1;
  for (int32_t i = 0; i < pSW->nCols; i++) {
    if (tEncodeSSchema(pEncoder, &pSW->pSchema[i]) < 0) return -1;
  }
@@ -393,6 +407,8 @@ static FORCE_INLINE int32_t tEncodeSSchemaWrapper(SEncoder* pEncoder, const SSch
 static FORCE_INLINE int32_t tDecodeSSchemaWrapper(SDecoder* pDecoder, SSchemaWrapper* pSW) {
  if (tDecodeI32v(pDecoder, &pSW->nCols) < 0) return -1;
  if (tDecodeI32v(pDecoder, &pSW->sver) < 0) return -1;
+  if (tDecodeI32v(pDecoder, &pSW->tagVer) < 0) return -1;
+  if (tDecodeI32v(pDecoder, &pSW->colVer) < 0) return -1;
  pSW->pSchema = (SSchema*)taosMemoryCalloc(pSW->nCols, sizeof(SSchema));
  if (pSW->pSchema == NULL) return -1;
@@ -403,6 +419,21 @@ static FORCE_INLINE int32_t tDecodeSSchemaWrapper(SDecoder* pDecoder, SSchemaWra
  return 0;
 }
+static FORCE_INLINE int32_t tDecodeSSchemaWrapperEx(SDecoder* pDecoder, SSchemaWrapper* pSW) {
+  if (tDecodeI32v(pDecoder, &pSW->nCols) < 0) return -1;
+  if (tDecodeI32v(pDecoder, &pSW->sver) < 0) return -1;
+  if (tDecodeI32v(pDecoder, &pSW->tagVer) < 0) return -1;
+  if (tDecodeI32v(pDecoder, &pSW->colVer) < 0) return -1;
+  pSW->pSchema = (SSchema*)tDecoderMalloc(pDecoder, pSW->nCols * sizeof(SSchema));
+  if (pSW->pSchema == NULL) return -1;
+  for (int32_t i = 0; i < pSW->nCols; i++) {
+    if (tDecodeSSchema(pDecoder, &pSW->pSchema[i]) < 0) return -1;
+  }
+  return 0;
+}
 STSchema* tdGetSTSChemaFromSSChema(SSchema** pSchema, int32_t nCols);
 typedef struct {
@@ -438,6 +469,7 @@ int32_t tDeserializeSMDropStbReq(void* buf, int32_t bufLen, SMDropStbReq* pReq);
 typedef struct {
  char    name[TSDB_TABLE_FNAME_LEN];
  int8_t  alterType;
+  int32_t verInBlock;
  int32_t numOfFields;
  SArray* pFields;
  int32_t ttl;
@@ -1463,6 +1495,7 @@ typedef struct {
 typedef struct {
  int64_t consumerId;
  char    cgroup[TSDB_CGROUP_LEN];
+  char    clientId[256];
  SArray* topicNames;  // SArray<char**>
 } SCMSubscribeReq;
@@ -1470,6 +1503,7 @@ static FORCE_INLINE int32_t tSerializeSCMSubscribeReq(void** buf, const SCMSubsc
  int32_t tlen = 0;
  tlen += taosEncodeFixedI64(buf, pReq->consumerId);
  tlen += taosEncodeString(buf, pReq->cgroup);
+  tlen += taosEncodeString(buf, pReq->clientId);
  int32_t topicNum = taosArrayGetSize(pReq->topicNames);
  tlen += taosEncodeFixedI32(buf, topicNum);
@@ -1483,6 +1517,7 @@ static FORCE_INLINE int32_t tSerializeSCMSubscribeReq(void** buf, const SCMSubsc
 static FORCE_INLINE void* tDeserializeSCMSubscribeReq(void* buf, SCMSubscribeReq* pReq) {
  buf = taosDecodeFixedI64(buf, &pReq->consumerId);
  buf = taosDecodeStringTo(buf, pReq->cgroup);
+  buf = taosDecodeStringTo(buf, pReq->clientId);
  int32_t topicNum;
  buf = taosDecodeFixedI32(buf, &topicNum);
@@ -1613,6 +1648,15 @@ typedef struct {
 int32_t tSerializeSMDropTopicReq(void* buf, int32_t bufLen, SMDropTopicReq* pReq);
 int32_t tDeserializeSMDropTopicReq(void* buf, int32_t bufLen, SMDropTopicReq* pReq);
+typedef struct {
+  char   topic[TSDB_TOPIC_FNAME_LEN];
+  char   cgroup[TSDB_CGROUP_LEN];
+  int8_t igNotExists;
+} SMDropCgroupReq;
+int32_t tSerializeSMDropCgroupReq(void* buf, int32_t bufLen, SMDropCgroupReq* pReq);
+int32_t tDeserializeSMDropCgroupReq(void* buf, int32_t bufLen, SMDropCgroupReq* pReq);
 typedef struct {
  char    name[TSDB_TABLE_FNAME_LEN];
  int8_t  alterType;

--- a/include/common/tmsgcb.h
+++ b/include/common/tmsgcb.h
@@ -22,9 +22,10 @@
 extern "C" {
 #endif
-typedef struct SRpcMsg      SRpcMsg;
+typedef struct SRpcMsg        SRpcMsg;
-typedef struct SEpSet       SEpSet;
+typedef struct SEpSet         SEpSet;
-typedef struct SMgmtWrapper SMgmtWrapper;
+typedef struct SMgmtWrapper   SMgmtWrapper;
+typedef struct SRpcHandleInfo SRpcHandleInfo;
 typedef enum {
  QUERY_QUEUE,
@@ -37,41 +38,36 @@ typedef enum {
  QUEUE_MAX,
 } EQueueType;
-typedef int32_t (*PutToQueueFp)(void *pMgmt, SRpcMsg* pReq);
+typedef int32_t (*PutToQueueFp)(void* pMgmt, SRpcMsg* pMsg);
-typedef int32_t (*GetQueueSizeFp)(void *pMgmt, int32_t vgId, EQueueType qtype);
+typedef int32_t (*GetQueueSizeFp)(void* pMgmt, int32_t vgId, EQueueType qtype);
-typedef int32_t (*SendReqFp)(SMgmtWrapper* pWrapper, const SEpSet* epSet, SRpcMsg* pReq);
+typedef int32_t (*SendReqFp)(const SEpSet* pEpSet, SRpcMsg* pMsg);
-typedef int32_t (*SendMnodeReqFp)(SMgmtWrapper* pWrapper, SRpcMsg* pReq);
+typedef void (*SendRspFp)(SRpcMsg* pMsg);
-typedef void (*SendRspFp)(SMgmtWrapper* pWrapper, const SRpcMsg* pRsp);
+typedef void (*SendRedirectRspFp)(SRpcMsg* pMsg, const SEpSet* pNewEpSet);
-typedef void (*SendMnodeRecvFp)(SMgmtWrapper* pWrapper, SRpcMsg* pReq, SRpcMsg* pRsp);
+typedef void (*RegisterBrokenLinkArgFp)(SRpcMsg* pMsg);
-typedef void (*SendRedirectRspFp)(SMgmtWrapper* pWrapper, const SRpcMsg* pRsp, const SEpSet* pNewEpSet);
+typedef void (*ReleaseHandleFp)(SRpcHandleInfo* pHandle, int8_t type);
-typedef void (*RegisterBrokenLinkArgFp)(SMgmtWrapper* pWrapper, SRpcMsg* pMsg);
+typedef void (*ReportStartup)(const char* name, const char* desc);
-typedef void (*ReleaseHandleFp)(SMgmtWrapper* pWrapper, void* handle, int8_t type);
-typedef void (*ReportStartup)(SMgmtWrapper* pWrapper, const char* name, const char* desc);
 typedef struct {
-  SMgmtWrapper*           pWrapper;
+  void*                   mgmt;
-  void*                   pMgmt;
  void*                   clientRpc;
  PutToQueueFp            queueFps[QUEUE_MAX];
  GetQueueSizeFp          qsizeFp;
  SendReqFp               sendReqFp;
  SendRspFp               sendRspFp;
-  SendMnodeRecvFp         sendMnodeRecvFp;
  SendRedirectRspFp       sendRedirectRspFp;
  RegisterBrokenLinkArgFp registerBrokenLinkArgFp;
  ReleaseHandleFp         releaseHandleFp;
  ReportStartup           reportStartupFp;
 } SMsgCb;
-void    tmsgSetDefaultMsgCb(const SMsgCb* pMsgCb);
+void    tmsgSetDefault(const SMsgCb* msgcb);
-int32_t tmsgPutToQueue(const SMsgCb* pMsgCb, EQueueType qtype, SRpcMsg* pReq);
+int32_t tmsgPutToQueue(const SMsgCb* msgcb, EQueueType qtype, SRpcMsg* pMsg);
-int32_t tmsgGetQueueSize(const SMsgCb* pMsgCb, int32_t vgId, EQueueType qtype);
+int32_t tmsgGetQueueSize(const SMsgCb* msgcb, int32_t vgId, EQueueType qtype);
-int32_t tmsgSendReq(const SMsgCb* pMsgCb, const SEpSet* epSet, SRpcMsg* pReq);
+int32_t tmsgSendReq(const SEpSet* epSet, SRpcMsg* pMsg);
-void    tmsgSendRsp(SRpcMsg* pRsp);
+void    tmsgSendRsp(SRpcMsg* pMsg);
-void    tmsgSendMnodeRecv(SRpcMsg* pReq, SRpcMsg* pRsp);
+void    tmsgSendRedirectRsp(SRpcMsg* pMsg, const SEpSet* pNewEpSet);
-void    tmsgSendRedirectRsp(SRpcMsg* pRsp, const SEpSet* pNewEpSet);
+void    tmsgRegisterBrokenLinkArg(SRpcMsg* pMsg);
-void    tmsgRegisterBrokenLinkArg(const SMsgCb* pMsgCb, SRpcMsg* pMsg);
+void    tmsgReleaseHandle(SRpcHandleInfo* pHandle, int8_t type);
-void    tmsgReleaseHandle(void* handle, int8_t type);
 void    tmsgReportStartup(const char* name, const char* desc);
 #ifdef __cplusplus

--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
@@ -179,6 +179,8 @@ typedef struct {
    }                                          \
  } while (0)
+//TODO: use varchar(0) to represent NULL type
+#define IS_NULL_TYPE(_t)             ((_t) == TSDB_DATA_TYPE_NULL)
 #define IS_SIGNED_NUMERIC_TYPE(_t)   ((_t) >= TSDB_DATA_TYPE_TINYINT && (_t) <= TSDB_DATA_TYPE_BIGINT)
 #define IS_UNSIGNED_NUMERIC_TYPE(_t) ((_t) >= TSDB_DATA_TYPE_UTINYINT && (_t) <= TSDB_DATA_TYPE_UBIGINT)
 #define IS_FLOAT_TYPE(_t)            ((_t) == TSDB_DATA_TYPE_FLOAT || (_t) == TSDB_DATA_TYPE_DOUBLE)

--- a/include/dnode/mgmt/dnode.h
+++ b/include/dnode/mgmt/dnode.h
@@ -22,66 +22,28 @@
 extern "C" {
 #endif
-/* ------------------------ TYPES EXPOSED ---------------- */
-typedef struct SDnode SDnode;
 /**
- * @brief Initialize the environment
+ * @brief Initialize the dnode
 *
+ * @param rtype for internal debug usage, default is 0
 * @return int32_t 0 for success and -1 for failure
 */
-int32_t dmInit();
+int32_t dmInit(int8_t rtype);
 /**
- * @brief Clear the environment
+ * @brief Cleanup the dnode
 */
 void dmCleanup();
-/* ------------------------ SDnode ----------------------- */
-typedef struct {
-  int32_t   numOfSupportVnodes;
-  uint16_t  serverPort;
-  char      dataDir[PATH_MAX];
-  char      localEp[TSDB_EP_LEN];
-  char      localFqdn[TSDB_FQDN_LEN];
-  char      firstEp[TSDB_EP_LEN];
-  char      secondEp[TSDB_EP_LEN];
-  SDiskCfg *disks;
-  int32_t   numOfDisks;
-  int8_t    ntype;
-} SDnodeOpt;
-typedef enum { DND_EVENT_START = 0, DND_EVENT_STOP = 1, DND_EVENT_CHILD = 2 } EDndEvent;
 /**
- * @brief Initialize and start the dnode.
+ * @brief Run dnode.
- *
- * @param pOption Option of the dnode.
- * @return SDnode* The dnode object.
 */
-SDnode *dmCreate(const SDnodeOpt *pOption);
+int32_t dmRun();
 /**
- * @brief Stop and cleanup the dnode.
+ * @brief Stop dnode.
- *
- * @param pDnode The dnode object to close.
- */
-void dmClose(SDnode *pDnode);
-/**
- * @brief Run dnode until specific event is receive.
- *
- * @param pDnode The dnode object to run.
- */
-int32_t dmRun(SDnode *pDnode);
-/**
- * @brief Handle event in the dnode.
- *
- * @param pDnode The dnode object to close.
- * @param event The event to handle.
 */
-void dmSetEvent(SDnode *pDnode, EDndEvent event);
+void dmStop();
 #ifdef __cplusplus
 }

--- a/include/dnode/mnode/mnode.h
+++ b/include/dnode/mnode/mnode.h
@@ -88,7 +88,7 @@ int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad);
 * @param pMsg The request msg.
 * @return int32_t 0 for success, -1 for failure.
 */
-int32_t mndProcessMsg(SNodeMsg *pMsg);
+int32_t mndProcessMsg(SRpcMsg *pMsg);
 /**
 * @brief Generate machine code

--- a/include/dnode/mnode/sdb/sdb.h
+++ b/include/dnode/mnode/sdb/sdb.h
@@ -333,23 +333,23 @@ SSdbRow *sdbAllocRow(int32_t objSize);
 void    *sdbGetRowObj(SSdbRow *pRow);
 typedef struct SSdb {
-  SMnode     *pMnode;
+  SMnode        *pMnode;
-  char       *currDir;
+  char          *currDir;
-  char       *syncDir;
+  char          *syncDir;
-  char       *tmpDir;
+  char          *tmpDir;
-  int64_t     lastCommitVer;
+  int64_t        lastCommitVer;
-  int64_t     curVer;
+  int64_t        curVer;
-  int64_t     tableVer[SDB_MAX];
+  int64_t        tableVer[SDB_MAX];
-  int64_t     maxId[SDB_MAX];
+  int64_t        maxId[SDB_MAX];
-  EKeyType    keyTypes[SDB_MAX];
+  EKeyType       keyTypes[SDB_MAX];
-  SHashObj   *hashObjs[SDB_MAX];
+  SHashObj      *hashObjs[SDB_MAX];
-  SRWLatch    locks[SDB_MAX];
+  TdThreadRwlock locks[SDB_MAX];
-  SdbInsertFp insertFps[SDB_MAX];
+  SdbInsertFp    insertFps[SDB_MAX];
-  SdbUpdateFp updateFps[SDB_MAX];
+  SdbUpdateFp    updateFps[SDB_MAX];
-  SdbDeleteFp deleteFps[SDB_MAX];
+  SdbDeleteFp    deleteFps[SDB_MAX];
-  SdbDeployFp deployFps[SDB_MAX];
+  SdbDeployFp    deployFps[SDB_MAX];
-  SdbEncodeFp encodeFps[SDB_MAX];
+  SdbEncodeFp    encodeFps[SDB_MAX];
-  SdbDecodeFp decodeFps[SDB_MAX];
+  SdbDecodeFp    decodeFps[SDB_MAX];
 } SSdb;
 #ifdef __cplusplus

--- a/include/libs/catalog/catalog.h
+++ b/include/libs/catalog/catalog.h
@@ -59,6 +59,11 @@ typedef struct SMetaData {
  SArray    *pQnodeList;  // qnode list, SArray<SQueryNodeAddr>
 } SMetaData;
+typedef struct STbSVersion {
+  char* tbFName;
+  int32_t sver;
+} STbSVersion;
 typedef struct SCatalogCfg {
  uint32_t maxTblCacheNum;
  uint32_t maxDBCacheNum;
@@ -165,6 +170,8 @@ int32_t catalogUpdateSTableMeta(SCatalog* pCatalog, STableMetaRsp *rspMsg);
 */
 int32_t catalogRefreshDBVgInfo(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, const char* dbFName);
+int32_t catalogChkTbMetaVersion(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps, SArray* pTables);
 /**
 * Force refresh a table's local cached meta data. 
 * @param pCatalog (input, got with catalogGetHandle)

--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -42,7 +42,7 @@ typedef struct SReadHandle {
 #define STREAM_DATA_TYPE_SSDATA_BLOCK 0x2
 typedef enum {
-  OPTR_EXEC_MODEL_BATCH  = 0x1,
+  OPTR_EXEC_MODEL_BATCH = 0x1,
  OPTR_EXEC_MODEL_STREAM = 0x2,
 } EOPTR_EXEC_MODEL;
@@ -81,7 +81,7 @@ int32_t qSetMultiStreamInput(qTaskInfo_t tinfo, const void* pBlocks, size_t numO
 * @param isAdd
 * @return
 */
-int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, SArray* tableIdList, bool isAdd);
+int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, const SArray* tableIdList, bool isAdd);
 /**
 * Create the exec task object according to task json
@@ -95,6 +95,15 @@ int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, SArray* tableIdList, bool isA
 int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, struct SSubplan* pPlan,
                        qTaskInfo_t* pTaskInfo, DataSinkHandle* handle, EOPTR_EXEC_MODEL model);
+/**
+ *
+ * @param tinfo
+ * @param sversion
+ * @param tversion
+ * @return
+ */
+int32_t qGetQueriedTableSchemaVersion(qTaskInfo_t tinfo, char* dbName, char* tableName, int32_t* sversion, int32_t* tversion);
 /**
 * The main task execution function, including query on both table and multiple tables,
 * which are decided according to the tag or table name query conditions
@@ -169,7 +178,7 @@ int32_t qUpdateQueriedTableIdList(qTaskInfo_t tinfo, int64_t uid, int32_t type);
 void qProcessFetchRsp(void* parent, struct SRpcMsg* pMsg, struct SEpSet* pEpSet);
-int32_t qGetExplainExecInfo(qTaskInfo_t tinfo, int32_t *resNum, SExplainExecInfo **pRes);
+int32_t qGetExplainExecInfo(qTaskInfo_t tinfo, int32_t* resNum, SExplainExecInfo** pRes);
 #ifdef __cplusplus
 }

--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
@@ -170,32 +170,18 @@ typedef struct SInputColumnInfoData {
 // sql function runtime context
 typedef struct SqlFunctionCtx {
-  SInputColumnInfoData input;
+  SInputColumnInfoData   input;
-  SResultDataInfo      resDataInfo;
+  SResultDataInfo        resDataInfo;
-  uint32_t             order;  // data block scanner order: asc|desc
+  uint32_t               order;  // data block scanner order: asc|desc
-  uint8_t              scanFlag;  // record current running step, default: 0
+  uint8_t                scanFlag;  // record current running step, default: 0
-  ////////////////////////////////////////////////////////////////
+  int16_t                functionId;    // function id
-  int32_t          startRow;   // start row index
+  char                  *pOutput;       // final result output buffer, point to sdata->data
-  int32_t          size;       // handled processed row number
+  int32_t                numOfParams;
-  SColumnInfoData* pInput;
+  SFunctParam           *param;         // input parameter, e.g., top(k, 20), the number of results for top query is kept in param
-  SColumnDataAgg   agg;
+  int64_t               *ptsList;       // corresponding timestamp array list
-  int16_t          inputType;    // TODO remove it
+  SColumnInfoData       *pTsOutput;     // corresponding output buffer for timestamp of each result, e.g., top/bottom*/
-  int16_t          inputBytes;   // TODO remove it
+  int32_t                offset;
-  bool             hasNull;      // null value exist in current block, TODO remove it
+  SVariant               tag;
-  bool             requireNull;  // require null in some function, TODO remove it
-  int32_t          columnIndex;  // TODO remove it
-  bool             isAggSet;
-  int64_t          startTs;       // timestamp range of current query when function is executed on a specific data block, TODO remove it
-  bool             stableQuery;
-  /////////////////////////////////////////////////////////////////
-  int16_t          functionId;    // function id
-  char *           pOutput;       // final result output buffer, point to sdata->data
-  int32_t          numOfParams;
-  SFunctParam     *param;         // input parameter, e.g., top(k, 20), the number of results for top query is kept in param
-  int64_t         *ptsList;       // corresponding timestamp array list
-  SColumnInfoData *pTsOutput;     // corresponding output buffer for timestamp of each result, e.g., top/bottom*/
-  int32_t          offset;
-  SVariant         tag;
  struct  SResultRowEntryInfo *resultInfo;
  SSubsidiaryResInfo     subsidiaries;
  SPoint1                start;

--- a/include/libs/function/functionMgt.h
+++ b/include/libs/function/functionMgt.h
@@ -142,6 +142,8 @@ void fmFuncMgtDestroy();
 int32_t fmGetFuncInfo(SFmGetFuncInfoParam* pParam, SFunctionNode* pFunc);
+bool fmIsBuiltinFunc(const char* pFunc);
 bool fmIsAggFunc(int32_t funcId);
 bool fmIsScalarFunc(int32_t funcId);
 bool fmIsNonstandardSQLFunc(int32_t funcId);

--- a/include/libs/nodes/cmdnodes.h
+++ b/include/libs/nodes/cmdnodes.h
@@ -78,7 +78,7 @@ typedef struct SAlterDatabaseStmt {
 typedef struct STableOptions {
  ENodeType  type;
-  char       comment[TSDB_STB_COMMENT_LEN];
+  char       comment[TSDB_TB_COMMENT_LEN];
  int32_t    delay;
  float      filesFactor;
  SNodeList* pRollupFuncs;
@@ -90,7 +90,7 @@ typedef struct SColumnDefNode {
  ENodeType type;
  char      colName[TSDB_COL_NAME_LEN];
  SDataType dataType;
-  char      comments[TSDB_STB_COMMENT_LEN];
+  char      comments[TSDB_TB_COMMENT_LEN];
  bool      sma;
 } SColumnDefNode;

--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
@@ -208,6 +208,7 @@ typedef enum ENodeType {
  QUERY_NODE_PHYSICAL_PLAN_SORT,
  QUERY_NODE_PHYSICAL_PLAN_INTERVAL,
  QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERVAL,
+  QUERY_NODE_PHYSICAL_PLAN_STREAM_FINAL_INTERVAL,
  QUERY_NODE_PHYSICAL_PLAN_FILL,
  QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW,
  QUERY_NODE_PHYSICAL_PLAN_STATE_WINDOW,
@@ -240,6 +241,7 @@ typedef struct SNodeList {
 #define SNodeptr void*
+int32_t  nodesNodeSize(ENodeType type);
 SNodeptr nodesMakeNode(ENodeType type);
 void     nodesDestroyNode(SNodeptr pNode);

--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -48,6 +48,7 @@ typedef struct SExprNode {
  ENodeType type;
  SDataType resType;
  char      aliasName[TSDB_COL_NAME_LEN];
+  char      userAlias[TSDB_COL_NAME_LEN];
  SArray*   pAssociation;
 } SExprNode;
@@ -247,6 +248,7 @@ typedef struct SSetOperator {
  SNode*           pRight;
  SNodeList*       pOrderByList;  // SOrderByExprNode
  SNode*           pLimit;
+  char             stmtName[TSDB_TABLE_NAME_LEN];
 } SSetOperator;
 typedef enum ESqlClause {
@@ -325,7 +327,7 @@ typedef struct SQuery {
  bool           showRewrite;
  int32_t        placeholderNum;
  SArray*        pPlaceholderValues;
-  SNode*         pContainPlaceholderRoot;
+  SNode*         pPrepareRoot;
 } SQuery;
 void nodesWalkSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeWalker walker, void* pContext);

--- a/include/libs/qcom/query.h
+++ b/include/libs/qcom/query.h
@@ -220,23 +220,23 @@ extern int32_t (*queryProcessMsgRsp[TDMT_MAX])(void* output, char* msg, int32_t
      taosPrintLog("QRY ", DEBUG_INFO, tsLogEmbedded ? 255 : qDebugFlag, __VA_ARGS__); \
    }                                                                                  \
  } while (0)
-#define qDebug(...)                                                                     \
+#define qDebug(...)                                               \
-  do {                                                                                  \
+  do {                                                            \
-    if (qDebugFlag & DEBUG_DEBUG) {                                                     \
+    if (qDebugFlag & DEBUG_DEBUG) {                               \
-      taosPrintLog("QRY ", DEBUG_DEBUG, tsLogEmbedded ? 255 : qDebugFlag, __VA_ARGS__); \
+      taosPrintLog("QRY ", DEBUG_DEBUG, qDebugFlag, __VA_ARGS__); \
-    }                                                                                   \
+    }                                                             \
  } while (0)
-#define qTrace(...)                                                                     \
+#define qTrace(...)                                               \
-  do {                                                                                  \
+  do {                                                            \
-    if (qDebugFlag & DEBUG_TRACE) {                                                     \
+    if (qDebugFlag & DEBUG_TRACE) {                               \
-      taosPrintLog("QRY ", DEBUG_TRACE, tsLogEmbedded ? 255 : qDebugFlag, __VA_ARGS__); \
+      taosPrintLog("QRY ", DEBUG_TRACE, qDebugFlag, __VA_ARGS__); \
-    }                                                                                   \
+    }                                                             \
  } while (0)
-#define qDebugL(...)                                                                           \
+#define qDebugL(...)                                                     \
-  do {                                                                                         \
+  do {                                                                   \
-    if (qDebugFlag & DEBUG_DEBUG) {                                                            \
+    if (qDebugFlag & DEBUG_DEBUG) {                                      \
-      taosPrintLongString("QRY ", DEBUG_DEBUG, tsLogEmbedded ? 255 : qDebugFlag, __VA_ARGS__); \
+      taosPrintLongString("QRY ", DEBUG_DEBUG, qDebugFlag, __VA_ARGS__); \
-    }                                                                                          \
+    }                                                                    \
  } while (0)
 #define QRY_ERR_RET(c)                \

--- a/include/libs/scheduler/scheduler.h
+++ b/include/libs/scheduler/scheduler.h
@@ -72,7 +72,7 @@ int32_t schedulerInit(SSchedulerCfg *cfg);
 * @param nodeList  Qnode/Vnode address list, element is SQueryNodeAddr
 * @return
 */
-int32_t schedulerExecJob(void *transport, SArray *nodeList, SQueryPlan *pDag, int64_t *pJob, const char *sql, int64_t startTs, bool needRes, SQueryResult *pRes);
+int32_t schedulerExecJob(void *transport, SArray *nodeList, SQueryPlan *pDag, int64_t *pJob, const char *sql, int64_t startTs, SQueryResult *pRes);
 /**
 * Process the query job, generated according to the query physical plan.

--- a/include/libs/transport/trpc.h
+++ b/include/libs/transport/trpc.h
@@ -26,38 +26,41 @@ extern "C" {
 #define TAOS_CONN_SERVER 0
 #define TAOS_CONN_CLIENT 1
+#define IsReq(pMsg)      (pMsg->msgType & 1U)
 extern int tsRpcHeadSize;
-typedef struct SRpcConnInfo {
+typedef struct {
  uint32_t clientIp;
  uint16_t clientPort;
-  uint32_t serverIp;
  char     user[TSDB_USER_LEN];
 } SRpcConnInfo;
-typedef struct SRpcMsg {
+typedef struct SRpcHandleInfo {
-  tmsg_t  msgType;
+  // rpc info
-  void *  pCont;
+  void   *handle;         // rpc handle returned to app
-  int     contLen;
-  int32_t code;
-  void *  handle;         // rpc handle returned to app
-  void *  ahandle;        // app handle set by client
  int64_t refId;          // refid, used by server
-  int     noResp;         // has response or not(default 0, 0: resp, 1: no resp);
+  int32_t noResp;         // has response or not(default 0, 0: resp, 1: no resp);
-  int     persistHandle;  // persist handle or not
+  int32_t persistHandle;  // persist handle or not
-} SRpcMsg;
+  // app info
+  void *ahandle;  // app handle set by client
+  void *wrapper;  // wrapper handle
+  void *node;     // node mgmt handle
-typedef struct {
+  // resp info
-  char     user[TSDB_USER_LEN];
+  void   *rsp;
-  uint32_t clientIp;
+  int32_t rspLen;
-  uint16_t clientPort;
+} SRpcHandleInfo;
-  SRpcMsg  rpcMsg;
-  int32_t  rspLen;
+typedef struct SRpcMsg {
-  void *   pRsp;
+  tmsg_t         msgType;
-  void *   pNode;
+  void          *pCont;
-} SNodeMsg;
+  int32_t        contLen;
+  int32_t        code;
+  SRpcHandleInfo info;
+  SRpcConnInfo   conn;
+} SRpcMsg;
 typedef void (*RpcCfp)(void *parent, SRpcMsg *, SEpSet *rf);
 typedef int (*RpcAfp)(void *parent, char *tableId, char *spi, char *encrypt, char *secret, char *ckey);

--- a/include/os/osString.h
+++ b/include/os/osString.h
@@ -38,6 +38,13 @@ typedef int32_t TdUcs4;
    #define wcsncpy WCSNCPY_FUNC_TAOS_FORBID
    #define wchar_t WCHAR_T_TYPE_TAOS_FORBID
    #define strcasestr STR_CASE_STR_FORBID
+    #define strtoll STR_TO_LL_FUNC_TAOS_FORBID
+    #define strtoull STR_TO_ULL_FUNC_TAOS_FORBID
+    #define strtol STR_TO_L_FUNC_TAOS_FORBID
+    #define strtoul STR_TO_UL_FUNC_TAOS_FORBID
+    #define strtod STR_TO_LD_FUNC_TAOS_FORBID
+    #define strtold STR_TO_D_FUNC_TAOS_FORBID
+    #define strtof STR_TO_F_FUNC_TAOS_FORBID
 #endif
 #ifdef WINDOWS
@@ -72,6 +79,17 @@ int32_t taosWcharsToMbs(char *pStrs, TdWchar *pWchars, int32_t size);
 char *taosStrCaseStr(const char *str, const char *pattern);
+int64_t taosStr2Int64(const char *str, char** pEnd, int32_t radix);
+uint64_t taosStr2UInt64(const char *str, char** pEnd, int32_t radix);
+int32_t taosStr2Int32(const char *str, char** pEnd, int32_t radix);
+uint32_t taosStr2UInt32(const char *str, char** pEnd, int32_t radix);
+int16_t taosStr2Int16(const char *str, char** pEnd, int32_t radix);
+uint16_t taosStr2UInt16(const char *str, char** pEnd, int32_t radix);
+int8_t taosStr2Int8(const char *str, char** pEnd, int32_t radix);
+uint8_t taosStr2UInt8(const char *str, char** pEnd, int32_t radix);
+double taosStr2Double(const char *str, char** pEnd);
+float taosStr2Float(const char *str, char** pEnd);
 #ifdef __cplusplus
 }
 #endif

--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -646,6 +646,9 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_PAR_INVALID_ALTER_TABLE       TAOS_DEF_ERROR_CODE(0, 0x2649)
 #define TSDB_CODE_PAR_CANNOT_DROP_PRIMARY_KEY   TAOS_DEF_ERROR_CODE(0, 0x264A)
 #define TSDB_CODE_PAR_INVALID_MODIFY_COL        TAOS_DEF_ERROR_CODE(0, 0x264B)
+#define TSDB_CODE_PAR_INVALID_TBNAME            TAOS_DEF_ERROR_CODE(0, 0x264C)
+#define TSDB_CODE_PAR_INVALID_FUNCTION_NAME     TAOS_DEF_ERROR_CODE(0, 0x264D)
+#define TSDB_CODE_PAR_COMMENT_TOO_LONG          TAOS_DEF_ERROR_CODE(0, 0x264E)
 //planner
 #define TSDB_CODE_PLAN_INTERNAL_ERROR           TAOS_DEF_ERROR_CODE(0, 0x2700)
@@ -668,6 +671,8 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_UDF_INVALID_STATE             TAOS_DEF_ERROR_CODE(0, 0x2906)
 #define TSDB_CODE_UDF_INVALID_INPUT             TAOS_DEF_ERROR_CODE(0, 0x2907)
 #define TSDB_CODE_UDF_NO_FUNC_HANDLE            TAOS_DEF_ERROR_CODE(0, 0x2908)
+#define TSDB_CODE_UDF_INVALID_BUFSIZE           TAOS_DEF_ERROR_CODE(0, 0x2909)
+#define TSDB_CODE_UDF_INVALID_OUTPUT_TYPE       TAOS_DEF_ERROR_CODE(0, 0x290A)
 #define TSDB_CODE_SML_INVALID_PROTOCOL_TYPE     TAOS_DEF_ERROR_CODE(0, 0x3000)
 #define TSDB_CODE_SML_INVALID_PRECISION_TYPE    TAOS_DEF_ERROR_CODE(0, 0x3001)

--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -218,8 +218,8 @@ typedef enum ELogicConditionType {
 #define TSDB_MAX_SQL_SHOW_LEN    1024
 #define TSDB_MAX_ALLOWED_SQL_LEN (1 * 1024 * 1024u)  // sql length should be less than 1mb
-#define TSDB_APP_NAME_LEN    TSDB_UNI_LEN
+#define TSDB_APP_NAME_LEN   TSDB_UNI_LEN
-#define TSDB_STB_COMMENT_LEN 1024
+#define TSDB_TB_COMMENT_LEN 1025
 /**
 *  In some scenarios uint16_t (0~65535) is used to store the row len.

--- a/include/util/tencode.h
+++ b/include/util/tencode.h
@@ -456,52 +456,189 @@ static FORCE_INLINE void* tDecoderMalloc(SDecoder* pCoder, int32_t size) {
  return p;
 }
-static FORCE_INLINE int32_t tPutBinary(uint8_t* p, const uint8_t* pData, uint32_t nData) {
+// ===========================================
-  int      n = 0;
+#define tPutV(p, v)                    \
-  uint32_t v = nData;
+  do {                                 \
+    int32_t n = 0;                     \
-  for (;;) {
+    for (;;) {                         \
-    if (v <= 0x7f) {
+      if (v <= 0x7f) {                 \
-      if (p) p[n] = v;
+        if (p) p[n] = v;               \
-      n++;
+        n++;                           \
-      break;
+        break;                         \
-    }
+      }                                \
+      if (p) p[n] = (v & 0x7f) | 0x80; \
-    if (p) p[n] = (v & 0x7f) | 0x80;
+      n++;                             \
-    n++;
+      v >>= 7;                         \
-    v >>= 7;
+    }                                  \
-  }
+    return n;                          \
+  } while (0)
-  if (p) {
+#define tGetV(p, v)                              \
-    memcpy(p + n, pData, nData);
+  do {                                           \
-  }
+    int32_t n = 0;                               \
+    if (v) *v = 0;                               \
+    for (;;) {                                   \
+      if (p[n] <= 0x7f) {                        \
+        if (v) (*v) |= (p[n] << (7 * n));        \
+        n++;                                     \
+        break;                                   \
+      }                                          \
+      if (v) (*v) |= ((p[n] & 0x7f) << (7 * n)); \
+      n++;                                       \
+    }                                            \
+    return n;                                    \
+  } while (0)
+// PUT
+static FORCE_INLINE int32_t tPutU8(uint8_t* p, uint8_t v) {
+  if (p) ((uint8_t*)p)[0] = v;
+  return sizeof(uint8_t);
+}
+static FORCE_INLINE int32_t tPutI8(uint8_t* p, int8_t v) {
+  if (p) ((int8_t*)p)[0] = v;
+  return sizeof(int8_t);
+}
+static FORCE_INLINE int32_t tPutU16(uint8_t* p, uint16_t v) {
+  if (p) ((uint16_t*)p)[0] = v;
+  return sizeof(uint16_t);
+}
+static FORCE_INLINE int32_t tPutI16(uint8_t* p, int16_t v) {
+  if (p) ((int16_t*)p)[0] = v;
+  return sizeof(int16_t);
+}
+static FORCE_INLINE int32_t tPutU32(uint8_t* p, uint32_t v) {
+  if (p) ((uint32_t*)p)[0] = v;
+  return sizeof(uint32_t);
+}
+static FORCE_INLINE int32_t tPutI32(uint8_t* p, int32_t v) {
+  if (p) ((int32_t*)p)[0] = v;
+  return sizeof(int32_t);
+}
+static FORCE_INLINE int32_t tPutU64(uint8_t* p, uint64_t v) {
+  if (p) ((uint64_t*)p)[0] = v;
+  return sizeof(uint64_t);
+}
+static FORCE_INLINE int32_t tPutI64(uint8_t* p, int64_t v) {
+  if (p) ((int64_t*)p)[0] = v;
+  return sizeof(int64_t);
+}
+static FORCE_INLINE int32_t tPutU16v(uint8_t* p, uint16_t v) { tPutV(p, v); }
+static FORCE_INLINE int32_t tPutI16v(uint8_t* p, int16_t v) { return tPutU16v(p, ZIGZAGE(int16_t, v)); }
+static FORCE_INLINE int32_t tPutU32v(uint8_t* p, uint32_t v) { tPutV(p, v); }
+static FORCE_INLINE int32_t tPutI32v(uint8_t* p, int32_t v) { return tPutU32v(p, ZIGZAGE(int32_t, v)); }
+static FORCE_INLINE int32_t tPutU64v(uint8_t* p, uint64_t v) { tPutV(p, v); }
+static FORCE_INLINE int32_t tPutI64v(uint8_t* p, int64_t v) { return tPutU64v(p, ZIGZAGE(int64_t, v)); }
+// GET
+static FORCE_INLINE int32_t tGetU8(uint8_t* p, uint8_t* v) {
+  if (v) *v = ((uint8_t*)p)[0];
+  return sizeof(uint8_t);
+}
+static FORCE_INLINE int32_t tGetI8(uint8_t* p, int8_t* v) {
+  if (v) *v = ((int8_t*)p)[0];
+  return sizeof(int8_t);
+}
+static FORCE_INLINE int32_t tGetU16(uint8_t* p, uint16_t* v) {
+  if (v) *v = ((uint16_t*)p)[0];
+  return sizeof(uint16_t);
+}
+static FORCE_INLINE int32_t tGetI16(uint8_t* p, int16_t* v) {
+  if (v) *v = ((int16_t*)p)[0];
+  return sizeof(int16_t);
+}
+static FORCE_INLINE int32_t tGetU32(uint8_t* p, uint32_t* v) {
+  if (v) *v = ((uint32_t*)p)[0];
+  return sizeof(uint32_t);
+}
+static FORCE_INLINE int32_t tGetI32(uint8_t* p, int32_t* v) {
+  if (v) *v = ((int32_t*)p)[0];
+  return sizeof(int32_t);
+}
+static FORCE_INLINE int32_t tGetU64(uint8_t* p, uint64_t* v) {
+  if (v) *v = ((uint64_t*)p)[0];
+  return sizeof(uint64_t);
+}
+static FORCE_INLINE int32_t tGetI64(uint8_t* p, int64_t* v) {
+  if (v) *v = ((int64_t*)p)[0];
+  return sizeof(int64_t);
+}
+static FORCE_INLINE int32_t tGetU16v(uint8_t* p, uint16_t* v) { tGetV(p, v); }
+static FORCE_INLINE int32_t tGetI16v(uint8_t* p, int16_t* v) {
+  int32_t  n;
+  uint16_t tv;
+  n = tGetU16v(p, &tv);
+  if (v) *v = ZIGZAGD(int16_t, tv);
+  return n;
+}
+static FORCE_INLINE int32_t tGetU32v(uint8_t* p, uint32_t* v) { tGetV(p, v); }
+static FORCE_INLINE int32_t tGetI32v(uint8_t* p, int32_t* v) {
+  int32_t  n;
+  uint32_t tv;
+  n = tGetU32v(p, &tv);
+  if (v) *v = ZIGZAGD(int32_t, tv);
+  return n;
+}
+static FORCE_INLINE int32_t tGetU64v(uint8_t* p, uint64_t* v) { tGetV(p, v); }
+static FORCE_INLINE int32_t tGetI64v(uint8_t* p, int64_t* v) {
+  int32_t  n;
+  uint64_t tv;
+  n = tGetU64v(p, &tv);
+  if (v) *v = ZIGZAGD(int64_t, tv);
+  return n;
+}
+// =====================
+static FORCE_INLINE int32_t tPutBinary(uint8_t* p, uint8_t* pData, uint32_t nData) {
+  int n = 0;
+  n += tPutU32v(p ? p + n : p, nData);
+  if (p) memcpy(p + n, pData, nData);
  n += nData;
  return n;
 }
-static FORCE_INLINE int32_t tGetBinary(const uint8_t* p, const uint8_t** ppData, uint32_t* nData) {
+static FORCE_INLINE int32_t tGetBinary(uint8_t* p, uint8_t** ppData, uint32_t* nData) {
  int32_t  n = 0;
-  uint32_t tv = 0;
+  uint32_t nt;
-  uint32_t t;
-  for (;;) {
-    if (p[n] <= 0x7f) {
-      t = p[n];
-      tv |= (t << (7 * n));
-      n++;
-      break;
-    }
-    t = p[n] & 0x7f;
-    tv |= (t << (7 * n));
-    n++;
-  }
-  if (nData) *nData = n;
+  n += tGetU32v(p, &nt);
+  if (nData) *nData = nt;
  if (ppData) *ppData = p + n;
+  n += nt;
-  n += tv;
  return n;
 }

--- a/include/util/tprocess.h
+++ b/include/util/tprocess.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 _TD_UTIL_PROCESS_H_
-#define _TD_UTIL_PROCESS_H_
-#include "os.h"
-#include "tqueue.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef enum { PROC_FUNC_REQ = 1, PROC_FUNC_RSP, PROC_FUNC_REGIST, PROC_FUNC_RELEASE } EProcFuncType;
-typedef struct SProcObj SProcObj;
-typedef void *(*ProcMallocFp)(int32_t contLen, EQItype itype);
-typedef void *(*ProcFreeFp)(void *pCont);
-typedef void (*ProcConsumeFp)(void *parent, void *pHead, int16_t headLen, void *pBody, int32_t bodyLen,
-                              EProcFuncType ftype);
-typedef struct {
-  ProcConsumeFp childConsumeFp;
-  ProcMallocFp  childMallocHeadFp;
-  ProcFreeFp    childFreeHeadFp;
-  ProcMallocFp  childMallocBodyFp;
-  ProcFreeFp    childFreeBodyFp;
-  ProcConsumeFp parentConsumeFp;
-  ProcMallocFp  parentMallocHeadFp;
-  ProcFreeFp    parentFreeHeadFp;
-  ProcMallocFp  parentMallocBodyFp;
-  ProcFreeFp    parentFreeBodyFp;
-  SShm          shm;
-  void         *parent;
-  const char   *name;
-  bool          isChild;
-} SProcCfg;
-SProcObj *taosProcInit(const SProcCfg *pCfg);
-void      taosProcCleanup(SProcObj *pProc);
-int32_t   taosProcRun(SProcObj *pProc);
-void      taosProcStop(SProcObj *pProc);
-int32_t taosProcPutToChildQ(SProcObj *pProc, const void *pHead, int16_t headLen, const void *pBody, int32_t bodyLen,
-                            void *handle, int64_t handleRef, EProcFuncType ftype);
-int64_t taosProcRemoveHandle(SProcObj *pProc, void *handle);
-void    taosProcCloseHandles(SProcObj *pProc, void (*HandleFp)(void *handle));
-void    taosProcPutToParentQ(SProcObj *pProc, const void *pHead, int16_t headLen, const void *pBody, int32_t bodyLen,
-                             EProcFuncType ftype);
-#ifdef __cplusplus
-}
-#endif
-#endif /*_TD_UTIL_PROCESS_H_*/
--- a/include/util/tskiplist.h
+++ b/include/util/tskiplist.h
@@ -56,10 +56,10 @@ typedef enum { SSkipListPutSuccess = 0, SSkipListPutEarlyStop = 1, SSkipListPutS
 typedef struct SSkipList {
  uint32_t           seed;
+  uint16_t           len;
  __compar_fn_t      comparFn;
  __sl_key_fn_t      keyFn;
  TdThreadRwlock    *lock;
-  uint16_t           len;
  uint8_t            maxLevel;
  uint8_t            flags;
  uint8_t            type;  // static info above

--- a/packaging/cfg/nginxd.service
+++ b/packaging/cfg/nginxd.service
 [Unit]
 Description=Nginx For TDengine Service
 After=network-online.target
 Wants=network-online.target
 [Service]
 Type=forking
 PIDFile=/usr/local/nginxd/logs/nginx.pid
 ExecStart=/usr/local/nginxd/sbin/nginx
 ExecStop=/usr/local/nginxd/sbin/nginx -s stop
 TimeoutStopSec=1000000s
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TimeoutStartSec=0
 StandardOutput=null
 Restart=always
 StartLimitBurst=3
 StartLimitInterval=60s
 [Install]
 WantedBy=multi-user.target
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
 ########################################################
 #                                                      #
 #                  TDengine Configuration              #
 #   Any questions, please email support@taosdata.com   #
 #                                                      #
 ########################################################
 # first fully qualified domain name (FQDN) for TDengine system
 # firstEp                   hostname:6030
 # local fully qualified domain name (FQDN)
 # fqdn                      hostname
 # first port number for the connection (12 continuous UDP/TCP port number are used) 
 # serverPort                6030
 # log file's directory
 # logDir                    /var/log/taos
 # data file's directory
 # dataDir                   /var/lib/taos
 # temporary file's directory
 # tempDir                   /tmp/
 # the arbitrator's fully qualified domain name (FQDN) for TDengine system, for cluster only   
 # arbitrator                arbitrator_hostname:6042     
 # number of threads per CPU core
 # numOfThreadsPerCore       1.0
 # number of threads to commit cache data
 # numOfCommitThreads        4
 # the proportion of total CPU cores available for query processing
 # 2.0: the query threads will be set to double of the CPU cores.
 # 1.0: all CPU cores are available for query processing [default].
 # 0.5: only half of the CPU cores are available for query.
 # 0.0: only one core available.
 # ratioOfQueryCores        1.0
 # the last_row/first/last aggregator will not change the original column name in the result fields
 keepColumnName            1
 # number of management nodes in the system
 # numOfMnodes               1
 # enable/disable backuping vnode directory when removing vnode
 # vnodeBak                  1
 # enable/disable installation / usage report
 # telemetryReporting        1
 # enable/disable load balancing
 # balance                   1
 # role for dnode. 0 - any, 1 - mnode, 2 - dnode
 # role                      0
 # max timer control blocks
 # maxTmrCtrl                512
 # time interval of system monitor, seconds 
 # monitorInterval           30
 # number of seconds allowed for a dnode to be offline, for cluster only 
 # offlineThreshold          864000
 # RPC re-try timer, millisecond
 # rpcTimer                  300
 # RPC maximum time for ack, seconds. 
 # rpcMaxTime                600
 # time interval of dnode status reporting to mnode, seconds, for cluster only 
 # statusInterval            1
 # time interval of heart beat from shell to dnode, seconds
 # shellActivityTimer        3
 # minimum sliding window time, milli-second
 # minSlidingTime            10
 # minimum time window, milli-second
 # minIntervalTime           10
 # maximum delay before launching a stream computation, milli-second
 # maxStreamCompDelay        20000
 # maximum delay before launching a stream computation for the first time, milli-second
 # maxFirstStreamCompDelay   10000
 # retry delay when a stream computation fails, milli-second
 # retryStreamCompDelay      10
 # the delayed time for launching a stream computation, from 0.1(default, 10% of whole computing time window) to 0.9
 # streamCompDelayRatio      0.1
 # max number of vgroups per db, 0 means configured automatically
 # maxVgroupsPerDb           0
 # max number of tables per vnode
 # maxTablesPerVnode         1000000
 # cache block size (Mbyte)
 # cache                     16
 # number of cache blocks per vnode
 # blocks                    6
 # number of days per DB file
 # days                  10
 # number of days to keep DB file
 # keep                  3650
 # minimum rows of records in file block
 # minRows               100
 # maximum rows of records in file block
 # maxRows               4096
 # the number of acknowledgments required for successful data writing
 # quorum                1     
 # enable/disable compression
 # comp                  2
 # write ahead log (WAL) level, 0: no wal; 1: write wal, but no fysnc; 2: write wal, and call fsync
 # walLevel              1
 # if walLevel is set to 2, the cycle of fsync being executed, if set to 0, fsync is called right away
 # fsync                 3000
 # number of replications, for cluster only 
 # replica               1
 # the compressed rpc message, option:
 #  -1 (no compression)
 #   0 (all message compressed),
 # > 0 (rpc message body which larger than this value will be compressed)
 # compressMsgSize       -1
 # query retrieved column data compression option:
 #  -1 (no compression)
 #   0 (all retrieved column data compressed),
 # > 0 (any retrieved column size greater than this value all data will be compressed.)
 # compressColData       -1
 # max length of an SQL
 # maxSQLLength          65480
 # max length of WildCards
 # maxWildCardsLength    100
 # the maximum number of records allowed for super table time sorting
 # maxNumOfOrderedRes    100000
 # system time zone
 # timezone              Asia/Shanghai (CST, +0800)
 # system time zone (for windows 10)
 # timezone              UTC-8
 # system locale
 # locale                en_US.UTF-8
 # default system charset
 # charset               UTF-8
 # max number of connections allowed in dnode
 # maxShellConns         5000
 # max number of connections allowed in client
 # maxConnections        5000
 # stop writing logs when the disk size of the log folder is less than this value
 # minimalLogDirGB       1.0
 # stop writing temporary files when the disk size of the tmp folder is less than this value
 # minimalTmpDirGB       1.0
 # if disk free space is less than this value, taosd service exit directly within startup process
 # minimalDataDirGB      2.0
 # One mnode is equal to the number of vnode consumed
 # mnodeEqualVnodeNum    4
 # enbale/disable http service
 # http                  1
 # enable/disable system monitor 
 # monitor               1
 # enable/disable recording the SQL statements via restful interface
 # httpEnableRecordSql   0
 # number of threads used to process http requests
 # httpMaxThreads        2
 # maximum number of rows returned by the restful interface
 # restfulRowLimit       10240
 # database name must be specified in restful interface if the following parameter is set, off by default
 # httpDbNameMandatory 1
 # http keep alive, default is 30 seconds
 # httpKeepAlive   30000
 # The following parameter is used to limit the maximum number of lines in log files.
 # max number of lines per log filters
 # numOfLogLines         10000000
 # enable/disable async log
 # asyncLog              1
 # time of keeping log files, days
 # logKeepDays           0
 # The following parameters are used for debug purpose only.
 # debugFlag 8 bits mask: FILE-SCREEN-UNUSED-HeartBeat-DUMP-TRACE_WARN-ERROR
 # 131: output warning and error 
 # 135: output debug, warning and error
 # 143: output trace, debug, warning and error to log
 # 199: output debug, warning and error to both screen and file
 # 207: output trace, debug, warning and error to both screen and file
 # debug flag for all log type, take effect when non-zero value
 # debugFlag             0
 # debug flag for meta management messages
 # mDebugFlag            135
 # debug flag for dnode messages
 # dDebugFlag            135
 # debug flag for sync module
 # sDebugFlag            135
 # debug flag for WAL
 # wDebugFlag            135
 # debug flag for SDB
 # sdbDebugFlag          135
 # debug flag for RPC 
 # rpcDebugFlag          131
 # debug flag for TAOS TIMER
 # tmrDebugFlag          131
 # debug flag for TDengine client 
 # cDebugFlag            131
 # debug flag for JNI
 # jniDebugFlag          131
 # debug flag for storage
 # uDebugFlag            131
 # debug flag for http server
 # httpDebugFlag         131
 # debug flag for monitor
 # monDebugFlag          131
 # debug flag for query
 # qDebugFlag            131
 # debug flag for vnode
 # vDebugFlag            131
 # debug flag for TSDB
 # tsdbDebugFlag         131
 # debug flag for continue query
 # cqDebugFlag           131
 # enable/disable recording the SQL in taos client
 # enableRecordSql    0
 # generate core file when service crash
 # enableCoreFile        1
 # maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden
 # maxBinaryDisplayWidth 30
 # enable/disable stream (continuous query)
 # stream                1
 # in retrieve blocking model, only in 50% query threads will be used in query processing in dnode
 # retrieveBlockingModel    0
 # the maximum allowed query buffer size in MB during query processing for each data node
 # -1 no limit (default)
 # 0  no query allowed, queries are disabled
 # queryBufferSize         -1
 # percent of redundant data in tsdb meta will compact meta data,0 means donot compact
 # tsdbMetaCompactRatio    0
 # default string type used for storing JSON String, options can be binary/nchar, default is nchar
 # defaultJSONStrType      nchar
 # force TCP transmission 
 # rpcForceTcp        0
 # unit MB. Flush vnode wal file if walSize > walFlushSize and walSize > cache*0.5*blocks
 # walFlushSize         1024
 # unit Hour. Latency of data migration
 # keepTimeOffset     0
--- a/packaging/cfg/taosd.service
+++ b/packaging/cfg/taosd.service
 [Unit]
 Description=TDengine server service
 After=network-online.target
 Wants=network-online.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/taosd
 ExecStartPre=/usr/local/taos/bin/startPre.sh
 TimeoutStopSec=1000000s
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TimeoutStartSec=0
 StandardOutput=null
 Restart=always
 StartLimitBurst=3
 StartLimitInterval=60s
 [Install]
 WantedBy=multi-user.target
--- a/packaging/cfg/tarbitratord.service
+++ b/packaging/cfg/tarbitratord.service
 [Unit]
 Description=TDengine arbitrator service
 After=network-online.target
 Wants=network-online.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/tarbitrator
 TimeoutStopSec=1000000s
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TimeoutStartSec=0
 StandardOutput=null
 Restart=always
 StartLimitBurst=3
 StartLimitInterval=60s
 [Install]
 WantedBy=multi-user.target
--- a/packaging/check_package.sh
+++ b/packaging/check_package.sh
 #!/bin/bash
 #
 # This file is used to install database on linux systems. The operating system
 # is required to use systemd to manage services at boot
 set -e
 #set -x
 verMode=edge
 pagMode=full
 iplist=""
 serverFqdn=""
 # -----------------------Variables definition---------------------
 script_dir="../release"
 # Dynamic directory
 data_dir="/var/lib/taos"
 log_dir="/var/log/taos"
 data_link_dir="/usr/local/taos/data"
 log_link_dir="/usr/local/taos/log"
 cfg_install_dir="/etc/taos"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
 lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
 #install main path
 install_main_dir="/usr/local/taos"
 # old bin dir
 sbin_dir="/usr/local/taos/bin"
 temp_version=""
 fin_result=""
 service_config_dir="/etc/systemd/system"
 nginx_port=6060
 nginx_dir="/usr/local/nginxd"
 # Color setting
 RED='\033[0;31m'
 GREEN='\033[1;32m'
 GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 # =============================  get input parameters =================================================
 # install.sh -v [server | client]  -e [yes | no] -i [systemd | service | ...]
 # set parameters by default value
 interactiveFqdn=yes   # [yes | no]
 verType=server        # [server | client]
 initType=systemd      # [systemd | service | ...]
 while getopts "hv:d:" arg
 do
  case $arg in
    d)
      #echo "interactiveFqdn=$OPTARG"
      script_dir=$( echo $OPTARG )
      ;;
    h)
      echo "Usage: `basename $0` -d scripy_path"
      exit 0
      ;;
    ?) #unknow option
      echo "unkonw argument"
      exit 1
      ;;
  esac
 done
 #echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
 function kill_process() {
  pid=$(ps -ef | grep "$1" | grep -v "grep" | awk '{print $2}')
  if [ -n "$pid" ]; then
    ${csudo}kill -9 $pid   || :
  fi
 }
 function check_file() {
    #check file whether exists
    if [ ! -e $1/$2 ];then
        echo -e "$1/$2 \033[31mnot exists\033[0m!quit"
        fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
        echo -e $fin_result
        exit 8
    fi
 }
 function get_package_name() {
  var=$1
 	if [[ $1 =~ 'aarch' ]];then
 		echo ${var::-21}
 	else
 		echo ${var::-17}
 	fi
 }
 function check_link() {
    #check Link whether exists or broken
    if [ -L $1 ] ; then
        if [ ! -e $1 ] ; then
            echo -e "$1 \033[31Broken link\033[0m"
            fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
            echo -e $fin_result
            exit 8
        fi
    else
        echo -e "$1 \033[31mnot exists\033[0m!quit"
        fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
        echo -e $fin_result
        exit 8
    fi
 }
 function check_main_path() {
    #check install main dir and all sub dir
    main_dir=("" "cfg" "bin" "connector" "driver" "examples" "include" "init.d")
    for i in "${main_dir[@]}";do
        check_file ${install_main_dir} $i
    done
    if [ "$verMode" == "cluster" ]; then
        nginx_main_dir=("admin" "conf" "html" "sbin" "logs")
        for i in "${nginx_main_dir[@]}";do
            check_file ${nginx_dir}  $i
        done
    fi
    echo -e "Check main path:\033[32mOK\033[0m!"
 }
 function check_bin_path() {
    # check install bin dir and all sub dir
    bin_dir=("taos" "taosd" "taosadapter" "taosdemo" "remove.sh" "tarbitrator" "set_core.sh")
    for i in "${bin_dir[@]}";do
        check_file ${sbin_dir} $i
    done
    lbin_dir=("taos" "taosd" "taosadapter" "taosdemo" "rmtaos" "tarbitrator" "set_core")
    for i in "${lbin_dir[@]}";do
        check_link ${bin_link_dir}/$i
    done
    if [ "$verMode" == "cluster" ]; then
        check_file ${nginx_dir}/sbin nginx
    fi
    echo -e "Check bin  path:\033[32mOK\033[0m!"
 }
 function check_lib_path() {
    # check all links
    check_link ${lib_link_dir}/libtaos.so
    check_link ${lib_link_dir}/libtaos.so.1
    if [[ -d ${lib64_link_dir}  ]]; then
        check_link ${lib64_link_dir}/libtaos.so
        check_link ${lib64_link_dir}/libtaos.so.1
    fi
    echo -e "Check lib  path:\033[32mOK\033[0m!"
 }
 function check_header_path() {
 	# check all header
 	header_dir=("taos.h" "taosdef.h" "taoserror.h")
    for i in "${header_dir[@]}";do
        check_link ${inc_link_dir}/$i
    done
    echo -e "Check bin  path:\033[32mOK\033[0m!"
 }
 function check_taosadapter_config_dir() {
 	# check all config
 	check_file ${cfg_install_dir} taosadapter.toml
 	check_file ${cfg_install_dir} taosadapter.service
 	check_file ${install_main_dir}/cfg taosadapter.toml.org
 	echo -e "Check conf path:\033[32mOK\033[0m!"
 }
 function check_config_dir() {
 	# check all config
 	check_file ${cfg_install_dir} taos.cfg
 	check_file ${install_main_dir}/cfg taos.cfg.org
 	echo -e "Check conf path:\033[32mOK\033[0m!"
 }
 function check_log_path() {
 	# check log path
 	check_file ${log_dir}
 	echo -e "Check log  path:\033[32mOK\033[0m!"
 }
 function check_data_path() {
 	# check data path
 	check_file ${data_dir}
 	echo -e "Check data path:\033[32mOK\033[0m!"
 }
 function install_TDengine() {
 	cd ${script_dir}
 	tar zxf $1
  temp_version=$(get_package_name $1)
 	cd $(get_package_name $1)
  echo -e "\033[32muninstall TDengine && install TDengine...\033[0m"
 	rmtaos >/dev/null 2>&1 || echo 'taosd not installed' && echo -e '\n\n' |./install.sh >/dev/null 2>&1
  echo -e "\033[32mTDengine has been installed!\033[0m"
  echo -e "\033[32mTDengine is starting...\033[0m"
  kill_process taos && systemctl start taosd && sleep 10
 }
 function test_TDengine() {
    check_main_path
    check_bin_path
    check_lib_path
    check_header_path
    check_config_dir
    check_taosadapter_config_dir
    check_log_path
    check_data_path
    result=`taos -s 'create database test ;create table test.tt(ts timestamp ,i int);insert into test.tt values(now,11);select * from test.tt' 2>&1 ||:`
    if [[ $result =~ "Unable to establish" ]];then
        echo -e "\033[31mTDengine connect failed\033[0m"
        fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
        echo -e $fin_result
        exit 8
    fi
    echo -e "Check TDengine connect:\033[32mOK\033[0m!"
    fin_result=$fin_result"\033[32m$temp_version\033[0m test OK!\n"
 }
 # ## ==============================Main program starts from here============================
 TD_package_name=`ls ${script_dir}/*server*gz |awk -F '/' '{print $NF}' `
 temp=`pwd`
 for i in $TD_package_name;do
 	if [[ $i =~ 'enterprise' ]];then
 		verMode="cluster"
 	else
 		verMode=""
 	fi
  cd $temp
 	install_TDengine $i
 	test_TDengine
 done
 echo "============================================================"
 echo -e $fin_result
--- a/packaging/deb/DEBIAN/control
+++ b/packaging/deb/DEBIAN/control
 Package: tdengine
 Version: 1.0.0
 Section: utils
 Priority: optional
 #Essential: no
 #Depends: no
 #Suggests: no
 Architecture: amd64
 Installed-Size: 66666
 Maintainer: support@taosdata.com
 Provides: taosdata
 Homepage: http://taosdata.com
 Description: Big Data Platform Designed and Optimized for IoT.
--- a/packaging/deb/DEBIAN/postinst
+++ b/packaging/deb/DEBIAN/postinst
 #!/bin/bash
 #set -x
 #path=`pwd`
 insmetaPath="/usr/local/taos/script"
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 ${csudo}chmod -R 744 ${insmetaPath}
 cd ${insmetaPath}
 ${csudo}./post.sh
--- a/packaging/deb/DEBIAN/postrm
+++ b/packaging/deb/DEBIAN/postrm
 #!/bin/bash
--- a/packaging/deb/DEBIAN/preinst
+++ b/packaging/deb/DEBIAN/preinst
 #!/bin/bash
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 # Stop the service if running
 if pidof taosd &> /dev/null; then
    if pidof systemd &> /dev/null; then
        ${csudo}systemctl stop taosd || :
    elif $(which service  &> /dev/null); then
        ${csudo}service taosd stop || :
    else
        pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
        if [ -n "$pid" ]; then
           ${csudo}kill -9 $pid   || :
        fi
    fi
    echo "Stop taosd service success!"
    sleep 1
 fi
 # if taos.cfg already softlink, remove it
 cfg_install_dir="/etc/taos"
 install_main_dir="/usr/local/taos"
 if [ -f "${install_main_dir}/taos.cfg" ]; then
    ${csudo}rm -f ${install_main_dir}/cfg/taos.cfg   || :
 fi
 if [ -f "${install_main_dir}/taosadapter.toml" ]; then
    ${csudo}rm -f ${install_main_dir}/cfg/taosadapter.toml     || :
 fi
 if [ -f "${install_main_dir}/taosadapter.service" ]; then
    ${csudo}rm -f ${install_main_dir}/cfg/taosadapter.service || :
 fi
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo}rm -f ${install_main_dir}/driver/libtaos*   || :
--- a/packaging/deb/DEBIAN/prerm
+++ b/packaging/deb/DEBIAN/prerm
 #!/bin/bash
 insmetaPath="/usr/local/taos/script"
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 ${csudo}chmod -R 744 ${insmetaPath}  || :
 #cd ${insmetaPath}
 #${csudo}./preun.sh
 if [ -f ${insmetaPath}/preun.sh ]; then
    cd ${insmetaPath}
    ${csudo}./preun.sh
 else
    bin_link_dir="/usr/bin"
    lib_link_dir="/usr/lib"
    inc_link_dir="/usr/include"
    data_link_dir="/usr/local/taos/data"
    log_link_dir="/usr/local/taos/log"
    cfg_link_dir="/usr/local/taos/cfg"
    # Remove all links
    ${csudo}rm -f ${bin_link_dir}/taos       || :
    ${csudo}rm -f ${bin_link_dir}/taosd      || :
    ${csudo}rm -f ${bin_link_dir}/taosadapter       || :
    ${csudo}rm -f ${bin_link_dir}/taosdemo   || :
    ${csudo}rm -f ${cfg_link_dir}/*          || :
    ${csudo}rm -f ${inc_link_dir}/taos.h     || :
    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
    ${csudo}rm -f ${log_link_dir}            || :
    ${csudo}rm -f ${data_link_dir}           || :
    pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
    if [ -n "$pid" ]; then
        ${csudo}kill -9 $pid   || :
    fi
 fi
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
 #!/bin/bash
 #
 # Generate deb package for ubuntu
 set -e
 # set -x
 #curr_dir=$(pwd)
 compile_dir=$1
 output_dir=$2
 tdengine_ver=$3
 cpuType=$4
 osType=$5
 verMode=$6
 verType=$7
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
 pkg_dir="${top_dir}/debworkroom"
 #echo "curr_dir: ${curr_dir}"
 #echo "top_dir: ${top_dir}"
 #echo "script_dir: ${script_dir}"
 echo "compile_dir: ${compile_dir}"
 echo "pkg_dir: ${pkg_dir}"
 if [ -d ${pkg_dir} ]; then
    rm -rf ${pkg_dir}
 fi
 mkdir -p ${pkg_dir}
 cd ${pkg_dir}
 libfile="libtaos.so.${tdengine_ver}"
 # create install dir
 install_home_path="/usr/local/taos"
 mkdir -p ${pkg_dir}${install_home_path}
 mkdir -p ${pkg_dir}${install_home_path}/bin
 mkdir -p ${pkg_dir}${install_home_path}/cfg
 #mkdir -p ${pkg_dir}${install_home_path}/connector
 mkdir -p ${pkg_dir}${install_home_path}/driver
 mkdir -p ${pkg_dir}${install_home_path}/examples
 mkdir -p ${pkg_dir}${install_home_path}/include
 #mkdir -p ${pkg_dir}${install_home_path}/init.d
 mkdir -p ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/cfg/taos.cfg         ${pkg_dir}${install_home_path}/cfg
 if [ -f "${compile_dir}/test/cfg/taosadapter.toml" ]; then
    cp ${compile_dir}/test/cfg/taosadapter.toml		${pkg_dir}${install_home_path}/cfg || :
 fi
 if [ -f "${compile_dir}/test/cfg/taosadapter.service" ]; then
    cp ${compile_dir}/test/cfg/taosadapter.service	${pkg_dir}${install_home_path}/cfg || :
 fi
 #cp ${compile_dir}/../packaging/deb/taosd            ${pkg_dir}${install_home_path}/init.d
 cp ${compile_dir}/../packaging/tools/post.sh        ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/preun.sh       ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/startPre.sh    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/../packaging/tools/set_core.sh    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/../packaging/tools/taosd-dump-cfg.gdb    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
 #cp ${compile_dir}/build/bin/taosBenchmark           ${pkg_dir}${install_home_path}/bin
 if [ -f "${compile_dir}/build/bin/taosadapter" ]; then
    cp ${compile_dir}/build/bin/taosadapter                    ${pkg_dir}${install_home_path}/bin ||:
 fi
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_path}/driver
-cp ${compile_dir}/../src/inc/taos.h                 ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../include/client/taos.h          ${pkg_dir}${install_home_path}/include
-cp ${compile_dir}/../src/inc/taosdef.h              ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../include/common/taosdef.h       ${pkg_dir}${install_home_path}/include
-cp ${compile_dir}/../src/inc/taoserror.h            ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../include/util/taoserror.h       ${pkg_dir}${install_home_path}/include
 cp -r ${top_dir}/examples/*                         ${pkg_dir}${install_home_path}/examples
 #cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector
 #cp -r ${top_dir}/src/connector/go                   ${pkg_dir}${install_home_path}/connector
 #cp -r ${top_dir}/src/connector/nodejs               ${pkg_dir}${install_home_path}/connector
 #cp ${compile_dir}/build/lib/taos-jdbcdriver*.*  ${pkg_dir}${install_home_path}/connector ||:
 install_user_local_path="/usr/local"
 if [ -f ${compile_dir}/build/bin/jemalloc-config ]; then
    mkdir -p ${pkg_dir}${install_user_local_path}/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
    cp ${compile_dir}/build/bin/jemalloc-config ${pkg_dir}${install_user_local_path}/bin/
    if [ -f ${compile_dir}/build/bin/jemalloc.sh ]; then
        cp ${compile_dir}/build/bin/jemalloc.sh ${pkg_dir}${install_user_local_path}/bin/
    fi
    if [ -f ${compile_dir}/build/bin/jeprof ]; then
        cp ${compile_dir}/build/bin/jeprof ${pkg_dir}${install_user_local_path}/bin/
    fi
    if [ -f ${compile_dir}/build/include/jemalloc/jemalloc.h ]; then
        cp ${compile_dir}/build/include/jemalloc/jemalloc.h ${pkg_dir}${install_user_local_path}/include/jemalloc/
    fi
    if [ -f ${compile_dir}/build/lib/libjemalloc.so.2 ]; then
        cp ${compile_dir}/build/lib/libjemalloc.so.2 ${pkg_dir}${install_user_local_path}/lib/
        ln -sf libjemalloc.so.2 ${pkg_dir}${install_user_local_path}/lib/libjemalloc.so
    fi
    if [ -f ${compile_dir}/build/lib/libjemalloc.a ]; then
        cp ${compile_dir}/build/lib/libjemalloc.a ${pkg_dir}${install_user_local_path}/lib/
    fi
    if [ -f ${compile_dir}/build/lib/libjemalloc_pic.a ]; then
        cp ${compile_dir}/build/lib/libjemalloc_pic.a ${pkg_dir}${install_user_local_path}/lib/
    fi
    if [ -f ${compile_dir}/build/lib/pkgconfig/jemalloc.pc ]; then
        cp ${compile_dir}/build/lib/pkgconfig/jemalloc.pc ${pkg_dir}${install_user_local_path}/lib/pkgconfig/
    fi
    if [ -f ${compile_dir}/build/share/doc/jemalloc/jemalloc.html ]; then
        cp ${compile_dir}/build/share/doc/jemalloc/jemalloc.html ${pkg_dir}${install_user_local_path}/share/doc/jemalloc/
    fi
    if [ -f ${compile_dir}/build/share/man/man3/jemalloc.3 ]; then
        cp ${compile_dir}/build/share/man/man3/jemalloc.3 ${pkg_dir}${install_user_local_path}/share/man/man3/
    fi
 fi
 cp -r ${compile_dir}/../packaging/deb/DEBIAN        ${pkg_dir}/
 chmod 755 ${pkg_dir}/DEBIAN/*
 # modify version of control
 debver="Version: "$tdengine_ver
 sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
 #get taos version, then set deb name
 if [ "$verMode" == "cluster" ]; then
  debname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
 elif [ "$verMode" == "edge" ]; then
  debname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
  echo "unknow verMode, nor cluster or edge"
  exit 1
 fi
 if [ "$verType" == "beta" ]; then
  debname="TDengine-server-"${tdengine_ver}-${verType}-${osType}-${cpuType}".deb"
 elif [ "$verType" == "stable" ]; then
  debname=${debname}".deb"
 else
  echo "unknow verType, nor stabel or beta"
  exit 1
 fi
 # make deb package
 dpkg -b ${pkg_dir} $debname
 echo "make deb package success!"
 cp ${pkg_dir}/*.deb ${output_dir}
 # clean temp dir
 rm -rf ${pkg_dir}
--- a/packaging/deb/taosd
+++ b/packaging/deb/taosd
 #!/bin/bash
 #
 # Modified from original source: Elastic Search
 # https://github.com/elasticsearch/elasticsearch
 # Thank you to the Elastic Search authors
 #
 # chkconfig: 2345 99 01
 #
 ### BEGIN INIT INFO
 # Provides:          TDengine
 # Required-Start:    $local_fs $network $syslog
 # Required-Stop:     $local_fs $network $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Starts TDengine taosd
 # Description:       Starts TDengine taosd, a time-series database engine
 ### END INIT INFO
 set -e
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 NAME="TDengine"
 USER="root"
 GROUP="root"
 DAEMON="/usr/local/taos/bin/taosd"
 DAEMON_OPTS=""
 HTTPD_NAME="taosadapter"
 DAEMON_HTTPD_NAME=$HTTPD_NAME
 DAEMON_HTTPD="/usr/local/taos/bin/$HTTPD_NAME"
 PID_FILE="/var/run/$NAME.pid"
 APPARGS=""
 # Maximum number of open files
 MAX_OPEN_FILES=65535
 . /lib/lsb/init-functions
 case "$1" in
    start)
        log_action_begin_msg "Starting TDengine..."
        $DAEMON_HTTPD &
        if start-stop-daemon --test --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS &> /dev/null; then
            touch "$PID_FILE" && chown "$USER":"$GROUP" "$PID_FILE"
            if [ -n "$MAX_OPEN_FILES" ]; then
                ulimit -n $MAX_OPEN_FILES
            fi
            start-stop-daemon --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS
            log_end_msg $?
        fi
        ;;
    stop)
        log_action_begin_msg "Stopping TDengine..."
        pkill -9 $DAEMON_HTTPD_NAME
        set +e
        if [ -f "$PID_FILE" ]; then
            start-stop-daemon --stop --pidfile "$PID_FILE" --user "$USER" --retry=TERM/120/KILL/5 > /dev/null
            if [ $? -eq 1 ]; then
                log_action_cont_msg "TSD is not running but pid file exists, cleaning up"
            elif [ $? -eq 3 ]; then
                PID="`cat $PID_FILE`"
                log_failure_msg "Failed to stop TDengine (pid $PID)"
                exit 1
            fi
            rm -f "$PID_FILE"
        else
            log_action_cont_msg "TDengine was not running"
        fi
        log_action_end_msg 0
        set -e
        ;;
    restart|force-reload)
        if [ -f "$PID_FILE" ]; then
            $0 stop
            sleep 1
        fi
        $0 start
        ;;
    status)
        status_of_proc -p "$PID_FILE" "$DAEMON" "$NAME"
        ;;
    *)
        exit 1
        ;;
 esac
 exit 0
--- a/packaging/deb/tarbitratord
+++ b/packaging/deb/tarbitratord
 #!/bin/bash 
 #
 # Modified from original source: Elastic Search
 # https://github.com/elasticsearch/elasticsearch
 # Thank you to the Elastic Search authors
 #
 # chkconfig: 2345 99 01
 #
 ### BEGIN INIT INFO
 # Provides:          taoscluster
 # Required-Start:    $local_fs $network $syslog
 # Required-Stop:     $local_fs $network $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Starts taoscluster tarbitrator
 # Description:       Starts taoscluster tarbitrator, a arbitrator
 ### END INIT INFO
 set -e
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 NAME="taoscluster"
 USER="root"
 GROUP="root"
 DAEMON="/usr/local/taos/bin/tarbitrator"
 DAEMON_OPTS=""
 PID_FILE="/var/run/$NAME.pid"
 APPARGS=""
 # Maximum number of open files
 MAX_OPEN_FILES=65535
 . /lib/lsb/init-functions
 case "$1" in
    start)
        log_action_begin_msg "Starting tarbitrator..."
        if start-stop-daemon --test --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS &> /dev/null; then
            touch "$PID_FILE" && chown "$USER":"$GROUP" "$PID_FILE"
            if [ -n "$MAX_OPEN_FILES" ]; then
                ulimit -n $MAX_OPEN_FILES
            fi
            start-stop-daemon --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS
            log_end_msg $?
        fi
        ;;
    stop)
        log_action_begin_msg "Stopping tarbitrator..."
        set +e
        if [ -f "$PID_FILE" ]; then
            start-stop-daemon --stop --pidfile "$PID_FILE" --user "$USER" --retry=TERM/120/KILL/5 > /dev/null
            if [ $? -eq 1 ]; then
                log_action_cont_msg "TSD is not running but pid file exists, cleaning up"
            elif [ $? -eq 3 ]; then
                PID="`cat $PID_FILE`"
                log_failure_msg "Failed to stop tarbitrator (pid $PID)"
                exit 1
            fi
            rm -f "$PID_FILE"
        else
            log_action_cont_msg "tarbitrator was not running"
        fi
        log_action_end_msg 0
        set -e
        ;;
    restart|force-reload)
        if [ -f "$PID_FILE" ]; then
            $0 stop
            sleep 1
        fi
        $0 start
        ;;
    status)
        status_of_proc -p "$PID_FILE" "$DAEMON" "$NAME"
        ;;
    *)
        exit 1
        ;;
 esac
 exit 0
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
 FROM ubuntu:18.04
 WORKDIR /root
 ARG pkgFile
 ARG dirName
 ARG cpuType
 RUN echo ${pkgFile} && echo ${dirName}
 COPY ${pkgFile} /root/
 RUN tar -zxf ${pkgFile}
 WORKDIR /root/
 RUN cd /root/${dirName}/ && /bin/bash install.sh -e no && cd /root
 RUN rm /root/${pkgFile}
 RUN rm -rf /root/${dirName}
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get clean && apt-get update && apt-get install -y locales tzdata netcat && locale-gen en_US.UTF-8
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
    LC_CTYPE=en_US.UTF-8 \
    LANG=en_US.UTF-8 \
    LC_ALL=en_US.UTF-8
 COPY ./bin/* /usr/bin/
 ENV TINI_VERSION v0.19.0
 RUN bash -c 'echo -e "Downloading tini-${cpuType} ..."'
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${cpuType} /tini
 RUN chmod +x /tini
 ENTRYPOINT ["/tini", "--", "/usr/bin/entrypoint.sh"]
 CMD ["taosd"]
 VOLUME [ "/var/lib/taos", "/var/log/taos", "/corefile" ]
--- a/packaging/docker/README.md
+++ b/packaging/docker/README.md
--- a/packaging/docker/bin/entrypoint.sh
+++ b/packaging/docker/bin/entrypoint.sh
--- a/packaging/docker/bin/env-to-cfg
+++ b/packaging/docker/bin/env-to-cfg
 #!/bin/sh
 set -e
 self=$0
 snake_to_camel_case() {
  echo $1 | awk -F _ '{printf "%s", $1; for(i=2; i<=NF; i++) printf "%s", toupper(substr($i,1,1)) substr($i,2); print"";}'
 }
 if echo $1 | grep -E "^$" - >/dev/null; then
  export |grep -E 'TAOS_.*' -o| sed 's/TAOS_//' |tr A-Z a-z | awk -F"=" '{print "name=$(""'$self' " $1"); echo $name "$2}' |sh
 else
  snake_to_camel_case $1
 fi
--- a/packaging/docker/docker-compose.yml
+++ b/packaging/docker/docker-compose.yml
--- a/packaging/docker/dockerManifest.sh
+++ b/packaging/docker/dockerManifest.sh
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
--- a/packaging/docker/dockerbuildi.sh
+++ b/packaging/docker/dockerbuildi.sh
--- a/packaging/release.bat
+++ b/packaging/release.bat
--- a/packaging/release.sh
+++ b/packaging/release.sh
--- a/packaging/rpm/makerpm.sh
+++ b/packaging/rpm/makerpm.sh
--- a/packaging/rpm/taosd
+++ b/packaging/rpm/taosd
--- a/packaging/rpm/tarbitratord
+++ b/packaging/rpm/tarbitratord
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
--- a/packaging/tools/check_os.sh
+++ b/packaging/tools/check_os.sh
--- a/packaging/tools/get_client.sh
+++ b/packaging/tools/get_client.sh
 #!/bin/bash
 #
 log_dir=$1
 result_file=$2
 if [ ! -n "$1" ];then
  echo "Pleas input the director of taosdlog."
  echo "usage: ./get_client.sh <taosdlog directory> <result file>"
  exit 1
 else
  log_dir=$1
 fi
 if [ ! -n "$2" ];then
  result_file=clientInfo.txt
 else
  result_file=$2
 fi
 grep "new TCP connection" ${log_dir}/taosdlog.* | sed -e "s/0x.* from / /"|sed -e "s/,.*$//"|sed -e "s/:[0-9]*$//"|sort -r|uniq -f 2|sort -k 3 -r|uniq -f 2 > ${result_file}
--- a/packaging/tools/get_os.sh
+++ b/packaging/tools/get_os.sh
 #!/bin/bash
 #
 # This file is used to install TAOS time-series database on linux systems. The operating system 
 # is required to use systemd to manage services at boot
 set -e
 # set -x
 # -----------------------Variables definition---------------------
 OS=$(cat /etc/*-release | grep "^NAME=" | cut -d= -f2)
 len=$(echo ${#OS})
 len=$((len-2))
 retval=$(echo -ne ${OS:1:${len}} | cut -d" " -f1)
 echo -ne $retval
--- a/packaging/tools/get_version.sh
+++ b/packaging/tools/get_version.sh
 #!/bin/bash
 #
 # This file is used to install TAOS time-series database on linux systems. The operating system 
 # is required to use systemd to manage services at boot
 set -e
 # set -x
 # -----------------------Variables definition---------------------
 verinfo=$(cat $1 | grep " version" | cut -d '"' -f2)
 verinfo=$(echo $verinfo | tr "\n" " ")
 len=$(echo ${#verinfo})
 len=$((len-1))
 retval=$(echo -ne ${verinfo:0:${len}})
 echo -ne $retval
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
--- a/packaging/tools/install_arbi.sh
+++ b/packaging/tools/install_arbi.sh
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
--- a/packaging/tools/make_install.bat
+++ b/packaging/tools/make_install.bat
--- a/packaging/tools/makearbi.sh
+++ b/packaging/tools/makearbi.sh
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
--- a/packaging/tools/preun.sh
+++ b/packaging/tools/preun.sh
--- a/packaging/tools/release_note
+++ b/packaging/tools/release_note
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
--- a/packaging/tools/remove_arbi.sh
+++ b/packaging/tools/remove_arbi.sh
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
--- a/packaging/tools/repair_link.sh
+++ b/packaging/tools/repair_link.sh
--- a/packaging/tools/run_taosd_and_taosadapter.sh
+++ b/packaging/tools/run_taosd_and_taosadapter.sh
--- a/packaging/tools/set_core.sh
+++ b/packaging/tools/set_core.sh
--- a/packaging/tools/startPre.sh
+++ b/packaging/tools/startPre.sh
--- a/packaging/tools/taosd-dump-cfg.gdb
+++ b/packaging/tools/taosd-dump-cfg.gdb
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
--- a/source/client/src/clientStmt.c
+++ b/source/client/src/clientStmt.c
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
--- a/source/client/test/smlTest.cpp
+++ b/source/client/test/smlTest.cpp
--- a/source/common/src/systable.c
+++ b/source/common/src/systable.c
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
--- a/source/common/src/tmsgcb.c
+++ b/source/common/src/tmsgcb.c
--- a/source/common/src/tname.c
+++ b/source/common/src/tname.c
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
--- a/source/common/src/tvariant.c
+++ b/source/common/src/tvariant.c
--- a/source/common/test/CMakeLists.txt
+++ b/source/common/test/CMakeLists.txt
--- a/source/common/test/dataformatTest.cpp
+++ b/source/common/test/dataformatTest.cpp
+#include "gtest/gtest.h"
\ No newline at end of file
--- a/source/common/test/trowTest.cpp
+++ b/source/common/test/trowTest.cpp
--- a/source/common/type/type.c
+++ b/source/common/type/type.c
--- a/source/common/type/typeBigint.c
+++ b/source/common/type/typeBigint.c
--- a/source/common/type/typeBinary.c
+++ b/source/common/type/typeBinary.c
--- a/source/common/type/typeBool.c
+++ b/source/common/type/typeBool.c
--- a/source/common/type/typeDecimal.c
+++ b/source/common/type/typeDecimal.c
--- a/source/common/type/typeDouble.c
+++ b/source/common/type/typeDouble.c
--- a/source/common/type/typeFloat.c
+++ b/source/common/type/typeFloat.c
--- a/source/common/type/typeInt.c
+++ b/source/common/type/typeInt.c
--- a/source/common/type/typeJson.c
+++ b/source/common/type/typeJson.c
--- a/source/common/type/typeLongblob.c
+++ b/source/common/type/typeLongblob.c
--- a/source/common/type/typeNchar.c
+++ b/source/common/type/typeNchar.c
--- a/source/common/type/typeNull.c
+++ b/source/common/type/typeNull.c
--- a/source/common/type/typeSmallint.c
+++ b/source/common/type/typeSmallint.c
--- a/source/common/type/typeTimestamp.c
+++ b/source/common/type/typeTimestamp.c
--- a/source/common/type/typeTinyint.c
+++ b/source/common/type/typeTinyint.c
--- a/source/common/type/typeUBigint.c
+++ b/source/common/type/typeUBigint.c
--- a/source/common/type/typeUSmallint.c
+++ b/source/common/type/typeUSmallint.c
--- a/source/common/type/typeUTinyint.c
+++ b/source/common/type/typeUTinyint.c
--- a/source/common/type/typeUint.c
+++ b/source/common/type/typeUint.c
--- a/source/common/type/typeVarchar.c
+++ b/source/common/type/typeVarchar.c
--- a/source/dnode/mgmt/exe/dmMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
--- a/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h
+++ b/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h
--- a/source/dnode/mgmt/mgmt_bnode/src/bmHandle.c
+++ b/source/dnode/mgmt/mgmt_bnode/src/bmHandle.c
--- a/source/dnode/mgmt/mgmt_bnode/src/bmInt.c
+++ b/source/dnode/mgmt/mgmt_bnode/src/bmInt.c
--- a/source/dnode/mgmt/mgmt_bnode/src/bmWorker.c
+++ b/source/dnode/mgmt/mgmt_bnode/src/bmWorker.c
--- a/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h
+++ b/source/dnode/mgmt/mgmt_dnode/inc/dmInt.h
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
--- a/source/dnode/mgmt/mgmt_dnode/src/dmInt.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmInt.c
--- a/source/dnode/mgmt/mgmt_dnode/src/dmMonitor.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmMonitor.c
--- a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
--- a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
+++ b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
--- a/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
--- a/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h
+++ b/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h
--- a/source/dnode/mgmt/mgmt_qnode/src/qmHandle.c
+++ b/source/dnode/mgmt/mgmt_qnode/src/qmHandle.c
--- a/source/dnode/mgmt/mgmt_qnode/src/qmInt.c
+++ b/source/dnode/mgmt/mgmt_qnode/src/qmInt.c
--- a/source/dnode/mgmt/mgmt_qnode/src/qmWorker.c
+++ b/source/dnode/mgmt/mgmt_qnode/src/qmWorker.c
--- a/source/dnode/mgmt/mgmt_snode/inc/smInt.h
+++ b/source/dnode/mgmt/mgmt_snode/inc/smInt.h
--- a/source/dnode/mgmt/mgmt_snode/src/smHandle.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smHandle.c
--- a/source/dnode/mgmt/mgmt_snode/src/smInt.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smInt.c
--- a/source/dnode/mgmt/mgmt_snode/src/smWorker.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smWorker.c
--- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
+++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
--- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
--- a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
+++ b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
--- a/source/common/type/typeBlob.c
+++ b/source/common/type/typeBlob.c
--- a/source/dnode/mgmt/node_mgmt/src/dmEnv.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmEnv.c
--- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
--- a/source/dnode/mgmt/node_mgmt/src/dmMonitor.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMonitor.c
--- a/source/dnode/mgmt/node_mgmt/src/dmRun.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmRun.c
--- a/source/dnode/mgmt/node_mgmt/src/dmProc.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmProc.c
--- a/source/dnode/mgmt/node_mgmt/src/dmTransport.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmTransport.c
--- a/source/dnode/mgmt/node_util/inc/dmUtil.h
+++ b/source/dnode/mgmt/node_util/inc/dmUtil.h
--- a/source/dnode/mgmt/node_util/src/dmEnv.c
+++ b/source/dnode/mgmt/node_util/src/dmEnv.c
--- a/source/dnode/mgmt/mgmt_dnode/src/dmEps.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmEps.c
--- a/source/dnode/mgmt/node_util/src/dmUtil.c
+++ b/source/dnode/mgmt/node_util/src/dmUtil.c
--- a/source/dnode/mgmt/test/CMakeLists.txt
+++ b/source/dnode/mgmt/test/CMakeLists.txt
--- a/source/dnode/mgmt/test/bnode/dbnode.cpp
+++ b/source/dnode/mgmt/test/bnode/dbnode.cpp
--- a/source/dnode/mgmt/test/mnode/dmnode.cpp
+++ b/source/dnode/mgmt/test/mnode/dmnode.cpp
--- a/source/dnode/mgmt/test/qnode/dqnode.cpp
+++ b/source/dnode/mgmt/test/qnode/dqnode.cpp
--- a/source/dnode/mgmt/test/snode/dsnode.cpp
+++ b/source/dnode/mgmt/test/snode/dsnode.cpp
--- a/source/dnode/mgmt/test/sut/inc/client.h
+++ b/source/dnode/mgmt/test/sut/inc/client.h
--- a/source/dnode/mgmt/test/sut/inc/server.h
+++ b/source/dnode/mgmt/test/sut/inc/server.h
--- a/source/dnode/mgmt/test/sut/src/client.cpp
+++ b/source/dnode/mgmt/test/sut/src/client.cpp
--- a/source/dnode/mgmt/test/sut/src/server.cpp
+++ b/source/dnode/mgmt/test/sut/src/server.cpp
--- a/source/dnode/mgmt/test/sut/src/sut.cpp
+++ b/source/dnode/mgmt/test/sut/src/sut.cpp
--- a/source/dnode/mgmt/test/vnode/vnode.cpp
+++ b/source/dnode/mgmt/test/vnode/vnode.cpp
--- a/source/dnode/mnode/impl/inc/mndDef.h
+++ b/source/dnode/mnode/impl/inc/mndDef.h
--- a/source/dnode/mnode/impl/inc/mndInt.h
+++ b/source/dnode/mnode/impl/inc/mndInt.h
--- a/source/dnode/mnode/impl/inc/mndTrans.h
+++ b/source/dnode/mnode/impl/inc/mndTrans.h
--- a/source/dnode/mnode/impl/inc/mndVgroup.h
+++ b/source/dnode/mnode/impl/inc/mndVgroup.h
--- a/source/dnode/mnode/impl/src/mndAcct.c
+++ b/source/dnode/mnode/impl/src/mndAcct.c
--- a/source/dnode/mnode/impl/src/mndAuth.c
+++ b/source/dnode/mnode/impl/src/mndAuth.c
--- a/source/dnode/mnode/impl/src/mndBnode.c
+++ b/source/dnode/mnode/impl/src/mndBnode.c
--- a/source/dnode/mnode/impl/src/mndCluster.c
+++ b/source/dnode/mnode/impl/src/mndCluster.c
--- a/source/dnode/mnode/impl/src/mndConsumer.c
+++ b/source/dnode/mnode/impl/src/mndConsumer.c
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
--- a/source/dnode/mnode/impl/src/mndFunc.c
+++ b/source/dnode/mnode/impl/src/mndFunc.c
--- a/source/dnode/mnode/impl/src/mndGrant.c
+++ b/source/dnode/mnode/impl/src/mndGrant.c
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
--- a/source/dnode/mnode/impl/src/mndOffset.c
+++ b/source/dnode/mnode/impl/src/mndOffset.c
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
--- a/source/dnode/mnode/impl/src/mndQnode.c
+++ b/source/dnode/mnode/impl/src/mndQnode.c
--- a/source/dnode/mnode/impl/src/mndQuery.c
+++ b/source/dnode/mnode/impl/src/mndQuery.c
--- a/source/dnode/mnode/impl/src/mndShow.c
+++ b/source/dnode/mnode/impl/src/mndShow.c
--- a/source/dnode/mnode/impl/src/mndSma.c
+++ b/source/dnode/mnode/impl/src/mndSma.c
--- a/source/dnode/mnode/impl/src/mndSnode.c
+++ b/source/dnode/mnode/impl/src/mndSnode.c
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
--- a/source/dnode/mnode/impl/src/mndTelem.c
+++ b/source/dnode/mnode/impl/src/mndTelem.c
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
--- a/source/dnode/mnode/impl/src/mndVgroup.c
+++ b/source/dnode/mnode/impl/src/mndVgroup.c
--- a/source/dnode/mnode/impl/src/mnode.c
+++ b/source/dnode/mnode/impl/src/mnode.c
--- a/source/dnode/mnode/impl/test/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/CMakeLists.txt
--- a/source/dnode/mnode/impl/test/acct/acct.cpp
+++ b/source/dnode/mnode/impl/test/acct/acct.cpp
--- a/source/dnode/mnode/impl/test/bnode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/bnode/CMakeLists.txt
--- a/source/dnode/mnode/impl/test/bnode/mbnode.cpp
+++ b/source/dnode/mnode/impl/test/bnode/mbnode.cpp
--- a/source/dnode/mnode/impl/test/dnode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/dnode/CMakeLists.txt
--- a/source/dnode/mnode/impl/test/dnode/mdnode.cpp
+++ b/source/dnode/mnode/impl/test/dnode/mdnode.cpp
--- a/source/dnode/mnode/impl/test/mnode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/mnode/CMakeLists.txt
--- a/source/dnode/mnode/impl/test/mnode/mnode.cpp
+++ b/source/dnode/mnode/impl/test/mnode/mnode.cpp
--- a/source/dnode/mnode/impl/test/qnode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/qnode/CMakeLists.txt
--- a/source/dnode/mnode/impl/test/qnode/qnode.cpp
+++ b/source/dnode/mnode/impl/test/qnode/qnode.cpp
--- a/source/dnode/mnode/impl/test/snode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/snode/CMakeLists.txt
--- a/source/dnode/mnode/impl/test/snode/snode.cpp
+++ b/source/dnode/mnode/impl/test/snode/snode.cpp
--- a/source/dnode/mnode/impl/test/stb/stb.cpp
+++ b/source/dnode/mnode/impl/test/stb/stb.cpp
--- a/source/dnode/mnode/impl/test/trans/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/trans/CMakeLists.txt
--- a/source/dnode/mnode/impl/test/trans/trans1.cpp
+++ b/source/dnode/mnode/impl/test/trans/trans1.cpp
--- a/source/dnode/mnode/impl/test/trans/trans2.cpp
+++ b/source/dnode/mnode/impl/test/trans/trans2.cpp
--- a/source/dnode/mnode/sdb/src/sdb.c
+++ b/source/dnode/mnode/sdb/src/sdb.c
--- a/source/dnode/mnode/sdb/src/sdbFile.c
+++ b/source/dnode/mnode/sdb/src/sdbFile.c
--- a/source/dnode/mnode/sdb/src/sdbHash.c
+++ b/source/dnode/mnode/sdb/src/sdbHash.c
--- a/source/dnode/mnode/sdb/src/sdbRaw.c
+++ b/source/dnode/mnode/sdb/src/sdbRaw.c
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
--- a/source/dnode/vnode/src/inc/meta.h
+++ b/source/dnode/vnode/src/inc/meta.h
--- a/source/dnode/vnode/src/inc/sma.h
+++ b/source/dnode/vnode/src/inc/sma.h
--- a/source/dnode/vnode/src/inc/tq.h
+++ b/source/dnode/vnode/src/inc/tq.h
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
--- a/source/dnode/vnode/src/meta/metaEntry.c
+++ b/source/dnode/vnode/src/meta/metaEntry.c
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
--- a/source/dnode/vnode/src/meta/metaSma.c
+++ b/source/dnode/vnode/src/meta/metaSma.c
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
--- a/source/dnode/vnode/src/sma/smaTDBImpl.c
+++ b/source/dnode/vnode/src/sma/smaTDBImpl.c
--- a/source/dnode/vnode/src/sma/smaTimeRange.c
+++ b/source/dnode/vnode/src/sma/smaTimeRange.c
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
--- a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
--- a/source/dnode/vnode/src/tsdb/tsdbTDBImpl.c
+++ b/source/dnode/vnode/src/tsdb/tsdbTDBImpl.c
--- a/source/dnode/vnode/src/tsdb/tsdbWrite.c
+++ b/source/dnode/vnode/src/tsdb/tsdbWrite.c
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
--- a/source/libs/catalog/inc/catalogInt.h
+++ b/source/libs/catalog/inc/catalogInt.h
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
--- a/source/libs/executor/src/executorMain.c
+++ b/source/libs/executor/src/executorMain.c
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
--- a/source/libs/function/inc/builtinsimpl.h
+++ b/source/libs/function/inc/builtinsimpl.h
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
--- a/source/libs/function/src/taggfunction.c
+++ b/source/libs/function/src/taggfunction.c
--- a/source/libs/function/src/tudf.c
+++ b/source/libs/function/src/tudf.c
--- a/source/libs/function/src/udfd.c
+++ b/source/libs/function/src/udfd.c
--- a/source/libs/function/test/runUdf.c
+++ b/source/libs/function/test/runUdf.c
--- a/source/libs/function/test/udf2.c
+++ b/source/libs/function/test/udf2.c
--- a/source/libs/index/src/indexComm.c
+++ b/source/libs/index/src/indexComm.c
--- a/source/libs/index/src/indexTfile.c
+++ b/source/libs/index/src/indexTfile.c
--- a/source/libs/index/test/jsonUT.cc
+++ b/source/libs/index/test/jsonUT.cc
--- a/source/libs/nodes/src/nodesCloneFuncs.c
+++ b/source/libs/nodes/src/nodesCloneFuncs.c
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
--- a/source/libs/nodes/src/nodesEqualFuncs.c
+++ b/source/libs/nodes/src/nodesEqualFuncs.c
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
--- a/source/libs/parser/src/parInsertData.c
+++ b/source/libs/parser/src/parInsertData.c
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
--- a/source/libs/parser/src/parser.c
+++ b/source/libs/parser/src/parser.c
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
--- a/source/libs/planner/inc/planInt.h
+++ b/source/libs/planner/inc/planInt.h
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
--- a/source/libs/planner/src/planSpliter.c
+++ b/source/libs/planner/src/planSpliter.c
--- a/source/libs/planner/test/planJoinTest.cpp
+++ b/source/libs/planner/test/planJoinTest.cpp
--- a/source/libs/planner/test/planSetOpTest.cpp
+++ b/source/libs/planner/test/planSetOpTest.cpp
--- a/source/libs/planner/test/planStmtTest.cpp
+++ b/source/libs/planner/test/planStmtTest.cpp
--- a/source/libs/planner/test/planTestUtil.cpp
+++ b/source/libs/planner/test/planTestUtil.cpp
--- a/source/libs/qcom/src/queryUtil.c
+++ b/source/libs/qcom/src/queryUtil.c
--- a/source/libs/qworker/inc/qworkerInt.h
+++ b/source/libs/qworker/inc/qworkerInt.h
--- a/source/libs/qworker/inc/qworkerMsg.h
+++ b/source/libs/qworker/inc/qworkerMsg.h
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
--- a/source/libs/qworker/src/qworkerMsg.c
+++ b/source/libs/qworker/src/qworkerMsg.c
--- a/source/libs/qworker/test/qworkerTests.cpp
+++ b/source/libs/qworker/test/qworkerTests.cpp
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
--- a/source/libs/scheduler/inc/schedulerInt.h
+++ b/source/libs/scheduler/inc/schedulerInt.h
--- a/source/libs/scheduler/src/scheduler.c
+++ b/source/libs/scheduler/src/scheduler.c
--- a/source/libs/scheduler/test/schedulerTests.cpp
+++ b/source/libs/scheduler/test/schedulerTests.cpp
--- a/source/libs/stream/src/tstream.c
+++ b/source/libs/stream/src/tstream.c
--- a/source/libs/sync/src/syncIO.c
+++ b/source/libs/sync/src/syncIO.c
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
--- a/source/libs/sync/test/syncRespMgrTest.cpp
+++ b/source/libs/sync/test/syncRespMgrTest.cpp
--- a/source/libs/tdb/CMakeLists.txt
+++ b/source/libs/tdb/CMakeLists.txt
--- a/source/libs/tdb/inc/tdb.h
+++ b/source/libs/tdb/inc/tdb.h
--- a/source/libs/tdb/src/db/tdbDb.c
+++ b/source/libs/tdb/src/db/tdbDb.c
--- a/source/libs/tdb/src/db/tdbEnv.c
+++ b/source/libs/tdb/src/db/tdbEnv.c
--- a/source/libs/tdb/src/db/tdbPCache.c
+++ b/source/libs/tdb/src/db/tdbPCache.c
--- a/source/libs/tdb/src/db/tdbPager.c
+++ b/source/libs/tdb/src/db/tdbPager.c
--- a/source/libs/tdb/src/db/tdbTable.c
+++ b/source/libs/tdb/src/db/tdbTable.c
--- a/source/libs/tdb/src/inc/tdbInt.h
+++ b/source/libs/tdb/src/inc/tdbInt.h
--- a/source/libs/tdb/test/tdbTest.cpp
+++ b/source/libs/tdb/test/tdbTest.cpp
--- a/source/libs/tfs/src/tfs.c
+++ b/source/libs/tfs/src/tfs.c
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
--- a/source/libs/transport/src/transSrv.c
+++ b/source/libs/transport/src/transSrv.c
--- a/source/libs/transport/test/pushServer.c
+++ b/source/libs/transport/test/pushServer.c
--- a/source/libs/transport/test/rclient.c
+++ b/source/libs/transport/test/rclient.c
--- a/source/libs/transport/test/rserver.c
+++ b/source/libs/transport/test/rserver.c
--- a/source/libs/transport/test/syncClient.c
+++ b/source/libs/transport/test/syncClient.c
--- a/source/libs/transport/test/transUT.cpp
+++ b/source/libs/transport/test/transUT.cpp
--- a/source/libs/wal/src/walMgmt.c
+++ b/source/libs/wal/src/walMgmt.c
--- a/source/os/CMakeLists.txt
+++ b/source/os/CMakeLists.txt
--- a/source/os/src/osString.c
+++ b/source/os/src/osString.c
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
--- a/source/util/src/tjson.c
+++ b/source/util/src/tjson.c
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
--- a/source/util/src/tprocess.c
+++ b/source/util/src/tprocess.c
--- a/source/util/src/tsched.c
+++ b/source/util/src/tsched.c
--- a/source/util/src/tskiplist.c
+++ b/source/util/src/tskiplist.c
--- a/source/util/src/tworker.c
+++ b/source/util/src/tworker.c
--- a/source/util/test/CMakeLists.txt
+++ b/source/util/test/CMakeLists.txt
--- a/source/util/test/procTest.cpp
+++ b/source/util/test/procTest.cpp
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
--- a/tests/script/api/batchprepare.c
+++ b/tests/script/api/batchprepare.c
--- a/tests/script/tsim/insert/basic0.sim
+++ b/tests/script/tsim/insert/basic0.sim
--- a/tests/script/tsim/query/explain.sim
+++ b/tests/script/tsim/query/explain.sim
--- a/tests/script/tsim/query/interval-offset.sim
+++ b/tests/script/tsim/query/interval-offset.sim
--- a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
+++ b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
--- a/tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim
+++ b/tests/script/tsim/tmq/prepareBasicEnv-1vgrp.sim
--- a/tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim
+++ b/tests/script/tsim/tmq/prepareBasicEnv-4vgrp.sim
--- a/tests/script/tsim/tmq/topic.sim
+++ b/tests/script/tsim/tmq/topic.sim
--- a/tests/script/tsim/tstream/basic1.sim
+++ b/tests/script/tsim/tstream/basic1.sim
--- a/tests/script/tsim/valgrind/checkError.sim
+++ b/tests/script/tsim/valgrind/checkError.sim
--- a/tests/system-test/1-insert/insertWithMoreVgroup.py
+++ b/tests/system-test/1-insert/insertWithMoreVgroup.py
--- a/tests/system-test/1-insert/manyVgroups.json
+++ b/tests/system-test/1-insert/manyVgroups.json
--- a/tests/system-test/2-query/abs.py
+++ b/tests/system-test/2-query/abs.py
--- a/tests/system-test/7-tmq/subscribeDb.py
+++ b/tests/system-test/7-tmq/subscribeDb.py
--- a/tests/system-test/7-tmq/subscribeDb1.py
+++ b/tests/system-test/7-tmq/subscribeDb1.py
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
--- a/tests/test/c/create_table.c
+++ b/tests/test/c/create_table.c
--- a/tests/test/c/tmqDemo.c
+++ b/tests/test/c/tmqDemo.c
--- a/tests/test/c/tmqSim.c
+++ b/tests/test/c/tmqSim.c
--- a/tests/tsim/src/simParse.c
+++ b/tests/tsim/src/simParse.c
--- a/tests/tsim/src/simSystem.c
+++ b/tests/tsim/src/simSystem.c
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
--- a/tools/shell/src/shellNettest.c
+++ b/tools/shell/src/shellNettest.c