From da13f68695b3b6b59fd8fa300bee79fc04bc8059 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sun, 17 Jan 2021 22:16:48 +0800
Subject: [PATCH 01/25] [TD-2778]<fix>: fix invalid read during merge data in
 both buffer and data files.

---
 src/tsdb/src/tsdbRead.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 2444283435..90f673eaee 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -1388,8 +1388,8 @@ static void doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo*
         break;
       }
 
-      if (((tsArray[pos] > pQueryHandle->window.ekey || pos > endPos) && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
-          ((tsArray[pos] < pQueryHandle->window.ekey || pos < endPos) && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+      if (((pos > endPos || tsArray[pos] > pQueryHandle->window.ekey) && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+          ((pos < endPos || tsArray[pos] < pQueryHandle->window.ekey) && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
         break;
       }
 

From 710d41daa9fdf82ac4df4538dea08d2bce724fff Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sun, 17 Jan 2021 22:19:27 +0800
Subject: [PATCH 02/25] [TD-1600]<fix>: return error code to client if
 importing data from file failed.

---
 src/client/src/tscParseInsert.c | 111 +++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 45 deletions(-)

diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 0c7af5d4e3..d284b92a67 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -1409,36 +1409,37 @@ typedef struct SImportFileSupport {
 static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
   assert(param != NULL && tres != NULL);
 
+  char *  tokenBuf = NULL;
+  size_t  n = 0;
+  ssize_t readLen = 0;
+  char *  line = NULL;
+  int32_t count = 0;
+  int32_t maxRows = 0;
+  FILE *  fp   = NULL;
+
   SSqlObj *pSql = tres;
   SSqlCmd *pCmd = &pSql->cmd;
 
-  SImportFileSupport *pSupporter = (SImportFileSupport *) param;
+  SImportFileSupport *pSupporter = (SImportFileSupport *)param;
 
   SSqlObj *pParentSql = pSupporter->pSql;
-  FILE    *fp = pSupporter->fp;
+  fp = pSupporter->fp;
 
   if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {  // handle error
     assert(taos_errno(pSql) == code);
 
-    do {
-      if (code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
-        assert(pSql->res.numOfRows == 0);
-        int32_t errc = fseek(fp, 0, SEEK_SET);
-        if (errc < 0) {
-          tscError("%p failed to seek SEEK_SET since:%s", pSql, tstrerror(errno));
-        } else {
-          break;
-        }
+    if (code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
+      assert(pSql->res.numOfRows == 0);
+      int32_t ret = fseek(fp, 0, SEEK_SET);
+      if (ret < 0) {
+        tscError("%p failed to seek SEEK_SET since:%s", pSql, tstrerror(errno));
+        pParentSql->res.code = TAOS_SYSTEM_ERROR(errno);
+        goto _error;
       }
-
-      taos_free_result(pSql);
-      tfree(pSupporter);
-      fclose(fp);
-
+    } else {
       pParentSql->res.code = code;
-      tscAsyncResultOnError(pParentSql);
-      return;
-    } while (0);
+      goto _error;
+    }
   }
 
   // accumulate the total submit records
@@ -1452,28 +1453,32 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
   SParsedDataColInfo spd = {.numOfCols = tinfo.numOfColumns};
   tscSetAssignedColumnInfo(&spd, pSchema, tinfo.numOfColumns);
 
-  size_t  n = 0;
-  ssize_t readLen = 0;
-  char *  line = NULL;
-  int32_t count = 0;
-  int32_t maxRows = 0;
-
   tfree(pCmd->pTableNameList);
   pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
 
   if (pCmd->pTableBlockHashList == NULL) {
     pCmd->pTableBlockHashList = taosHashInit(16, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
+    if (pCmd->pTableBlockHashList == NULL) {
+      pParentSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      goto _error;
+    }
   }
 
   STableDataBlocks *pTableDataBlock = NULL;
-  int32_t ret = tscGetDataBlockFromList(pCmd->pTableBlockHashList, pTableMeta->id.uid, TSDB_PAYLOAD_SIZE,
-                                        sizeof(SSubmitBlk), tinfo.rowSize, pTableMetaInfo->name, pTableMeta, &pTableDataBlock, NULL);
+  int32_t           ret =
+      tscGetDataBlockFromList(pCmd->pTableBlockHashList, pTableMeta->id.uid, TSDB_PAYLOAD_SIZE, sizeof(SSubmitBlk),
+                              tinfo.rowSize, pTableMetaInfo->name, pTableMeta, &pTableDataBlock, NULL);
   if (ret != TSDB_CODE_SUCCESS) {
-//    return ret;
+    pParentSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
   }
 
   tscAllocateMemIfNeed(pTableDataBlock, tinfo.rowSize, &maxRows);
-  char *tokenBuf = calloc(1, 4096);
+  tokenBuf = calloc(1, TSDB_MAX_BYTES_PER_ROW);
+  if (tokenBuf == NULL) {
+    pParentSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
+  }
 
   while ((readLen = tgetline(&line, &n, fp)) != -1) {
     if (('\r' == line[readLen - 1]) || ('\n' == line[readLen - 1])) {
@@ -1501,27 +1506,43 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
   }
 
   tfree(tokenBuf);
-  free(line);
+  tfree(line);
 
-  if (count > 0) {
-    code = doPackSendDataBlock(pSql, count, pTableDataBlock);
-    if (code != TSDB_CODE_SUCCESS) {
+  pParentSql->res.code = code;
+
+  if (code == TSDB_CODE_SUCCESS) {
+    if (count > 0) {
+      code = doPackSendDataBlock(pSql, count, pTableDataBlock);
+      if (code == TSDB_CODE_SUCCESS) {
+        return;
+      } else {
+        pParentSql->res.code = code;
+        goto _error;
+      }
+    } else {
       pParentSql->res.code = code;
-      tscAsyncResultOnError(pParentSql);
+      taos_free_result(pSql);
+      tfree(pSupporter);
+      fclose(fp);
+
+      pParentSql->fp = pParentSql->fetchFp;
+
+      // all data has been sent to vnode, call user function
+      int32_t v =
+          (pParentSql->res.code != TSDB_CODE_SUCCESS) ? pParentSql->res.code : (int32_t)pParentSql->res.numOfRows;
+      (*pParentSql->fp)(pParentSql->param, pParentSql, v);
       return;
     }
-
-  } else {
-    taos_free_result(pSql);
-    tfree(pSupporter);
-    fclose(fp);
-
-    pParentSql->fp = pParentSql->fetchFp;
-
-    // all data has been sent to vnode, call user function
-    int32_t v = (pParentSql->res.code != TSDB_CODE_SUCCESS) ? pParentSql->res.code : (int32_t)pParentSql->res.numOfRows;
-    (*pParentSql->fp)(pParentSql->param, pParentSql, v);
   }
+
+_error:
+  tfree(tokenBuf);
+  tfree(line);
+  taos_free_result(pSql);
+  tfree(pSupporter);
+  fclose(fp);
+
+  tscAsyncResultOnError(pParentSql);
 }
 
 void tscProcessMultiVnodesImportFromFile(SSqlObj *pSql) {

From 795690cd0c31b8bc9299fd31f3d52bb82bb517cd Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sun, 17 Jan 2021 22:31:42 +0800
Subject: [PATCH 03/25] [TD-1600]refactor codes.

---
 src/client/inc/tsclient.h       |  2 +-
 src/client/src/tscParseInsert.c | 41 ++++++++++++++-------------------
 src/client/src/tscUtil.c        |  2 +-
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 652e5bdd47..83eaeeb321 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -435,7 +435,7 @@ void waitForQueryRsp(void *param, TAOS_RES *tres, int code);
 
 void doAsyncQuery(STscObj *pObj, SSqlObj *pSql, __async_cb_func_t fp, void *param, const char *sqlstr, size_t sqlLen);
 
-void tscProcessMultiVnodesImportFromFile(SSqlObj *pSql);
+void tscImportDataFromFile(SSqlObj *pSql);
 void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen);
 bool tscIsUpdateQuery(SSqlObj* pSql);
 bool tscHasReachLimitation(SQueryInfo *pQueryInfo, SSqlRes *pRes);
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index d284b92a67..f2dddd5e29 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -1406,7 +1406,7 @@ typedef struct SImportFileSupport {
   FILE    *fp;
 } SImportFileSupport;
 
-static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
+static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int32_t numOfRows) {
   assert(param != NULL && tres != NULL);
 
   char *  tokenBuf = NULL;
@@ -1425,21 +1425,19 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
   SSqlObj *pParentSql = pSupporter->pSql;
   fp = pSupporter->fp;
 
-  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {  // handle error
-    assert(taos_errno(pSql) == code);
+  int32_t code = pSql->res.code;
 
-    if (code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
-      assert(pSql->res.numOfRows == 0);
-      int32_t ret = fseek(fp, 0, SEEK_SET);
-      if (ret < 0) {
-        tscError("%p failed to seek SEEK_SET since:%s", pSql, tstrerror(errno));
-        pParentSql->res.code = TAOS_SYSTEM_ERROR(errno);
-        goto _error;
-      }
-    } else {
-      pParentSql->res.code = code;
+  // retry parse data from file and import data from the begining again
+  if (code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
+    assert(pSql->res.numOfRows == 0);
+    int32_t ret = fseek(fp, 0, SEEK_SET);
+    if (ret < 0) {
+      tscError("%p failed to seek SEEK_SET since:%s", pSql, tstrerror(errno));
+      code = TAOS_SYSTEM_ERROR(errno);
       goto _error;
     }
+  } else if (code != TSDB_CODE_SUCCESS) {
+    goto _error;
   }
 
   // accumulate the total submit records
@@ -1459,7 +1457,7 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
   if (pCmd->pTableBlockHashList == NULL) {
     pCmd->pTableBlockHashList = taosHashInit(16, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
     if (pCmd->pTableBlockHashList == NULL) {
-      pParentSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      code = TSDB_CODE_TSC_OUT_OF_MEMORY;
       goto _error;
     }
   }
@@ -1476,7 +1474,7 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
   tscAllocateMemIfNeed(pTableDataBlock, tinfo.rowSize, &maxRows);
   tokenBuf = calloc(1, TSDB_MAX_BYTES_PER_ROW);
   if (tokenBuf == NULL) {
-    pParentSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    code = TSDB_CODE_TSC_OUT_OF_MEMORY;
     goto _error;
   }
 
@@ -1509,18 +1507,15 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
   tfree(line);
 
   pParentSql->res.code = code;
-
   if (code == TSDB_CODE_SUCCESS) {
     if (count > 0) {
       code = doPackSendDataBlock(pSql, count, pTableDataBlock);
       if (code == TSDB_CODE_SUCCESS) {
         return;
       } else {
-        pParentSql->res.code = code;
         goto _error;
       }
     } else {
-      pParentSql->res.code = code;
       taos_free_result(pSql);
       tfree(pSupporter);
       fclose(fp);
@@ -1528,8 +1523,7 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
       pParentSql->fp = pParentSql->fetchFp;
 
       // all data has been sent to vnode, call user function
-      int32_t v =
-          (pParentSql->res.code != TSDB_CODE_SUCCESS) ? pParentSql->res.code : (int32_t)pParentSql->res.numOfRows;
+      int32_t v = (code != TSDB_CODE_SUCCESS) ? code : (int32_t)pParentSql->res.numOfRows;
       (*pParentSql->fp)(pParentSql->param, pParentSql, v);
       return;
     }
@@ -1545,7 +1539,7 @@ _error:
   tscAsyncResultOnError(pParentSql);
 }
 
-void tscProcessMultiVnodesImportFromFile(SSqlObj *pSql) {
+void tscImportDataFromFile(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
   if (pCmd->command != TSDB_SQL_INSERT) {
     return;
@@ -1564,12 +1558,11 @@ void tscProcessMultiVnodesImportFromFile(SSqlObj *pSql) {
 
     tfree(pSupporter);
     tscAsyncResultOnError(pSql);
-
     return;
   }
 
   pSupporter->pSql = pSql;
-  pSupporter->fp = fp;
+  pSupporter->fp   = fp;
 
-  parseFileSendDataBlock(pSupporter, pNew, 0);
+  parseFileSendDataBlock(pSupporter, pNew, TSDB_CODE_SUCCESS);
 }
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 02cd9b9692..a153a9147d 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -2197,7 +2197,7 @@ void tscDoQuery(SSqlObj* pSql) {
   }
 
   if (pCmd->dataSourceType == DATA_FROM_DATA_FILE) {
-    tscProcessMultiVnodesImportFromFile(pSql);
+    tscImportDataFromFile(pSql);
   } else {
     SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
     uint16_t type = pQueryInfo->type;

From 6402c2b053125ac9eb4f10a92d85358bf7f6566f Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sun, 17 Jan 2021 22:50:23 +0800
Subject: [PATCH 04/25] [TD-225]refactor codes.

---
 src/client/inc/tscLocalMerge.h |   8 +-
 src/client/inc/tscUtil.h       |   4 +-
 src/client/inc/tsclient.h      |   4 +-
 src/client/src/tscLocalMerge.c | 345 ++++++++++++++++-----------------
 src/client/src/tscServer.c     |   2 +-
 src/client/src/tscSubquery.c   |   6 +-
 src/client/src/tscUtil.c       |  21 +-
 src/query/src/qExecutor.c      |   4 +-
 src/util/inc/tarray.h          |   2 +-
 src/util/src/tarray.c          |   2 +-
 10 files changed, 196 insertions(+), 202 deletions(-)

diff --git a/src/client/inc/tscLocalMerge.h b/src/client/inc/tscLocalMerge.h
index 0617645188..581cd37cbd 100644
--- a/src/client/inc/tscLocalMerge.h
+++ b/src/client/inc/tscLocalMerge.h
@@ -38,7 +38,7 @@ typedef struct SLocalDataSource {
   tFilePage      filePage;
 } SLocalDataSource;
 
-typedef struct SLocalReducer {
+typedef struct SLocalMerger {
   SLocalDataSource **    pLocalDataSrc;
   int32_t                numOfBuffer;
   int32_t                numOfCompleted;
@@ -62,7 +62,7 @@ typedef struct SLocalReducer {
   bool                   discard;
   int32_t                offset;             // limit offset value
   bool                   orderPrjOnSTable;   // projection query on stable
-} SLocalReducer;
+} SLocalMerger;
 
 typedef struct SRetrieveSupport {
   tExtMemBuffer **  pExtMemBuffer;     // for build loser tree
@@ -89,10 +89,10 @@ int32_t tscFlushTmpBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tF
 /*
  * create local reducer to launch the second-stage reduce process at client site
  */
-void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
+void tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
                            SColumnModel *finalModel, SColumnModel *pFFModel, SSqlObj* pSql);
 
-void tscDestroyLocalReducer(SSqlObj *pSql);
+void tscDestroyLocalMerger(SSqlObj *pSql);
 
 int32_t tscDoLocalMerge(SSqlObj *pSql);
 
diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index 633512e324..45a5c2e578 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -225,7 +225,7 @@ void tscInitQueryInfo(SQueryInfo* pQueryInfo);
 
 void tscClearSubqueryInfo(SSqlCmd* pCmd);
 void tscFreeVgroupTableInfo(SArray* pVgroupTables);
-SArray* tscVgroupTableInfoClone(SArray* pVgroupTables);
+SArray* tscVgroupTableInfoDup(SArray* pVgroupTables);
 void tscRemoveVgroupTableGroup(SArray* pVgroupTable, int32_t index);
 void tscVgroupTableCopy(SVgroupTableInfo* info, SVgroupTableInfo* pInfo);
 
@@ -292,7 +292,7 @@ uint32_t tscGetTableMetaSize(STableMeta* pTableMeta);
 CChildTableMeta* tscCreateChildMeta(STableMeta* pTableMeta);
 uint32_t tscGetTableMetaMaxSize();
 int32_t tscCreateTableMetaFromCChildMeta(STableMeta* pChild, const char* name);
-STableMeta* tscTableMetaClone(STableMeta* pTableMeta);
+STableMeta* tscTableMetaDup(STableMeta* pTableMeta);
 
 
 void* malloc_throw(size_t size);
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 83eaeeb321..8c3daeb656 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -39,7 +39,7 @@ extern "C" {
 
 // forward declaration
 struct SSqlInfo;
-struct SLocalReducer;
+struct SLocalMerger;
 
 // data source from sql string or from file
 enum {
@@ -292,7 +292,7 @@ typedef struct {
   SColumnIndex*  pColumnIndex;
 
   SArithmeticSupport   *pArithSup;   // support the arithmetic expression calculation on agg functions
-  struct SLocalReducer *pLocalReducer;
+  struct SLocalMerger  *pLocalMerger;
 } SSqlRes;
 
 typedef struct STscObj {
diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index 6280cc520a..a3619dddc2 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -56,7 +56,7 @@ int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
   }
 }
 
-static void tscInitSqlContext(SSqlCmd *pCmd, SLocalReducer *pReducer, tOrderDescriptor *pDesc) {
+static void tscInitSqlContext(SSqlCmd *pCmd, SLocalMerger *pReducer, tOrderDescriptor *pDesc) {
   /*
    * the fields and offset attributes in pCmd and pModel may be different due to
    * merge requirement. So, the final result in pRes structure is formatted in accordance with the pCmd object.
@@ -166,7 +166,7 @@ static SFillColInfo* createFillColInfo(SQueryInfo* pQueryInfo) {
   return pFillCol;
 }
 
-void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
+void tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
                            SColumnModel *finalmodel, SColumnModel *pFFModel, SSqlObj* pSql) {
   SSqlCmd* pCmd = &pSql->cmd;
   SSqlRes* pRes = &pSql->res;
@@ -212,9 +212,9 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
     return;
   }
 
-  size_t size = sizeof(SLocalReducer) + POINTER_BYTES * numOfFlush;
+  size_t size = sizeof(SLocalMerger) + POINTER_BYTES * numOfFlush;
   
-  SLocalReducer *pReducer = (SLocalReducer *) calloc(1, size);
+  SLocalMerger *pReducer = (SLocalMerger *) calloc(1, size);
   if (pReducer == NULL) {
     tscError("%p failed to create local merge structure, out of memory", pSql);
 
@@ -372,7 +372,7 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
 
   pReducer->offset = (int32_t)pQueryInfo->limit.offset;
 
-  pRes->pLocalReducer = pReducer;
+  pRes->pLocalMerger = pReducer;
   pRes->numOfGroups = 0;
 
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
@@ -477,13 +477,13 @@ int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePa
   return 0;
 }
 
-void tscDestroyLocalReducer(SSqlObj *pSql) {
+void tscDestroyLocalMerger(SSqlObj *pSql) {
   if (pSql == NULL) {
     return;
   }
 
   SSqlRes *pRes = &(pSql->res);
-  if (pRes->pLocalReducer == NULL) {
+  if (pRes->pLocalMerger == NULL) {
     return;
   }
 
@@ -491,14 +491,14 @@ void tscDestroyLocalReducer(SSqlObj *pSql) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   // there is no more result, so we release all allocated resource
-  SLocalReducer *pLocalReducer = (SLocalReducer *)atomic_exchange_ptr(&pRes->pLocalReducer, NULL);
-  if (pLocalReducer != NULL) {
-    pLocalReducer->pFillInfo = taosDestroyFillInfo(pLocalReducer->pFillInfo);
+  SLocalMerger *pLocalMerge = (SLocalMerger *)atomic_exchange_ptr(&pRes->pLocalMerger, NULL);
+  if (pLocalMerge != NULL) {
+    pLocalMerge->pFillInfo = taosDestroyFillInfo(pLocalMerge->pFillInfo);
 
-    if (pLocalReducer->pCtx != NULL) {
+    if (pLocalMerge->pCtx != NULL) {
       int32_t numOfExprs = (int32_t) tscSqlExprNumOfExprs(pQueryInfo);
       for (int32_t i = 0; i < numOfExprs; ++i) {
-        SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[i];
+        SQLFunctionCtx *pCtx = &pLocalMerge->pCtx[i];
 
         tVariantDestroy(&pCtx->tag);
         tfree(pCtx->resultInfo);
@@ -508,31 +508,31 @@ void tscDestroyLocalReducer(SSqlObj *pSql) {
         }
       }
 
-      tfree(pLocalReducer->pCtx);
+      tfree(pLocalMerge->pCtx);
     }
 
-    tfree(pLocalReducer->prevRowOfInput);
+    tfree(pLocalMerge->prevRowOfInput);
 
-    tfree(pLocalReducer->pTempBuffer);
-    tfree(pLocalReducer->pResultBuf);
+    tfree(pLocalMerge->pTempBuffer);
+    tfree(pLocalMerge->pResultBuf);
 
-    if (pLocalReducer->pLoserTree) {
-      tfree(pLocalReducer->pLoserTree->param);
-      tfree(pLocalReducer->pLoserTree);
+    if (pLocalMerge->pLoserTree) {
+      tfree(pLocalMerge->pLoserTree->param);
+      tfree(pLocalMerge->pLoserTree);
     }
 
-    tfree(pLocalReducer->pFinalRes);
-    tfree(pLocalReducer->discardData);
+    tfree(pLocalMerge->pFinalRes);
+    tfree(pLocalMerge->discardData);
 
-    tscLocalReducerEnvDestroy(pLocalReducer->pExtMemBuffer, pLocalReducer->pDesc, pLocalReducer->resColModel, pLocalReducer->finalModel,
-                              pLocalReducer->numOfVnode);
-    for (int32_t i = 0; i < pLocalReducer->numOfBuffer; ++i) {
-      tfree(pLocalReducer->pLocalDataSrc[i]);
+    tscLocalReducerEnvDestroy(pLocalMerge->pExtMemBuffer, pLocalMerge->pDesc, pLocalMerge->resColModel, pLocalMerge->finalModel,
+                              pLocalMerge->numOfVnode);
+    for (int32_t i = 0; i < pLocalMerge->numOfBuffer; ++i) {
+      tfree(pLocalMerge->pLocalDataSrc[i]);
     }
 
-    pLocalReducer->numOfBuffer = 0;
-    pLocalReducer->numOfCompleted = 0;
-    free(pLocalReducer);
+    pLocalMerge->numOfBuffer = 0;
+    pLocalMerge->numOfCompleted = 0;
+    free(pLocalMerge);
   } else {
     tscDebug("%p already freed or another free function is invoked", pSql);
   }
@@ -604,7 +604,7 @@ static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SSqlCmd *pCm
   }
 }
 
-bool isSameGroup(SSqlCmd *pCmd, SLocalReducer *pReducer, char *pPrev, tFilePage *tmpBuffer) {
+bool isSameGroup(SSqlCmd *pCmd, SLocalMerger *pReducer, char *pPrev, tFilePage *tmpBuffer) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   // disable merge procedure for column projection query
@@ -795,12 +795,12 @@ void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDe
 
 /**
  *
- * @param pLocalReducer
+ * @param pLocalMerge
  * @param pOneInterDataSrc
  * @param treeList
  * @return the number of remain input source. if ret == 0, all data has been handled
  */
-int32_t loadNewDataFromDiskFor(SLocalReducer *pLocalReducer, SLocalDataSource *pOneInterDataSrc,
+int32_t loadNewDataFromDiskFor(SLocalMerger *pLocalMerge, SLocalDataSource *pOneInterDataSrc,
                                bool *needAdjustLoserTree) {
   pOneInterDataSrc->rowIdx = 0;
   pOneInterDataSrc->pageId += 1;
@@ -817,17 +817,17 @@ int32_t loadNewDataFromDiskFor(SLocalReducer *pLocalReducer, SLocalDataSource *p
 #endif
     *needAdjustLoserTree = true;
   } else {
-    pLocalReducer->numOfCompleted += 1;
+    pLocalMerge->numOfCompleted += 1;
 
     pOneInterDataSrc->rowIdx = -1;
     pOneInterDataSrc->pageId = -1;
     *needAdjustLoserTree = true;
   }
 
-  return pLocalReducer->numOfBuffer;
+  return pLocalMerge->numOfBuffer;
 }
 
-void adjustLoserTreeFromNewData(SLocalReducer *pLocalReducer, SLocalDataSource *pOneInterDataSrc,
+void adjustLoserTreeFromNewData(SLocalMerger *pLocalMerge, SLocalDataSource *pOneInterDataSrc,
                                 SLoserTreeInfo *pTree) {
   /*
    * load a new data page into memory for intermediate dataset source,
@@ -835,7 +835,7 @@ void adjustLoserTreeFromNewData(SLocalReducer *pLocalReducer, SLocalDataSource *
    */
   bool needToAdjust = true;
   if (pOneInterDataSrc->filePage.num <= pOneInterDataSrc->rowIdx) {
-    loadNewDataFromDiskFor(pLocalReducer, pOneInterDataSrc, &needToAdjust);
+    loadNewDataFromDiskFor(pLocalMerge, pOneInterDataSrc, &needToAdjust);
   }
 
   /*
@@ -843,7 +843,7 @@ void adjustLoserTreeFromNewData(SLocalReducer *pLocalReducer, SLocalDataSource *
    * if the loser tree is rebuild completed, we do not need to adjust
    */
   if (needToAdjust) {
-    int32_t leafNodeIdx = pTree->pNode[0].index + pLocalReducer->numOfBuffer;
+    int32_t leafNodeIdx = pTree->pNode[0].index + pLocalMerge->numOfBuffer;
 
 #ifdef _DEBUG_VIEW
     printf("before adjust:\t");
@@ -860,7 +860,7 @@ void adjustLoserTreeFromNewData(SLocalReducer *pLocalReducer, SLocalDataSource *
   }
 }
 
-void savePrevRecordAndSetupFillInfo(SLocalReducer *pLocalReducer, SQueryInfo *pQueryInfo, SFillInfo *pFillInfo) {
+void savePrevRecordAndSetupFillInfo(SLocalMerger *pLocalMerge, SQueryInfo *pQueryInfo, SFillInfo *pFillInfo) {
   // discard following dataset in the same group and reset the interpolation information
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
@@ -873,28 +873,28 @@ void savePrevRecordAndSetupFillInfo(SLocalReducer *pLocalReducer, SQueryInfo *pQ
     taosResetFillInfo(pFillInfo, revisedSTime);
   }
 
-  pLocalReducer->discard = true;
-  pLocalReducer->discardData->num = 0;
+  pLocalMerge->discard = true;
+  pLocalMerge->discardData->num = 0;
 
-  SColumnModel *pModel = pLocalReducer->pDesc->pColumnModel;
-  tColModelAppend(pModel, pLocalReducer->discardData, pLocalReducer->prevRowOfInput, 0, 1, 1);
+  SColumnModel *pModel = pLocalMerge->pDesc->pColumnModel;
+  tColModelAppend(pModel, pLocalMerge->discardData, pLocalMerge->prevRowOfInput, 0, 1, 1);
 }
 
-static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer, SQueryInfo* pQueryInfo) {
+static void genFinalResWithoutFill(SSqlRes* pRes, SLocalMerger *pLocalMerge, SQueryInfo* pQueryInfo) {
   assert(pQueryInfo->interval.interval == 0 || pQueryInfo->fillType == TSDB_FILL_NONE);
 
-  tFilePage * pBeforeFillData = pLocalReducer->pResultBuf;
+  tFilePage * pBeforeFillData = pLocalMerge->pResultBuf;
 
-  pRes->data = pLocalReducer->pFinalRes;
+  pRes->data = pLocalMerge->pFinalRes;
   pRes->numOfRows = (int32_t) pBeforeFillData->num;
 
   if (pQueryInfo->limit.offset > 0) {
     if (pQueryInfo->limit.offset < pRes->numOfRows) {
       int32_t prevSize = (int32_t) pBeforeFillData->num;
-      tColModelErase(pLocalReducer->finalModel, pBeforeFillData, prevSize, 0, (int32_t)pQueryInfo->limit.offset - 1);
+      tColModelErase(pLocalMerge->finalModel, pBeforeFillData, prevSize, 0, (int32_t)pQueryInfo->limit.offset - 1);
 
       /* remove the hole in column model */
-      tColModelCompact(pLocalReducer->finalModel, pBeforeFillData, prevSize);
+      tColModelCompact(pLocalMerge->finalModel, pBeforeFillData, prevSize);
 
       pRes->numOfRows -= (int32_t) pQueryInfo->limit.offset;
       pQueryInfo->limit.offset = 0;
@@ -907,7 +907,7 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer,
   if (pRes->numOfRowsGroup >= pQueryInfo->limit.limit && pQueryInfo->limit.limit > 0) {
     pRes->numOfRows = 0;
     pBeforeFillData->num = 0;
-    pLocalReducer->discard = true;
+    pLocalMerge->discard = true;
     return;
   }
 
@@ -923,29 +923,29 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer,
     pRes->numOfRows -= overflow;
     pBeforeFillData->num -= overflow;
 
-    tColModelCompact(pLocalReducer->finalModel, pBeforeFillData, prevSize);
+    tColModelCompact(pLocalMerge->finalModel, pBeforeFillData, prevSize);
 
     // set remain data to be discarded, and reset the interpolation information
-    savePrevRecordAndSetupFillInfo(pLocalReducer, pQueryInfo, pLocalReducer->pFillInfo);
+    savePrevRecordAndSetupFillInfo(pLocalMerge, pQueryInfo, pLocalMerge->pFillInfo);
   }
 
-  memcpy(pRes->data, pBeforeFillData->data, (size_t)(pRes->numOfRows * pLocalReducer->finalModel->rowSize));
+  memcpy(pRes->data, pBeforeFillData->data, (size_t)(pRes->numOfRows * pLocalMerge->finalModel->rowSize));
 
   pRes->numOfClauseTotal += pRes->numOfRows;
   pBeforeFillData->num = 0;
 }
 
 /*
- * Note: pRes->pLocalReducer may be null, due to the fact that "tscDestroyLocalReducer" is called
+ * Note: pRes->pLocalMerge may be null, due to the fact that "tscDestroyLocalMerger" is called
  * by "interuptHandler" function in shell
  */
-static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneOutput) {
+static void doFillResult(SSqlObj *pSql, SLocalMerger *pLocalMerge, bool doneOutput) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
   
-  tFilePage  *pBeforeFillData = pLocalReducer->pResultBuf;
+  tFilePage  *pBeforeFillData = pLocalMerge->pResultBuf;
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SFillInfo  *pFillInfo = pLocalReducer->pFillInfo;
+  SFillInfo  *pFillInfo = pLocalMerge->pFillInfo;
 
   // todo extract function
   int64_t actualETime = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.ekey: pQueryInfo->window.skey;
@@ -953,11 +953,11 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
   tFilePage **pResPages = malloc(POINTER_BYTES * pQueryInfo->fieldsInfo.numOfOutput);
   for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
     TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
-    pResPages[i] = calloc(1, sizeof(tFilePage) + pField->bytes * pLocalReducer->resColModel->capacity);
+    pResPages[i] = calloc(1, sizeof(tFilePage) + pField->bytes * pLocalMerge->resColModel->capacity);
   }
 
   while (1) {
-    int64_t newRows = taosFillResultDataBlock(pFillInfo, pResPages, pLocalReducer->resColModel->capacity);
+    int64_t newRows = taosFillResultDataBlock(pFillInfo, pResPages, pLocalMerge->resColModel->capacity);
 
     if (pQueryInfo->limit.offset < newRows) {
       newRows -= pQueryInfo->limit.offset;
@@ -970,7 +970,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
         }
       }
 
-      pRes->data = pLocalReducer->pFinalRes;
+      pRes->data = pLocalMerge->pFinalRes;
       pRes->numOfRows = (int32_t) newRows;
 
       pQueryInfo->limit.offset = 0;
@@ -985,7 +985,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
         }
 
         // all output in current group are completed
-        int32_t totalRemainRows = (int32_t)getNumOfResultsAfterFillGap(pFillInfo, actualETime, pLocalReducer->resColModel->capacity);
+        int32_t totalRemainRows = (int32_t)getNumOfResultsAfterFillGap(pFillInfo, actualETime, pLocalMerge->resColModel->capacity);
         if (totalRemainRows <= 0) {
           break;
         }
@@ -1003,7 +1003,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
       assert(pRes->numOfRows >= 0);
 
       /* set remain data to be discarded, and reset the interpolation information */
-      savePrevRecordAndSetupFillInfo(pLocalReducer, pQueryInfo, pFillInfo);
+      savePrevRecordAndSetupFillInfo(pLocalMerge, pQueryInfo, pFillInfo);
     }
 
     int32_t offset = 0;
@@ -1025,8 +1025,8 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
   tfree(pResPages);
 }
 
-static void savePreviousRow(SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
-  SColumnModel *pColumnModel = pLocalReducer->pDesc->pColumnModel;
+static void savePreviousRow(SLocalMerger *pLocalMerge, tFilePage *tmpBuffer) {
+  SColumnModel *pColumnModel = pLocalMerge->pDesc->pColumnModel;
   assert(pColumnModel->capacity == 1 && tmpBuffer->num == 1);
 
   // copy to previous temp buffer
@@ -1034,20 +1034,20 @@ static void savePreviousRow(SLocalReducer *pLocalReducer, tFilePage *tmpBuffer)
     SSchema *pSchema = getColumnModelSchema(pColumnModel, i);
     int16_t  offset = getColumnModelOffset(pColumnModel, i);
 
-    memcpy(pLocalReducer->prevRowOfInput + offset, tmpBuffer->data + offset, pSchema->bytes);
+    memcpy(pLocalMerge->prevRowOfInput + offset, tmpBuffer->data + offset, pSchema->bytes);
   }
 
   tmpBuffer->num = 0;
-  pLocalReducer->hasPrevRow = true;
+  pLocalMerge->hasPrevRow = true;
 }
 
-static void doExecuteSecondaryMerge(SSqlCmd *pCmd, SLocalReducer *pLocalReducer, bool needInit) {
+static void doExecuteSecondaryMerge(SSqlCmd *pCmd, SLocalMerger *pLocalMerge, bool needInit) {
   // the tag columns need to be set before all functions execution
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   size_t size = tscSqlExprNumOfExprs(pQueryInfo);
   for (int32_t j = 0; j < size; ++j) {
-    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[j];
+    SQLFunctionCtx *pCtx = &pLocalMerge->pCtx[j];
 
     // tags/tags_dummy function, the tag field of SQLFunctionCtx is from the input buffer
     int32_t functionId = pCtx->functionId;
@@ -1074,20 +1074,20 @@ static void doExecuteSecondaryMerge(SSqlCmd *pCmd, SLocalReducer *pLocalReducer,
   }
 
   for (int32_t j = 0; j < size; ++j) {
-    int32_t functionId = pLocalReducer->pCtx[j].functionId;
+    int32_t functionId = pLocalMerge->pCtx[j].functionId;
     if (functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TS_DUMMY) {
       continue;
     }
 
-    aAggs[functionId].mergeFunc(&pLocalReducer->pCtx[j]);
+    aAggs[functionId].mergeFunc(&pLocalMerge->pCtx[j]);
   }
 }
 
-static void handleUnprocessedRow(SSqlCmd *pCmd, SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
-  if (pLocalReducer->hasUnprocessedRow) {
-    pLocalReducer->hasUnprocessedRow = false;
-    doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
-    savePreviousRow(pLocalReducer, tmpBuffer);
+static void handleUnprocessedRow(SSqlCmd *pCmd, SLocalMerger *pLocalMerge, tFilePage *tmpBuffer) {
+  if (pLocalMerge->hasUnprocessedRow) {
+    pLocalMerge->hasUnprocessedRow = false;
+    doExecuteSecondaryMerge(pCmd, pLocalMerge, true);
+    savePreviousRow(pLocalMerge, tmpBuffer);
   }
 }
 
@@ -1120,7 +1120,7 @@ static int64_t getNumOfResultLocal(SQueryInfo *pQueryInfo, SQLFunctionCtx *pCtx)
  * filled with the same result, which is the tags, specified in group by clause
  *
  */
-static void fillMultiRowsOfTagsVal(SQueryInfo *pQueryInfo, int32_t numOfRes, SLocalReducer *pLocalReducer) {
+static void fillMultiRowsOfTagsVal(SQueryInfo *pQueryInfo, int32_t numOfRes, SLocalMerger *pLocalMerge) {
   int32_t maxBufSize = 0;  // find the max tags column length to prepare the buffer
   size_t size = tscSqlExprNumOfExprs(pQueryInfo);
   
@@ -1135,7 +1135,7 @@ static void fillMultiRowsOfTagsVal(SQueryInfo *pQueryInfo, int32_t numOfRes, SLo
 
   char *buf = malloc((size_t)maxBufSize);
   for (int32_t k = 0; k < size; ++k) {
-    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[k];
+    SQLFunctionCtx *pCtx = &pLocalMerge->pCtx[k];
     if (pCtx->functionId != TSDB_FUNC_TAG) {
       continue;
     }
@@ -1153,20 +1153,20 @@ static void fillMultiRowsOfTagsVal(SQueryInfo *pQueryInfo, int32_t numOfRes, SLo
   free(buf);
 }
 
-int32_t finalizeRes(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer) {
+int32_t finalizeRes(SQueryInfo *pQueryInfo, SLocalMerger *pLocalMerge) {
   size_t size = tscSqlExprNumOfExprs(pQueryInfo);
   
   for (int32_t k = 0; k < size; ++k) {
-    SQLFunctionCtx* pCtx = &pLocalReducer->pCtx[k];
+    SQLFunctionCtx* pCtx = &pLocalMerge->pCtx[k];
     aAggs[pCtx->functionId].xFinalize(pCtx);
   }
 
-  pLocalReducer->hasPrevRow = false;
+  pLocalMerge->hasPrevRow = false;
 
-  int32_t numOfRes = (int32_t)getNumOfResultLocal(pQueryInfo, pLocalReducer->pCtx);
-  pLocalReducer->pResultBuf->num += numOfRes;
+  int32_t numOfRes = (int32_t)getNumOfResultLocal(pQueryInfo, pLocalMerge->pCtx);
+  pLocalMerge->pResultBuf->num += numOfRes;
 
-  fillMultiRowsOfTagsVal(pQueryInfo, numOfRes, pLocalReducer);
+  fillMultiRowsOfTagsVal(pQueryInfo, numOfRes, pLocalMerge);
   return numOfRes;
 }
 
@@ -1177,22 +1177,22 @@ int32_t finalizeRes(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer) {
  * results generated by simple aggregation function, we merge them all into one points
  * *Exception*: column projection query, required no merge procedure
  */
-bool needToMerge(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
+bool needToMerge(SQueryInfo *pQueryInfo, SLocalMerger *pLocalMerge, tFilePage *tmpBuffer) {
   int32_t ret = 0;  // merge all result by default
 
-  int16_t functionId = pLocalReducer->pCtx[0].functionId;
+  int16_t functionId = pLocalMerge->pCtx[0].functionId;
 
   // todo opt performance
   if ((/*functionId == TSDB_FUNC_PRJ || */functionId == TSDB_FUNC_ARITHM) || (tscIsProjectionQueryOnSTable(pQueryInfo, 0))) {  // column projection query
     ret = 1;                                                            // disable merge procedure
   } else {
-    tOrderDescriptor *pDesc = pLocalReducer->pDesc;
+    tOrderDescriptor *pDesc = pLocalMerge->pDesc;
     if (pDesc->orderInfo.numOfCols > 0) {
       if (pDesc->tsOrder == TSDB_ORDER_ASC) {  // asc
         // todo refactor comparator
-        ret = compare_a(pLocalReducer->pDesc, 1, 0, pLocalReducer->prevRowOfInput, 1, 0, tmpBuffer->data);
+        ret = compare_a(pLocalMerge->pDesc, 1, 0, pLocalMerge->prevRowOfInput, 1, 0, tmpBuffer->data);
       } else {  // desc
-        ret = compare_d(pLocalReducer->pDesc, 1, 0, pLocalReducer->prevRowOfInput, 1, 0, tmpBuffer->data);
+        ret = compare_d(pLocalMerge->pDesc, 1, 0, pLocalMerge->prevRowOfInput, 1, 0, tmpBuffer->data);
       }
     }
   }
@@ -1230,17 +1230,17 @@ static bool saveGroupResultInfo(SSqlObj *pSql) {
 /**
  *
  * @param pSql
- * @param pLocalReducer
+ * @param pLocalMerge
  * @param noMoreCurrentGroupRes
  * @return if current group is skipped, return false, and do NOT record it into pRes->numOfGroups
  */
-bool genFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCurrentGroupRes) {
+bool genFinalResults(SSqlObj *pSql, SLocalMerger *pLocalMerge, bool noMoreCurrentGroupRes) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
 
   SQueryInfo *  pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  tFilePage *   pResBuf = pLocalReducer->pResultBuf;
-  SColumnModel *pModel = pLocalReducer->resColModel;
+  tFilePage *   pResBuf = pLocalMerge->pResultBuf;
+  SColumnModel *pModel = pLocalMerge->resColModel;
 
   pRes->code = TSDB_CODE_SUCCESS;
 
@@ -1251,11 +1251,11 @@ bool genFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCur
   if (pQueryInfo->slimit.offset > 0) {
     pRes->numOfRows = 0;
     pQueryInfo->slimit.offset -= 1;
-    pLocalReducer->discard = !noMoreCurrentGroupRes;
+    pLocalMerge->discard = !noMoreCurrentGroupRes;
 
-    if (pLocalReducer->discard) {
-      SColumnModel *pInternModel = pLocalReducer->pDesc->pColumnModel;
-      tColModelAppend(pInternModel, pLocalReducer->discardData, pLocalReducer->pTempBuffer->data, 0, 1, 1);
+    if (pLocalMerge->discard) {
+      SColumnModel *pInternModel = pLocalMerge->pDesc->pColumnModel;
+      tColModelAppend(pInternModel, pLocalMerge->discardData, pLocalMerge->pTempBuffer->data, 0, 1, 1);
     }
 
     return false;
@@ -1264,19 +1264,14 @@ bool genFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCur
   tColModelCompact(pModel, pResBuf, pModel->capacity);
 
   if (tscIsSecondStageQuery(pQueryInfo)) {
-    doArithmeticCalculate(pQueryInfo, pResBuf, pModel->rowSize, pLocalReducer->finalModel->rowSize);
+    doArithmeticCalculate(pQueryInfo, pResBuf, pModel->rowSize, pLocalMerge->finalModel->rowSize);
   }
 
-#ifdef _DEBUG_VIEW
-  printf("final result before interpo:\n");
-//  tColModelDisplay(pLocalReducer->resColModel, pLocalReducer->pBufForInterpo, pResBuf->num, pResBuf->num);
-#endif
-
   // no interval query, no fill operation
   if (pQueryInfo->interval.interval == 0 || pQueryInfo->fillType == TSDB_FILL_NONE) {
-    genFinalResWithoutFill(pRes, pLocalReducer, pQueryInfo);
+    genFinalResWithoutFill(pRes, pLocalMerge, pQueryInfo);
   } else {
-    SFillInfo* pFillInfo = pLocalReducer->pFillInfo;
+    SFillInfo* pFillInfo = pLocalMerge->pFillInfo;
     if (pFillInfo != NULL) {
       TSKEY ekey = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.ekey: pQueryInfo->window.skey;
 
@@ -1284,34 +1279,34 @@ bool genFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCur
       taosFillCopyInputDataFromOneFilePage(pFillInfo, pResBuf);
     }
     
-    doFillResult(pSql, pLocalReducer, noMoreCurrentGroupRes);
+    doFillResult(pSql, pLocalMerge, noMoreCurrentGroupRes);
   }
 
   return true;
 }
 
-void resetOutputBuf(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer) {// reset output buffer to the beginning
+void resetOutputBuf(SQueryInfo *pQueryInfo, SLocalMerger *pLocalMerge) {// reset output buffer to the beginning
   size_t t = tscSqlExprNumOfExprs(pQueryInfo);
   for (int32_t i = 0; i < t; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-    pLocalReducer->pCtx[i].aOutputBuf = pLocalReducer->pResultBuf->data + pExpr->offset * pLocalReducer->resColModel->capacity;
+    pLocalMerge->pCtx[i].aOutputBuf = pLocalMerge->pResultBuf->data + pExpr->offset * pLocalMerge->resColModel->capacity;
 
     if (pExpr->functionId == TSDB_FUNC_TOP || pExpr->functionId == TSDB_FUNC_BOTTOM || pExpr->functionId == TSDB_FUNC_DIFF) {
-      pLocalReducer->pCtx[i].ptsOutputBuf = pLocalReducer->pCtx[0].aOutputBuf;
+      pLocalMerge->pCtx[i].ptsOutputBuf = pLocalMerge->pCtx[0].aOutputBuf;
     }
   }
 
-  memset(pLocalReducer->pResultBuf, 0, pLocalReducer->nResultBufSize + sizeof(tFilePage));
+  memset(pLocalMerge->pResultBuf, 0, pLocalMerge->nResultBufSize + sizeof(tFilePage));
 }
 
-static void resetEnvForNewResultset(SSqlRes *pRes, SSqlCmd *pCmd, SLocalReducer *pLocalReducer) {
+static void resetEnvForNewResultset(SSqlRes *pRes, SSqlCmd *pCmd, SLocalMerger *pLocalMerge) {
   // In handling data in other groups, we need to reset the interpolation information for a new group data
   pRes->numOfRows = 0;
   pRes->numOfRowsGroup = 0;
 
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
-  pQueryInfo->limit.offset = pLocalReducer->offset;
+  pQueryInfo->limit.offset = pLocalMerge->offset;
 
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
   STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
@@ -1320,12 +1315,12 @@ static void resetEnvForNewResultset(SSqlRes *pRes, SSqlCmd *pCmd, SLocalReducer
   if (pQueryInfo->fillType != TSDB_FILL_NONE) {
     TSKEY skey = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.skey:pQueryInfo->window.ekey;//MIN(pQueryInfo->window.skey, pQueryInfo->window.ekey);
     int64_t newTime = taosTimeTruncate(skey, &pQueryInfo->interval, tinfo.precision);
-    taosResetFillInfo(pLocalReducer->pFillInfo, newTime);
+    taosResetFillInfo(pLocalMerge->pFillInfo, newTime);
   }
 }
 
-static bool isAllSourcesCompleted(SLocalReducer *pLocalReducer) {
-  return (pLocalReducer->numOfBuffer == pLocalReducer->numOfCompleted);
+static bool isAllSourcesCompleted(SLocalMerger *pLocalMerge) {
+  return (pLocalMerge->numOfBuffer == pLocalMerge->numOfCompleted);
 }
 
 static bool doBuildFilledResultForGroup(SSqlObj *pSql) {
@@ -1333,19 +1328,19 @@ static bool doBuildFilledResultForGroup(SSqlObj *pSql) {
   SSqlRes *pRes = &pSql->res;
 
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
-  SFillInfo *pFillInfo = pLocalReducer->pFillInfo;
+  SLocalMerger *pLocalMerge = pRes->pLocalMerger;
+  SFillInfo *pFillInfo = pLocalMerge->pFillInfo;
 
   if (pFillInfo != NULL && taosFillHasMoreResults(pFillInfo)) {
     assert(pQueryInfo->fillType != TSDB_FILL_NONE);
 
-    tFilePage *pFinalDataBuf = pLocalReducer->pResultBuf;
+    tFilePage *pFinalDataBuf = pLocalMerge->pResultBuf;
     int64_t etime = *(int64_t *)(pFinalDataBuf->data + TSDB_KEYSIZE * (pFillInfo->numOfRows - 1));
 
     // the first column must be the timestamp column
-    int32_t rows = (int32_t) getNumOfResultsAfterFillGap(pFillInfo, etime, pLocalReducer->resColModel->capacity);
+    int32_t rows = (int32_t) getNumOfResultsAfterFillGap(pFillInfo, etime, pLocalMerge->resColModel->capacity);
     if (rows > 0) {  // do fill gap
-      doFillResult(pSql, pLocalReducer, false);
+      doFillResult(pSql, pLocalMerge, false);
     }
 
     return true;
@@ -1358,23 +1353,23 @@ static bool doHandleLastRemainData(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
 
-  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
-  SFillInfo     *pFillInfo = pLocalReducer->pFillInfo;
+  SLocalMerger *pLocalMerge = pRes->pLocalMerger;
+  SFillInfo     *pFillInfo = pLocalMerge->pFillInfo;
 
-  bool prevGroupCompleted = (!pLocalReducer->discard) && pLocalReducer->hasUnprocessedRow;
+  bool prevGroupCompleted = (!pLocalMerge->discard) && pLocalMerge->hasUnprocessedRow;
 
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
-  if ((isAllSourcesCompleted(pLocalReducer) && !pLocalReducer->hasPrevRow) || pLocalReducer->pLocalDataSrc[0] == NULL ||
+  if ((isAllSourcesCompleted(pLocalMerge) && !pLocalMerge->hasPrevRow) || pLocalMerge->pLocalDataSrc[0] == NULL ||
       prevGroupCompleted) {
     // if fillType == TSDB_FILL_NONE, return directly
     if (pQueryInfo->fillType != TSDB_FILL_NONE &&
       ((pRes->numOfRowsGroup < pQueryInfo->limit.limit && pQueryInfo->limit.limit > 0) || (pQueryInfo->limit.limit < 0))) {
       int64_t etime = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.ekey : pQueryInfo->window.skey;
 
-      int32_t rows = (int32_t)getNumOfResultsAfterFillGap(pFillInfo, etime, pLocalReducer->resColModel->capacity);
+      int32_t rows = (int32_t)getNumOfResultsAfterFillGap(pFillInfo, etime, pLocalMerge->resColModel->capacity);
       if (rows > 0) {
-        doFillResult(pSql, pLocalReducer, true);
+        doFillResult(pSql, pLocalMerge, true);
       }
     }
 
@@ -1384,7 +1379,7 @@ static bool doHandleLastRemainData(SSqlObj *pSql) {
      *
      * No results will be generated and query completed.
      */
-    if (pRes->numOfRows > 0 || (isAllSourcesCompleted(pLocalReducer) && (!pLocalReducer->hasUnprocessedRow))) {
+    if (pRes->numOfRows > 0 || (isAllSourcesCompleted(pLocalMerge) && (!pLocalMerge->hasUnprocessedRow))) {
       return true;
     }
 
@@ -1393,7 +1388,7 @@ static bool doHandleLastRemainData(SSqlObj *pSql) {
       return true;
     }
 
-    resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
+    resetEnvForNewResultset(pRes, pCmd, pLocalMerge);
   }
 
   return false;
@@ -1403,12 +1398,12 @@ static void doProcessResultInNextWindow(SSqlObj *pSql, int32_t numOfRes) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
 
-  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
+  SLocalMerger *pLocalMerge = pRes->pLocalMerger;
   SQueryInfo *   pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
   size_t size = tscSqlExprNumOfExprs(pQueryInfo);
 
   for (int32_t k = 0; k < size; ++k) {
-    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[k];
+    SQLFunctionCtx *pCtx = &pLocalMerge->pCtx[k];
     pCtx->aOutputBuf += pCtx->outputBytes * numOfRes;
 
     // set the correct output timestamp column position
@@ -1417,7 +1412,7 @@ static void doProcessResultInNextWindow(SSqlObj *pSql, int32_t numOfRes) {
     }
   }
 
-  doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
+  doExecuteSecondaryMerge(pCmd, pLocalMerge, true);
 }
 
 int32_t tscDoLocalMerge(SSqlObj *pSql) {
@@ -1426,14 +1421,14 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
 
   tscResetForNextRetrieve(pRes);
 
-  if (pSql->signature != pSql || pRes == NULL || pRes->pLocalReducer == NULL) {  // all data has been processed
+  if (pSql->signature != pSql || pRes == NULL || pRes->pLocalMerger == NULL) {  // all data has been processed
     tscError("%p local merge abort due to error occurs, code:%s", pSql, tstrerror(pRes->code));
     return pRes->code;
   }
 
-  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
+  SLocalMerger  *pLocalMerge = pRes->pLocalMerger;
   SQueryInfo    *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  tFilePage     *tmpBuffer = pLocalReducer->pTempBuffer;
+  tFilePage     *tmpBuffer = pLocalMerge->pTempBuffer;
 
   if (doHandleLastRemainData(pSql)) {
     return TSDB_CODE_SUCCESS;
@@ -1443,24 +1438,24 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SLoserTreeInfo *pTree = pLocalReducer->pLoserTree;
+  SLoserTreeInfo *pTree = pLocalMerge->pLoserTree;
 
   // clear buffer
-  handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
-  SColumnModel *pModel = pLocalReducer->pDesc->pColumnModel;
+  handleUnprocessedRow(pCmd, pLocalMerge, tmpBuffer);
+  SColumnModel *pModel = pLocalMerge->pDesc->pColumnModel;
 
   while (1) {
-    if (isAllSourcesCompleted(pLocalReducer)) {
+    if (isAllSourcesCompleted(pLocalMerge)) {
       break;
     }
 
 #ifdef _DEBUG_VIEW
     printf("chosen data in pTree[0] = %d\n", pTree->pNode[0].index);
 #endif
-    assert((pTree->pNode[0].index < pLocalReducer->numOfBuffer) && (pTree->pNode[0].index >= 0) && tmpBuffer->num == 0);
+    assert((pTree->pNode[0].index < pLocalMerge->numOfBuffer) && (pTree->pNode[0].index >= 0) && tmpBuffer->num == 0);
 
     // chosen from loser tree
-    SLocalDataSource *pOneDataSrc = pLocalReducer->pLocalDataSrc[pTree->pNode[0].index];
+    SLocalDataSource *pOneDataSrc = pLocalMerge->pLocalDataSrc[pTree->pNode[0].index];
 
     tColModelAppend(pModel, tmpBuffer, pOneDataSrc->filePage.data, pOneDataSrc->rowIdx, 1,
                     pOneDataSrc->pMemBuffer->pColumnModel->capacity);
@@ -1473,76 +1468,76 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
     tColModelDisplayEx(pModel, tmpBuffer->data, tmpBuffer->num, pModel->capacity, colInfo);
 #endif
 
-    if (pLocalReducer->discard) {
-      assert(pLocalReducer->hasUnprocessedRow == false);
+    if (pLocalMerge->discard) {
+      assert(pLocalMerge->hasUnprocessedRow == false);
 
       /* current record belongs to the same group of previous record, need to discard it */
-      if (isSameGroup(pCmd, pLocalReducer, pLocalReducer->discardData->data, tmpBuffer)) {
+      if (isSameGroup(pCmd, pLocalMerge, pLocalMerge->discardData->data, tmpBuffer)) {
         tmpBuffer->num = 0;
         pOneDataSrc->rowIdx += 1;
 
-        adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
+        adjustLoserTreeFromNewData(pLocalMerge, pOneDataSrc, pTree);
 
         // all inputs are exhausted, abort current process
-        if (isAllSourcesCompleted(pLocalReducer)) {
+        if (isAllSourcesCompleted(pLocalMerge)) {
           break;
         }
 
         // data belongs to the same group needs to be discarded
         continue;
       } else {
-        pLocalReducer->discard = false;
-        pLocalReducer->discardData->num = 0;
+        pLocalMerge->discard = false;
+        pLocalMerge->discardData->num = 0;
 
         if (saveGroupResultInfo(pSql)) {
           return TSDB_CODE_SUCCESS;
         }
 
-        resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
+        resetEnvForNewResultset(pRes, pCmd, pLocalMerge);
       }
     }
 
-    if (pLocalReducer->hasPrevRow) {
-      if (needToMerge(pQueryInfo, pLocalReducer, tmpBuffer)) {
+    if (pLocalMerge->hasPrevRow) {
+      if (needToMerge(pQueryInfo, pLocalMerge, tmpBuffer)) {
         // belong to the group of the previous row, continue process it
-        doExecuteSecondaryMerge(pCmd, pLocalReducer, false);
+        doExecuteSecondaryMerge(pCmd, pLocalMerge, false);
 
         // copy to buffer
-        savePreviousRow(pLocalReducer, tmpBuffer);
+        savePreviousRow(pLocalMerge, tmpBuffer);
       } else {
         /*
          * current row does not belong to the group of previous row.
          * so the processing of previous group is completed.
          */
-        int32_t numOfRes = finalizeRes(pQueryInfo, pLocalReducer);
-        bool   sameGroup = isSameGroup(pCmd, pLocalReducer, pLocalReducer->prevRowOfInput, tmpBuffer);
+        int32_t numOfRes = finalizeRes(pQueryInfo, pLocalMerge);
+        bool   sameGroup = isSameGroup(pCmd, pLocalMerge, pLocalMerge->prevRowOfInput, tmpBuffer);
 
-        tFilePage *pResBuf = pLocalReducer->pResultBuf;
+        tFilePage *pResBuf = pLocalMerge->pResultBuf;
 
         /*
          * if the previous group does NOT generate any result (pResBuf->num == 0),
          * continue to process results instead of return results.
          */
-        if ((!sameGroup && pResBuf->num > 0) || (pResBuf->num == pLocalReducer->resColModel->capacity)) {
+        if ((!sameGroup && pResBuf->num > 0) || (pResBuf->num == pLocalMerge->resColModel->capacity)) {
           // does not belong to the same group
-          bool notSkipped = genFinalResults(pSql, pLocalReducer, !sameGroup);
+          bool notSkipped = genFinalResults(pSql, pLocalMerge, !sameGroup);
 
           // this row needs to discard, since it belongs to the group of previous
-          if (pLocalReducer->discard && sameGroup) {
-            pLocalReducer->hasUnprocessedRow = false;
+          if (pLocalMerge->discard && sameGroup) {
+            pLocalMerge->hasUnprocessedRow = false;
             tmpBuffer->num = 0;
           } else { // current row does not belongs to the previous group, so it is not be handled yet.
-            pLocalReducer->hasUnprocessedRow = true;
+            pLocalMerge->hasUnprocessedRow = true;
           }
 
-          resetOutputBuf(pQueryInfo, pLocalReducer);
+          resetOutputBuf(pQueryInfo, pLocalMerge);
           pOneDataSrc->rowIdx += 1;
 
           // here we do not check the return value
-          adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
+          adjustLoserTreeFromNewData(pLocalMerge, pOneDataSrc, pTree);
 
           if (pRes->numOfRows == 0) {
-            handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
+            handleUnprocessedRow(pCmd, pLocalMerge, tmpBuffer);
 
             if (!sameGroup) {
               /*
@@ -1553,7 +1548,7 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
                 return TSDB_CODE_SUCCESS;
               }
 
-              resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
+              resetEnvForNewResultset(pRes, pCmd, pLocalMerge);
             }
           } else {
             /*
@@ -1561,7 +1556,7 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
              * We start the process in a new round.
              */
             if (sameGroup) {
-              handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
+              handleUnprocessedRow(pCmd, pLocalMerge, tmpBuffer);
             }
           }
 
@@ -1573,24 +1568,24 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
           }
         } else {  // result buffer is not full
           doProcessResultInNextWindow(pSql, numOfRes);
-          savePreviousRow(pLocalReducer, tmpBuffer);
+          savePreviousRow(pLocalMerge, tmpBuffer);
         }
       }
     } else {
-      doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
-      savePreviousRow(pLocalReducer, tmpBuffer);  // copy the processed row to buffer
+      doExecuteSecondaryMerge(pCmd, pLocalMerge, true);
+      savePreviousRow(pLocalMerge, tmpBuffer);  // copy the processed row to buffer
     }
 
     pOneDataSrc->rowIdx += 1;
-    adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
+    adjustLoserTreeFromNewData(pLocalMerge, pOneDataSrc, pTree);
   }
 
-  if (pLocalReducer->hasPrevRow) {
-    finalizeRes(pQueryInfo, pLocalReducer);
+  if (pLocalMerge->hasPrevRow) {
+    finalizeRes(pQueryInfo, pLocalMerge);
   }
 
-  if (pLocalReducer->pResultBuf->num) {
-    genFinalResults(pSql, pLocalReducer, true);
+  if (pLocalMerge->pResultBuf->num) {
+    genFinalResults(pSql, pLocalMerge, true);
   }
 
   return TSDB_CODE_SUCCESS;
@@ -1598,8 +1593,8 @@ int32_t tscDoLocalMerge(SSqlObj *pSql) {
 
 void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen) {
   SSqlRes *pRes = &pObj->res;
-  if (pRes->pLocalReducer != NULL) {
-    tscDestroyLocalReducer(pObj);
+  if (pRes->pLocalMerger != NULL) {
+    tscDestroyLocalMerger(pObj);
   }
 
   pRes->qhandle = 1;  // hack to pass the safety check in fetch_row function
@@ -1607,17 +1602,17 @@ void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen)
   pRes->row = 0;
 
   pRes->rspType = 0;  // used as a flag to denote if taos_retrieved() has been called yet
-  pRes->pLocalReducer = (SLocalReducer *)calloc(1, sizeof(SLocalReducer));
+  pRes->pLocalMerger = (SLocalMerger *)calloc(1, sizeof(SLocalMerger));
 
   /*
    * we need one additional byte space
    * the sprintf function needs one additional space to put '\0' at the end of string
    */
   size_t allocSize = numOfRes * rowLen + sizeof(tFilePage) + 1;
-  pRes->pLocalReducer->pResultBuf = (tFilePage *)calloc(1, allocSize);
+  pRes->pLocalMerger->pResultBuf = (tFilePage *)calloc(1, allocSize);
 
-  pRes->pLocalReducer->pResultBuf->num = numOfRes;
-  pRes->data = pRes->pLocalReducer->pResultBuf->data;
+  pRes->pLocalMerger->pResultBuf->num = numOfRes;
+  pRes->data = pRes->pLocalMerger->pResultBuf->data;
 }
 
 int32_t doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_t rowSize, int32_t finalRowSize) {
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 537e81413f..440bb9dd47 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2444,7 +2444,7 @@ int tscGetSTableVgroupInfo(SSqlObj *pSql, int32_t clauseIndex) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
     STableMetaInfo *pMInfo = tscGetMetaInfo(pQueryInfo, i);
-    STableMeta* pTableMeta = tscTableMetaClone(pMInfo->pTableMeta);
+    STableMeta* pTableMeta = tscTableMetaDup(pMInfo->pTableMeta);
     tscAddTableMetaInfo(pNewQueryInfo, pMInfo->name, pTableMeta, NULL, pMInfo->tagColList, pMInfo->pVgroupTables);
   }
 
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 2622246111..b4723d4b03 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -885,10 +885,10 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
     tscBuildVgroupTableInfo(pParentSql, pTableMetaInfo2, s2);
 
     SSqlObj* psub1 = pParentSql->pSubs[0];
-    ((SJoinSupporter*)psub1->param)->pVgroupTables =  tscVgroupTableInfoClone(pTableMetaInfo1->pVgroupTables);
+    ((SJoinSupporter*)psub1->param)->pVgroupTables =  tscVgroupTableInfoDup(pTableMetaInfo1->pVgroupTables);
 
     SSqlObj* psub2 = pParentSql->pSubs[1];
-    ((SJoinSupporter*)psub2->param)->pVgroupTables =  tscVgroupTableInfoClone(pTableMetaInfo2->pVgroupTables);
+    ((SJoinSupporter*)psub2->param)->pVgroupTables =  tscVgroupTableInfoDup(pTableMetaInfo2->pVgroupTables);
 
     pParentSql->subState.numOfSub = 2;
     pParentSql->subState.numOfRemain = pParentSql->subState.numOfSub;
@@ -1998,7 +1998,7 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
   SQueryInfo *pPQueryInfo = tscGetQueryInfoDetail(&pParentSql->cmd, 0);
   tscClearInterpInfo(pPQueryInfo);
   
-  tscCreateLocalReducer(trsupport->pExtMemBuffer, pState->numOfSub, pDesc, trsupport->pFinalColModel, trsupport->pFFColModel, pParentSql);
+  tscCreateLocalMerger(trsupport->pExtMemBuffer, pState->numOfSub, pDesc, trsupport->pFinalColModel, trsupport->pFFColModel, pParentSql);
   tscDebug("%p build loser tree completed", pParentSql);
   
   pParentSql->res.precision = pSql->res.precision;
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index a153a9147d..70bc2038f5 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -420,7 +420,7 @@ void tscResetSqlCmdObj(SSqlCmd* pCmd) {
 }
 
 void tscFreeSqlResult(SSqlObj* pSql) {
-  tscDestroyLocalReducer(pSql);
+  tscDestroyLocalMerger(pSql);
   
   SSqlRes* pRes = &pSql->res;
   tscDestroyResPointerInfo(pRes);
@@ -612,7 +612,7 @@ int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock) {
       tfree(pTableMetaInfo->pTableMeta);
     }
 
-    pTableMetaInfo->pTableMeta = tscTableMetaClone(pDataBlock->pTableMeta);
+    pTableMetaInfo->pTableMeta = tscTableMetaDup(pDataBlock->pTableMeta);
   } else {
     assert(strncmp(pTableMetaInfo->name, pDataBlock->tableName, tListLen(pDataBlock->tableName)) == 0);
   }
@@ -680,7 +680,7 @@ int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOff
   tstrncpy(dataBuf->tableName, name, sizeof(dataBuf->tableName));
 
   //Here we keep the tableMeta to avoid it to be remove by other threads.
-  dataBuf->pTableMeta = tscTableMetaClone(pTableMeta);
+  dataBuf->pTableMeta = tscTableMetaDup(pTableMeta);
   assert(initialSize > 0 && pTableMeta != NULL && dataBuf->pTableMeta != NULL);
 
   *dataBlocks = dataBuf;
@@ -1810,10 +1810,10 @@ void tscVgroupTableCopy(SVgroupTableInfo* info, SVgroupTableInfo* pInfo) {
     info->vgInfo.epAddr[j].fqdn = strdup(pInfo->vgInfo.epAddr[j].fqdn);
   }
 
-  info->itemList = taosArrayClone(pInfo->itemList);
+  info->itemList = taosArrayDup(pInfo->itemList);
 }
 
-SArray* tscVgroupTableInfoClone(SArray* pVgroupTables) {
+SArray* tscVgroupTableInfoDup(SArray* pVgroupTables) {
   if (pVgroupTables == NULL) {
     return NULL;
   }
@@ -1881,7 +1881,7 @@ STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, ST
     tscColumnListCopy(pTableMetaInfo->tagColList, pTagCols, -1);
   }
 
-  pTableMetaInfo->pVgroupTables = tscVgroupTableInfoClone(pVgroupTables);
+  pTableMetaInfo->pVgroupTables = tscVgroupTableInfoDup(pVgroupTables);
   
   pQueryInfo->numOfTables += 1;
   return pTableMetaInfo;
@@ -2064,7 +2064,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   
   pNewQueryInfo->groupbyExpr = pQueryInfo->groupbyExpr;
   if (pQueryInfo->groupbyExpr.columnInfo != NULL) {
-    pNewQueryInfo->groupbyExpr.columnInfo = taosArrayClone(pQueryInfo->groupbyExpr.columnInfo);
+    pNewQueryInfo->groupbyExpr.columnInfo = taosArrayDup(pQueryInfo->groupbyExpr.columnInfo);
     if (pNewQueryInfo->groupbyExpr.columnInfo == NULL) {
       terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
       goto _error;
@@ -2119,7 +2119,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   STableMetaInfo* pFinalInfo = NULL;
 
   if (pPrevSql == NULL) {
-    STableMeta* pTableMeta = tscTableMetaClone(pTableMetaInfo->pTableMeta);
+    STableMeta* pTableMeta = tscTableMetaDup(pTableMetaInfo->pTableMeta);
     assert(pTableMeta != NULL);
 
     pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pTableMeta, pTableMetaInfo->vgroupList,
@@ -2127,7 +2127,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   } else {  // transfer the ownership of pTableMeta to the newly create sql object.
     STableMetaInfo* pPrevInfo = tscGetTableMetaInfoFromCmd(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex, 0);
 
-    STableMeta*  pPrevTableMeta = tscTableMetaClone(pPrevInfo->pTableMeta);
+    STableMeta*  pPrevTableMeta = tscTableMetaDup(pPrevInfo->pTableMeta);
     SVgroupsInfo* pVgroupsInfo = pPrevInfo->vgroupList;
     pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pPrevTableMeta, pVgroupsInfo, pTableMetaInfo->tagColList,
         pTableMetaInfo->pVgroupTables);
@@ -2297,7 +2297,6 @@ int32_t tscSQLSyntaxErrMsg(char* msg, const char* additionalInfo,  const char* s
   }
 
   return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
-  
 }
 
 int32_t tscInvalidSQLErrMsg(char* msg, const char* additionalInfo, const char* sql) {
@@ -2695,7 +2694,7 @@ uint32_t tscGetTableMetaMaxSize() {
   return sizeof(STableMeta) + TSDB_MAX_COLUMNS * sizeof(SSchema);
 }
 
-STableMeta* tscTableMetaClone(STableMeta* pTableMeta) {
+STableMeta* tscTableMetaDup(STableMeta* pTableMeta) {
   assert(pTableMeta != NULL);
   uint32_t size = tscGetTableMetaSize(pTableMeta);
   STableMeta* p = calloc(1, size);
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 0cf8112eb4..c0f2035286 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5043,7 +5043,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
       STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
 
       SArray *g1 = taosArrayInit(1, POINTER_BYTES);
-      SArray *tx = taosArrayClone(group);
+      SArray *tx = taosArrayDup(group);
       taosArrayPush(g1, &tx);
 
       STableGroupInfo gp = {.numOfTables = taosArrayGetSize(tx), .pGroupList = g1};
@@ -5103,7 +5103,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
       STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
 
       SArray *g1 = taosArrayInit(1, POINTER_BYTES);
-      SArray *tx = taosArrayClone(group);
+      SArray *tx = taosArrayDup(group);
       taosArrayPush(g1, &tx);
 
       STableGroupInfo gp = {.numOfTables = taosArrayGetSize(tx), .pGroupList = g1};
diff --git a/src/util/inc/tarray.h b/src/util/inc/tarray.h
index bf922fe9c4..35053c278e 100644
--- a/src/util/inc/tarray.h
+++ b/src/util/inc/tarray.h
@@ -110,7 +110,7 @@ void taosArrayCopy(SArray* pDst, const SArray* pSrc);
  * clone a new array
  * @param pSrc
  */
-SArray* taosArrayClone(const SArray* pSrc);
+SArray* taosArrayDup(const SArray* pSrc);
 
 /**
  * clear the array (remove all element)
diff --git a/src/util/src/tarray.c b/src/util/src/tarray.c
index bec2fac7df..45cb6eee0f 100644
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
@@ -165,7 +165,7 @@ void taosArrayCopy(SArray* pDst, const SArray* pSrc) {
   pDst->size = pSrc->size;
 }
 
-SArray* taosArrayClone(const SArray* pSrc) {
+SArray* taosArrayDup(const SArray* pSrc) {
   assert(pSrc != NULL);
   
   if (pSrc->size == 0) { // empty array list

From 6d91f15214f4c70541955c9f4660bb5330ec755c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 18 Jan 2021 10:43:34 +0800
Subject: [PATCH 05/25] [TD-225]fix compiler error.

---
 src/query/tests/percentileTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/query/tests/percentileTest.cpp b/src/query/tests/percentileTest.cpp
index 0c24202bdb..f2b457e7dd 100644
--- a/src/query/tests/percentileTest.cpp
+++ b/src/query/tests/percentileTest.cpp
@@ -43,7 +43,7 @@ tMemBucket *createDoubleDataBucket(int32_t start, int32_t end) {
 }
 
 tMemBucket *createUnsignedDataBucket(int32_t start, int32_t end, int32_t type) {
-  tMemBucket *pBucket = tMemBucketCreate(tDataTypes[type].nSize, type, start, end);
+  tMemBucket *pBucket = tMemBucketCreate(tDataTypes[type].bytes, type, start, end);
   for (int32_t i = start; i <= end; ++i) {
     uint64_t k = i;
     int32_t ret = tMemBucketPut(pBucket, &k, 1);

From 84313b70dfb6c0a29a55a2ba61002f14011a57d5 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 19 Jan 2021 18:04:25 +0800
Subject: [PATCH 06/25] [TD-2490]<fix>: add check for full table name.

---
 src/client/inc/tscUtil.h        |  13 +-
 src/client/inc/tsclient.h       |  10 +-
 src/client/src/tscLocal.c       |  14 +-
 src/client/src/tscParseInsert.c |  20 +--
 src/client/src/tscPrepare.c     |   4 +-
 src/client/src/tscSQLParser.c   |  98 +++++++-------
 src/client/src/tscSchemaUtil.c  |   1 +
 src/client/src/tscServer.c      | 226 ++++++++++++++++----------------
 src/client/src/tscSql.c         |   7 +-
 src/client/src/tscStream.c      |  15 ++-
 src/client/src/tscSubquery.c    |  13 +-
 src/client/src/tscUtil.c        |  54 +++-----
 src/common/inc/tname.h          |  42 +++++-
 src/common/src/tname.c          | 205 +++++++++++++++++++++++++----
 src/inc/taosmsg.h               |   5 +-
 src/mnode/inc/mnodeDb.h         |   2 +-
 src/mnode/src/mnodeDb.c         |  17 +--
 src/mnode/src/mnodeTable.c      | 103 ++++++++-------
 src/query/src/qAst.c            |   2 +-
 src/query/src/qExecutor.c       |   2 +-
 20 files changed, 518 insertions(+), 335 deletions(-)

diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index 45a5c2e578..e614ddc872 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -98,8 +98,7 @@ static FORCE_INLINE SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t sub
   return pCmd->pQueryInfo[subClauseIndex];
 }
 
-int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, const char* name,
-                           STableMeta* pTableMeta, STableDataBlocks** dataBlocks);
+int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, SName* name, STableMeta* pTableMeta, STableDataBlocks** dataBlocks);
 void tscDestroyDataBlock(STableDataBlocks* pDataBlock);
 void tscSortRemoveDataBlockDupRows(STableDataBlocks* dataBuf);
 
@@ -111,7 +110,7 @@ void*   tscDestroyBlockHashTable(SHashObj* pBlockHashTable);
 
 int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock);
 int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap);
-int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, int32_t startOffset, int32_t rowSize, const char* tableId, STableMeta* pTableMeta,
+int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, int32_t startOffset, int32_t rowSize, SName* pName, STableMeta* pTableMeta,
                                 STableDataBlocks** dataBlocks, SArray* pBlockList);
 
 /**
@@ -142,10 +141,6 @@ void    tscClearInterpInfo(SQueryInfo* pQueryInfo);
 
 bool tscIsInsertData(char* sqlstr);
 
-/* use for keep current db info temporarily, for handle table with db prefix */
-// todo remove it
-void tscGetDBInfoFromTableFullName(char* tableId, char* db);
-
 int tscAllocPayload(SSqlCmd* pCmd, int size);
 
 TAOS_FIELD tscCreateField(int8_t type, const char* name, int16_t bytes);
@@ -215,8 +210,8 @@ SQueryInfo *tscGetQueryInfoDetailSafely(SSqlCmd *pCmd, int32_t subClauseIndex);
 
 void tscClearTableMetaInfo(STableMetaInfo* pTableMetaInfo);
 
-STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta,
-    SVgroupsInfo* vgroupList, SArray* pTagCols, SArray* pVgroupTables);
+STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, SName* name, STableMeta* pTableMeta,
+                                    SVgroupsInfo* vgroupList, SArray* pTagCols, SArray* pVgroupTables);
 
 STableMetaInfo* tscAddEmptyMetaInfo(SQueryInfo *pQueryInfo);
 int32_t tscAddSubqueryInfo(SSqlCmd *pCmd);
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 8c3daeb656..9d693322fa 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -67,7 +67,7 @@ typedef struct CChildTableMeta {
   int32_t        vgId;
   STableId       id;
   uint8_t        tableType;
-  char           sTableName[TSDB_TABLE_FNAME_LEN];
+  char           sTableName[TSDB_TABLE_FNAME_LEN];  //super table name, not full name
 } CChildTableMeta;
 
 typedef struct STableMeta {
@@ -91,7 +91,7 @@ typedef struct STableMetaInfo {
    * 2. keep the vgroup index for multi-vnode insertion
    */
   int32_t       vgroupIndex;
-  char          name[TSDB_TABLE_FNAME_LEN];        // (super) table name
+  SName         name;
   char          aliasName[TSDB_TABLE_NAME_LEN];    // alias name of table specified in query sql
   SArray       *tagColList;                        // SArray<SColumn*>, involved tag columns
 } STableMetaInfo;
@@ -142,7 +142,7 @@ typedef struct SCond {
 } SCond;
 
 typedef struct SJoinNode {
-  char     tableId[TSDB_TABLE_FNAME_LEN];
+  char     tableName[TSDB_TABLE_FNAME_LEN];
   uint64_t uid;
   int16_t  tagColId;
 } SJoinNode;
@@ -176,7 +176,7 @@ typedef struct SParamInfo {
 } SParamInfo;
 
 typedef struct STableDataBlocks {
-  char        tableName[TSDB_TABLE_FNAME_LEN];
+  SName       tableName;
   int8_t      tsSource;     // where does the UNIX timestamp come from, server or client
   bool        ordered;      // if current rows are ordered or not
   int64_t     vgId;         // virtual group id
@@ -254,7 +254,7 @@ typedef struct {
   int8_t       submitSchema;   // submit block is built with table schema
   STagData     tagData;        // NOTE: pTagData->data is used as a variant length array
 
-  char       **pTableNameList; // all involved tableMeta list of current insert sql statement.
+  SName      **pTableNameList; // all involved tableMeta list of current insert sql statement.
   int32_t      numOfTables;
 
   SHashObj    *pTableBlockHashList;     // data block for each table
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 599fa86460..4b1ab47730 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -569,10 +569,12 @@ static int32_t tscRebuildDDLForSubTable(SSqlObj *pSql, const char *tableName, ch
   }
 
   char fullName[TSDB_TABLE_FNAME_LEN * 2] = {0};
-  extractDBName(pTableMetaInfo->name, fullName);
+  tNameGetDbName(&pTableMetaInfo->name, fullName);
+
   extractTableName(pMeta->sTableName, param->sTableName);
   snprintf(fullName + strlen(fullName), TSDB_TABLE_FNAME_LEN - strlen(fullName),  ".%s", param->sTableName);
-  extractTableName(pTableMetaInfo->name, param->buf);
+
+  strncpy(param->buf, tNameGetTableName(&pTableMetaInfo->name), TSDB_TABLE_NAME_LEN);
 
   param->pParentSql = pSql;
   param->pInterSql  = pInterSql;
@@ -602,6 +604,7 @@ static int32_t tscRebuildDDLForSubTable(SSqlObj *pSql, const char *tableName, ch
 
   return TSDB_CODE_TSC_ACTION_IN_PROGRESS; 
 }
+
 static int32_t tscRebuildDDLForNormalTable(SSqlObj *pSql, const char *tableName, char *ddl) {
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
@@ -675,8 +678,7 @@ static int32_t tscProcessShowCreateTable(SSqlObj *pSql) {
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
   assert(pTableMetaInfo->pTableMeta != NULL);
 
-  char tableName[TSDB_TABLE_NAME_LEN] = {0};
-  extractTableName(pTableMetaInfo->name, tableName);
+  const char* tableName = tNameGetTableName(&pTableMetaInfo->name);
 
   char *result = (char *)calloc(1, TSDB_MAX_BINARY_LEN);
   int32_t code = TSDB_CODE_SUCCESS;
@@ -712,7 +714,9 @@ static int32_t tscProcessShowCreateDatabase(SSqlObj *pSql) {
     free(pInterSql);
     return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
-  extractTableName(pTableMetaInfo->name, param->buf);
+
+  strncpy(param->buf, tNameGetTableName(&pTableMetaInfo->name), TSDB_TABLE_NAME_LEN);
+
   param->pParentSql = pSql;
   param->pInterSql  = pInterSql;
   param->fp         = tscRebuildCreateDBStatement;
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index f2dddd5e29..2466ae060e 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -703,7 +703,7 @@ static int32_t doParseInsertStatement(SSqlCmd* pCmd, char **str, SParsedDataColI
   
   STableDataBlocks *dataBuf = NULL;
   int32_t ret = tscGetDataBlockFromList(pCmd->pTableBlockHashList, pTableMeta->id.uid, TSDB_DEFAULT_PAYLOAD_SIZE,
-                                        sizeof(SSubmitBlk), tinfo.rowSize, pTableMetaInfo->name, pTableMeta, &dataBuf, NULL);
+                                        sizeof(SSubmitBlk), tinfo.rowSize, &pTableMetaInfo->name, pTableMeta, &dataBuf, NULL);
   if (ret != TSDB_CODE_SUCCESS) {
     return ret;
   }
@@ -813,26 +813,26 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       tscAddEmptyMetaInfo(pQueryInfo);
     }
 
-    STableMetaInfo *pSTableMeterMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX);
-    code = tscSetTableFullName(pSTableMeterMetaInfo, &sToken, pSql);
+    STableMetaInfo *pSTableMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX);
+    code = tscSetTableFullName(pSTableMetaInfo, &sToken, pSql);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
 
-    tstrncpy(pCmd->tagData.name, pSTableMeterMetaInfo->name, sizeof(pCmd->tagData.name));
+    tNameExtractFullName(&pSTableMetaInfo->name, pCmd->tagData.name);
     pCmd->tagData.dataLen = 0;
 
-    code = tscGetTableMeta(pSql, pSTableMeterMetaInfo);
+    code = tscGetTableMeta(pSql, pSTableMetaInfo);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
 
-    if (!UTIL_TABLE_IS_SUPER_TABLE(pSTableMeterMetaInfo)) {
+    if (!UTIL_TABLE_IS_SUPER_TABLE(pSTableMetaInfo)) {
       return tscInvalidSQLErrMsg(pCmd->payload, "create table only from super table is allowed", sToken.z);
     }
 
-    SSchema *pTagSchema = tscGetTableTagSchema(pSTableMeterMetaInfo->pTableMeta);
-    STableComInfo tinfo = tscGetTableInfo(pSTableMeterMetaInfo->pTableMeta);
+    SSchema *pTagSchema = tscGetTableTagSchema(pSTableMetaInfo->pTableMeta);
+    STableComInfo tinfo = tscGetTableInfo(pSTableMetaInfo->pTableMeta);
     
     index = 0;
     sToken = tStrGetToken(sql, &index, false, 0, NULL);
@@ -840,7 +840,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
 
     SParsedDataColInfo spd = {0};
     
-    uint8_t numOfTags = tscGetNumOfTags(pSTableMeterMetaInfo->pTableMeta);
+    uint8_t numOfTags = tscGetNumOfTags(pSTableMetaInfo->pTableMeta);
     spd.numOfCols = numOfTags;
 
     // if specify some tags column
@@ -1465,7 +1465,7 @@ static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int32_t numOfRow
   STableDataBlocks *pTableDataBlock = NULL;
   int32_t           ret =
       tscGetDataBlockFromList(pCmd->pTableBlockHashList, pTableMeta->id.uid, TSDB_PAYLOAD_SIZE, sizeof(SSubmitBlk),
-                              tinfo.rowSize, pTableMetaInfo->name, pTableMeta, &pTableDataBlock, NULL);
+                              tinfo.rowSize, &pTableMetaInfo->name, pTableMeta, &pTableDataBlock, NULL);
   if (ret != TSDB_CODE_SUCCESS) {
     pParentSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
     goto _error;
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index 7c69c16b04..c5f06a52f3 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -707,7 +707,7 @@ static int insertStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
 
   int32_t ret =
       tscGetDataBlockFromList(pCmd->pTableBlockHashList, pTableMeta->id.uid, TSDB_PAYLOAD_SIZE, sizeof(SSubmitBlk),
-                              pTableMeta->tableInfo.rowSize, pTableMetaInfo->name, pTableMeta, &pBlock, NULL);
+                              pTableMeta->tableInfo.rowSize, &pTableMetaInfo->name, pTableMeta, &pBlock, NULL);
   if (ret != 0) {
     // todo handle error
   }
@@ -790,7 +790,7 @@ static int insertStmtExecute(STscStmt* stmt) {
 
   int32_t ret =
       tscGetDataBlockFromList(pCmd->pTableBlockHashList, pTableMeta->id.uid, TSDB_PAYLOAD_SIZE, sizeof(SSubmitBlk),
-                              pTableMeta->tableInfo.rowSize, pTableMetaInfo->name, pTableMeta, &pBlock, NULL);
+                              pTableMeta->tableInfo.rowSize, &pTableMetaInfo->name, pTableMeta, &pBlock, NULL);
   assert(ret == 0);
   pBlock->size = sizeof(SSubmitBlk) + pCmd->batchSize * pBlock->rowSize;
   SSubmitBlk* pBlk = (SSubmitBlk*) pBlock->pData;
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 44b21c1337..a4cce66223 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -60,7 +60,7 @@ static int32_t setShowInfo(SSqlObj* pSql, SSqlInfo* pInfo);
 static char*   getAccountId(SSqlObj* pSql);
 
 static bool has(SArray* pFieldList, int32_t startIdx, const char* name);
-static void getCurrentDBName(SSqlObj* pSql, SStrToken* pDBToken);
+static char* getCurrentDBName(SSqlObj* pSql);
 static bool hasSpecifyDB(SStrToken* pTableName);
 static bool validateTableColumnInfo(SArray* pFieldList, SSqlCmd* pCmd);
 static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pCmd);
@@ -272,8 +272,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
       if (pInfo->type == TSDB_SQL_DROP_DB) {
         assert(pInfo->pDCLInfo->nTokens == 1);
-
-        code = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), pzName, NULL, NULL);
+        code = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), pzName);
         if (code != TSDB_CODE_SUCCESS) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
         }
@@ -287,13 +286,13 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         }
       } else if (pInfo->type == TSDB_SQL_DROP_DNODE) {
         pzName->n = strdequote(pzName->z);
-        strncpy(pTableMetaInfo->name, pzName->z, pzName->n);
-      } else {  // drop user
+        strncpy(pCmd->payload, pzName->z, pzName->n);
+      } else {  // drop user/account
         if (pzName->n >= TSDB_USER_LEN) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
         }
 
-        strncpy(pTableMetaInfo->name, pzName->z, pzName->n);
+        strncpy(pCmd->payload, pzName->z, pzName->n);
       }
 
       break;
@@ -307,7 +306,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
 
-      int32_t ret = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), pToken, NULL, NULL);
+      int32_t ret = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), pToken);
       if (ret != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
@@ -337,7 +336,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      int32_t ret = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), &(pCreateDB->dbname), NULL, NULL);
+      int32_t ret = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), &(pCreateDB->dbname));
       if (ret != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
@@ -878,47 +877,41 @@ int32_t parseSlidingClause(SSqlObj* pSql, SQueryInfo* pQueryInfo, SQuerySQL* pQu
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pzTableName, SSqlObj* pSql) {
+int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pTableName, SSqlObj* pSql) {
   const char* msg1 = "name too long";
 
   SSqlCmd* pCmd = &pSql->cmd;
   int32_t  code = TSDB_CODE_SUCCESS;
 
-  // backup the old name in pTableMetaInfo
-  char oldName[TSDB_TABLE_FNAME_LEN] = {0};
-  tstrncpy(oldName, pTableMetaInfo->name, tListLen(oldName));
+  if (hasSpecifyDB(pTableName)) { // db has been specified in sql string so we ignore current db path
+    tNameSetAcctId(&pTableMetaInfo->name, getAccountId(pSql));
 
-  if (hasSpecifyDB(pzTableName)) { // db has been specified in sql string so we ignore current db path
-    code = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), NULL, pzTableName, NULL);
+    char name[TSDB_TABLE_FNAME_LEN] = {0};
+    strncpy(name, pTableName->z, pTableName->n);
+
+    code = tNameFromString(&pTableMetaInfo->name, name, T_NAME_DB|T_NAME_TABLE);
     if (code != 0) {
-      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
   } else {  // get current DB name first, and then set it into path
-    SStrToken t = {0};
-    getCurrentDBName(pSql, &t);
-    if (t.n == 0) {  // current database not available or not specified
+    char* t = getCurrentDBName(pSql);
+    assert(strlen(t) > 0);
+
+    code = tNameFromString(&pTableMetaInfo->name, t, T_NAME_ACCT|T_NAME_DB);
+    if (code != 0) {
       code = TSDB_CODE_TSC_DB_NOT_SELECTED;
     } else {
-      code = setObjFullName(pTableMetaInfo->name, NULL, &t, pzTableName, NULL);
+      char name[TSDB_TABLE_FNAME_LEN] = {0};
+      strncpy(name, pTableName->z, pTableName->n);
+
+      code = tNameFromString(&pTableMetaInfo->name, name, T_NAME_TABLE);
       if (code != 0) {
-        invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+        code = invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
     }
   }
 
-  if (code != TSDB_CODE_SUCCESS) {
-    return code;
-  }
-
-  /*
-   * the old name exists and is not equalled to the new name. Release the table meta
-   * that are corresponding to the old name for the new table name.
-   */
-  if (strlen(oldName) > 0 && strncasecmp(oldName, pTableMetaInfo->name, tListLen(pTableMetaInfo->name)) != 0) {
-    tscClearTableMetaInfo(pTableMetaInfo);
-  }
-
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 static bool validateTableColumnInfo(SArray* pFieldList, SSqlCmd* pCmd) {
@@ -1218,9 +1211,8 @@ static bool has(SArray* pFieldList, int32_t startIdx, const char* name) {
 
 static char* getAccountId(SSqlObj* pSql) { return pSql->pTscObj->acctId; }
 
-static void getCurrentDBName(SSqlObj* pSql, SStrToken* pDBToken) {
-  pDBToken->z = pSql->pTscObj->db;
-  pDBToken->n = (uint32_t)strlen(pSql->pTscObj->db);
+static char* getCurrentDBName(SSqlObj* pSql) {
+  return pSql->pTscObj->db;
 }
 
 /* length limitation, strstr cannot be applied */
@@ -2617,7 +2609,7 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      int32_t ret = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), pDbPrefixToken, NULL, NULL);
+      int32_t ret = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), pDbPrefixToken);
       if (ret != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
@@ -2898,7 +2890,7 @@ int32_t parseGroupbyClause(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd)
 
   STableMeta* pTableMeta = NULL;
   SSchema*    pSchema = NULL;
-  SSchema     s = tscGetTbnameColumnSchema();
+  SSchema     s = tGetTbnameColumnSchema();
 
   int32_t tableIndex = COLUMN_INDEX_INITIAL_VAL;
 
@@ -3421,6 +3413,7 @@ static int32_t getColumnQueryCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQ
 
 static int32_t getJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pExpr) {
   const char* msg1 = "invalid join query condition";
+  const char* msg2 = "invalid table name in join query";
   const char* msg3 = "type of join columns must be identical";
   const char* msg4 = "invalid column name in join condition";
 
@@ -3446,7 +3439,11 @@ static int32_t getJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr*
 
   pLeft->uid = pTableMetaInfo->pTableMeta->id.uid;
   pLeft->tagColId = pTagSchema1->colId;
-  strcpy(pLeft->tableId, pTableMetaInfo->name);
+
+  int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pLeft->tableName);
+  if (code != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+  }
 
   index = (SColumnIndex)COLUMN_INDEX_INITIALIZER;
   if (getColumnIndexByName(pCmd, &pExpr->pRight->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
@@ -3458,7 +3455,11 @@ static int32_t getJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr*
 
   pRight->uid = pTableMetaInfo->pTableMeta->id.uid;
   pRight->tagColId = pTagSchema2->colId;
-  strcpy(pRight->tableId, pTableMetaInfo->name);
+
+  code = tNameExtractFullName(&pTableMetaInfo->name, pRight->tableName);
+  if (code != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+  }
 
   if (pTagSchema1->type != pTagSchema2->type) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
@@ -4035,8 +4036,6 @@ static int32_t setTableCondForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
   SStringBuilder sb1; memset(&sb1, 0, sizeof(sb1));
   taosStringBuilderAppendStringLen(&sb1, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN);
 
-  char db[TSDB_TABLE_FNAME_LEN] = {0};
-
   // remove the duplicated input table names
   int32_t num = 0;
   char*   tableNameString = taosStringBuilderGetResult(sb, NULL);
@@ -4052,7 +4051,8 @@ static int32_t setTableCondForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
   }
   num = j;
 
-  char* name = extractDBName(pTableMetaInfo->name, db);
+  char name[TSDB_DB_NAME_LEN] = {0};
+  tNameGetDbName(&pTableMetaInfo->name, name);
   SStrToken dbToken = { .type = TK_STRING, .z = name, .n = (uint32_t)strlen(name) };
   
   for (int32_t i = 0; i < num; ++i) {
@@ -6212,9 +6212,9 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
     }
 
     // get table meta from mnode
-    tstrncpy(pCreateTableInfo->tagdata.name, pStableMetaInfo->name, tListLen(pCreateTableInfo->tagdata.name));
-    SArray* pList = pCreateTableInfo->pTagVals;
+    code = tNameExtractFullName(&pStableMetaInfo->name, pCreateTableInfo->tagdata.name);
 
+    SArray* pList = pCreateTableInfo->pTagVals;
     code = tscGetTableMeta(pSql, pStableMetaInfo);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
@@ -6292,7 +6292,11 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
       return ret;
     }
 
-    pCreateTableInfo->fullname = strndup(pTableMetaInfo->name, TSDB_TABLE_FNAME_LEN);
+    pCreateTableInfo->fullname = calloc(1, tNameLen(&pTableMetaInfo->name) + 1);
+    ret = tNameExtractFullName(&pTableMetaInfo->name, pCreateTableInfo->fullname);
+    if (ret != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+    }
   }
 
   return TSDB_CODE_SUCCESS;
@@ -6539,7 +6543,7 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
 
     // has no table alias name
     if (memcmp(pTableItem->pz, p1->pVar.pz, p1->pVar.nLen) == 0) {
-      extractTableName(pTableMetaInfo1->name, pTableMetaInfo1->aliasName);
+      strncpy(pTableMetaInfo1->aliasName, tNameGetTableName(&pTableMetaInfo1->name), tListLen(pTableMetaInfo->aliasName));
     } else {
       tstrncpy(pTableMetaInfo1->aliasName, p1->pVar.pz, sizeof(pTableMetaInfo1->aliasName));
     }
diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c
index 47c3cd9716..67352ca71c 100644
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/client/src/tscSchemaUtil.c
@@ -106,6 +106,7 @@ STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg) {
 
   pTableMeta->sversion = pTableMetaMsg->sversion;
   pTableMeta->tversion = pTableMetaMsg->tversion;
+
   tstrncpy(pTableMeta->sTableName, pTableMetaMsg->sTableName, TSDB_TABLE_FNAME_LEN);
   
   memcpy(pTableMeta->schema, pTableMetaMsg->schema, schemaSize);
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 440bb9dd47..0e3f015951 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -461,16 +461,20 @@ int doProcessSql(SSqlObj *pSql) {
 }
 
 int tscProcessSql(SSqlObj *pSql) {
-  char    *name = NULL;
+  char name[TSDB_TABLE_FNAME_LEN] = {0};
+
   SSqlCmd *pCmd = &pSql->cmd;
-  
+  uint32_t type = 0;
+
   SQueryInfo     *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
   STableMetaInfo *pTableMetaInfo = NULL;
-  uint32_t        type = 0;
 
   if (pQueryInfo != NULL) {
     pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-    name = (pTableMetaInfo != NULL)? pTableMetaInfo->name:NULL;
+    if (pTableMetaInfo != NULL) {
+      tNameExtractFullName(&pTableMetaInfo->name, name);
+    }
+
     type = pQueryInfo->type;
 
     // while numOfTables equals to 0, it must be Heartbeat
@@ -669,10 +673,11 @@ static char *doSerializeTableInfo(SQueryTableMsg* pQueryMsg, SSqlObj *pSql, char
       pMsg += sizeof(STableIdInfo);
     }
   }
-  
-  tscDebug("%p vgId:%d, query on table:%s, tid:%d, uid:%" PRIu64, pSql, htonl(pQueryMsg->head.vgId), pTableMetaInfo->name,
-      pTableMeta->id.tid, pTableMeta->id.uid);
-  
+
+  char n[TSDB_TABLE_FNAME_LEN] = {0};
+  tNameExtractFullName(&pTableMetaInfo->name, n);
+
+  tscDebug("%p vgId:%d, query on table:%s, tid:%d, uid:%" PRIu64, pSql, htonl(pQueryMsg->head.vgId), n, pTableMeta->id.tid, pTableMeta->id.uid);
   return pMsg;
 }
 
@@ -755,8 +760,11 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     SSchema *pColSchema = &pSchema[pCol->colIndex.columnIndex];
 
     if (pCol->colIndex.columnIndex >= tscGetNumOfColumns(pTableMeta) || !isValidDataType(pColSchema->type)) {
+      char n[TSDB_TABLE_FNAME_LEN] = {0};
+      tNameExtractFullName(&pTableMetaInfo->name, n);
+
       tscError("%p tid:%d uid:%" PRIu64" id:%s, column index out of range, numOfColumns:%d, index:%d, column name:%s",
-          pSql, pTableMeta->id.tid, pTableMeta->id.uid, pTableMetaInfo->name, tscGetNumOfColumns(pTableMeta), pCol->colIndex.columnIndex,
+          pSql, pTableMeta->id.tid, pTableMeta->id.uid, n, tscGetNumOfColumns(pTableMeta), pCol->colIndex.columnIndex,
                pColSchema->name);
       return TSDB_CODE_TSC_INVALID_SQL;
     }
@@ -942,9 +950,11 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
       if ((pCol->colIndex.columnIndex >= numOfTagColumns || pCol->colIndex.columnIndex < -1) ||
           (!isValidDataType(pColSchema->type))) {
+        char n[TSDB_TABLE_FNAME_LEN] = {0};
+        tNameExtractFullName(&pTableMetaInfo->name, n);
+
         tscError("%p tid:%d uid:%" PRIu64 " id:%s, tag index out of range, totalCols:%d, numOfTags:%d, index:%d, column name:%s",
-                 pSql, pTableMeta->id.tid, pTableMeta->id.uid, pTableMetaInfo->name, total, numOfTagColumns,
-                 pCol->colIndex.columnIndex, pColSchema->name);
+                 pSql, pTableMeta->id.tid, pTableMeta->id.uid, n, total, numOfTagColumns, pCol->colIndex.columnIndex, pColSchema->name);
 
         return TSDB_CODE_TSC_INVALID_SQL;
       }
@@ -1021,7 +1031,8 @@ int32_t tscBuildCreateDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   assert(pCmd->numOfClause == 1);
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  tstrncpy(pCreateDbMsg->db, pTableMetaInfo->name, sizeof(pCreateDbMsg->db));
+  int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pCreateDbMsg->db);
+  assert(code == TSDB_CODE_SUCCESS);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -1138,7 +1149,10 @@ int32_t tscBuildDropDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SDropDbMsg *pDropDbMsg = (SDropDbMsg*)pCmd->payload;
 
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  tstrncpy(pDropDbMsg->db, pTableMetaInfo->name, sizeof(pDropDbMsg->db));
+
+  int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pDropDbMsg->db);
+  assert(code == TSDB_CODE_SUCCESS && pTableMetaInfo->name.type == TSDB_DB_NAME_T);
+
   pDropDbMsg->ignoreNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
 
   pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_DB;
@@ -1156,15 +1170,19 @@ int32_t tscBuildDropTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   SCMDropTableMsg *pDropTableMsg = (SCMDropTableMsg*)pCmd->payload;
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  strcpy(pDropTableMsg->tableFname, pTableMetaInfo->name);
-  pDropTableMsg->igNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
+  tNameExtractFullName(&pTableMetaInfo->name, pDropTableMsg->name);
 
+  pDropTableMsg->igNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
   pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_TABLE;
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildDropDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &pSql->cmd;
+
+  char dnodeEp[TSDB_EP_LEN] = {0};
+  tstrncpy(dnodeEp, pCmd->payload, TSDB_EP_LEN);
+
   pCmd->payloadLen = sizeof(SDropDnodeMsg);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
     tscError("%p failed to malloc for query msg", pSql);
@@ -1172,43 +1190,28 @@ int32_t tscBuildDropDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   }
 
   SDropDnodeMsg * pDrop = (SDropDnodeMsg *)pCmd->payload;
-  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  tstrncpy(pDrop->ep, pTableMetaInfo->name, sizeof(pDrop->ep));
+  tstrncpy(pDrop->ep, dnodeEp, tListLen(pDrop->ep));
   pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_DNODE;
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tscBuildDropUserMsg(SSqlObj *pSql, SSqlInfo * UNUSED_PARAM(pInfo)) {
+int32_t tscBuildDropUserAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &pSql->cmd;
+
+  char user[TSDB_USER_LEN] = {0};
+  tstrncpy(user, pCmd->payload, TSDB_USER_LEN);
+
   pCmd->payloadLen = sizeof(SDropUserMsg);
-  pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_USER;
+  pCmd->msgType = (pInfo->type == TSDB_SQL_DROP_USER)? TSDB_MSG_TYPE_CM_DROP_USER:TSDB_MSG_TYPE_CM_DROP_ACCT;
 
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
     tscError("%p failed to malloc for query msg", pSql);
     return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  SDropUserMsg *  pDropMsg = (SDropUserMsg *)pCmd->payload;
-  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  tstrncpy(pDropMsg->user, pTableMetaInfo->name, sizeof(pDropMsg->user));
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t tscBuildDropAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  pCmd->payloadLen = sizeof(SDropUserMsg);
-  pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_ACCT;
-
-  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
-    tscError("%p failed to malloc for query msg", pSql);
-    return TSDB_CODE_TSC_OUT_OF_MEMORY;
-  }
-
-  SDropUserMsg *  pDropMsg = (SDropUserMsg *)pCmd->payload;
-  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  tstrncpy(pDropMsg->user, pTableMetaInfo->name, sizeof(pDropMsg->user));
+  SDropUserMsg *pDropMsg = (SDropUserMsg *)pCmd->payload;
+  tstrncpy(pDropMsg->user, user, tListLen(user));
 
   return TSDB_CODE_SUCCESS;
 }
@@ -1224,7 +1227,7 @@ int32_t tscBuildUseDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   SUseDbMsg *pUseDbMsg = (SUseDbMsg *)pCmd->payload;
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  strcpy(pUseDbMsg->db, pTableMetaInfo->name);
+  tNameExtractFullName(&pTableMetaInfo->name, pUseDbMsg->db);
   pCmd->msgType = TSDB_MSG_TYPE_CM_USE_DB;
 
   return TSDB_CODE_SUCCESS;
@@ -1244,11 +1247,11 @@ int32_t tscBuildShowMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SShowMsg *pShowMsg = (SShowMsg *)pCmd->payload;
 
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  size_t nameLen = strlen(pTableMetaInfo->name);
-  if (nameLen > 0) {
-    tstrncpy(pShowMsg->db, pTableMetaInfo->name, sizeof(pShowMsg->db));  // prefix is set here
-  } else {
+
+  if (tNameIsEmpty(&pTableMetaInfo->name)) {
     tstrncpy(pShowMsg->db, pObj->db, sizeof(pShowMsg->db));
+  } else {
+    tNameGetFullDbName(&pTableMetaInfo->name, pShowMsg->db);
   }
 
   SShowInfo *pShowInfo = &pInfo->pDCLInfo->showOpt;
@@ -1310,12 +1313,12 @@ int tscEstimateCreateTableMsgLength(SSqlObj *pSql, SSqlInfo *pInfo) {
 }
 
 int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  int              msgLen = 0;
-  SSchema *        pSchema;
-  int              size = 0;
+  int      msgLen = 0;
+  int      size = 0;
+  SSchema *pSchema;
   SSqlCmd *pCmd = &pSql->cmd;
 
-  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  SQueryInfo     *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   // Reallocate the payload size
@@ -1346,11 +1349,10 @@ int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
       pMsg += sizeof(SCreateTableMsg);
 
       SCreatedTableInfo* p = taosArrayGet(list, i);
-      strcpy(pCreate->tableFname, p->fullname);
+      strcpy(pCreate->tableName, p->fullname);
       pCreate->igExists = (p->igExist)? 1 : 0;
 
       // use dbinfo from table id without modifying current db info
-      tscGetDBInfoFromTableFullName(p->fullname, pCreate->db);
       pMsg = serializeTagData(&p->tagdata, pMsg);
 
       int32_t len = (int32_t)(pMsg - (char*) pCreate);
@@ -1359,10 +1361,8 @@ int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   } else {  // create (super) table
     pCreateTableMsg->numOfTables = htonl(1); // only one table will be created
 
-    strcpy(pCreateMsg->tableFname, pTableMetaInfo->name);
-
-    // use dbinfo from table id without modifying current db info
-    tscGetDBInfoFromTableFullName(pTableMetaInfo->name, pCreateMsg->db);
+    int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pCreateMsg->tableName);
+    assert(code == 0);
 
     SCreateTableSQL *pCreateTable = pInfo->pCreateTableInfo;
 
@@ -1428,9 +1428,8 @@ int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   }
   
   SAlterTableMsg *pAlterTableMsg = (SAlterTableMsg *)pCmd->payload;
-  tscGetDBInfoFromTableFullName(pTableMetaInfo->name, pAlterTableMsg->db);
 
-  strcpy(pAlterTableMsg->tableFname, pTableMetaInfo->name);
+  tNameExtractFullName(&pTableMetaInfo->name, pAlterTableMsg->tableFname);
   pAlterTableMsg->type = htons(pAlterInfo->type);
 
   pAlterTableMsg->numOfCols = htons(tscNumOfFields(pQueryInfo));
@@ -1485,7 +1484,7 @@ int tscAlterDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   SAlterDbMsg *pAlterDbMsg = (SAlterDbMsg* )pCmd->payload;
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  tstrncpy(pAlterDbMsg->db, pTableMetaInfo->name, sizeof(pAlterDbMsg->db));
+  tNameExtractFullName(&pTableMetaInfo->name, pAlterDbMsg->db);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -1623,13 +1622,18 @@ int tscBuildConnectMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 }
 
 int tscBuildTableMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SSqlCmd *   pCmd = &pSql->cmd;
+  SSqlCmd    *pCmd = &pSql->cmd;
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
 
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   STableInfoMsg *pInfoMsg = (STableInfoMsg *)pCmd->payload;
-  strcpy(pInfoMsg->tableFname, pTableMetaInfo->name);
+
+  int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pInfoMsg->tableFname);
+  if (code != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
+  }
+
   pInfoMsg->createFlag = htons(pSql->cmd.autoCreated ? 1 : 0);
 
   char *pMsg = (char *)pInfoMsg + sizeof(STableInfoMsg);
@@ -1686,33 +1690,6 @@ int tscBuildMultiMeterMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   return 0;  
 }
 
-//static UNUSED_FUNC int32_t tscEstimateMetricMetaMsgSize(SSqlCmd *pCmd) {
-////  const int32_t defaultSize =
-////      minMsgSize() + sizeof(SSuperTableMetaMsg) + sizeof(SMgmtHead) + sizeof(int16_t) * TSDB_MAX_TAGS;
-////  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-////
-////  int32_t n = 0;
-////  size_t size = taosArrayGetSize(pQueryInfo->tagCond.pCond);
-////  for (int32_t i = 0; i < size; ++i) {
-////    assert(0);
-//////    n += strlen(pQueryInfo->tagCond.cond[i].cond);
-////  }
-////
-////  int32_t tagLen = n * TSDB_NCHAR_SIZE;
-////  if (pQueryInfo->tagCond.tbnameCond.cond != NULL) {
-////    tagLen += strlen(pQueryInfo->tagCond.tbnameCond.cond) * TSDB_NCHAR_SIZE;
-////  }
-////
-////  int32_t joinCondLen = (TSDB_TABLE_FNAME_LEN + sizeof(int16_t)) * 2;
-////  int32_t elemSize = sizeof(SSuperTableMetaElemMsg) * pQueryInfo->numOfTables;
-////
-////  int32_t colSize = pQueryInfo->groupbyExpr.numOfGroupCols*sizeof(SColIndex);
-////
-////  int32_t len = tagLen + joinCondLen + elemSize + colSize + defaultSize;
-////
-////  return MAX(len, TSDB_DEFAULT_PAYLOAD_SIZE);
-//}
-
 int tscBuildSTableVgroupMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &pSql->cmd;
   
@@ -1725,9 +1702,10 @@ int tscBuildSTableVgroupMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
     STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, i);
-    size_t size = sizeof(pTableMetaInfo->name);
-    tstrncpy(pMsg, pTableMetaInfo->name, size);
-    pMsg += size;
+    int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pMsg);
+    assert(code == TSDB_CODE_SUCCESS);
+
+    pMsg += TSDB_TABLE_FNAME_LEN;
   }
 
   pCmd->msgType = TSDB_MSG_TYPE_CM_STABLE_VGROUP;
@@ -1827,7 +1805,6 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
       assert(i == 0);
     }
 
-    assert(isValidDataType(pSchema->type));
     pSchema++;
   }
   
@@ -1835,8 +1812,8 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
   assert(pTableMetaInfo->pTableMeta == NULL);
 
   STableMeta* pTableMeta = tscCreateTableMetaFromMsg(pMetaMsg);
-  if (!isValidSchema(pTableMeta->schema, pTableMeta->tableInfo.numOfColumns, pTableMeta->tableInfo.numOfTags)) {
-    tscError("%p invalid table meta from mnode, name:%s", pSql, pTableMetaInfo->name);
+  if (!tIsValidSchema(pTableMeta->schema, pTableMeta->tableInfo.numOfColumns, pTableMeta->tableInfo.numOfTags)) {
+    tscError("%p invalid table meta from mnode, name:%s", pSql, tNameGetTableName(&pTableMetaInfo->name));
     return TSDB_CODE_TSC_INVALID_VALUE;
   }
 
@@ -1854,11 +1831,19 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
     tfree(pSupTableMeta);
 
     CChildTableMeta* cMeta = tscCreateChildMeta(pTableMeta);
-    taosHashPut(tscTableMetaInfo, pTableMetaInfo->name, strlen(pTableMetaInfo->name), cMeta, sizeof(CChildTableMeta));
+
+    char name[TSDB_TABLE_FNAME_LEN] = {0};
+    tNameExtractFullName(&pTableMetaInfo->name, name);
+
+    taosHashPut(tscTableMetaInfo, name, strlen(name), cMeta, sizeof(CChildTableMeta));
     tfree(cMeta);
   } else {
     uint32_t s = tscGetTableMetaSize(pTableMeta);
-    taosHashPut(tscTableMetaInfo, pTableMetaInfo->name, strlen(pTableMetaInfo->name), pTableMeta, s);
+
+    char name[TSDB_TABLE_FNAME_LEN] = {0};
+    tNameExtractFullName(&pTableMetaInfo->name, name);
+
+    taosHashPut(tscTableMetaInfo, name, strlen(name), pTableMeta, s);
   }
 
   // update the vgroupInfo if needed
@@ -1877,9 +1862,10 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
     }
   }
 
-  tscDebug("%p recv table meta, uid:%"PRId64 ", tid:%d, name:%s", pSql, pTableMeta->id.uid, pTableMeta->id.tid, pTableMetaInfo->name);
+  tscDebug("%p recv table meta, uid:%" PRIu64 ", tid:%d, name:%s", pSql, pTableMeta->id.uid, pTableMeta->id.tid,
+           tNameGetTableName(&pTableMetaInfo->name));
+
   free(pTableMeta);
-  
   return TSDB_CODE_SUCCESS;
 }
 
@@ -2174,9 +2160,7 @@ int tscProcessConnectRsp(SSqlObj *pSql) {
 int tscProcessUseDbRsp(SSqlObj *pSql) {
   STscObj *       pObj = pSql->pTscObj;
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
-
-  tstrncpy(pObj->db, pTableMetaInfo->name, sizeof(pObj->db));
-  return 0;
+  return tNameExtractFullName(&pTableMetaInfo->name, pObj->db);
 }
 
 int tscProcessDropDbRsp(SSqlObj *pSql) {
@@ -2189,9 +2173,11 @@ int tscProcessDropTableRsp(SSqlObj *pSql) {
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
 
   //The cached tableMeta is expired in this case, so clean it in hash table
-  taosHashRemove(tscTableMetaInfo, pTableMetaInfo->name, strnlen(pTableMetaInfo->name, TSDB_TABLE_FNAME_LEN));
-  tscDebug("%p remove table meta after drop table:%s, numOfRemain:%d", pSql, pTableMetaInfo->name,
-           (int32_t) taosHashGetSize(tscTableMetaInfo));
+  char name[TSDB_TABLE_FNAME_LEN] = {0};
+  tNameExtractFullName(&pTableMetaInfo->name, name);
+
+  taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN));
+  tscDebug("%p remove table meta after drop table:%s, numOfRemain:%d", pSql, name, (int32_t) taosHashGetSize(tscTableMetaInfo));
 
   assert(pTableMetaInfo->pTableMeta == NULL);
   return 0;
@@ -2200,7 +2186,9 @@ int tscProcessDropTableRsp(SSqlObj *pSql) {
 int tscProcessAlterTableMsgRsp(SSqlObj *pSql) {
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
 
-  char* name = pTableMetaInfo->name;
+  char name[TSDB_TABLE_FNAME_LEN] = {0};
+  tNameExtractFullName(&pTableMetaInfo->name, name);
+
   tscDebug("%p remove tableMeta in hashMap after alter-table: %s", pSql, name);
 
   bool isSuperTable = UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
@@ -2319,7 +2307,7 @@ static int32_t getTableMetaFromMnode(SSqlObj *pSql, STableMetaInfo *pTableMetaIn
   STableMetaInfo *pNewMeterMetaInfo = tscAddEmptyMetaInfo(pNewQueryInfo);
   assert(pNew->cmd.numOfClause == 1 && pNewQueryInfo->numOfTables == 1);
 
-  tstrncpy(pNewMeterMetaInfo->name, pTableMetaInfo->name, sizeof(pNewMeterMetaInfo->name));
+  tNameAssign(&pNewMeterMetaInfo->name, &pTableMetaInfo->name);
 
   if (pSql->cmd.autoCreated) {
     int32_t code = copyTagData(&pNew->cmd.tagData, &pSql->cmd.tagData);
@@ -2350,7 +2338,8 @@ static int32_t getTableMetaFromMnode(SSqlObj *pSql, STableMetaInfo *pTableMetaIn
 }
 
 int32_t tscGetTableMeta(SSqlObj *pSql, STableMetaInfo *pTableMetaInfo) {
-  assert(strlen(pTableMetaInfo->name) != 0);
+  assert(tIsValidName(&pTableMetaInfo->name));
+
   tfree(pTableMetaInfo->pTableMeta);
 
   uint32_t size = tscGetTableMetaMaxSize();
@@ -2358,15 +2347,18 @@ int32_t tscGetTableMeta(SSqlObj *pSql, STableMetaInfo *pTableMetaInfo) {
 
   pTableMetaInfo->pTableMeta->tableType = -1;
   pTableMetaInfo->pTableMeta->tableInfo.numOfColumns  = -1;
-  int32_t len = (int32_t) strlen(pTableMetaInfo->name);
 
-  taosHashGetClone(tscTableMetaInfo, pTableMetaInfo->name, len, NULL, pTableMetaInfo->pTableMeta, -1);
+  char name[TSDB_TABLE_FNAME_LEN] = {0};
+  tNameExtractFullName(&pTableMetaInfo->name, name);
+  int32_t len = strlen(name);
+
+  taosHashGetClone(tscTableMetaInfo, name, len, NULL, pTableMetaInfo->pTableMeta, -1);
 
   // TODO resize the tableMeta
   STableMeta* pMeta = pTableMetaInfo->pTableMeta;
   if (pMeta->id.uid > 0) {
     if (pMeta->tableType == TSDB_CHILD_TABLE) {
-      int32_t code = tscCreateTableMetaFromCChildMeta(pTableMetaInfo->pTableMeta, pTableMetaInfo->name);
+      int32_t code = tscCreateTableMetaFromCChildMeta(pTableMetaInfo->pTableMeta, name);
       if (code != TSDB_CODE_SUCCESS) {
         return getTableMetaFromMnode(pSql, pTableMetaInfo);
       }
@@ -2394,7 +2386,15 @@ int tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex) {
 
   SQueryInfo     *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableIndex);
-  const char* name = pTableMetaInfo->name;
+
+  char name[TSDB_TABLE_FNAME_LEN] = {0};
+  int32_t code = tNameExtractFullName(&pTableMetaInfo->name, name);
+  if (code != TSDB_CODE_SUCCESS) {
+    tscError("%p failed to generate the table full name", pSql, name);
+    return TSDB_CODE_TSC_INVALID_SQL;
+  }
+
+  int32_t len = strlen(name);
 
   STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
   if (pTableMeta) {
@@ -2403,7 +2403,7 @@ int tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex) {
   }
 
   // remove stored tableMeta info in hash table
-  taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN));
+  taosHashRemove(tscTableMetaInfo, name, len);
   return getTableMetaFromMnode(pSql, pTableMetaInfo);
 }
 
@@ -2445,7 +2445,7 @@ int tscGetSTableVgroupInfo(SSqlObj *pSql, int32_t clauseIndex) {
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
     STableMetaInfo *pMInfo = tscGetMetaInfo(pQueryInfo, i);
     STableMeta* pTableMeta = tscTableMetaDup(pMInfo->pTableMeta);
-    tscAddTableMetaInfo(pNewQueryInfo, pMInfo->name, pTableMeta, NULL, pMInfo->tagColList, pMInfo->pVgroupTables);
+    tscAddTableMetaInfo(pNewQueryInfo, &pMInfo->name, pTableMeta, NULL, pMInfo->tagColList, pMInfo->pVgroupTables);
   }
 
   if ((code = tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE)) != TSDB_CODE_SUCCESS) {
@@ -2485,8 +2485,8 @@ void tscInitMsgsFp() {
   tscBuildMsg[TSDB_SQL_ALTER_ACCT] = tscBuildAcctMsg;
 
   tscBuildMsg[TSDB_SQL_CREATE_TABLE] = tscBuildCreateTableMsg;
-  tscBuildMsg[TSDB_SQL_DROP_USER] = tscBuildDropUserMsg;
-  tscBuildMsg[TSDB_SQL_DROP_ACCT] = tscBuildDropAcctMsg;
+  tscBuildMsg[TSDB_SQL_DROP_USER] = tscBuildDropUserAcctMsg;
+  tscBuildMsg[TSDB_SQL_DROP_ACCT] = tscBuildDropUserAcctMsg;
   tscBuildMsg[TSDB_SQL_DROP_DB] = tscBuildDropDbMsg;
   tscBuildMsg[TSDB_SQL_DROP_TABLE] = tscBuildDropTableMsg;
   tscBuildMsg[TSDB_SQL_ALTER_USER] = tscBuildUserMsg;
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index a4f2976cad..106f62fb74 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -995,7 +995,8 @@ static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t t
       return code;
     }
 
-    if (payloadLen + strlen(pTableMetaInfo->name) + 128 >= pCmd->allocSize) {
+    int32_t xlen = tNameLen(&pTableMetaInfo->name);
+    if (payloadLen + xlen + 128 >= pCmd->allocSize) {
       char *pNewMem = realloc(pCmd->payload, pCmd->allocSize + tblListLen);
       if (pNewMem == NULL) {
         code = TSDB_CODE_TSC_OUT_OF_MEMORY;
@@ -1008,7 +1009,9 @@ static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t t
       pMsg = pCmd->payload;
     }
 
-    payloadLen += sprintf(pMsg + payloadLen, "%s,", pTableMetaInfo->name);
+    char n[TSDB_TABLE_FNAME_LEN] = {0};
+    tNameExtractFullName(&pTableMetaInfo->name, n);
+    payloadLen += sprintf(pMsg + payloadLen, "%s,", n);
   }
 
   *(pMsg + payloadLen) = '\0';
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index a39fbc9420..f14538fba9 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -104,7 +104,7 @@ static void doLaunchQuery(void* param, TAOS_RES* tres, int32_t code) {
   // failed to get table Meta or vgroup list, retry in 10sec.
   if (code == TSDB_CODE_SUCCESS) {
     tscTansformSQLFuncForSTableQuery(pQueryInfo);
-    tscDebug("%p stream:%p, start stream query on:%s", pSql, pStream, pTableMetaInfo->name);
+    tscDebug("%p stream:%p, start stream query on:%s", pSql, pStream, tNameGetTableName(&pTableMetaInfo->name));
 
     pSql->fp = tscProcessStreamQueryCallback;
     pSql->fetchFp = tscProcessStreamQueryCallback;
@@ -191,8 +191,9 @@ static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOf
 
     STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pStream->pSql->cmd, 0, 0);
 
-    char* name = pTableMetaInfo->name;
-    taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN));
+    assert(0);
+//    char* name = pTableMetaInfo->name;
+//    taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN));
     pTableMetaInfo->vgroupList = tscVgroupInfoClear(pTableMetaInfo->vgroupList);
 
     tscSetRetryTimer(pStream, pStream->pSql, retryDelay);
@@ -291,8 +292,8 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
       pStream->stime += 1;
     }
 
-    tscDebug("%p stream:%p, query on:%s, fetch result completed, fetched rows:%" PRId64, pSql, pStream, pTableMetaInfo->name,
-             pStream->numOfRes);
+//    tscDebug("%p stream:%p, query on:%s, fetch result completed, fetched rows:%" PRId64, pSql, pStream, pTableMetaInfo->name,
+//             pStream->numOfRes);
 
     tfree(pTableMetaInfo->pTableMeta);
 
@@ -555,8 +556,8 @@ static void tscCreateStream(void *param, TAOS_RES *res, int code) {
 
   taosTmrReset(tscProcessStreamTimer, (int32_t)starttime, pStream, tscTmr, &pStream->pTimer);
 
-  tscDebug("%p stream:%p is opened, query on:%s, interval:%" PRId64 ", sliding:%" PRId64 ", first launched in:%" PRId64 ", sql:%s", pSql,
-           pStream, pTableMetaInfo->name, pStream->interval.interval, pStream->interval.sliding, starttime, pSql->sqlstr);
+//  tscDebug("%p stream:%p is opened, query on:%s, interval:%" PRId64 ", sliding:%" PRId64 ", first launched in:%" PRId64 ", sql:%s", pSql,
+//           pStream, pTableMetaInfo->name, pStream->interval.interval, pStream->interval.sliding, starttime, pSql->sqlstr);
 }
 
 void tscSetStreamDestTable(SSqlStream* pStream, const char* dstTable) {
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index b4723d4b03..d0961c5cad 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -483,7 +483,7 @@ static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
     size_t numOfCols = taosArrayGetSize(pQueryInfo->colList);
     tscDebug("%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s",
              pSql, pNew, 0, pTableMetaInfo->vgroupIndex, pQueryInfo->type, taosArrayGetSize(pQueryInfo->exprList),
-             numOfCols, pQueryInfo->fieldsInfo.numOfOutput, pTableMetaInfo->name);
+             numOfCols, pQueryInfo->fieldsInfo.numOfOutput, tNameGetTableName(&pTableMetaInfo->name));
   }
   
   //prepare the subqueries object failed, abort
@@ -674,7 +674,7 @@ static void issueTSCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj*
       "%p subquery:%p tableIndex:%d, vgroupIndex:%d, numOfVgroups:%d, type:%d, ts_comp query to retrieve timestamps, "
       "numOfExpr:%" PRIzu ", colList:%" PRIzu ", numOfOutputFields:%d, name:%s",
       pParent, pSql, 0, pTableMetaInfo->vgroupIndex, pTableMetaInfo->vgroupList->numOfVgroups, pQueryInfo->type,
-      tscSqlExprNumOfExprs(pQueryInfo), numOfCols, pQueryInfo->fieldsInfo.numOfOutput, pTableMetaInfo->name);
+      tscSqlExprNumOfExprs(pQueryInfo), numOfCols, pQueryInfo->fieldsInfo.numOfOutput, tNameGetTableName(&pTableMetaInfo->name));
   
   tscProcessSql(pSql);
 }
@@ -1534,7 +1534,7 @@ int32_t tscCreateJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
           "%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, transfer to tid_tag query to retrieve (tableId, tags), "
           "exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, tagIndex:%d, name:%s",
           pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
-          numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, colIndex.columnIndex, pNewQueryInfo->pTableMetaInfo[0]->name);
+          numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, colIndex.columnIndex, tNameGetTableName(&pNewQueryInfo->pTableMetaInfo[0]->name));
     } else {
       SSchema      colSchema = {.type = TSDB_DATA_TYPE_BINARY, .bytes = 1};
       SColumnIndex colIndex = {0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
@@ -1569,7 +1569,7 @@ int32_t tscCreateJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter
           "%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%u, transfer to ts_comp query to retrieve timestamps, "
           "exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s",
           pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
-          numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, pNewQueryInfo->pTableMetaInfo[0]->name);
+          numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, tNameGetTableName(&pNewQueryInfo->pTableMetaInfo[0]->name));
     }
   } else {
     assert(0);
@@ -2286,7 +2286,7 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
         tscFreeQueryInfo(&pSql->cmd);
         SQueryInfo* pQueryInfo = tscGetQueryInfoDetailSafely(&pSql->cmd, 0);
         STableMetaInfo* pMasterTableMetaInfo = tscGetTableMetaInfoFromCmd(&pParentObj->cmd, pSql->cmd.clauseIndex, 0);
-        tscAddTableMetaInfo(pQueryInfo, pMasterTableMetaInfo->name, NULL, NULL, NULL, NULL);
+        tscAddTableMetaInfo(pQueryInfo, &pMasterTableMetaInfo->name, NULL, NULL, NULL, NULL);
 
         tscDebug("%p, failed sub:%d, %p", pParentObj, i, pSql);
       }
@@ -2297,7 +2297,8 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
 
     tscDebug("%p cleanup %d tableMeta in hashTable", pParentObj, pParentObj->cmd.numOfTables);
     for(int32_t i = 0; i < pParentObj->cmd.numOfTables; ++i) {
-      char* name = pParentObj->cmd.pTableNameList[i];
+      char name[TSDB_TABLE_FNAME_LEN] = {0};
+      tNameExtractFullName(pParentObj->cmd.pTableNameList[i], name);
       taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN));
     }
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 70bc2038f5..64d0ebbd1d 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -89,21 +89,6 @@ bool tscQueryTags(SQueryInfo* pQueryInfo) {
   return true;
 }
 
-// todo refactor, extract methods and move the common module
-void tscGetDBInfoFromTableFullName(char* tableId, char* db) {
-  char* st = strstr(tableId, TS_PATH_DELIMITER);
-  if (st != NULL) {
-    char* end = strstr(st + 1, TS_PATH_DELIMITER);
-    if (end != NULL) {
-      memcpy(db, tableId, (end - tableId));
-      db[end - tableId] = 0;
-      return;
-    }
-  }
-
-  db[0] = 0;
-}
-
 bool tscIsTwoStageSTableQuery(SQueryInfo* pQueryInfo, int32_t tableIndex) {
   if (pQueryInfo == NULL) {
     return false;
@@ -606,15 +591,13 @@ int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock) {
   // todo refactor
   // set the correct table meta object, the table meta has been locked in pDataBlocks, so it must be in the cache
   if (pTableMetaInfo->pTableMeta != pDataBlock->pTableMeta) {
-    tstrncpy(pTableMetaInfo->name, pDataBlock->tableName, sizeof(pTableMetaInfo->name));
+    tNameAssign(&pTableMetaInfo->name, &pDataBlock->tableName);
 
     if (pTableMetaInfo->pTableMeta != NULL) {
       tfree(pTableMetaInfo->pTableMeta);
     }
 
     pTableMetaInfo->pTableMeta = tscTableMetaDup(pDataBlock->pTableMeta);
-  } else {
-    assert(strncmp(pTableMetaInfo->name, pDataBlock->tableName, tListLen(pDataBlock->tableName)) == 0);
   }
 
   /*
@@ -649,7 +632,7 @@ int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock) {
  * @param dataBlocks
  * @return
  */
-int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, const char* name,
+int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, SName* name,
                            STableMeta* pTableMeta, STableDataBlocks** dataBlocks) {
   STableDataBlocks* dataBuf = (STableDataBlocks*)calloc(1, sizeof(STableDataBlocks));
   if (dataBuf == NULL) {
@@ -677,7 +660,7 @@ int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOff
   dataBuf->size = startOffset;
   dataBuf->tsSource = -1;
 
-  tstrncpy(dataBuf->tableName, name, sizeof(dataBuf->tableName));
+  tNameAssign(&dataBuf->tableName, name);
 
   //Here we keep the tableMeta to avoid it to be remove by other threads.
   dataBuf->pTableMeta = tscTableMetaDup(pTableMeta);
@@ -687,8 +670,8 @@ int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOff
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, int32_t startOffset, int32_t rowSize, const char* tableId, STableMeta* pTableMeta,
-                                STableDataBlocks** dataBlocks, SArray* pBlockList) {
+int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, int32_t startOffset, int32_t rowSize,
+    SName* name, STableMeta* pTableMeta, STableDataBlocks** dataBlocks, SArray* pBlockList) {
   *dataBlocks = NULL;
   STableDataBlocks** t1 = (STableDataBlocks**)taosHashGet(pHashList, (const char*)&id, sizeof(id));
   if (t1 != NULL) {
@@ -696,7 +679,7 @@ int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, i
   }
 
   if (*dataBlocks == NULL) {
-    int32_t ret = tscCreateDataBlock((size_t)size, rowSize, startOffset, tableId, pTableMeta, dataBlocks);
+    int32_t ret = tscCreateDataBlock((size_t)size, rowSize, startOffset, name, pTableMeta, dataBlocks);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
@@ -797,7 +780,7 @@ static void extractTableNameList(SSqlCmd* pCmd, bool freeBlockMap) {
   int32_t i = 0;
   while(p1) {
     STableDataBlocks* pBlocks = *p1;
-    pCmd->pTableNameList[i++] = strndup(pBlocks->tableName, TSDB_TABLE_FNAME_LEN);
+    pCmd->pTableNameList[i++] = tNameDup(&pBlocks->tableName);
     p1 = taosHashIterate(pCmd->pTableBlockHashList, p1);
   }
 
@@ -822,7 +805,7 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
     STableDataBlocks* dataBuf = NULL;
     
     int32_t ret = tscGetDataBlockFromList(pVnodeDataBlockHashList, pOneTableBlock->vgId, TSDB_PAYLOAD_SIZE,
-                                INSERT_HEAD_SIZE, 0, pOneTableBlock->tableName, pOneTableBlock->pTableMeta, &dataBuf, pVnodeDataBlockList);
+                                INSERT_HEAD_SIZE, 0, &pOneTableBlock->tableName, pOneTableBlock->pTableMeta, &dataBuf, pVnodeDataBlockList);
     if (ret != TSDB_CODE_SUCCESS) {
       tscError("%p failed to prepare the data block buffer for merging table data, code:%d", pSql, ret);
       taosHashCleanup(pVnodeDataBlockHashList);
@@ -855,8 +838,8 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap) {
 
     tscSortRemoveDataBlockDupRows(pOneTableBlock);
     char* ekey = (char*)pBlocks->data + pOneTableBlock->rowSize*(pBlocks->numOfRows-1);
-    
-    tscDebug("%p name:%s, sid:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pSql, pOneTableBlock->tableName,
+
+    tscDebug("%p name:%s, name:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pSql, tNameGetTableName(&pOneTableBlock->tableName),
         pBlocks->tid, pBlocks->numOfRows, pBlocks->sversion, GET_INT64_VAL(pBlocks->data), GET_INT64_VAL(ekey));
 
     int32_t len = pBlocks->numOfRows * (pOneTableBlock->rowSize + expandSize) + sizeof(STColumn) * tscGetNumOfColumns(pOneTableBlock->pTableMeta);
@@ -1304,7 +1287,7 @@ SColumn* tscColumnClone(const SColumn* src) {
 
   dst->colIndex     = src->colIndex;
   dst->numOfFilters = src->numOfFilters;
-  dst->filterInfo   = tscFilterInfoClone(src->filterInfo, src->numOfFilters);
+  dst->filterInfo   = tFilterInfoDup(src->filterInfo, src->numOfFilters);
   
   return dst;
 }
@@ -1844,7 +1827,7 @@ void clearAllTableMetaInfo(SQueryInfo* pQueryInfo) {
   tfree(pQueryInfo->pTableMetaInfo);
 }
 
-STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta,
+STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, SName* name, STableMeta* pTableMeta,
                                     SVgroupsInfo* vgroupList, SArray* pTagCols, SArray* pVgroupTables) {
   void* pAlloc = realloc(pQueryInfo->pTableMetaInfo, (pQueryInfo->numOfTables + 1) * POINTER_BYTES);
   if (pAlloc == NULL) {
@@ -1862,7 +1845,7 @@ STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, ST
   pQueryInfo->pTableMetaInfo[pQueryInfo->numOfTables] = pTableMetaInfo;
 
   if (name != NULL) {
-    tstrncpy(pTableMetaInfo->name, name, sizeof(pTableMetaInfo->name));
+    tNameAssign(&pTableMetaInfo->name, name);
   }
 
   pTableMetaInfo->pTableMeta = pTableMeta;
@@ -1959,7 +1942,7 @@ SSqlObj* createSimpleSubObj(SSqlObj* pSql, __async_cb_func_t fp, void* param, in
   assert(pSql->cmd.clauseIndex == 0);
   STableMetaInfo* pMasterTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, pSql->cmd.clauseIndex, 0);
 
-  tscAddTableMetaInfo(pQueryInfo, pMasterTableMetaInfo->name, NULL, NULL, NULL, NULL);
+  tscAddTableMetaInfo(pQueryInfo, &pMasterTableMetaInfo->name, NULL, NULL, NULL, NULL);
   registerSqlObj(pNew);
 
   return pNew;
@@ -2115,27 +2098,26 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   pNew->param   = param;
   pNew->maxRetry = TSDB_MAX_REPLICA;
 
-  char* name = pTableMetaInfo->name;
   STableMetaInfo* pFinalInfo = NULL;
 
   if (pPrevSql == NULL) {
     STableMeta* pTableMeta = tscTableMetaDup(pTableMetaInfo->pTableMeta);
     assert(pTableMeta != NULL);
 
-    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pTableMeta, pTableMetaInfo->vgroupList,
+    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, &pTableMetaInfo->name, pTableMeta, pTableMetaInfo->vgroupList,
                                      pTableMetaInfo->tagColList, pTableMetaInfo->pVgroupTables);
   } else {  // transfer the ownership of pTableMeta to the newly create sql object.
     STableMetaInfo* pPrevInfo = tscGetTableMetaInfoFromCmd(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex, 0);
 
     STableMeta*  pPrevTableMeta = tscTableMetaDup(pPrevInfo->pTableMeta);
     SVgroupsInfo* pVgroupsInfo = pPrevInfo->vgroupList;
-    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pPrevTableMeta, pVgroupsInfo, pTableMetaInfo->tagColList,
+    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, &pTableMetaInfo->name, pPrevTableMeta, pVgroupsInfo, pTableMetaInfo->tagColList,
         pTableMetaInfo->pVgroupTables);
   }
 
   // this case cannot be happened
   if (pFinalInfo->pTableMeta == NULL) {
-    tscError("%p new subquery failed since no tableMeta, name:%s", pSql, name);
+    tscError("%p new subquery failed since no tableMeta, name:%s", pSql, tNameGetTableName(&pTableMetaInfo->name));
 
     if (pPrevSql != NULL) { // pass the previous error to client
       assert(pPrevSql->res.code != TSDB_CODE_SUCCESS);
@@ -2160,7 +2142,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
         "%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ","
         "fieldInfo:%d, name:%s, qrang:%" PRId64 " - %" PRId64 " order:%d, limit:%" PRId64,
         pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
-        size, pNewQueryInfo->fieldsInfo.numOfOutput, pFinalInfo->name, pNewQueryInfo->window.skey,
+        size, pNewQueryInfo->fieldsInfo.numOfOutput, tNameGetTableName(&pFinalInfo->name), pNewQueryInfo->window.skey,
         pNewQueryInfo->window.ekey, pNewQueryInfo->order.order, pNewQueryInfo->limit.limit);
     
     tscPrintSelectClause(pNew, 0);
diff --git a/src/common/inc/tname.h b/src/common/inc/tname.h
index 44f1047543..bc1611cefe 100644
--- a/src/common/inc/tname.h
+++ b/src/common/inc/tname.h
@@ -21,6 +21,20 @@ typedef struct SColumnInfoData {
   void* pData;    // the corresponding block data in memory
 } SColumnInfoData;
 
+#define TSDB_DB_NAME_T     1
+#define TSDB_TABLE_NAME_T  2
+
+#define T_NAME_ACCT     0x1u
+#define T_NAME_DB       0x2u
+#define T_NAME_TABLE    0x4u
+
+typedef struct SName {
+  uint8_t type;  //db_name_t, table_name_t
+  char acctId[TSDB_ACCT_ID_LEN];
+  char dbname[TSDB_DB_NAME_LEN];
+  char tname[TSDB_TABLE_NAME_LEN];
+} SName;
+
 void extractTableName(const char *tableId, char *name);
 
 char* extractDBName(const char *tableId, char *name);
@@ -35,9 +49,9 @@ SSchema tGetUserSpecifiedColumnSchema(tVariant* pVal, SStrToken* exprStr, const
 
 bool tscValidateTableNameLength(size_t len);
 
-SColumnFilterInfo* tscFilterInfoClone(const SColumnFilterInfo* src, int32_t numOfFilters);
+SColumnFilterInfo* tFilterInfoDup(const SColumnFilterInfo* src, int32_t numOfFilters);
 
-SSchema tscGetTbnameColumnSchema();
+SSchema tGetTbnameColumnSchema();
 
 /**
  * check if the schema is valid or not, including following aspects:
@@ -51,6 +65,28 @@ SSchema tscGetTbnameColumnSchema();
  * @param numOfCols
  * @return
  */
-bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags);
+bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags);
+
+int32_t tNameExtractFullName(const SName* name, char* dst);
+int32_t tNameLen(const SName* name);
+
+SName* tNameDup(const SName* name);
+
+bool tIsValidName(const SName* name);
+
+const char* tNameGetTableName(const SName* name);
+
+int32_t tNameGetDbName(const SName* name, char* dst);
+int32_t tNameGetFullDbName(const SName* name, char* dst);
+
+bool tNameIsEmpty(const SName* name);
+
+void tNameAssign(SName* dst, const SName* src);
+
+int32_t tNameFromString(SName* dst, const char* str, uint32_t type);
+
+int32_t tNameSetAcctId(SName* dst, const char* acct);
+
+int32_t tNameSetDbName(SName* dst, const char* acct, SStrToken* dbToken);
 
 #endif  // TDENGINE_NAME_H
diff --git a/src/common/src/tname.c b/src/common/src/tname.c
index f35867ede3..ba2b61c46a 100644
--- a/src/common/src/tname.c
+++ b/src/common/src/tname.c
@@ -3,31 +3,12 @@
 
 #include "tname.h"
 #include "tstoken.h"
-#include "ttokendef.h"
 #include "tvariant.h"
 
-#define VALIDNUMOFCOLS(x) ((x) >= TSDB_MIN_COLUMNS && (x) <= TSDB_MAX_COLUMNS)
-
+#define VALIDNUMOFCOLS(x)  ((x) >= TSDB_MIN_COLUMNS && (x) <= TSDB_MAX_COLUMNS)
 #define VALIDNUMOFTAGS(x)  ((x) >= 0 && (x) <= TSDB_MAX_TAGS)
 
-// todo refactor
-UNUSED_FUNC static FORCE_INLINE const char* skipSegments(const char* input, char delim, int32_t num) {
-  for (int32_t i = 0; i < num; ++i) {
-    while (*input != 0 && *input++ != delim) {
-    };
-  }
-  return input;
-}
-
-UNUSED_FUNC static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
-  size_t len = 0;
-  while (*src != delimiter && *src != 0) {
-    *dst++ = *src++;
-    len++;
-  }
-  
-  return len;
-}
+#define VALID_NAME_TYPE(x)  ((x) == TSDB_DB_NAME_T || (x) == TSDB_TABLE_NAME_T)
 
 void extractTableName(const char* tableId, char* name) {
   size_t s1 = strcspn(tableId, &TS_PATH_DELIMITER[0]);
@@ -85,7 +66,7 @@ bool tscValidateTableNameLength(size_t len) {
   return len < TSDB_TABLE_NAME_LEN;
 }
 
-SColumnFilterInfo* tscFilterInfoClone(const SColumnFilterInfo* src, int32_t numOfFilters) {
+SColumnFilterInfo* tFilterInfoDup(const SColumnFilterInfo* src, int32_t numOfFilters) {
   if (numOfFilters == 0) {
     assert(src == NULL);
     return NULL;
@@ -200,7 +181,7 @@ void extractTableNameFromToken(SStrToken* pToken, SStrToken* pTable) {
   }
 }
 
-SSchema tscGetTbnameColumnSchema() {
+SSchema tGetTbnameColumnSchema() {
   struct SSchema s = {
       .colId = TSDB_TBNAME_COLUMN_INDEX,
       .type  = TSDB_DATA_TYPE_BINARY,
@@ -248,7 +229,7 @@ static bool doValidateSchema(SSchema* pSchema, int32_t numOfCols, int32_t maxLen
   return rowLen <= maxLen;
 }
 
-bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags) {
+bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags) {
   if (!VALIDNUMOFCOLS(numOfCols)) {
     return false;
   }
@@ -272,3 +253,179 @@ bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags
 
   return true;
 }
+
+int32_t tNameExtractFullName(const SName* name, char* dst) {
+  assert(name != NULL && dst != NULL);
+
+  // invalid full name format, abort
+  if (!tIsValidName(name)) {
+    return -1;
+  }
+
+  int32_t len = snprintf(dst, TSDB_ACCT_ID_LEN + 1 + TSDB_DB_NAME_LEN, "%s.%s", name->acctId, name->dbname);
+
+  size_t tnameLen = strlen(name->tname);
+  if (tnameLen > 0) {
+    assert(name->type == TSDB_TABLE_NAME_T);
+    dst[len] = TS_PATH_DELIMITER[0];
+
+    memcpy(dst + len + 1, name->tname, tnameLen);
+    dst[len + tnameLen + 1] = 0;
+  }
+
+  return 0;
+}
+
+int32_t tNameLen(const SName* name) {
+  assert(name != NULL);
+  int32_t len  = (int32_t) strlen(name->acctId);
+  int32_t len1 = (int32_t) strlen(name->dbname);
+  int32_t len2 = (int32_t) strlen(name->tname);
+
+  if (name->type == TSDB_DB_NAME_T) {
+    assert(len2 == 0);
+    return len + len1 + TS_PATH_DELIMITER_LEN;
+  } else {
+    assert(len2 > 0);
+    return len + len1 + len2 + TS_PATH_DELIMITER_LEN * 2;
+  }
+}
+
+bool tIsValidName(const SName* name) {
+  assert(name != NULL);
+
+  if (!VALID_NAME_TYPE(name->type)) {
+    return false;
+  }
+
+  if (strlen(name->acctId) <= 0) {
+    return false;
+  }
+
+  if (name->type == TSDB_DB_NAME_T) {
+    return strlen(name->dbname) > 0;
+  } else {
+    return strlen(name->dbname) > 0 && strlen(name->tname) > 0;
+  }
+}
+
+SName* tNameDup(const SName* name) {
+  assert(name != NULL);
+
+  SName* p = calloc(1, sizeof(SName));
+  memcpy(p, name, sizeof(SName));
+  return p;
+}
+
+int32_t tNameGetDbName(const SName* name, char* dst) {
+  assert(name != NULL && dst != NULL);
+  strncpy(dst, name->dbname, tListLen(name->dbname));
+  return 0;
+}
+
+int32_t tNameGetFullDbName(const SName* name, char* dst) {
+  assert(name != NULL && dst != NULL);
+  snprintf(dst, TSDB_ACCT_ID_LEN + TS_PATH_DELIMITER_LEN + TSDB_DB_NAME_LEN,
+      "%s.%s", name->acctId, name->dbname);
+  return 0;
+}
+
+bool tNameIsEmpty(const SName* name) {
+  assert(name != NULL);
+  return name->type == 0 || strlen(name->acctId) <= 0;
+}
+
+const char* tNameGetTableName(const SName* name) {
+  assert(name != NULL && name->type == TSDB_TABLE_NAME_T);
+  return &name->tname[0];
+}
+
+void tNameAssign(SName* dst, const SName* src) {
+  memcpy(dst, src, sizeof(SName));
+}
+
+int32_t tNameSetDbName(SName* dst, const char* acct, SStrToken* dbToken) {
+  assert(dst != NULL && dbToken != NULL && acct != NULL);
+
+  // too long account id or too long db name
+  if (strlen(acct) >= tListLen(dst->acctId) || dbToken->n >= tListLen(dst->dbname)) {
+    return -1;
+  }
+
+  dst->type = TSDB_DB_NAME_T;
+  tstrncpy(dst->acctId, acct, tListLen(dst->acctId));
+  tstrncpy(dst->dbname, dbToken->z, dbToken->n + 1);
+  return 0;
+}
+
+int32_t tNameSetAcctId(SName* dst, const char* acct) {
+  assert(dst != NULL && acct != NULL);
+
+  // too long account id or too long db name
+  if (strlen(acct) >= tListLen(dst->acctId)) {
+    return -1;
+  }
+
+  tstrncpy(dst->acctId, acct, tListLen(dst->acctId));
+  return 0;
+}
+
+int32_t tNameFromString(SName* dst, const char* str, uint32_t type) {
+  assert(dst != NULL && str != NULL && strlen(str) > 0);
+
+  char* p = NULL;
+  if ((type & T_NAME_ACCT) == T_NAME_ACCT) {
+    p = strstr(str, TS_PATH_DELIMITER);
+    if (p == NULL) {
+      return -1;
+    }
+
+    int32_t len = p - str;
+
+    // too long account id or too long db name
+    if (len >= tListLen(dst->acctId) || len == 0) {
+      return -1;
+    }
+
+    memcpy (dst->acctId, str, len);
+    dst->acctId[len] = 0;
+  }
+
+  if ((type & T_NAME_DB) == T_NAME_DB) {
+    dst->type = TSDB_DB_NAME_T;
+    char* start = (char*)((p == NULL)? str:(p+1));
+
+    int32_t len = 0;
+    p = strstr(start, TS_PATH_DELIMITER);
+    if (p == NULL) {
+      len = strlen(start);
+    } else {
+      len = p - start;
+    }
+
+    // too long account id or too long db name
+    if (len >= tListLen(dst->dbname) || len == 0) {
+      return -1;
+    }
+
+    memcpy (dst->dbname, start, len);
+    dst->dbname[len] = 0;
+  }
+
+  if ((type & T_NAME_TABLE) == T_NAME_TABLE) {
+    dst->type = TSDB_TABLE_NAME_T;
+    char* start = (char*) ((p == NULL)? str: (p+1));
+
+    int32_t len = strlen(start);
+
+    // too long account id or too long db name
+    if (len >= tListLen(dst->tname) || len == 0) {
+      return -1;
+    }
+
+    memcpy (dst->tname, start, len);
+    dst->tname[len] = 0;
+  }
+
+  return 0;
+}
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 4582efbc40..5b31fbf292 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -268,8 +268,7 @@ typedef struct {
 
 typedef struct {
   int32_t len;  // one create table message
-  char    tableFname[TSDB_TABLE_FNAME_LEN];
-  char    db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN];
+  char    tableName[TSDB_TABLE_FNAME_LEN];
   int8_t  igExists;
   int8_t  getMeta;
   int16_t numOfTags;
@@ -285,7 +284,7 @@ typedef struct {
 } SCMCreateTableMsg;
 
 typedef struct {
-  char   tableFname[TSDB_TABLE_FNAME_LEN];
+  char   name[TSDB_TABLE_FNAME_LEN];
   int8_t igNotExists;
 } SCMDropTableMsg;
 
diff --git a/src/mnode/inc/mnodeDb.h b/src/mnode/inc/mnodeDb.h
index 9354b923d7..d03ba8d717 100644
--- a/src/mnode/inc/mnodeDb.h
+++ b/src/mnode/inc/mnodeDb.h
@@ -32,7 +32,7 @@ int32_t mnodeInitDbs();
 void    mnodeCleanupDbs();
 int64_t mnodeGetDbNum();
 SDbObj *mnodeGetDb(char *db);
-SDbObj *mnodeGetDbByTableId(char *db);
+SDbObj *mnodeGetDbByTableName(char *db);
 void *  mnodeGetNextDb(void *pIter, SDbObj **pDb);
 void    mnodeCancelGetNextDb(void *pIter);
 void    mnodeIncDbRef(SDbObj *pDb);
diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c
index fbcad151bc..d9ed22a567 100644
--- a/src/mnode/src/mnodeDb.c
+++ b/src/mnode/src/mnodeDb.c
@@ -199,18 +199,13 @@ void mnodeDecDbRef(SDbObj *pDb) {
   return sdbDecRef(tsDbSdb, pDb); 
 }
 
-SDbObj *mnodeGetDbByTableId(char *tableId) {
-  char db[TSDB_TABLE_FNAME_LEN], *pos;
- 
-  // tableId format should be :  acct.db.table
-  pos = strstr(tableId, TS_PATH_DELIMITER);
-  assert(NULL != pos);
+SDbObj *mnodeGetDbByTableName(char *tableName) {
+  SName name = {0};
+  tNameFromString(&name, tableName, T_NAME_ACCT|T_NAME_DB|T_NAME_TABLE);
 
-  pos = strstr(pos + 1, TS_PATH_DELIMITER);
-  assert(NULL != pos);
-
-  memset(db, 0, sizeof(db));
-  strncpy(db, tableId, pos - tableId);
+  // validate the tableName?
+  char db[TSDB_TABLE_FNAME_LEN] = {0};
+  tNameGetFullDbName(&name, db);
 
   return mnodeGetDb(db);
 }
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index bdf5a7fb8b..4229a4ce6e 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -297,7 +297,7 @@ static int32_t mnodeChildTableActionRestored() {
     pIter = mnodeGetNextChildTable(pIter, &pTable);
     if (pTable == NULL) break;
 
-    SDbObj *pDb = mnodeGetDbByTableId(pTable->info.tableId);
+    SDbObj *pDb = mnodeGetDbByTableName(pTable->info.tableId);
     if (pDb == NULL || pDb->status != TSDB_DB_STATUS_READY) {
       mError("ctable:%s, failed to get db or db in dropping, discard it", pTable->info.tableId);
       SSdbRow desc = {.type = SDB_OPER_LOCAL, .pObj = pTable, .pTable = tsChildTableSdb};
@@ -443,7 +443,7 @@ static int32_t mnodeSuperTableActionDestroy(SSdbRow *pRow) {
 
 static int32_t mnodeSuperTableActionInsert(SSdbRow *pRow) {
   SSTableObj *pStable = pRow->pObj;
-  SDbObj *pDb = mnodeGetDbByTableId(pStable->info.tableId);
+  SDbObj *pDb = mnodeGetDbByTableName(pStable->info.tableId);
   if (pDb != NULL && pDb->status == TSDB_DB_STATUS_READY) {
     mnodeAddSuperTableIntoDb(pDb);
   }
@@ -455,7 +455,7 @@ static int32_t mnodeSuperTableActionInsert(SSdbRow *pRow) {
 
 static int32_t mnodeSuperTableActionDelete(SSdbRow *pRow) {
   SSTableObj *pStable = pRow->pObj;
-  SDbObj *pDb = mnodeGetDbByTableId(pStable->info.tableId);
+  SDbObj *pDb = mnodeGetDbByTableName(pStable->info.tableId);
   if (pDb != NULL) {
     mnodeRemoveSuperTableFromDb(pDb);
     mnodeDropAllChildTablesInStable((SSTableObj *)pStable);
@@ -748,9 +748,12 @@ void mnodeDestroySubMsg(SMnodeMsg *pSubMsg) {
 }
 
 static int32_t mnodeValidateCreateTableMsg(SCreateTableMsg *pCreateTable, SMnodeMsg *pMsg) {
-  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pCreateTable->db);
   if (pMsg->pDb == NULL) {
-    mError("msg:%p, app:%p table:%s, failed to create, db not selected", pMsg, pMsg->rpcMsg.ahandle, pCreateTable->tableFname);
+    pMsg->pDb = mnodeGetDbByTableName(pCreateTable->tableName);
+  }
+
+  if (pMsg->pDb == NULL) {
+    mError("msg:%p, app:%p table:%s, failed to create, db not selected", pMsg, pMsg->rpcMsg.ahandle, pCreateTable->tableName);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
 
@@ -759,28 +762,28 @@ static int32_t mnodeValidateCreateTableMsg(SCreateTableMsg *pCreateTable, SMnode
     return TSDB_CODE_MND_DB_IN_DROPPING;
   }
 
-  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pCreateTable->tableFname);
+  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pCreateTable->tableName);
   if (pMsg->pTable != NULL && pMsg->retry == 0) {
     if (pCreateTable->getMeta) {
-      mDebug("msg:%p, app:%p table:%s, continue to get meta", pMsg, pMsg->rpcMsg.ahandle, pCreateTable->tableFname);
+      mDebug("msg:%p, app:%p table:%s, continue to get meta", pMsg, pMsg->rpcMsg.ahandle, pCreateTable->tableName);
       return mnodeGetChildTableMeta(pMsg);
     } else if (pCreateTable->igExists) {
-      mDebug("msg:%p, app:%p table:%s, is already exist", pMsg, pMsg->rpcMsg.ahandle, pCreateTable->tableFname);
+      mDebug("msg:%p, app:%p table:%s, is already exist", pMsg, pMsg->rpcMsg.ahandle, pCreateTable->tableName);
       return TSDB_CODE_SUCCESS;
     } else {
       mError("msg:%p, app:%p table:%s, failed to create, table already exist", pMsg, pMsg->rpcMsg.ahandle,
-             pCreateTable->tableFname);
+             pCreateTable->tableName);
       return TSDB_CODE_MND_TABLE_ALREADY_EXIST;
     }
   }
 
   if (pCreateTable->numOfTags != 0) {
     mDebug("msg:%p, app:%p table:%s, create stable msg is received from thandle:%p", pMsg, pMsg->rpcMsg.ahandle,
-           pCreateTable->tableFname, pMsg->rpcMsg.handle);
+           pCreateTable->tableName, pMsg->rpcMsg.handle);
     return mnodeProcessCreateSuperTableMsg(pMsg);
   } else {
     mDebug("msg:%p, app:%p table:%s, create ctable msg is received from thandle:%p", pMsg, pMsg->rpcMsg.ahandle,
-           pCreateTable->tableFname, pMsg->rpcMsg.handle);
+           pCreateTable->tableName, pMsg->rpcMsg.handle);
     return mnodeProcessCreateChildTableMsg(pMsg);
   }
 }
@@ -860,9 +863,12 @@ static int32_t mnodeProcessCreateTableMsg(SMnodeMsg *pMsg) {
   }
 
   SCreateTableMsg *p = (SCreateTableMsg*)((char*) pCreate + sizeof(SCMCreateTableMsg));
-  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(p->db);
   if (pMsg->pDb == NULL) {
-    mError("msg:%p, app:%p table:%s, failed to create, db not selected", pMsg, pMsg->rpcMsg.ahandle, p->tableFname);
+    pMsg->pDb = mnodeGetDbByTableName(p->tableName);
+  }
+
+  if (pMsg->pDb == NULL) {
+    mError("msg:%p, app:%p table:%s, failed to create, db not selected", pMsg, pMsg->rpcMsg.ahandle, p->tableName);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
 
@@ -871,37 +877,37 @@ static int32_t mnodeProcessCreateTableMsg(SMnodeMsg *pMsg) {
     return TSDB_CODE_MND_DB_IN_DROPPING;
   }
 
-  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(p->tableFname);
+  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(p->tableName);
   if (pMsg->pTable != NULL && pMsg->retry == 0) {
     if (p->getMeta) {
-      mDebug("msg:%p, app:%p table:%s, continue to get meta", pMsg, pMsg->rpcMsg.ahandle, p->tableFname);
+      mDebug("msg:%p, app:%p table:%s, continue to get meta", pMsg, pMsg->rpcMsg.ahandle, p->tableName);
       return mnodeGetChildTableMeta(pMsg);
     } else if (p->igExists) {
-      mDebug("msg:%p, app:%p table:%s, is already exist", pMsg, pMsg->rpcMsg.ahandle, p->tableFname);
+      mDebug("msg:%p, app:%p table:%s, is already exist", pMsg, pMsg->rpcMsg.ahandle, p->tableName);
       return TSDB_CODE_SUCCESS;
     } else {
-      mError("msg:%p, app:%p table:%s, failed to create, table already exist", pMsg, pMsg->rpcMsg.ahandle, p->tableFname);
+      mError("msg:%p, app:%p table:%s, failed to create, table already exist", pMsg, pMsg->rpcMsg.ahandle, p->tableName);
       return TSDB_CODE_MND_TABLE_ALREADY_EXIST;
     }
   }
 
   if (p->numOfTags != 0) {
     mDebug("msg:%p, app:%p table:%s, create stable msg is received from thandle:%p", pMsg, pMsg->rpcMsg.ahandle,
-           p->tableFname, pMsg->rpcMsg.handle);
+           p->tableName, pMsg->rpcMsg.handle);
     return mnodeProcessCreateSuperTableMsg(pMsg);
   } else {
     mDebug("msg:%p, app:%p table:%s, create ctable msg is received from thandle:%p", pMsg, pMsg->rpcMsg.ahandle,
-           p->tableFname, pMsg->rpcMsg.handle);
+           p->tableName, pMsg->rpcMsg.handle);
     return mnodeProcessCreateChildTableMsg(pMsg);
   }
 }
 
 static int32_t mnodeProcessDropTableMsg(SMnodeMsg *pMsg) {
   SCMDropTableMsg *pDrop = pMsg->rpcMsg.pCont;
-  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pDrop->tableFname);
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableName(pDrop->name);
   if (pMsg->pDb == NULL) {
     mError("msg:%p, app:%p table:%s, failed to drop table, db not selected or db in dropping", pMsg,
-           pMsg->rpcMsg.ahandle, pDrop->tableFname);
+           pMsg->rpcMsg.ahandle, pDrop->name);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
 
@@ -912,17 +918,17 @@ static int32_t mnodeProcessDropTableMsg(SMnodeMsg *pMsg) {
 
   if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
     mError("msg:%p, app:%p table:%s, failed to drop table, in monitor database", pMsg, pMsg->rpcMsg.ahandle,
-           pDrop->tableFname);
+           pDrop->name);
     return TSDB_CODE_MND_MONITOR_DB_FORBIDDEN;
   }
 
-  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pDrop->tableFname);
+  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pDrop->name);
   if (pMsg->pTable == NULL) {
     if (pDrop->igNotExists) {
-      mDebug("msg:%p, app:%p table:%s is not exist, treat as success", pMsg, pMsg->rpcMsg.ahandle, pDrop->tableFname);
+      mDebug("msg:%p, app:%p table:%s is not exist, treat as success", pMsg, pMsg->rpcMsg.ahandle, pDrop->name);
       return TSDB_CODE_SUCCESS;
     } else {
-      mError("msg:%p, app:%p table:%s, failed to drop, table not exist", pMsg, pMsg->rpcMsg.ahandle, pDrop->tableFname);
+      mError("msg:%p, app:%p table:%s, failed to drop, table not exist", pMsg, pMsg->rpcMsg.ahandle, pDrop->name);
       return TSDB_CODE_MND_INVALID_TABLE_NAME;
     }
   }
@@ -930,12 +936,12 @@ static int32_t mnodeProcessDropTableMsg(SMnodeMsg *pMsg) {
   if (pMsg->pTable->type == TSDB_SUPER_TABLE) {
     SSTableObj *pSTable = (SSTableObj *)pMsg->pTable;
     mInfo("msg:%p, app:%p table:%s, start to drop stable, uid:%" PRIu64 ", numOfChildTables:%d, sizeOfVgList:%d", pMsg,
-          pMsg->rpcMsg.ahandle, pDrop->tableFname, pSTable->uid, pSTable->numOfTables, taosHashGetSize(pSTable->vgHash));
+          pMsg->rpcMsg.ahandle, pDrop->name, pSTable->uid, pSTable->numOfTables, taosHashGetSize(pSTable->vgHash));
     return mnodeProcessDropSuperTableMsg(pMsg);
   } else {
     SCTableObj *pCTable = (SCTableObj *)pMsg->pTable;
     mInfo("msg:%p, app:%p table:%s, start to drop ctable, vgId:%d tid:%d uid:%" PRIu64, pMsg, pMsg->rpcMsg.ahandle,
-          pDrop->tableFname, pCTable->vgId, pCTable->tid, pCTable->uid);
+          pDrop->name, pCTable->vgId, pCTable->tid, pCTable->uid);
     return mnodeProcessDropChildTableMsg(pMsg);
   }
 }
@@ -946,7 +952,7 @@ static int32_t mnodeProcessTableMetaMsg(SMnodeMsg *pMsg) {
   mDebug("msg:%p, app:%p table:%s, table meta msg is received from thandle:%p, createFlag:%d", pMsg, pMsg->rpcMsg.ahandle,
          pInfo->tableFname, pMsg->rpcMsg.handle, pInfo->createFlag);
 
-  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pInfo->tableFname);
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableName(pInfo->tableFname);
   if (pMsg->pDb == NULL) {
     mError("msg:%p, app:%p table:%s, failed to get table meta, db not selected", pMsg, pMsg->rpcMsg.ahandle,
            pInfo->tableFname);
@@ -1006,12 +1012,12 @@ static int32_t mnodeProcessCreateSuperTableMsg(SMnodeMsg *pMsg) {
 
   SSTableObj *   pStable = calloc(1, sizeof(SSTableObj));
   if (pStable == NULL) {
-    mError("msg:%p, app:%p table:%s, failed to create, no enough memory", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname);
+    mError("msg:%p, app:%p table:%s, failed to create, no enough memory", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName);
     return TSDB_CODE_MND_OUT_OF_MEMORY;
   }
 
   int64_t us = taosGetTimestampUs();
-  pStable->info.tableId = strdup(pCreate->tableFname);
+  pStable->info.tableId = strdup(pCreate->tableName);
   pStable->info.type    = TSDB_SUPER_TABLE;
   pStable->createdTime  = taosGetTimestampMs();
   pStable->uid          = (us << 24) + ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));
@@ -1025,14 +1031,14 @@ static int32_t mnodeProcessCreateSuperTableMsg(SMnodeMsg *pMsg) {
   pStable->schema = (SSchema *)calloc(1, schemaSize);
   if (pStable->schema == NULL) {
     free(pStable);
-    mError("msg:%p, app:%p table:%s, failed to create, no schema input", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname);
+    mError("msg:%p, app:%p table:%s, failed to create, no schema input", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName);
     return TSDB_CODE_MND_INVALID_TABLE_NAME;
   }
 
   memcpy(pStable->schema, pCreate->schema, numOfCols * sizeof(SSchema));
 
   if (pStable->numOfColumns > TSDB_MAX_COLUMNS || pStable->numOfTags > TSDB_MAX_TAGS) {
-    mError("msg:%p, app:%p table:%s, failed to create, too many columns", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname);
+    mError("msg:%p, app:%p table:%s, failed to create, too many columns", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName);
     return TSDB_CODE_MND_INVALID_TABLE_NAME;
   }
 
@@ -1044,8 +1050,8 @@ static int32_t mnodeProcessCreateSuperTableMsg(SMnodeMsg *pMsg) {
     tschema[col].bytes = htons(tschema[col].bytes);
   }
 
-  if (!isValidSchema(pStable->schema, pStable->numOfColumns, pStable->numOfTags)) {
-    mError("msg:%p, app:%p table:%s, failed to create table, invalid schema", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname);
+  if (!tIsValidSchema(pStable->schema, pStable->numOfColumns, pStable->numOfTags)) {
+    mError("msg:%p, app:%p table:%s, failed to create table, invalid schema", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName);
     return TSDB_CODE_MND_INVALID_CREATE_TABLE_MSG;
   }
 
@@ -1065,7 +1071,7 @@ static int32_t mnodeProcessCreateSuperTableMsg(SMnodeMsg *pMsg) {
   if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mnodeDestroySuperTable(pStable);
     pMsg->pTable = NULL;
-    mError("msg:%p, app:%p table:%s, failed to create, sdb error", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname);
+    mError("msg:%p, app:%p table:%s, failed to create, sdb error", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName);
   }
 
   return code;
@@ -1907,12 +1913,12 @@ static int32_t mnodeDoCreateChildTable(SMnodeMsg *pMsg, int32_t tid) {
 
   SCTableObj *pTable = calloc(1, sizeof(SCTableObj));
   if (pTable == NULL) {
-    mError("msg:%p, app:%p table:%s, failed to alloc memory", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname);
+    mError("msg:%p, app:%p table:%s, failed to alloc memory", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName);
     return TSDB_CODE_MND_OUT_OF_MEMORY;
   }
 
   pTable->info.type    = (pCreate->numOfColumns == 0)? TSDB_CHILD_TABLE:TSDB_NORMAL_TABLE;
-  pTable->info.tableId = strdup(pCreate->tableFname);
+  pTable->info.tableId = strdup(pCreate->tableName);
   pTable->createdTime  = taosGetTimestampMs();
   pTable->tid          = tid;
   pTable->vgId         = pVgroup->vgId;
@@ -1928,7 +1934,7 @@ static int32_t mnodeDoCreateChildTable(SMnodeMsg *pMsg, int32_t tid) {
     size_t prefixLen = tableIdPrefix(pMsg->pDb->name, prefix, 64);
     if (0 != strncasecmp(prefix, stableName, prefixLen)) {
       mError("msg:%p, app:%p table:%s, corresponding super table:%s not in this db", pMsg, pMsg->rpcMsg.ahandle,
-             pCreate->tableFname, stableName);
+             pCreate->tableName, stableName);
       mnodeDestroyChildTable(pTable);
       return TSDB_CODE_TDB_INVALID_CREATE_TB_MSG;
     }
@@ -1936,7 +1942,7 @@ static int32_t mnodeDoCreateChildTable(SMnodeMsg *pMsg, int32_t tid) {
     if (pMsg->pSTable == NULL) pMsg->pSTable = mnodeGetSuperTable(stableName);
     if (pMsg->pSTable == NULL) {
       mError("msg:%p, app:%p table:%s, corresponding super table:%s does not exist", pMsg, pMsg->rpcMsg.ahandle,
-             pCreate->tableFname, stableName);
+             pCreate->tableName, stableName);
       mnodeDestroyChildTable(pTable);
       return TSDB_CODE_MND_INVALID_TABLE_NAME;
     }
@@ -2003,7 +2009,7 @@ static int32_t mnodeDoCreateChildTable(SMnodeMsg *pMsg, int32_t tid) {
   if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
     mnodeDestroyChildTable(pTable);
     pMsg->pTable = NULL;
-    mError("msg:%p, app:%p table:%s, failed to create, reason:%s", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname,
+    mError("msg:%p, app:%p table:%s, failed to create, reason:%s", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName,
            tstrerror(code));
   } else {
     mDebug("msg:%p, app:%p table:%s, allocated in vgroup, vgId:%d sid:%d uid:%" PRIu64, pMsg, pMsg->rpcMsg.ahandle,
@@ -2020,7 +2026,7 @@ static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg) {
   int32_t code = grantCheck(TSDB_GRANT_TIMESERIES);
   if (code != TSDB_CODE_SUCCESS) {
     mError("msg:%p, app:%p table:%s, failed to create, grant timeseries failed", pMsg, pMsg->rpcMsg.ahandle,
-           pCreate->tableFname);
+           pCreate->tableName);
     return code;
   }
 
@@ -2031,7 +2037,7 @@ static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg) {
       code = mnodeGetAvailableVgroup(pMsg, &pVgroup, &tid);
       if (code != TSDB_CODE_SUCCESS) {
         mDebug("msg:%p, app:%p table:%s, failed to get available vgroup, reason:%s", pMsg, pMsg->rpcMsg.ahandle,
-               pCreate->tableFname, tstrerror(code));
+               pCreate->tableName, tstrerror(code));
         return code;
       }
 
@@ -2045,15 +2051,15 @@ static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg) {
       return mnodeDoCreateChildTable(pMsg, tid);
     }
   } else {
-    if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pCreate->tableFname);
+    if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pCreate->tableName);
   }
 
   if (pMsg->pTable == NULL) {
-    mError("msg:%p, app:%p table:%s, object not found, retry:%d reason:%s", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname, pMsg->retry,
+    mError("msg:%p, app:%p table:%s, object not found, retry:%d reason:%s", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName, pMsg->retry,
            tstrerror(terrno));
     return terrno;
   } else {
-    mDebug("msg:%p, app:%p table:%s, send create msg to vnode again", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableFname);
+    mDebug("msg:%p, app:%p table:%s, send create msg to vnode again", pMsg, pMsg->rpcMsg.ahandle, pCreate->tableName);
     return mnodeDoCreateChildTableFp(pMsg);
   }
 }
@@ -2398,8 +2404,7 @@ static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg) {
   SCreateTableMsg* pCreate = (SCreateTableMsg*) ((char*) pCreateMsg + sizeof(SCMCreateTableMsg));
 
   size_t size = tListLen(pInfo->tableFname);
-  tstrncpy(pCreate->tableFname, pInfo->tableFname, size);
-  tstrncpy(pCreate->db, pMsg->pDb->name, sizeof(pCreate->db));
+  tstrncpy(pCreate->tableName, pInfo->tableFname, size);
   pCreate->igExists = 1;
   pCreate->getMeta = 1;
 
@@ -2767,7 +2772,7 @@ static int32_t mnodeProcessMultiTableMetaMsg(SMnodeMsg *pMsg) {
     SCTableObj *pTable = mnodeGetChildTable(tableId);
     if (pTable == NULL) continue;
 
-    if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(tableId);
+    if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableName(tableId);
     if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) {
       mnodeDecTableRef(pTable);
       continue;
@@ -2988,7 +2993,7 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
   mDebug("msg:%p, app:%p table:%s, alter table msg is received from thandle:%p", pMsg, pMsg->rpcMsg.ahandle,
          pAlter->tableFname, pMsg->rpcMsg.handle);
 
-  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pAlter->tableFname);
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableName(pAlter->tableFname);
   if (pMsg->pDb == NULL) {
     mError("msg:%p, app:%p table:%s, failed to alter table, db not selected", pMsg, pMsg->rpcMsg.ahandle, pAlter->tableFname);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
diff --git a/src/query/src/qAst.c b/src/query/src/qAst.c
index 1e6dbe8e3d..bd87cacb4b 100644
--- a/src/query/src/qAst.c
+++ b/src/query/src/qAst.c
@@ -407,7 +407,7 @@ tExprNode* exprTreeFromTableName(const char* tbnameCond) {
   SSchema* pSchema = exception_calloc(1, sizeof(SSchema));
   left->pSchema = pSchema;
 
-  *pSchema = tscGetTbnameColumnSchema();
+  *pSchema = tGetTbnameColumnSchema();
 
   tExprNode* right = exception_calloc(1, sizeof(tExprNode));
   expr->_node.pRight = right;
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index c0f2035286..c20888c659 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6572,7 +6572,7 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGrou
   int32_t srcSize = 0;
   for (int16_t i = 0; i < numOfCols; ++i) {
     pQuery->colList[i] = pQueryMsg->colList[i];
-    pQuery->colList[i].filters = tscFilterInfoClone(pQueryMsg->colList[i].filters, pQuery->colList[i].numOfFilters);
+    pQuery->colList[i].filters = tFilterInfoDup(pQueryMsg->colList[i].filters, pQuery->colList[i].numOfFilters);
     srcSize += pQuery->colList[i].bytes;
   }
 

From bd25e9e928a03a3d6d2d479b5f8ff6496f80ed34 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 19 Jan 2021 18:08:58 +0800
Subject: [PATCH 07/25] [TD-225] refactor codes.

---
 src/client/src/tscServer.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 0e3f015951..45636da89b 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1626,8 +1626,7 @@ int tscBuildTableMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
 
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-
-  STableInfoMsg *pInfoMsg = (STableInfoMsg *)pCmd->payload;
+  STableInfoMsg  *pInfoMsg = (STableInfoMsg *)pCmd->payload;
 
   int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pInfoMsg->tableFname);
   if (code != TSDB_CODE_SUCCESS) {
@@ -2390,7 +2389,7 @@ int tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex) {
   char name[TSDB_TABLE_FNAME_LEN] = {0};
   int32_t code = tNameExtractFullName(&pTableMetaInfo->name, name);
   if (code != TSDB_CODE_SUCCESS) {
-    tscError("%p failed to generate the table full name", pSql, name);
+    tscError("%p failed to generate the table full name", pSql);
     return TSDB_CODE_TSC_INVALID_SQL;
   }
 

From 55a7ce46c1f29a6218a6cf39757f99c629e9eb27 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 19 Jan 2021 22:43:51 +0800
Subject: [PATCH 08/25] [TD-225]refactor.

---
 src/query/src/qExecutor.c                | 32 +++++++++---------------
 tests/script/general/parser/function.sim | 26 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 261ba86bda..b69a5e7434 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1875,6 +1875,7 @@ static int32_t setCtxTagColumnInfo(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx
   return TSDB_CODE_SUCCESS;
 }
 
+// todo refactor
 static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int16_t order) {
   qDebug("QInfo:%p setup runtime env", GET_QINFO_ADDR(pRuntimeEnv));
   SQuery *pQuery = pRuntimeEnv->pQuery;
@@ -3845,11 +3846,6 @@ void setExecutionContext(SQInfo *pQInfo, int32_t groupIndex, TSKEY nextKey) {
 
   // lastKey needs to be updated
   pTableQueryInfo->lastKey = nextKey;
-
-  if (pRuntimeEnv->hasTagResults || pRuntimeEnv->pTsBuf != NULL) {
-    setAdditionalInfo(pQInfo, pTableQueryInfo->pTable, pTableQueryInfo);
-  }
-
   if (pRuntimeEnv->prevGroupId != INT32_MIN && pRuntimeEnv->prevGroupId == groupIndex) {
     return;
   }
@@ -4296,7 +4292,6 @@ int32_t doFillGapsInResults(SQueryRuntimeEnv* pRuntimeEnv, tFilePage **pDst, int
              pQInfo, pFillInfo->numOfRows, ret, pQuery->limit.offset, ret - pQuery->limit.offset, 0);
 
       ret -= (int32_t)pQuery->limit.offset;
-      // todo !!!!there exactly number of interpo is not valid.
       for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
         memmove(pDst[i]->data, pDst[i]->data + pQuery->pExpr1[i].bytes * pQuery->limit.offset,
                 ret * pQuery->pExpr1[i].bytes);
@@ -4777,19 +4772,17 @@ static void enableExecutionForNextTable(SQueryRuntimeEnv *pRuntimeEnv) {
   }
 }
 
-// TODO refactor: setAdditionalInfo
 static FORCE_INLINE void setEnvForEachBlock(SQInfo* pQInfo, STableQueryInfo* pTableQueryInfo, SDataBlockInfo* pBlockInfo) {
   SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery* pQuery = pQInfo->runtimeEnv.pQuery;
   int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
 
-  if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
-    TSKEY nextKey = pBlockInfo->window.skey;
-    setIntervalQueryRange(pQInfo, nextKey);
+  if (pRuntimeEnv->hasTagResults || pRuntimeEnv->pTsBuf != NULL) {
+    setAdditionalInfo(pQInfo, pTableQueryInfo->pTable, pTableQueryInfo);
+  }
 
-    if (pRuntimeEnv->hasTagResults || pRuntimeEnv->pTsBuf != NULL) {
-      setAdditionalInfo(pQInfo, pTableQueryInfo->pTable, pTableQueryInfo);
-    }
+  if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    setIntervalQueryRange(pQInfo, pBlockInfo->window.skey);
   } else {  // non-interval query
     setExecutionContext(pQInfo, pTableQueryInfo->groupIndex, pBlockInfo->window.ekey + step);
   }
@@ -4812,7 +4805,7 @@ static void doTableQueryInfoTimeWindowCheck(SQuery* pQuery, STableQueryInfo* pTa
 static int64_t scanMultiTableDataBlocks(SQInfo *pQInfo) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery*           pQuery = pRuntimeEnv->pQuery;
-  SQueryCostInfo*   summary  = &pRuntimeEnv->summary;
+  SQueryCostInfo*   summary = &pRuntimeEnv->summary;
 
   int64_t st = taosGetTimestampMs();
 
@@ -5469,7 +5462,7 @@ static void doRestoreContext(SQInfo *pQInfo) {
   SET_MASTER_SCAN_FLAG(pRuntimeEnv);
 }
 
-static void doCloseAllTimeWindowAfterScan(SQInfo *pQInfo) {
+static void doCloseAllTimeWindow(SQInfo *pQInfo) {
   SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
 
   if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
@@ -5521,7 +5514,7 @@ static void multiTableQueryProcess(SQInfo *pQInfo) {
   }
 
   // close all time window results
-  doCloseAllTimeWindowAfterScan(pQInfo);
+  doCloseAllTimeWindow(pQInfo);
 
   if (needReverseScan(pQuery)) {
     int32_t code = doSaveContext(pQInfo);
@@ -5846,8 +5839,7 @@ static void stableQueryImpl(SQInfo *pQInfo) {
       (isFixedOutputQuery(pRuntimeEnv) && (!isPointInterpoQuery(pQuery)) && (!pRuntimeEnv->groupbyColumn))) {
     multiTableQueryProcess(pQInfo);
   } else {
-    assert((pQuery->checkResultBuf == 1 && pQuery->interval.interval == 0) || isPointInterpoQuery(pQuery) ||
-           pRuntimeEnv->groupbyColumn);
+    assert(pQuery->checkResultBuf == 1 || isPointInterpoQuery(pQuery) || pRuntimeEnv->groupbyColumn);
 
     sequentialTableProcess(pQInfo);
   }
@@ -6375,7 +6367,7 @@ static int32_t createQueryFuncExprFromMsg(SQueryTableMsg *pQueryMsg, int32_t num
     if (functId == TSDB_FUNC_TOP || functId == TSDB_FUNC_BOTTOM) {
       int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].base, pTagCols);
       if (j < 0 || j >= pQueryMsg->numOfCols) {
-        assert(0);
+        return TSDB_CODE_QRY_INVALID_MSG;
       } else {
         SColumnInfo *pCol = &pQueryMsg->colList[j];
         int32_t ret =
@@ -6640,7 +6632,7 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGrou
   pQInfo->runtimeEnv.summary.tableInfoSize += (pTableGroupInfo->numOfTables * sizeof(STableQueryInfo));
 
   pQInfo->runtimeEnv.pResultRowHashTable = taosHashInit(pTableGroupInfo->numOfTables, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
-  pQInfo->runtimeEnv.keyBuf = malloc(TSDB_MAX_BYTES_PER_ROW);
+  pQInfo->runtimeEnv.keyBuf = malloc(TSDB_MAX_BYTES_PER_ROW);  // todo opt size
   pQInfo->runtimeEnv.pool = initResultRowPool(getResultRowSize(&pQInfo->runtimeEnv));
   pQInfo->runtimeEnv.prevRow = malloc(POINTER_BYTES * pQuery->numOfCols + srcSize);
 
diff --git a/tests/script/general/parser/function.sim b/tests/script/general/parser/function.sim
index 7d702e989e..133c05c6f4 100644
--- a/tests/script/general/parser/function.sim
+++ b/tests/script/general/parser/function.sim
@@ -382,4 +382,28 @@ sql drop table cars;
 sql create table cars(ts timestamp, c int) tags(id int);
 sql create table car1 using cars tags(1);
 sql create table car2 using cars tags(2);
-sql insert into car1 (ts, c) values (now,1) car2(ts, c) values(now, 2);
\ No newline at end of file
+sql insert into car1 (ts, c) values (now,1) car2(ts, c) values(now, 2);
+
+print ========================> TD-2700
+sql create table t1(ts timestamp, k int);
+sql insert into t1 values(1500000001000, 0);
+sql select sum(k) from t1 interval(1d) sliding(1h);
+if $rows != 24 then
+  return -1
+endi
+
+print ========================> TD-2740
+sql drop table if exists m1;
+sql create table m1(ts timestamp, k int) tags(a int);
+sql create table tm0 using m1 tags(0);
+sql create table tm1 using m1 tags(1);
+sql create table tm2 using m1 tags(2);
+sql create table tm3 using m1 tags(3);
+sql insert into tm0 values('2020-1-1 1:1:1', 0);
+sql insert into tm1 values('2020-1-5 1:1:1', 0);
+sql insert into tm2 values('2020-1-7 1:1:1', 0);
+sql insert into tm3 values('2020-1-1 1:1:1', 0);
+sql select count from m1 where ts='2020-1-1 1:1:1' interval(1h) group by tbname;
+if $rows != 2 then
+  return -1
+endi
\ No newline at end of file

From 1ecf9659142c6e9eaa3299ff00576a4b29e9eab4 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 10:40:16 +0800
Subject: [PATCH 09/25] [TD-225]refactor

---
 src/client/src/tscSQLParser.c | 128 +++++++++++++++++++---------------
 src/client/src/tscServer.c    |  22 +++---
 src/query/inc/qSqlparser.h    |  65 ++++++++---------
 src/query/inc/sql.y           |  26 +++----
 src/query/src/qParserImpl.c   | 115 +++++++++++++++---------------
 src/query/src/sql.c           |  24 +++----
 6 files changed, 192 insertions(+), 188 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index a4cce66223..16368ff153 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -100,8 +100,8 @@ static int32_t validateSqlFunctionInStreamSql(SSqlCmd* pCmd, SQueryInfo* pQueryI
 static int32_t validateFunctionsInIntervalOrGroupbyQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo);
 static int32_t validateArithmeticSQLExpr(SSqlCmd* pCmd, tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList, int32_t* type);
 static int32_t validateEp(char* ep);
-static int32_t validateDNodeConfig(tDCLSQL* pOptions);
-static int32_t validateLocalConfig(tDCLSQL* pOptions);
+static int32_t validateDNodeConfig(SMiscInfo* pOptions);
+static int32_t validateLocalConfig(SMiscInfo* pOptions);
 static int32_t validateColumnName(char* name);
 static int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType);
 
@@ -110,7 +110,7 @@ static bool hasTimestampForPointInterpQuery(SQueryInfo* pQueryInfo);
 static bool hasNormalColumnFilter(SQueryInfo* pQueryInfo);
 
 static int32_t parseLimitClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t index, SQuerySQL* pQuerySql, SSqlObj* pSql);
-static int32_t parseCreateDBOptions(SSqlCmd* pCmd, SCreateDBInfo* pCreateDbSql);
+static int32_t parseCreateDBOptions(SSqlCmd* pCmd, SCreateDbInfo* pCreateDbSql);
 static int32_t getColumnIndexByName(SSqlCmd* pCmd, const SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
 static int32_t getTableIndexByName(SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
 static int32_t optrToString(tSQLExpr* pExpr, char** exprString);
@@ -239,7 +239,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   int32_t code = TSDB_CODE_SUCCESS;
   if (!pInfo->valid || terrno == TSDB_CODE_TSC_SQL_SYNTAX_ERROR) {
     terrno = TSDB_CODE_SUCCESS;  // clear the error number
-    return tscSQLSyntaxErrMsg(tscGetErrorMsgPayload(pCmd), NULL, pInfo->pzErrMsg);
+    return tscSQLSyntaxErrMsg(tscGetErrorMsgPayload(pCmd), NULL, pInfo->msg);
   }
 
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex);
@@ -265,20 +265,20 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       const char* msg2 = "invalid name";
       const char* msg3 = "param name too long";
 
-      SStrToken* pzName = &pInfo->pDCLInfo->a[0];
+      SStrToken* pzName = taosArrayGet(pInfo->pMiscInfo->a, 0);
       if ((pInfo->type != TSDB_SQL_DROP_DNODE) && (tscValidateName(pzName) != TSDB_CODE_SUCCESS)) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       if (pInfo->type == TSDB_SQL_DROP_DB) {
-        assert(pInfo->pDCLInfo->nTokens == 1);
+        assert(taosArrayGetSize(pInfo->pMiscInfo->a) == 1);
         code = tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), pzName);
         if (code != TSDB_CODE_SUCCESS) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
         }
 
       } else if (pInfo->type == TSDB_SQL_DROP_TABLE) {
-        assert(pInfo->pDCLInfo->nTokens == 1);
+        assert(taosArrayGetSize(pInfo->pMiscInfo->a) == 1);
 
         code = tscSetTableFullName(pTableMetaInfo, pzName, pSql);
         if(code != TSDB_CODE_SUCCESS) {
@@ -300,7 +300,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     case TSDB_SQL_USE_DB: {
       const char* msg = "invalid db name";
-      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
+      SStrToken* pToken = taosArrayGet(pInfo->pMiscInfo->a, 0);
 
       if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
@@ -331,7 +331,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       const char* msg1 = "invalid db name";
       const char* msg2 = "name too long";
 
-      SCreateDBInfo* pCreateDB = &(pInfo->pDCLInfo->dbOpt);
+      SCreateDbInfo* pCreateDB = &(pInfo->pMiscInfo->dbOpt);
       if (tscValidateName(&pCreateDB->dbname) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
@@ -348,15 +348,15 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       break;
     }
 
-    case TSDB_SQL_CREATE_DNODE: {  // todo hostname
+    case TSDB_SQL_CREATE_DNODE: {
       const char* msg = "invalid host name (ip address)";
 
-      if (pInfo->pDCLInfo->nTokens > 1) {
+      if (taosArrayGetSize(pInfo->pMiscInfo->a) > 1) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
 
-      SStrToken* pIpAddr = &pInfo->pDCLInfo->a[0];
-      pIpAddr->n = strdequote(pIpAddr->z);
+      SStrToken* id = taosArrayGet(pInfo->pMiscInfo->a, 0);
+      id->n = strdequote(id->z);
       break;
     }
 
@@ -366,8 +366,8 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       const char* msg2 = "invalid user/account name";
       const char* msg3 = "name too long";
 
-      SStrToken* pName = &pInfo->pDCLInfo->user.user;
-      SStrToken* pPwd = &pInfo->pDCLInfo->user.passwd;
+      SStrToken* pName = &pInfo->pMiscInfo->user.user;
+      SStrToken* pPwd = &pInfo->pMiscInfo->user.passwd;
 
       if (handlePassword(pCmd, pPwd) != TSDB_CODE_SUCCESS) {
         return TSDB_CODE_TSC_INVALID_SQL;
@@ -381,7 +381,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
-      SCreateAcctSQL* pAcctOpt = &pInfo->pDCLInfo->acctOpt;
+      SCreateAcctInfo* pAcctOpt = &pInfo->pMiscInfo->acctOpt;
       if (pAcctOpt->stat.n > 0) {
         if (pAcctOpt->stat.z[0] == 'r' && pAcctOpt->stat.n == 1) {
         } else if (pAcctOpt->stat.z[0] == 'w' && pAcctOpt->stat.n == 1) {
@@ -396,10 +396,10 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     case TSDB_SQL_DESCRIBE_TABLE: {
-      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
       const char* msg1 = "invalid table name";
       const char* msg2 = "table name too long";
 
+      SStrToken* pToken = taosArrayGet(pInfo->pMiscInfo->a, 0);
       if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
@@ -417,10 +417,10 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return tscGetTableMeta(pSql, pTableMetaInfo);
     }
     case TSDB_SQL_SHOW_CREATE_TABLE: {
-      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
       const char* msg1 = "invalid table name";
       const char* msg2 = "table name is too long";
 
+      SStrToken* pToken = taosArrayGet(pInfo->pMiscInfo->a, 0);
       if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
@@ -438,11 +438,12 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
     case TSDB_SQL_SHOW_CREATE_DATABASE: {
       const char* msg1 = "invalid database name";
-      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
 
+      SStrToken* pToken = taosArrayGet(pInfo->pMiscInfo->a, 0);
       if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
+
       if (pToken->n > TSDB_DB_NAME_LEN) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
@@ -454,29 +455,33 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       const char* msg3 = "invalid dnode ep";
 
       /* validate the ip address */
-      tDCLSQL* pDCL = pInfo->pDCLInfo;
+      SMiscInfo* pMiscInfo = pInfo->pMiscInfo;
 
       /* validate the parameter names and options */
-      if (validateDNodeConfig(pDCL) != TSDB_CODE_SUCCESS) {
+      if (validateDNodeConfig(pMiscInfo) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       char* pMsg = pCmd->payload;
 
       SCfgDnodeMsg* pCfg = (SCfgDnodeMsg*)pMsg;
-      pDCL->a[0].n = strdequote(pDCL->a[0].z);
-      
-      strncpy(pCfg->ep, pDCL->a[0].z, pDCL->a[0].n);
+
+      SStrToken* t0 = taosArrayGet(pMiscInfo->a, 0);
+      SStrToken* t1 = taosArrayGet(pMiscInfo->a, 1);
+      SStrToken* t2 = taosArrayGet(pMiscInfo->a, 2);
+
+      t0->n = strdequote(t0->z);
+      strncpy(pCfg->ep, t0->z, t0->n);
 
       if (validateEp(pCfg->ep) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
 
-      strncpy(pCfg->config, pDCL->a[1].z, pDCL->a[1].n);
+      strncpy(pCfg->config, t1->z, t1->n);
 
-      if (pDCL->nTokens == 3) {
-        pCfg->config[pDCL->a[1].n] = ' ';  // add sep
-        strncpy(&pCfg->config[pDCL->a[1].n + 1], pDCL->a[2].z, pDCL->a[2].n);
+      if (taosArrayGetSize(pMiscInfo->a) == 3) {
+        pCfg->config[t1->n] = ' ';  // add sep
+        strncpy(&pCfg->config[t1->n + 1], t2->z, t2->n);
       }
 
       break;
@@ -491,7 +496,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
       pCmd->command = pInfo->type;
 
-      SUserInfo* pUser = &pInfo->pDCLInfo->user;
+      SUserInfo* pUser = &pInfo->pMiscInfo->user;
       SStrToken* pName = &pUser->user;
       SStrToken* pPwd = &pUser->passwd;
 
@@ -535,18 +540,22 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     case TSDB_SQL_CFG_LOCAL: {
-      tDCLSQL*    pDCL = pInfo->pDCLInfo;
-      const char* msg = "invalid configure options or values";
+      SMiscInfo  *pMiscInfo = pInfo->pMiscInfo;
+      const char *msg = "invalid configure options or values";
 
       // validate the parameter names and options
-      if (validateLocalConfig(pDCL) != TSDB_CODE_SUCCESS) {
+      if (validateLocalConfig(pMiscInfo) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
 
-      strncpy(pCmd->payload, pDCL->a[0].z, pDCL->a[0].n);
-      if (pDCL->nTokens == 2) {
-        pCmd->payload[pDCL->a[0].n] = ' ';  // add sep
-        strncpy(&pCmd->payload[pDCL->a[0].n + 1], pDCL->a[1].z, pDCL->a[1].n);
+      int32_t numOfToken = taosArrayGetSize(pMiscInfo->a);
+      SStrToken* t = taosArrayGet(pMiscInfo->a, 0);
+      SStrToken* t1 = taosArrayGet(pMiscInfo->a, 1);
+
+      strncpy(pCmd->payload, t->z, t->n);
+      if (numOfToken == 2) {
+        pCmd->payload[t->n] = ' ';  // add sep
+        strncpy(&pCmd->payload[t->n + 1], t1->z, t1->n);
       }
 
       break;
@@ -2587,10 +2596,10 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   const char* msg6 = "pattern string is empty";
 
   /*
-   * database prefix in pInfo->pDCLInfo->a[0]
-   * wildcard in like clause in pInfo->pDCLInfo->a[1]
+   * database prefix in pInfo->pMiscInfo->a[0]
+   * wildcard in like clause in pInfo->pMiscInfo->a[1]
    */
-  SShowInfo* pShowInfo = &pInfo->pDCLInfo->showOpt;
+  SShowInfo* pShowInfo = &pInfo->pMiscInfo->showOpt;
   int16_t    showType = pShowInfo->showType;
   if (showType == TSDB_MGMT_TABLE_TABLE || showType == TSDB_MGMT_TABLE_METRIC || showType == TSDB_MGMT_TABLE_VGROUP) {
     // db prefix in tagCond, show table conds in payload
@@ -2655,7 +2664,7 @@ int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType) {
   SSqlCmd* pCmd = &pSql->cmd;
   pCmd->command = pInfo->type;
   
-  SStrToken* idStr = &(pInfo->pDCLInfo->ip);
+  SStrToken* idStr = &(pInfo->pMiscInfo->id);
   if (idStr->n > TSDB_KILL_MSG_LEN) {
     return TSDB_CODE_TSC_INVALID_SQL;
   }
@@ -4798,7 +4807,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   int32_t code = TSDB_CODE_SUCCESS;
 
   SSqlCmd*        pCmd = &pSql->cmd;
-  SAlterTableSQL* pAlterSQL = pInfo->pAlterInfo;
+  SAlterTableInfo* pAlterSQL = pInfo->pAlterInfo;
   SQueryInfo*     pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
 
   STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, DEFAULT_TABLE_INDEX);
@@ -5133,8 +5142,10 @@ int32_t validateEp(char* ep) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t validateDNodeConfig(tDCLSQL* pOptions) {
-  if (pOptions->nTokens < 2 || pOptions->nTokens > 3) {
+int32_t validateDNodeConfig(SMiscInfo* pOptions) {
+  int32_t numOfToken = taosArrayGetSize(pOptions->a);
+
+  if (numOfToken < 2 || numOfToken > 3) {
     return TSDB_CODE_TSC_INVALID_SQL;
   }
 
@@ -5152,9 +5163,9 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
       {"cqDebugFlag", 11},
   };
 
-  SStrToken* pOptionToken = &pOptions->a[1];
+  SStrToken* pOptionToken = taosArrayGet(pOptions->a, 1);
 
-  if (pOptions->nTokens == 2) {
+  if (numOfToken == 2) {
     // reset log and reset query cache does not need value
     for (int32_t i = 0; i < tokenLogEnd; ++i) {
       const SDNodeDynConfOption* pOption = &cfgOptions[i];
@@ -5164,7 +5175,7 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
     }
   } else if ((strncasecmp(cfgOptions[tokenBalance].name, pOptionToken->z, pOptionToken->n) == 0) &&
              (cfgOptions[tokenBalance].len == pOptionToken->n)) {
-    SStrToken* pValToken = &pOptions->a[2];
+    SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
     int32_t vnodeId = 0;
     int32_t dnodeId = 0;
     strdequote(pValToken->z);
@@ -5175,14 +5186,14 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
     return TSDB_CODE_SUCCESS;
   } else if ((strncasecmp(cfgOptions[tokenMonitor].name, pOptionToken->z, pOptionToken->n) == 0) &&
              (cfgOptions[tokenMonitor].len == pOptionToken->n)) {
-    SStrToken* pValToken = &pOptions->a[2];
+    SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
     int32_t    val = strtol(pValToken->z, NULL, 10);
     if (val != 0 && val != 1) {
       return TSDB_CODE_TSC_INVALID_SQL;  // options value is invalid
     }
     return TSDB_CODE_SUCCESS;
   } else {
-    SStrToken* pValToken = &pOptions->a[2];
+    SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
 
     int32_t val = strtol(pValToken->z, NULL, 10);
     if (val < 0 || val > 256) {
@@ -5193,8 +5204,8 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
     for (int32_t i = tokenDebugFlag; i < tokenDebugFlagEnd; ++i) {
       const SDNodeDynConfOption* pOption = &cfgOptions[i];
 
+      // options is valid
       if ((strncasecmp(pOption->name, pOptionToken->z, pOptionToken->n) == 0) && (pOption->len == pOptionToken->n)) {
-        /* options is valid */
         return TSDB_CODE_SUCCESS;
       }
     }
@@ -5203,17 +5214,18 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
   return TSDB_CODE_TSC_INVALID_SQL;
 }
 
-int32_t validateLocalConfig(tDCLSQL* pOptions) {
-  if (pOptions->nTokens < 1 || pOptions->nTokens > 2) {
+int32_t validateLocalConfig(SMiscInfo* pOptions) {
+  int32_t numOfToken = taosArrayGetSize(pOptions->a);
+  if (numOfToken < 1 || numOfToken > 2) {
     return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   SDNodeDynConfOption LOCAL_DYNAMIC_CFG_OPTIONS[6] = {{"resetLog", 8},    {"rpcDebugFlag", 12}, {"tmrDebugFlag", 12},
                                                       {"cDebugFlag", 10}, {"uDebugFlag", 10},   {"debugFlag", 9}};
 
-  SStrToken* pOptionToken = &pOptions->a[0];
+  SStrToken* pOptionToken = taosArrayGet(pOptions->a, 0);
 
-  if (pOptions->nTokens == 1) {
+  if (numOfToken == 1) {
     // reset log does not need value
     for (int32_t i = 0; i < 1; ++i) {
       SDNodeDynConfOption* pOption = &LOCAL_DYNAMIC_CFG_OPTIONS[i];
@@ -5222,7 +5234,7 @@ int32_t validateLocalConfig(tDCLSQL* pOptions) {
       }
     }
   } else {
-    SStrToken* pValToken = &pOptions->a[1];
+    SStrToken* pValToken = taosArrayGet(pOptions->a, 1);
 
     int32_t val = strtol(pValToken->z, NULL, 10);
     if (val < 131 || val > 199) {
@@ -5374,7 +5386,7 @@ int32_t parseLimitClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t clauseIn
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
+static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* pCreateDb) {
   const char* msg = "invalid number of options";
 
   pMsg->daysToKeep = htonl(-1);
@@ -5412,7 +5424,7 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo* p
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t setTimePrecision(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo* pCreateDbInfo) {
+static int32_t setTimePrecision(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* pCreateDbInfo) {
   const char* msg = "invalid time precision";
 
   pMsg->precision = TSDB_TIME_PRECISION_MILLI;  // millisecond by default
@@ -5436,7 +5448,7 @@ static int32_t setTimePrecision(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo
   return TSDB_CODE_SUCCESS;
 }
 
-static void setCreateDBOption(SCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
+static void setCreateDBOption(SCreateDbMsg* pMsg, SCreateDbInfo* pCreateDb) {
   pMsg->maxTables = htonl(-1);  // max tables can not be set anymore
   pMsg->cacheBlockSize = htonl(pCreateDb->cacheBlockSize);
   pMsg->totalBlocks = htonl(pCreateDb->numOfBlocks);
@@ -5454,7 +5466,7 @@ static void setCreateDBOption(SCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
   pMsg->cacheLastRow = pCreateDb->cachelast;
 }
 
-int32_t parseCreateDBOptions(SSqlCmd* pCmd, SCreateDBInfo* pCreateDbSql) {
+int32_t parseCreateDBOptions(SSqlCmd* pCmd, SCreateDbInfo* pCreateDbSql) {
   SCreateDbMsg* pMsg = (SCreateDbMsg *)(pCmd->payload);
   setCreateDBOption(pMsg, pCreateDbSql);
 
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 45636da89b..ca49f21252 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -309,7 +309,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
     return;
   }
 
-  if (pEpSet) { // todo update this
+  if (pEpSet) {
     if (!tscEpSetIsEqual(&pSql->epSet, pEpSet)) {
       if (pCmd->command < TSDB_SQL_MGMT) {
         tscUpdateVgroupInfo(pSql, pEpSet);
@@ -1046,7 +1046,9 @@ int32_t tscBuildCreateDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   }
 
   SCreateDnodeMsg *pCreate = (SCreateDnodeMsg *)pCmd->payload;
-  strncpy(pCreate->ep, pInfo->pDCLInfo->a[0].z, pInfo->pDCLInfo->a[0].n);
+
+  SStrToken* t0 = taosArrayGet(pInfo->pMiscInfo->a, 0);
+  strncpy(pCreate->ep, t0->z, t0->n);
   
   pCmd->msgType = TSDB_MSG_TYPE_CM_CREATE_DNODE;
 
@@ -1063,13 +1065,13 @@ int32_t tscBuildAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   SCreateAcctMsg *pAlterMsg = (SCreateAcctMsg *)pCmd->payload;
 
-  SStrToken *pName = &pInfo->pDCLInfo->user.user;
-  SStrToken *pPwd = &pInfo->pDCLInfo->user.passwd;
+  SStrToken *pName = &pInfo->pMiscInfo->user.user;
+  SStrToken *pPwd = &pInfo->pMiscInfo->user.passwd;
 
   strncpy(pAlterMsg->user, pName->z, pName->n);
   strncpy(pAlterMsg->pass, pPwd->z, pPwd->n);
 
-  SCreateAcctSQL *pAcctOpt = &pInfo->pDCLInfo->acctOpt;
+  SCreateAcctInfo *pAcctOpt = &pInfo->pMiscInfo->acctOpt;
 
   pAlterMsg->cfg.maxUsers = htonl(pAcctOpt->maxUsers);
   pAlterMsg->cfg.maxDbs = htonl(pAcctOpt->maxDbs);
@@ -1109,7 +1111,7 @@ int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   SCreateUserMsg *pAlterMsg = (SCreateUserMsg *)pCmd->payload;
 
-  SUserInfo *pUser = &pInfo->pDCLInfo->user;
+  SUserInfo *pUser = &pInfo->pMiscInfo->user;
   strncpy(pAlterMsg->user, pUser->user.z, pUser->user.n);
   pAlterMsg->flag = (int8_t)pUser->type;
 
@@ -1153,7 +1155,7 @@ int32_t tscBuildDropDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   int32_t code = tNameExtractFullName(&pTableMetaInfo->name, pDropDbMsg->db);
   assert(code == TSDB_CODE_SUCCESS && pTableMetaInfo->name.type == TSDB_DB_NAME_T);
 
-  pDropDbMsg->ignoreNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
+  pDropDbMsg->ignoreNotExists = pInfo->pMiscInfo->existsCheck ? 1 : 0;
 
   pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_DB;
   return TSDB_CODE_SUCCESS;
@@ -1172,7 +1174,7 @@ int32_t tscBuildDropTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
   tNameExtractFullName(&pTableMetaInfo->name, pDropTableMsg->name);
 
-  pDropTableMsg->igNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
+  pDropTableMsg->igNotExists = pInfo->pMiscInfo->existsCheck ? 1 : 0;
   pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_TABLE;
   return TSDB_CODE_SUCCESS;
 }
@@ -1254,7 +1256,7 @@ int32_t tscBuildShowMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     tNameGetFullDbName(&pTableMetaInfo->name, pShowMsg->db);
   }
 
-  SShowInfo *pShowInfo = &pInfo->pDCLInfo->showOpt;
+  SShowInfo *pShowInfo = &pInfo->pMiscInfo->showOpt;
   pShowMsg->type = pShowInfo->showType;
 
   if (pShowInfo->showType != TSDB_MGMT_TABLE_VNODES) {
@@ -1420,7 +1422,7 @@ int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
   
-  SAlterTableSQL *pAlterInfo = pInfo->pAlterInfo;
+  SAlterTableInfo *pAlterInfo = pInfo->pAlterInfo;
   int size = tscEstimateAlterTableMsgLength(pCmd);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
     tscError("%p failed to malloc for alter table msg", pSql);
diff --git a/src/query/inc/qSqlparser.h b/src/query/inc/qSqlparser.h
index 56e676ef16..bfb1d4152d 100644
--- a/src/query/inc/qSqlparser.h
+++ b/src/query/inc/qSqlparser.h
@@ -96,15 +96,15 @@ typedef struct SCreateTableSQL {
   SQuerySQL   *pSelect;
 } SCreateTableSQL;
 
-typedef struct SAlterTableSQL {
+typedef struct SAlterTableInfo {
   SStrToken     name;
   int16_t       type;
   STagData      tagData;
   SArray       *pAddColumns; // SArray<TAOS_FIELD>
   SArray       *varList;  // set t=val or: change src dst, SArray<tVariantListItem>
-} SAlterTableSQL;
+} SAlterTableInfo;
 
-typedef struct SCreateDBInfo {
+typedef struct SCreateDbInfo {
   SStrToken dbname;
   int32_t   replica;
   int32_t   cacheBlockSize;
@@ -122,11 +122,10 @@ typedef struct SCreateDBInfo {
   bool      ignoreExists;
   int8_t    update;
   int8_t    cachelast; 
-  
-  SArray *keep;
-} SCreateDBInfo;
+  SArray    *keep;
+} SCreateDbInfo;
 
-typedef struct SCreateAcctSQL {
+typedef struct SCreateAcctInfo {
   int32_t   maxUsers;
   int32_t   maxDbs;
   int32_t   maxTimeSeries;
@@ -136,7 +135,7 @@ typedef struct SCreateAcctSQL {
   int64_t   maxQueryTime;
   int32_t   maxConnections;
   SStrToken stat;
-} SCreateAcctSQL;
+} SCreateAcctInfo;
 
 typedef struct SShowInfo {
   uint8_t showType;
@@ -151,22 +150,20 @@ typedef struct SUserInfo {
   int16_t   type;
 } SUserInfo;
 
-typedef struct tDCLSQL {
-  int32_t    nTokens; /* Number of expressions on the list */
-  int32_t    nAlloc;  /* Number of entries allocated below */
-  SStrToken *a;       /* one entry for element */
-  bool  existsCheck;
-  
+typedef struct SMiscInfo {
+//  int32_t    nTokens; /* Number of expressions on the list */
+//  int32_t    nAlloc;  /* Number of entries allocated below */
+//  SStrToken *a;       /* one entry for element */
+  SArray    *a;         // SArray<SStrToken>
+  bool       existsCheck;
+  SUserInfo  user;
   union {
-    SCreateDBInfo  dbOpt;
-    SCreateAcctSQL acctOpt;
-    SShowInfo      showOpt;
-    SStrToken      ip;
+    SCreateDbInfo   dbOpt;
+    SCreateAcctInfo acctOpt;
+    SShowInfo       showOpt;
+    SStrToken       id;
   };
-  
-  SUserInfo user;
-  
-} tDCLSQL;
+} SMiscInfo;
 
 typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
   SQuerySQL **pClause;
@@ -176,15 +173,13 @@ typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
 typedef struct SSqlInfo {
   int32_t            type;
   bool               valid;
-  
-  union {
-    SCreateTableSQL *pCreateTableInfo;
-    SAlterTableSQL  *pAlterInfo;
-    tDCLSQL         *pDCLInfo;
-  };
-  
   SSubclauseInfo     subclauseInfo;
-  char               pzErrMsg[256];
+  char               msg[256];
+  union {
+    SCreateTableSQL  *pCreateTableInfo;
+    SAlterTableInfo  *pAlterInfo;
+    SMiscInfo        *pMiscInfo;
+  };
 } SSqlInfo;
 
 typedef struct tSQLExpr {
@@ -250,7 +245,7 @@ SCreateTableSQL *tSetCreateSqlElems(SArray *pCols, SArray *pTags, SQuerySQL *pSe
 
 void tSqlExprNodeDestroy(tSQLExpr *pExpr);
 
-SAlterTableSQL *  tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type);
+SAlterTableInfo *  tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type);
 SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagVals, SStrToken *pToken, SStrToken* igExists);
 
 void destroyAllSelectClause(SSubclauseInfo *pSql);
@@ -270,16 +265,16 @@ void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
 void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck);
 void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns);
 
-tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SStrToken *pToken);
+SMiscInfo *tTokenListAppend(SMiscInfo *pTokenList, SStrToken *pToken);
 
-void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDBInfo *pDB, SStrToken *pIgExists);
+void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDbInfo *pDB, SStrToken *pIgExists);
 
-void setCreateAcctSql(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctSQL *pAcctInfo);
+void setCreateAcctSql(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctInfo *pAcctInfo);
 void setCreateUserSql(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd);
 void setKillSql(SSqlInfo *pInfo, int32_t type, SStrToken *ip);
 void setAlterUserSql(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken* pPwd, SStrToken *pPrivilege);
 
-void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo);
+void setDefaultCreateDbOption(SCreateDbInfo *pDBInfo);
 
 // prefix show db.tables;
 void setDbName(SStrToken *pCpxName, SStrToken *pDb);
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
index 1fa1369bb5..83c9fef311 100644
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
@@ -36,7 +36,7 @@
 
 %syntax_error {
   pInfo->valid = false;
-  int32_t outputBufLen = tListLen(pInfo->pzErrMsg);
+  int32_t outputBufLen = tListLen(pInfo->msg);
   int32_t len = 0;
 
   if(TOKEN.z) {
@@ -46,13 +46,13 @@
     if (sqlLen + sizeof(msg)/sizeof(msg[0]) + 1 > outputBufLen) {
         char tmpstr[128] = {0};
         memcpy(tmpstr, &TOKEN.z[0], sizeof(tmpstr)/sizeof(tmpstr[0]) - 1);
-        len = sprintf(pInfo->pzErrMsg, msg, tmpstr);
+        len = sprintf(pInfo->msg, msg, tmpstr);
     } else {
-        len = sprintf(pInfo->pzErrMsg, msg, &TOKEN.z[0]);
+        len = sprintf(pInfo->msg, msg, &TOKEN.z[0]);
     }
 
   } else {
-    len = sprintf(pInfo->pzErrMsg, "Incomplete SQL statement");
+    len = sprintf(pInfo->msg, "Incomplete SQL statement");
   }
 
   assert(len <= outputBufLen);
@@ -210,7 +210,7 @@ conns(Y) ::= CONNS INTEGER(X).              { Y = X;     }
 state(Y) ::= .                              { Y.n = 0;   }
 state(Y) ::= STATE ids(X).                  { Y = X;     }
 
-%type acct_optr {SCreateAcctSQL}
+%type acct_optr {SCreateAcctInfo}
 acct_optr(Y) ::= pps(C) tseries(D) storage(P) streams(F) qtime(Q) dbs(E) users(K) conns(L) state(M). {
     Y.maxUsers   = (K.n>0)?atoi(K.z):-1;
     Y.maxDbs     = (E.n>0)?atoi(E.z):-1;
@@ -242,7 +242,7 @@ prec(Y)    ::= PRECISION STRING(X).           { Y = X; }
 update(Y)  ::= UPDATE INTEGER(X).             { Y = X; }     
 cachelast(Y) ::= CACHELAST INTEGER(X).        { Y = X; }
 
-%type db_optr {SCreateDBInfo}
+%type db_optr {SCreateDbInfo}
 db_optr(Y) ::= . {setDefaultCreateDbOption(&Y);}
 
 db_optr(Y) ::= db_optr(Z) cache(X).          { Y = Z; Y.cacheBlockSize = strtol(X.z, NULL, 10); }
@@ -261,7 +261,7 @@ db_optr(Y) ::= db_optr(Z) keep(X).           { Y = Z; Y.keep = X; }
 db_optr(Y) ::= db_optr(Z) update(X).         { Y = Z; Y.update = strtol(X.z, NULL, 10); }
 db_optr(Y) ::= db_optr(Z) cachelast(X).      { Y = Z; Y.cachelast = strtol(X.z, NULL, 10); }
 
-%type alter_db_optr {SCreateDBInfo}
+%type alter_db_optr {SCreateDbInfo}
 alter_db_optr(Y) ::= . { setDefaultCreateDbOption(&Y);}
 
 alter_db_optr(Y) ::= alter_db_optr(Z) replica(X).     { Y = Z; Y.replica = strtol(X.z, NULL, 10); }
@@ -683,7 +683,7 @@ cmd ::= RESET QUERY CACHE.  { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
 ///////////////////////////////////ALTER TABLE statement//////////////////////////////////
 cmd ::= ALTER TABLE ids(X) cpxName(F) ADD COLUMN columnlist(A).     {
     X.n += F.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -693,14 +693,14 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
     toTSDBType(A.type);
     SArray* K = tVariantListAppendToken(NULL, &A, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
 //////////////////////////////////ALTER TAGS statement/////////////////////////////////////
 cmd ::= ALTER TABLE ids(X) cpxName(Y) ADD TAG columnlist(A).        {
     X.n += Y.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
@@ -709,7 +709,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
     toTSDBType(Y.type);
     SArray* A = tVariantListAppendToken(NULL, &Y, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -722,7 +722,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
     toTSDBType(Z.type);
     A = tVariantListAppendToken(A, &Z, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
@@ -733,7 +733,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
     SArray* A = tVariantListAppendToken(NULL, &Y, -1);
     A = tVariantListAppend(A, &Z, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
 
diff --git a/src/query/src/qParserImpl.c b/src/query/src/qParserImpl.c
index a5a3d7e323..9ccca9a82b 100644
--- a/src/query/src/qParserImpl.c
+++ b/src/query/src/qParserImpl.c
@@ -54,7 +54,7 @@ SSqlInfo qSQLParse(const char *pStr) {
       
       case TK_QUESTION:
       case TK_ILLEGAL: {
-        snprintf(sqlInfo.pzErrMsg, tListLen(sqlInfo.pzErrMsg), "unrecognized token: \"%s\"", t0.z);
+        snprintf(sqlInfo.msg, tListLen(sqlInfo.msg), "unrecognized token: \"%s\"", t0.z);
         sqlInfo.valid = false;
         goto abort_parse;
       }
@@ -585,8 +585,8 @@ SCreatedTableInfo createNewChildTableInfo(SStrToken *pTableName, SArray *pTagVal
   return info;
 }
 
-SAlterTableSQL *tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type) {
-  SAlterTableSQL *pAlterTable = calloc(1, sizeof(SAlterTableSQL));
+SAlterTableInfo *tAlterTableSqlElems(SStrToken *pTableName, SArray *pCols, SArray *pVals, int32_t type) {
+  SAlterTableInfo *pAlterTable = calloc(1, sizeof(SAlterTableInfo));
   
   pAlterTable->name = *pTableName;
   pAlterTable->type = type;
@@ -631,15 +631,15 @@ void SqlInfoDestroy(SSqlInfo *pInfo) {
     tfree(pInfo->pAlterInfo->tagData.data);
     tfree(pInfo->pAlterInfo);
   } else {
-    if (pInfo->pDCLInfo != NULL && pInfo->pDCLInfo->nAlloc > 0) {
-      free(pInfo->pDCLInfo->a);
+    if (pInfo->pMiscInfo != NULL) {
+      taosArrayDestroy(pInfo->pMiscInfo->a);
     }
 
-    if (pInfo->pDCLInfo != NULL && pInfo->type == TSDB_SQL_CREATE_DB) {
-      taosArrayDestroyEx(pInfo->pDCLInfo->dbOpt.keep, freeVariant);
+    if (pInfo->pMiscInfo != NULL && pInfo->type == TSDB_SQL_CREATE_DB) {
+      taosArrayDestroyEx(pInfo->pMiscInfo->dbOpt.keep, freeVariant);
     }
 
-    tfree(pInfo->pDCLInfo);
+    tfree(pInfo->pMiscInfo);
   }
 }
 
@@ -696,57 +696,53 @@ void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pTableNameToken, SStrToken
   pInfo->pCreateTableInfo->existCheck = (pIfNotExists->n != 0);
 }
 
-void tTokenListBuyMoreSpace(tDCLSQL *pTokenList) {
-  if (pTokenList->nAlloc <= pTokenList->nTokens) {  //
-    pTokenList->nAlloc = (pTokenList->nAlloc << 1u) + 4;
-    pTokenList->a = realloc(pTokenList->a, pTokenList->nAlloc * sizeof(pTokenList->a[0]));
-    if (pTokenList->a == 0) {
-      pTokenList->nTokens = pTokenList->nAlloc = 0;
-    }
+SMiscInfo *tTokenListAppend(SMiscInfo *pMiscInfo, SStrToken *pToken) {
+  assert(pToken != NULL);
+
+  if (pMiscInfo == NULL) {
+    pMiscInfo = calloc(1, sizeof(SMiscInfo));
+    pMiscInfo->a = taosArrayInit(8, sizeof(SStrToken));
   }
-}
 
-tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SStrToken *pToken) {
-  if (pToken == NULL) return NULL;
-
-  if (pTokenList == NULL) pTokenList = calloc(1, sizeof(tDCLSQL));
-
-  tTokenListBuyMoreSpace(pTokenList);
-  pTokenList->a[pTokenList->nTokens++] = *pToken;
-
-  return pTokenList;
+  taosArrayPush(pMiscInfo->a, pToken);
+  return pMiscInfo;
 }
 
 void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParam, ...) {
   pInfo->type = type;
+  if (nParam == 0) {
+    return;
+  }
 
-  if (nParam == 0) return;
-  if (pInfo->pDCLInfo == NULL) pInfo->pDCLInfo = (tDCLSQL *)calloc(1, sizeof(tDCLSQL));
+  if (pInfo->pMiscInfo == NULL) {
+    pInfo->pMiscInfo = (SMiscInfo *)calloc(1, sizeof(SMiscInfo));
+    pInfo->pMiscInfo->a = taosArrayInit(4, sizeof(SStrToken));
+  }
 
   va_list va;
   va_start(va, nParam);
 
-  while (nParam-- > 0) {
+  while ((nParam--) > 0) {
     SStrToken *pToken = va_arg(va, SStrToken *);
-    pInfo->pDCLInfo = tTokenListAppend(pInfo->pDCLInfo, pToken);
+    pInfo->pMiscInfo = tTokenListAppend(pInfo->pMiscInfo, pToken);
   }
   va_end(va);
 }
 
 void setDropDbTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck) {
   pInfo->type = type;
-  pInfo->pDCLInfo = tTokenListAppend(pInfo->pDCLInfo, pToken);
-  pInfo->pDCLInfo->existsCheck = (existsCheck->n == 1);
+  pInfo->pMiscInfo = tTokenListAppend(pInfo->pMiscInfo, pToken);
+  pInfo->pMiscInfo->existsCheck = (existsCheck->n == 1);
 }
 
 void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns) {
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  if (pInfo->pMiscInfo == NULL) {
+    pInfo->pMiscInfo = calloc(1, sizeof(SMiscInfo));
   }
   
   pInfo->type = TSDB_SQL_SHOW;
   
-  SShowInfo* pShowInfo = &pInfo->pDCLInfo->showOpt;
+  SShowInfo* pShowInfo = &pInfo->pMiscInfo->showOpt;
   pShowInfo->showType = type;
   
   if (prefix != NULL && prefix->type != 0) {
@@ -762,54 +758,54 @@ void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken*
   }
 }
 
-void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDBInfo *pDB, SStrToken *pIgExists) {
+void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDbInfo *pDB, SStrToken *pIgExists) {
   pInfo->type = type;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  if (pInfo->pMiscInfo == NULL) {
+    pInfo->pMiscInfo = calloc(1, sizeof(SMiscInfo));
   }
 
-  pInfo->pDCLInfo->dbOpt = *pDB;
-  pInfo->pDCLInfo->dbOpt.dbname = *pToken;
-  pInfo->pDCLInfo->dbOpt.ignoreExists = pIgExists->n; // sql.y has: ifnotexists(X) ::= IF NOT EXISTS.   {X.n = 1;}
+  pInfo->pMiscInfo->dbOpt = *pDB;
+  pInfo->pMiscInfo->dbOpt.dbname = *pToken;
+  pInfo->pMiscInfo->dbOpt.ignoreExists = pIgExists->n; // sql.y has: ifnotexists(X) ::= IF NOT EXISTS.   {X.n = 1;}
 }
 
-void setCreateAcctSql(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctSQL *pAcctInfo) {
+void setCreateAcctSql(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctInfo *pAcctInfo) {
   pInfo->type = type;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  if (pInfo->pMiscInfo == NULL) {
+    pInfo->pMiscInfo = calloc(1, sizeof(SMiscInfo));
   }
 
-  pInfo->pDCLInfo->acctOpt = *pAcctInfo;
+  pInfo->pMiscInfo->acctOpt = *pAcctInfo;
   
   assert(pName != NULL);
-  pInfo->pDCLInfo->user.user = *pName;
+  pInfo->pMiscInfo->user.user = *pName;
   
   if (pPwd != NULL) {
-    pInfo->pDCLInfo->user.passwd = *pPwd;
+    pInfo->pMiscInfo->user.passwd = *pPwd;
   }
 }
 
 void setCreateUserSql(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd) {
   pInfo->type = TSDB_SQL_CREATE_USER;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  if (pInfo->pMiscInfo == NULL) {
+    pInfo->pMiscInfo = calloc(1, sizeof(SMiscInfo));
   }
   
   assert(pName != NULL && pPasswd != NULL);
   
-  pInfo->pDCLInfo->user.user = *pName;
-  pInfo->pDCLInfo->user.passwd = *pPasswd;
+  pInfo->pMiscInfo->user.user = *pName;
+  pInfo->pMiscInfo->user.passwd = *pPasswd;
 }
 
 void setAlterUserSql(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken* pPwd, SStrToken *pPrivilege) {
   pInfo->type = TSDB_SQL_ALTER_USER;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  if (pInfo->pMiscInfo == NULL) {
+    pInfo->pMiscInfo = calloc(1, sizeof(SMiscInfo));
   }
   
   assert(pName != NULL);
   
-  SUserInfo* pUser = &pInfo->pDCLInfo->user;
+  SUserInfo* pUser = &pInfo->pMiscInfo->user;
   pUser->type = type;
   pUser->user = *pName;
   
@@ -826,18 +822,17 @@ void setAlterUserSql(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken*
   }
 }
 
-void setKillSql(SSqlInfo *pInfo, int32_t type, SStrToken *ip) {
+void setKillSql(SSqlInfo *pInfo, int32_t type, SStrToken *id) {
   pInfo->type = type;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  if (pInfo->pMiscInfo == NULL) {
+    pInfo->pMiscInfo = calloc(1, sizeof(SMiscInfo));
   }
   
-  assert(ip != NULL);
-  
-  pInfo->pDCLInfo->ip = *ip;
+  assert(id != NULL);
+  pInfo->pMiscInfo->id = *id;
 }
 
-void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo) {
+void setDefaultCreateDbOption(SCreateDbInfo *pDBInfo) {
   pDBInfo->compressionLevel = -1;
 
   pDBInfo->walLevel = -1;
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
index 6c59a51074..ac4af7319a 100644
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
@@ -104,7 +104,7 @@ typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
   SCreateTableSQL* yy38;
-  SCreateAcctSQL yy71;
+  SCreateAcctInfo yy71;
   tSQLExpr* yy78;
   int yy96;
   SQuerySQL* yy148;
@@ -113,7 +113,7 @@ typedef union {
   tSQLExprList* yy166;
   SLimitVal yy167;
   TAOS_FIELD yy183;
-  SCreateDBInfo yy234;
+  SCreateDbInfo yy234;
   int64_t yy325;
   SIntervalVal yy400;
   SArray* yy421;
@@ -2865,7 +2865,7 @@ static void yy_reduce(
       case 231: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
@@ -2876,14 +2876,14 @@ static void yy_reduce(
     toTSDBType(yymsp[0].minor.yy0.type);
     SArray* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
       case 233: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
 {
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
@@ -2894,7 +2894,7 @@ static void yy_reduce(
     toTSDBType(yymsp[0].minor.yy0.type);
     SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
@@ -2908,7 +2908,7 @@ static void yy_reduce(
     toTSDBType(yymsp[0].minor.yy0.type);
     A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
@@ -2920,7 +2920,7 @@ static void yy_reduce(
     SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
     A = tVariantListAppend(A, &yymsp[0].minor.yy430, -1);
 
-    SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
+    SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
 }
         break;
@@ -2991,7 +2991,7 @@ static void yy_syntax_error(
 /************ Begin %syntax_error code ****************************************/
 
   pInfo->valid = false;
-  int32_t outputBufLen = tListLen(pInfo->pzErrMsg);
+  int32_t outputBufLen = tListLen(pInfo->msg);
   int32_t len = 0;
 
   if(TOKEN.z) {
@@ -3001,13 +3001,13 @@ static void yy_syntax_error(
     if (sqlLen + sizeof(msg)/sizeof(msg[0]) + 1 > outputBufLen) {
         char tmpstr[128] = {0};
         memcpy(tmpstr, &TOKEN.z[0], sizeof(tmpstr)/sizeof(tmpstr[0]) - 1);
-        len = sprintf(pInfo->pzErrMsg, msg, tmpstr);
+        len = sprintf(pInfo->msg, msg, tmpstr);
     } else {
-        len = sprintf(pInfo->pzErrMsg, msg, &TOKEN.z[0]);
+        len = sprintf(pInfo->msg, msg, &TOKEN.z[0]);
     }
 
   } else {
-    len = sprintf(pInfo->pzErrMsg, "Incomplete SQL statement");
+    len = sprintf(pInfo->msg, "Incomplete SQL statement");
   }
 
   assert(len <= outputBufLen);

From 061de3e69e54b4f7e8c79531eae49cda21696fd9 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 11:49:08 +0800
Subject: [PATCH 10/25] [TD-225]fix compiler error.

---
 src/common/src/tname.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/src/tname.c b/src/common/src/tname.c
index ba2b61c46a..a93a2bd5d8 100644
--- a/src/common/src/tname.c
+++ b/src/common/src/tname.c
@@ -398,7 +398,7 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type) {
     int32_t len = 0;
     p = strstr(start, TS_PATH_DELIMITER);
     if (p == NULL) {
-      len = strlen(start);
+      len = (int32_t) strlen(start);
     } else {
       len = p - start;
     }
@@ -416,7 +416,7 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type) {
     dst->type = TSDB_TABLE_NAME_T;
     char* start = (char*) ((p == NULL)? str: (p+1));
 
-    int32_t len = strlen(start);
+    int32_t len = (int32_t) strlen(start);
 
     // too long account id or too long db name
     if (len >= tListLen(dst->tname) || len == 0) {

From e72ca01e6c710e28df89030e4faa2c2a23313307 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 11:53:24 +0800
Subject: [PATCH 11/25] [TD-225]fix compiler error.

---
 src/common/src/tname.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/src/tname.c b/src/common/src/tname.c
index a93a2bd5d8..5c49e2e102 100644
--- a/src/common/src/tname.c
+++ b/src/common/src/tname.c
@@ -380,7 +380,7 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type) {
       return -1;
     }
 
-    int32_t len = p - str;
+    int32_t len = (int32_t)(p - str);
 
     // too long account id or too long db name
     if (len >= tListLen(dst->acctId) || len == 0) {
@@ -400,7 +400,7 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type) {
     if (p == NULL) {
       len = (int32_t) strlen(start);
     } else {
-      len = p - start;
+      len = (int32_t) (p - start);
     }
 
     // too long account id or too long db name

From 59e902d9f1a73617b5fc0c8e8ba1a185d458add6 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 12:07:02 +0800
Subject: [PATCH 12/25] [TD-225]fix compiler error.

---
 src/client/src/tscSQLParser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 2cabcbe5f2..a0d310c07f 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -561,7 +561,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
 
-      int32_t numOfToken = taosArrayGetSize(pMiscInfo->a);
+      int32_t numOfToken = (int32_t) taosArrayGetSize(pMiscInfo->a);
       SStrToken* t = taosArrayGet(pMiscInfo->a, 0);
       SStrToken* t1 = taosArrayGet(pMiscInfo->a, 1);
 

From bcf2e490151b48f08fe7ff647030300cf770e96f Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 12:13:26 +0800
Subject: [PATCH 13/25] [TD-225]fix compiler error.

---
 src/client/src/tscSQLParser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index a0d310c07f..53bf91cd05 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5161,7 +5161,7 @@ int32_t validateEp(char* ep) {
 }
 
 int32_t validateDNodeConfig(SMiscInfo* pOptions) {
-  int32_t numOfToken = taosArrayGetSize(pOptions->a);
+  int32_t numOfToken = (int32_t) taosArrayGetSize(pOptions->a);
 
   if (numOfToken < 2 || numOfToken > 3) {
     return TSDB_CODE_TSC_INVALID_SQL;
@@ -5233,7 +5233,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
 }
 
 int32_t validateLocalConfig(SMiscInfo* pOptions) {
-  int32_t numOfToken = taosArrayGetSize(pOptions->a);
+  int32_t numOfToken = (int32_t) taosArrayGetSize(pOptions->a);
   if (numOfToken < 1 || numOfToken > 2) {
     return TSDB_CODE_TSC_INVALID_SQL;
   }

From 73e5bf9aec70393f52ec1c0bed36924eb44357df Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 12:17:11 +0800
Subject: [PATCH 14/25] [TD-225]fix compiler error.

---
 src/client/src/tscServer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index bcdfdd792a..bfb72d99db 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2351,8 +2351,8 @@ int32_t tscGetTableMeta(SSqlObj *pSql, STableMetaInfo *pTableMetaInfo) {
 
   char name[TSDB_TABLE_FNAME_LEN] = {0};
   tNameExtractFullName(&pTableMetaInfo->name, name);
-  int32_t len = strlen(name);
 
+  size_t len = strlen(name);
   taosHashGetClone(tscTableMetaInfo, name, len, NULL, pTableMetaInfo->pTableMeta, -1);
 
   // TODO resize the tableMeta

From 63b5cda5a502bd253ae1ce9bb08b61eb1da9a37d Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 12:18:15 +0800
Subject: [PATCH 15/25] [TD-225]fix compiler error.

---
 src/client/src/tscServer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index bfb72d99db..3afae07fbb 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2395,8 +2395,6 @@ int tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex) {
     return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  int32_t len = strlen(name);
-
   STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
   if (pTableMeta) {
     tscDebug("%p update table meta:%s, old meta numOfTags:%d, numOfCols:%d, uid:%" PRId64, pSql, name,
@@ -2404,7 +2402,9 @@ int tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex) {
   }
 
   // remove stored tableMeta info in hash table
+  size_t len = strlen(name);
   taosHashRemove(tscTableMetaInfo, name, len);
+
   return getTableMetaFromMnode(pSql, pTableMetaInfo);
 }
 

From 54a086f0f37cfd97220342b69cb75e7bbb86d81f Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 20 Jan 2021 12:48:58 +0800
Subject: [PATCH 16/25] [TD-2718]<fix>: new create multiple tables test cases

---
 tests/script/general/table/createmulti.sim | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 tests/script/general/table/createmulti.sim

diff --git a/tests/script/general/table/createmulti.sim b/tests/script/general/table/createmulti.sim
new file mode 100644
index 0000000000..0da1ce96a7
--- /dev/null
+++ b/tests/script/general/table/createmulti.sim
@@ -0,0 +1,46 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database
+sql create database db
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create super table
+sql create table db.st1 (ts timestamp, i int) tags (j int)
+sql create table db.st2 (ts timestamp, i int, j int) tags (t1 int, t2 int, t3 int)
+sql show db.stables
+if $rows != 2 then
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create multiple child tables
+sql create table db.ct1 using db.st1 tags(1) db.ct2 using db.st1 tags(2);
+
+sql show db.tables
+if $rows != 2 then
+  return -1
+endi
+
+sql create table db.ct3 using db.st2 tags(1, 1, 1) db.ct4 using db.st2 tags(2, 2, 2);
+sql show db.tables
+if $rows != 4 then
+  return -1
+endi
+
+sql create table db.ct5 using db.st1 tags(3) db.ct6 using db.st2 tags(3, 3, 3);
+sql show db.tables
+if $rows != 6 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

From 944780d50ebec071e6c9c94cc013aa7b29b2d660 Mon Sep 17 00:00:00 2001
From: dapan1121 <89396746@qq.com>
Date: Tue, 19 Jan 2021 19:08:21 -1000
Subject: [PATCH 17/25] add stable case

---
 tests/script/general/parser/stableOp.sim | 97 ++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 tests/script/general/parser/stableOp.sim

diff --git a/tests/script/general/parser/stableOp.sim b/tests/script/general/parser/stableOp.sim
new file mode 100644
index 0000000000..133de95b9c
--- /dev/null
+++ b/tests/script/general/parser/stableOp.sim
@@ -0,0 +1,97 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 100
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = fi_in_db
+$tbPrefix = fi_in_tb
+$stbPrefix = fi_in_stb
+$mtPrefix = fi_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print create_tb test
+print =============== set up
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql create database $db
+sql use $db
+
+# case1: create stable test
+print =========== stableOp.sim case1: create/alter/drop stable test
+sql CREATE STABLE $stb (TS TIMESTAMP, COL1 INT) TAGS (ID INT);
+sql show stables
+
+if $rows != 1 then
+  return -1
+endi
+print data00 = $data00
+if $data00 != $stb then 
+  return -1
+endi
+
+sql_error CREATE STABLE $tb using $stb tags (1);
+
+sql create table $tb using $stb tags (2);
+sql show tables
+
+if $rows != 1 then
+  return -1
+endi
+
+sql alter stable $stb add column COL2 DOUBLE;
+
+sql insert into $tb values (now, 1, 2.0);
+
+sql select * from $tb ;
+
+if $rows != 1 then
+  return -1
+endi
+
+sql alter stable $stb drop column COL2;
+
+sql_error insert into $tb values (now, 1, 2.0);
+
+sql alter stable $stb add tag tag2 int;
+
+sql alter stable $stb change tag tag2 tag3;
+
+sql_error drop stable $tb
+
+sql drop table $tb ;
+
+sql show tables
+
+if $rows != 0 then
+  return -1
+endi
+
+
+sql DROP STABLE $stb
+sql show stables
+
+if $rows != 0 then
+  return -1
+endi
+
+print create/alter/drop stable test passed
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

From acfe7d344437af8f985b8448aa15413e27b7d81f Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 13:43:54 +0800
Subject: [PATCH 18/25] [TD-225]reduce sleep time

---
 .../alter/cached_schema_after_alter.sim       |  6 ++---
 tests/script/general/alter/count.sim          | 10 ++++----
 tests/script/general/alter/dnode.sim          |  4 +--
 tests/script/general/alter/import.sim         |  2 +-
 tests/script/general/alter/insert1.sim        |  6 ++---
 tests/script/general/alter/insert2.sim        |  6 ++---
 tests/script/general/alter/metrics.sim        |  6 ++---
 tests/script/general/alter/table.sim          |  6 ++---
 tests/script/general/cache/new_metrics.sim    |  2 +-
 .../script/general/cache/restart_metrics.sim  |  4 +--
 tests/script/general/cache/restart_table.sim  |  6 ++---
 tests/script/general/column/commit.sim        |  6 ++---
 tests/script/general/column/metrics.sim       |  6 ++---
 tests/script/general/column/table.sim         |  6 ++---
 tests/script/general/compress/commitlog.sim   |  6 ++---
 tests/script/general/compress/compress.sim    |  6 ++---
 tests/script/general/compress/compress2.sim   |  6 ++---
 tests/script/general/compress/uncompress.sim  |  6 ++---
 tests/script/general/compute/avg.sim          |  2 +-
 tests/script/general/compute/bottom.sim       |  2 +-
 tests/script/general/compute/count.sim        |  2 +-
 tests/script/general/compute/diff.sim         |  2 +-
 tests/script/general/compute/diff2.sim        |  2 +-
 tests/script/general/compute/first.sim        |  2 +-
 tests/script/general/compute/interval.sim     |  2 +-
 tests/script/general/compute/last.sim         |  2 +-
 tests/script/general/compute/last_row.sim     |  2 +-
 tests/script/general/compute/leastsquare.sim  |  2 +-
 tests/script/general/compute/max.sim          |  2 +-
 tests/script/general/compute/min.sim          |  2 +-
 tests/script/general/compute/null.sim         |  2 +-
 tests/script/general/compute/percentile.sim   |  2 +-
 tests/script/general/compute/stddev.sim       |  2 +-
 tests/script/general/compute/sum.sim          |  2 +-
 tests/script/general/compute/top.sim          |  2 +-
 .../script/general/connection/connection.sim  |  2 +-
 tests/script/general/connection/mqtt.sim      |  2 +-
 tests/script/general/db/alter_option.sim      |  2 +-
 tests/script/general/db/alter_tables_d2.sim   |  4 +--
 tests/script/general/db/alter_tables_v4.sim   |  4 +--
 tests/script/general/db/alter_vgroups.sim     | 10 ++++----
 tests/script/general/db/backup/keep.sim       | 14 +++++------
 tests/script/general/db/basic.sim             |  2 +-
 tests/script/general/db/basic1.sim            |  2 +-
 tests/script/general/db/basic2.sim            |  2 +-
 tests/script/general/db/basic3.sim            |  2 +-
 tests/script/general/db/basic4.sim            |  2 +-
 tests/script/general/db/basic5.sim            |  2 +-
 tests/script/general/db/delete.sim            |  4 +--
 tests/script/general/db/delete_reuse1.sim     |  2 +-
 tests/script/general/db/delete_reuse2.sim     | 12 ++++-----
 .../script/general/db/delete_reusevnode2.sim  |  2 +-
 tests/script/general/db/delete_writing1.sim   |  2 +-
 tests/script/general/db/delete_writing2.sim   |  4 +--
 tests/script/general/db/dropdnodes.sim        |  4 +--
 tests/script/general/db/len.sim               |  2 +-
 tests/script/general/db/nosuchfile.sim        |  4 +--
 tests/script/general/db/repeat.sim            | 10 ++++----
 tests/script/general/db/show_create_db.sim    |  2 +-
 tests/script/general/db/show_create_table.sim |  2 +-
 tests/script/general/db/tables.sim            |  2 +-
 tests/script/general/db/vnodes.sim            |  2 +-
 tests/script/general/field/2.sim              |  2 +-
 tests/script/general/field/3.sim              |  2 +-
 tests/script/general/field/4.sim              |  2 +-
 tests/script/general/field/5.sim              |  2 +-
 tests/script/general/field/6.sim              |  2 +-
 tests/script/general/field/bigint.sim         |  2 +-
 tests/script/general/field/binary.sim         |  2 +-
 tests/script/general/field/bool.sim           |  2 +-
 tests/script/general/field/double.sim         |  2 +-
 tests/script/general/field/float.sim          |  2 +-
 tests/script/general/field/int.sim            |  2 +-
 tests/script/general/field/single.sim         |  2 +-
 tests/script/general/field/smallint.sim       |  2 +-
 tests/script/general/field/tinyint.sim        |  2 +-
 tests/script/general/http/autocreate.sim      |  4 +--
 tests/script/general/http/chunked.sim         |  4 +--
 tests/script/general/http/grafana.sim         |  6 ++---
 tests/script/general/http/grafana_bug.sim     |  4 +--
 tests/script/general/http/gzip.sim            |  4 +--
 tests/script/general/http/prepare.sim         |  4 +--
 tests/script/general/http/restful.sim         |  4 +--
 tests/script/general/http/restful_full.sim    |  6 ++---
 tests/script/general/http/restful_insert.sim  |  4 +--
 tests/script/general/http/restful_limit.sim   |  4 +--
 tests/script/general/http/telegraf.sim        |  6 ++---
 tests/script/general/import/basic.sim         |  2 +-
 tests/script/general/import/commit.sim        |  6 ++---
 tests/script/general/import/large.sim         |  2 +-
 tests/script/general/import/replica1.sim      | 10 ++++----
 tests/script/general/insert/basic.sim         |  2 +-
 tests/script/general/insert/insert_drop.sim   |  6 ++---
 .../general/insert/query_block1_file.sim      |  2 +-
 .../general/insert/query_block1_memory.sim    |  2 +-
 .../general/insert/query_block2_file.sim      |  2 +-
 .../general/insert/query_block2_memory.sim    |  2 +-
 .../general/insert/query_file_memory.sim      |  2 +-
 .../general/insert/query_multi_file.sim       |  2 +-
 tests/script/general/insert/tcp.sim           |  2 +-
 tests/script/general/parser/alter.sim         |  4 +--
 .../script/general/parser/auto_create_tb.sim  |  2 +-
 .../parser/col_arithmetic_operation.sim       |  2 +-
 tests/script/general/parser/commit.sim        |  2 +-
 tests/script/general/parser/first_last.sim    |  2 +-
 tests/script/general/parser/function.sim      | 25 ++++++++++---------
 .../script/general/parser/import_commit1.sim  |  2 +-
 .../script/general/parser/import_commit2.sim  |  2 +-
 .../script/general/parser/import_commit3.sim  |  4 +--
 tests/script/general/parser/interp.sim        |  2 +-
 tests/script/general/parser/lastrow.sim       |  2 +-
 tests/script/general/parser/limit.sim         |  2 +-
 tests/script/general/parser/limit1.sim        |  2 +-
 .../general/parser/limit1_tblocks100.sim      |  2 +-
 tests/script/general/parser/limit2.sim        |  2 +-
 tests/script/general/parser/mixed_blocks.sim  |  2 +-
 .../parser/projection_limit_offset.sim        |  2 +-
 tests/script/general/parser/selectResNum.sim  |  2 +-
 .../general/parser/select_from_cache_disk.sim |  2 +-
 .../general/parser/single_row_in_tb.sim       |  2 +-
 tests/script/general/parser/slimit.sim        |  2 +-
 tests/script/general/parser/slimit1.sim       |  2 +-
 .../general/parser/slimit_alter_tags.sim      |  2 +-
 tests/script/general/parser/tbnameIn.sim      |  2 +-
 tests/script/general/parser/topbot.sim        |  2 +-
 tests/script/general/stable/disk.sim          |  4 +--
 tests/script/general/stable/metrics.sim       |  2 +-
 tests/script/general/stable/refcount.sim      |  2 +-
 tests/script/general/stable/show.sim          |  2 +-
 tests/script/general/stable/values.sim        |  2 +-
 tests/script/general/stable/vnode3.sim        |  2 +-
 tests/script/general/stream/agg_stream.sim    |  2 +-
 tests/script/general/stream/column_stream.sim |  4 +--
 tests/script/general/stream/metrics_del.sim   |  2 +-
 .../stream/metrics_replica1_vnoden.sim        |  2 +-
 .../script/general/stream/restart_stream.sim  |  2 +-
 tests/script/general/stream/stream_3.sim      |  2 +-
 .../script/general/stream/stream_restart.sim  |  2 +-
 tests/script/general/stream/table_del.sim     |  2 +-
 .../general/stream/table_replica1_vnoden.sim  |  2 +-
 tests/script/general/table/autocreate.sim     |  2 +-
 tests/script/general/table/basic1.sim         |  2 +-
 tests/script/general/table/basic2.sim         |  2 +-
 tests/script/general/table/basic3.sim         |  2 +-
 tests/script/general/table/bigint.sim         |  2 +-
 tests/script/general/table/binary.sim         |  2 +-
 tests/script/general/table/bool.sim           |  2 +-
 tests/script/general/table/column2.sim        |  2 +-
 tests/script/general/table/column_name.sim    |  2 +-
 tests/script/general/table/column_num.sim     |  2 +-
 tests/script/general/table/column_value.sim   |  2 +-
 tests/script/general/table/date.sim           |  2 +-
 tests/script/general/table/db.table.sim       |  2 +-
 tests/script/general/table/delete_reuse1.sim  |  2 +-
 tests/script/general/table/delete_reuse2.sim  |  2 +-
 tests/script/general/table/delete_writing.sim |  2 +-
 tests/script/general/table/describe.sim       |  2 +-
 tests/script/general/table/double.sim         |  2 +-
 tests/script/general/table/fill.sim           |  6 ++---
 tests/script/general/table/float.sim          |  2 +-
 tests/script/general/table/int.sim            |  2 +-
 tests/script/general/table/limit.sim          |  2 +-
 tests/script/general/table/smallint.sim       |  2 +-
 tests/script/general/table/table.sim          |  2 +-
 tests/script/general/table/table_len.sim      |  2 +-
 tests/script/general/table/tinyint.sim        |  2 +-
 tests/script/general/table/vgroup.sim         |  2 +-
 tests/script/general/tag/3.sim                |  2 +-
 tests/script/general/tag/4.sim                |  2 +-
 tests/script/general/tag/5.sim                |  2 +-
 tests/script/general/tag/6.sim                |  2 +-
 tests/script/general/tag/add.sim              |  2 +-
 tests/script/general/tag/bigint.sim           |  2 +-
 tests/script/general/tag/binary.sim           |  2 +-
 tests/script/general/tag/binary_binary.sim    |  2 +-
 tests/script/general/tag/bool.sim             |  2 +-
 tests/script/general/tag/bool_binary.sim      |  2 +-
 tests/script/general/tag/bool_int.sim         |  2 +-
 tests/script/general/tag/change.sim           |  4 +--
 tests/script/general/tag/column.sim           |  2 +-
 tests/script/general/tag/commit.sim           |  6 ++---
 tests/script/general/tag/create.sim           |  2 +-
 tests/script/general/tag/delete.sim           |  4 +--
 tests/script/general/tag/double.sim           |  2 +-
 tests/script/general/tag/filter.sim           |  2 +-
 tests/script/general/tag/float.sim            |  2 +-
 tests/script/general/tag/int.sim              |  2 +-
 tests/script/general/tag/int_binary.sim       |  2 +-
 tests/script/general/tag/int_float.sim        |  2 +-
 tests/script/general/tag/set.sim              |  2 +-
 tests/script/general/tag/smallint.sim         |  2 +-
 tests/script/general/tag/tinyint.sim          |  2 +-
 tests/script/general/user/authority.sim       |  2 +-
 tests/script/general/user/monitor.sim         |  4 +--
 tests/script/general/user/pass_alter.sim      |  2 +-
 tests/script/general/user/pass_len.sim        |  2 +-
 tests/script/general/user/user_len.sim        |  2 +-
 tests/script/general/vector/metrics_field.sim |  2 +-
 tests/script/general/vector/metrics_mix.sim   |  2 +-
 tests/script/general/vector/metrics_query.sim |  2 +-
 tests/script/general/vector/metrics_tag.sim   |  2 +-
 tests/script/general/vector/metrics_time.sim  |  2 +-
 tests/script/general/vector/multi.sim         |  2 +-
 tests/script/general/vector/single.sim        |  2 +-
 tests/script/general/vector/table_field.sim   |  2 +-
 tests/script/general/vector/table_mix.sim     |  2 +-
 tests/script/general/vector/table_query.sim   |  2 +-
 tests/script/general/vector/table_time.sim    |  2 +-
 tests/script/general/wal/kill.sim             | 22 ++++++++--------
 tests/script/general/wal/maxtables.sim        |  4 +--
 tests/script/tmp/mnodes.sim                   |  2 +-
 .../script/unique/account/account_create.sim  |  2 +-
 .../script/unique/account/account_delete.sim  |  2 +-
 tests/script/unique/account/account_len.sim   |  2 +-
 tests/script/unique/account/authority.sim     |  2 +-
 tests/script/unique/account/basic.sim         |  2 +-
 tests/script/unique/account/paras.sim         |  2 +-
 tests/script/unique/account/pass_alter.sim    |  2 +-
 tests/script/unique/account/pass_len.sim      |  2 +-
 tests/script/unique/account/usage.sim         |  2 +-
 tests/script/unique/account/user_create.sim   |  2 +-
 tests/script/unique/account/user_len.sim      |  2 +-
 .../arbitrator/check_cluster_cfg_para.sim     |  2 +-
 .../arbitrator/dn2_mn1_cache_file_sync.sim    |  6 ++---
 .../dn2_mn1_cache_file_sync_second.sim        |  4 +--
 .../dn3_mn1_full_createTableFail.sim          |  4 +--
 .../arbitrator/dn3_mn1_full_dropDnodeFail.sim |  4 +--
 .../dn3_mn1_multiCreateDropTable.sim          | 10 ++++----
 ...3_mn1_nw_disable_timeout_autoDropDnode.sim |  4 +--
 .../arbitrator/dn3_mn1_r2_vnode_delDir.sim    |  6 ++---
 .../arbitrator/dn3_mn1_r3_vnode_delDir.sim    |  8 +++---
 .../dn3_mn1_replica2_wal1_AddDelDnode.sim     | 18 ++++++-------
 .../dn3_mn1_replica_change_dropDnod.sim       |  4 +--
 .../arbitrator/dn3_mn1_stopDnode_timeout.sim  |  6 ++---
 .../arbitrator/dn3_mn1_vnode_change.sim       |  4 +--
 .../dn3_mn1_vnode_corruptFile_offline.sim     |  4 +--
 .../dn3_mn1_vnode_corruptFile_online.sim      |  4 +--
 .../dn3_mn1_vnode_createErrData_online.sim    |  4 +--
 .../arbitrator/dn3_mn1_vnode_delDir.sim       |  4 +--
 .../dn3_mn1_vnode_noCorruptFile_offline.sim   |  4 +--
 .../arbitrator/dn3_mn1_vnode_nomaster.sim     |  6 ++---
 .../unique/arbitrator/dn3_mn2_killDnode.sim   |  8 +++---
 .../arbitrator/insert_duplicationTs.sim       |  8 +++---
 .../offline_replica2_alterTable_online.sim    |  4 +--
 .../offline_replica2_alterTag_online.sim      |  4 +--
 .../offline_replica2_createTable_online.sim   |  4 +--
 .../offline_replica2_dropDb_online.sim        |  4 +--
 .../offline_replica2_dropTable_online.sim     |  4 +--
 .../offline_replica3_alterTable_online.sim    |  4 +--
 .../offline_replica3_alterTag_online.sim      |  4 +--
 .../offline_replica3_createTable_online.sim   |  4 +--
 .../offline_replica3_dropDb_online.sim        |  4 +--
 .../offline_replica3_dropTable_online.sim     |  4 +--
 .../replica_changeWithArbitrator.sim          | 12 ++++-----
 .../sync_replica2_alterTable_add.sim          |  4 +--
 .../sync_replica2_alterTable_drop.sim         |  4 +--
 .../arbitrator/sync_replica2_dropDb.sim       |  4 +--
 .../arbitrator/sync_replica2_dropTable.sim    |  4 +--
 .../sync_replica3_alterTable_add.sim          |  4 +--
 .../sync_replica3_alterTable_drop.sim         |  4 +--
 .../arbitrator/sync_replica3_createTable.sim  |  4 +--
 ...ca3_dnodeChang_DropAddAlterTableDropDb.sim |  4 +--
 .../arbitrator/sync_replica3_dropDb.sim       |  4 +--
 .../arbitrator/sync_replica3_dropTable.sim    |  4 +--
 tests/script/unique/big/maxvnodes.sim         |  4 +--
 tests/script/unique/big/restartSpeed.sim      |  2 +-
 tests/script/unique/cluster/alter.sim         |  4 +--
 tests/script/unique/cluster/balance2.sim      |  4 +--
 tests/script/unique/cluster/cache.sim         |  4 +--
 tests/script/unique/cluster/cluster_main.sim  | 14 +++++------
 tests/script/unique/cluster/cluster_main0.sim | 18 ++++++-------
 tests/script/unique/cluster/cluster_main1.sim | 14 +++++------
 tests/script/unique/cluster/cluster_main2.sim | 16 ++++++------
 tests/script/unique/cluster/flowctrl.sim      |  6 ++---
 .../unique/clusterSimCase/cluster_main.sim    | 12 ++++-----
 tests/script/unique/db/commit.sim             | 12 ++++-----
 tests/script/unique/db/delete.sim             |  4 +--
 tests/script/unique/db/replica_reduce32.sim   |  2 +-
 tests/script/unique/dnode/alternativeRole.sim |  4 +--
 tests/script/unique/dnode/balance2.sim        |  2 +-
 tests/script/unique/dnode/balancex.sim        |  6 ++---
 tests/script/unique/dnode/data1.sim           |  6 ++---
 tests/script/unique/dnode/datatrans_1node.sim |  4 +--
 tests/script/unique/dnode/datatrans_3node.sim |  6 ++---
 .../script/unique/dnode/datatrans_3node_2.sim |  6 ++---
 tests/script/unique/dnode/monitor.sim         |  6 ++---
 tests/script/unique/dnode/monitor_bug.sim     |  4 +--
 tests/script/unique/dnode/offline1.sim        |  2 +-
 tests/script/unique/dnode/offline2.sim        |  6 ++---
 tests/script/unique/dnode/simple.sim          |  4 +--
 tests/script/unique/http/admin.sim            |  4 +--
 tests/script/unique/http/opentsdb.sim         |  4 +--
 tests/script/unique/import/replica3.sim       |  4 +--
 tests/script/unique/mnode/mgmt20.sim          |  2 +-
 tests/script/unique/mnode/mgmt22.sim          |  2 +-
 tests/script/unique/mnode/mgmt26.sim          |  2 +-
 tests/script/unique/mnode/mgmt30.sim          |  2 +-
 tests/script/unique/mnode/mgmtr2.sim          |  2 +-
 tests/script/unique/stable/dnode2_stop.sim    |  4 +--
 .../script/unique/stream/metrics_balance.sim  |  4 +--
 .../unique/stream/metrics_vnode_stop.sim      |  4 +--
 tests/script/unique/stream/table_balance.sim  |  4 +--
 tests/script/unique/stream/table_move.sim     |  6 ++---
 .../script/unique/stream/table_vnode_stop.sim |  4 +--
 tests/script/unique/vnode/many.sim            | 10 ++++----
 .../script/unique/vnode/replica2_a_large.sim  |  6 ++---
 tests/script/unique/vnode/replica2_basic2.sim | 12 ++++-----
 tests/script/unique/vnode/replica2_repeat.sim | 10 ++++----
 tests/script/unique/vnode/replica3_repeat.sim | 16 ++++++------
 tests/script/unique/vnode/replica3_vgroup.sim |  4 +--
 tests/script/windows/alter/metrics.sim        |  6 ++---
 tests/script/windows/alter/table.sim          |  6 ++---
 tests/script/windows/compute/avg.sim          |  2 +-
 tests/script/windows/compute/bottom.sim       |  2 +-
 tests/script/windows/compute/count.sim        |  2 +-
 tests/script/windows/compute/diff.sim         |  2 +-
 tests/script/windows/compute/first.sim        |  2 +-
 tests/script/windows/compute/interval.sim     |  2 +-
 tests/script/windows/compute/last.sim         |  2 +-
 tests/script/windows/compute/leastsquare.sim  |  2 +-
 tests/script/windows/compute/max.sim          |  2 +-
 tests/script/windows/compute/min.sim          |  2 +-
 tests/script/windows/compute/percentile.sim   |  2 +-
 tests/script/windows/compute/stddev.sim       |  2 +-
 tests/script/windows/compute/sum.sim          |  2 +-
 tests/script/windows/compute/top.sim          |  2 +-
 tests/script/windows/db/basic.sim             |  2 +-
 tests/script/windows/db/len.sim               |  2 +-
 tests/script/windows/field/2.sim              |  2 +-
 tests/script/windows/field/3.sim              |  2 +-
 tests/script/windows/field/4.sim              |  2 +-
 tests/script/windows/field/5.sim              |  2 +-
 tests/script/windows/field/6.sim              |  2 +-
 tests/script/windows/field/bigint.sim         |  2 +-
 tests/script/windows/field/binary.sim         |  2 +-
 tests/script/windows/field/bool.sim           |  2 +-
 tests/script/windows/field/double.sim         |  2 +-
 tests/script/windows/field/float.sim          |  2 +-
 tests/script/windows/field/int.sim            |  2 +-
 tests/script/windows/field/single.sim         |  2 +-
 tests/script/windows/field/smallint.sim       |  2 +-
 tests/script/windows/field/tinyint.sim        |  2 +-
 tests/script/windows/import/basic.sim         |  2 +-
 tests/script/windows/insert/basic.sim         |  2 +-
 .../windows/insert/query_block1_file.sim      |  2 +-
 .../windows/insert/query_block1_memory.sim    |  2 +-
 .../windows/insert/query_block2_file.sim      |  2 +-
 .../windows/insert/query_block2_memory.sim    |  2 +-
 .../windows/insert/query_file_memory.sim      |  2 +-
 .../windows/insert/query_multi_file.sim       |  2 +-
 tests/script/windows/table/binary.sim         |  2 +-
 tests/script/windows/table/bool.sim           |  2 +-
 tests/script/windows/table/column_name.sim    |  2 +-
 tests/script/windows/table/column_num.sim     |  2 +-
 tests/script/windows/table/column_value.sim   |  2 +-
 tests/script/windows/table/db.table.sim       |  2 +-
 tests/script/windows/table/double.sim         |  2 +-
 tests/script/windows/table/float.sim          |  2 +-
 tests/script/windows/table/table.sim          |  2 +-
 tests/script/windows/table/table_len.sim      |  2 +-
 tests/script/windows/tag/3.sim                |  2 +-
 tests/script/windows/tag/4.sim                |  2 +-
 tests/script/windows/tag/5.sim                |  2 +-
 tests/script/windows/tag/6.sim                |  2 +-
 tests/script/windows/tag/add.sim              |  2 +-
 tests/script/windows/tag/bigint.sim           |  2 +-
 tests/script/windows/tag/binary.sim           |  2 +-
 tests/script/windows/tag/binary_binary.sim    |  2 +-
 tests/script/windows/tag/bool.sim             |  2 +-
 tests/script/windows/tag/bool_binary.sim      |  2 +-
 tests/script/windows/tag/bool_int.sim         |  2 +-
 tests/script/windows/tag/change.sim           |  4 +--
 tests/script/windows/tag/column.sim           |  2 +-
 tests/script/windows/tag/create.sim           |  2 +-
 tests/script/windows/tag/delete.sim           |  4 +--
 tests/script/windows/tag/double.sim           |  2 +-
 tests/script/windows/tag/filter.sim           |  2 +-
 tests/script/windows/tag/float.sim            |  2 +-
 tests/script/windows/tag/int.sim              |  2 +-
 tests/script/windows/tag/int_binary.sim       |  2 +-
 tests/script/windows/tag/int_float.sim        |  2 +-
 tests/script/windows/tag/set.sim              |  2 +-
 tests/script/windows/tag/smallint.sim         |  2 +-
 tests/script/windows/tag/tinyint.sim          |  2 +-
 tests/script/windows/vector/metrics_field.sim |  2 +-
 tests/script/windows/vector/metrics_mix.sim   |  2 +-
 tests/script/windows/vector/metrics_query.sim |  2 +-
 tests/script/windows/vector/metrics_tag.sim   |  2 +-
 tests/script/windows/vector/metrics_time.sim  |  2 +-
 tests/script/windows/vector/multi.sim         |  2 +-
 tests/script/windows/vector/single.sim        |  2 +-
 tests/script/windows/vector/table_field.sim   |  2 +-
 tests/script/windows/vector/table_mix.sim     |  2 +-
 tests/script/windows/vector/table_query.sim   |  2 +-
 tests/script/windows/vector/table_time.sim    |  2 +-
 395 files changed, 672 insertions(+), 671 deletions(-)

diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim
index 2d049ec595..96ee439084 100644
--- a/tests/script/general/alter/cached_schema_after_alter.sim
+++ b/tests/script/general/alter/cached_schema_after_alter.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $db = csaa_db
@@ -53,10 +53,10 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
-sleep 5000
+sleep 3000
 sql connect
 
 sql use $db
diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim
index 157b4c1371..fc936668b8 100644
--- a/tests/script/general/alter/count.sim
+++ b/tests/script/general/alter/count.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 
 print ========= start dnode1 as master
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
@@ -141,9 +141,9 @@ endi
 
 print ============= step10
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
 if $data00 != 24 then
@@ -250,9 +250,9 @@ endi
 
 print ============== step18
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 #sql select count(g) from tb
 #if $data00 != 12 then
diff --git a/tests/script/general/alter/dnode.sim b/tests/script/general/alter/dnode.sim
index 73a095ec05..7b31218fc2 100644
--- a/tests/script/general/alter/dnode.sim
+++ b/tests/script/general/alter/dnode.sim
@@ -4,14 +4,14 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
 sql alter dnode 1 resetlog
 sql alter dnode 1 monitor 1
 
-sleep 5000
+sleep 3000
 sql select * from log.dn
 if $rows <= 0 then
   return -1
diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim
index 76388a26f2..aef0a258b2 100644
--- a/tests/script/general/alter/import.sim
+++ b/tests/script/general/alter/import.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 
 print ========= start dnode1 as master
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim
index 3b16214465..12ab09beb9 100644
--- a/tests/script/general/alter/insert1.sim
+++ b/tests/script/general/alter/insert1.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
@@ -940,9 +940,9 @@ endi
 print ======== step9
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql select * from tb order by ts asc
 if $rows != 8 then
diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim
index 28948b69d2..dcd9f50030 100644
--- a/tests/script/general/alter/insert2.sim
+++ b/tests/script/general/alter/insert2.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
@@ -608,9 +608,9 @@ sql_error alter table tb drop column a
 
 print ======== step9
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql select * from tb order by ts desc
 if $rows != 7 then
diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim
index 5ed8050b96..fd0b210cd1 100644
--- a/tests/script/general/alter/metrics.sim
+++ b/tests/script/general/alter/metrics.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
@@ -367,9 +367,9 @@ endi
 print ======== step9
 print ======== step10
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql use d2
 sql describe tb
diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim
index 5a72fc9256..06704eeca6 100644
--- a/tests/script/general/alter/table.sim
+++ b/tests/script/general/alter/table.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
@@ -318,9 +318,9 @@ endi
 print ======== step9
 print ======== step10
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql use d1
 sql describe tb
diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/general/cache/new_metrics.sim
index 84f9e40de3..a13dd23bb6 100644
--- a/tests/script/general/cache/new_metrics.sim
+++ b/tests/script/general/cache/new_metrics.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/cache/restart_metrics.sim b/tests/script/general/cache/restart_metrics.sim
index f24768859f..f5035e1251 100644
--- a/tests/script/general/cache/restart_metrics.sim
+++ b/tests/script/general/cache/restart_metrics.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
@@ -49,7 +49,7 @@ endi
 
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
-sleep 5000
+sleep 3000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/cache/restart_table.sim b/tests/script/general/cache/restart_table.sim
index 8697c26bc3..fcdb2fb593 100644
--- a/tests/script/general/cache/restart_table.sim
+++ b/tests/script/general/cache/restart_table.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
@@ -33,14 +33,14 @@ endi
 
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
-sleep 5000
+sleep 3000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 print =============== step3
 print ==> sleep 8 seconds to renew cache
-sleep 3000
+sleep 2000
 sql reset query cache
 sleep 18000
 
diff --git a/tests/script/general/column/commit.sim b/tests/script/general/column/commit.sim
index c574db1aa9..e1b98d3814 100644
--- a/tests/script/general/column/commit.sim
+++ b/tests/script/general/column/commit.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
@@ -89,9 +89,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print =============== step5
 
diff --git a/tests/script/general/column/metrics.sim b/tests/script/general/column/metrics.sim
index 673b66c9e2..a46ab6560a 100644
--- a/tests/script/general/column/metrics.sim
+++ b/tests/script/general/column/metrics.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
@@ -157,9 +157,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print =============== step5
 
diff --git a/tests/script/general/column/table.sim b/tests/script/general/column/table.sim
index aec0dc3c75..7c9302aa08 100644
--- a/tests/script/general/column/table.sim
+++ b/tests/script/general/column/table.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
@@ -129,9 +129,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print ==============  step5
 
diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim
index b5d653fe83..e8eab6ed0c 100644
--- a/tests/script/general/compress/commitlog.sim
+++ b/tests/script/general/compress/commitlog.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ============================ dnode1 start
 
@@ -87,9 +87,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print =============== step5
 
diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim
index 6975f87996..0df2a0d4cb 100644
--- a/tests/script/general/compress/compress.sim
+++ b/tests/script/general/compress/compress.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -82,9 +82,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print =============== step5
 
diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim
index cf96f572ac..007d1ec339 100644
--- a/tests/script/general/compress/compress2.sim
+++ b/tests/script/general/compress/compress2.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c comp -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -82,9 +82,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print =============== step5
 
diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim
index 13d288451c..9c71c8c1cc 100644
--- a/tests/script/general/compress/uncompress.sim
+++ b/tests/script/general/compress/uncompress.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ============================ dnode1 start
 
@@ -81,9 +81,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
-system sh/exec.sh -n dnode1 -s start
 sleep 3000
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
 
 print =============== step5
 
diff --git a/tests/script/general/compute/avg.sim b/tests/script/general/compute/avg.sim
index 52a270bc6d..027cfbe61d 100644
--- a/tests/script/general/compute/avg.sim
+++ b/tests/script/general/compute/avg.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_av_db
diff --git a/tests/script/general/compute/bottom.sim b/tests/script/general/compute/bottom.sim
index 415bd36e2e..5c76d5d171 100644
--- a/tests/script/general/compute/bottom.sim
+++ b/tests/script/general/compute/bottom.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_bo_db
diff --git a/tests/script/general/compute/count.sim b/tests/script/general/compute/count.sim
index d8aeb18752..fc481088a5 100644
--- a/tests/script/general/compute/count.sim
+++ b/tests/script/general/compute/count.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_co_db
diff --git a/tests/script/general/compute/diff.sim b/tests/script/general/compute/diff.sim
index 88c2ecb09d..433a935609 100644
--- a/tests/script/general/compute/diff.sim
+++ b/tests/script/general/compute/diff.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_di_db
diff --git a/tests/script/general/compute/diff2.sim b/tests/script/general/compute/diff2.sim
index 14675c823f..7406771ac6 100644
--- a/tests/script/general/compute/diff2.sim
+++ b/tests/script/general/compute/diff2.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_di_db
diff --git a/tests/script/general/compute/first.sim b/tests/script/general/compute/first.sim
index 01b82cce62..f12ed2b73a 100644
--- a/tests/script/general/compute/first.sim
+++ b/tests/script/general/compute/first.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_fi_db
diff --git a/tests/script/general/compute/interval.sim b/tests/script/general/compute/interval.sim
index 8f9bf2ecb3..79f3475222 100644
--- a/tests/script/general/compute/interval.sim
+++ b/tests/script/general/compute/interval.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_in_db
diff --git a/tests/script/general/compute/last.sim b/tests/script/general/compute/last.sim
index 88a6a26846..7b7c45044f 100644
--- a/tests/script/general/compute/last.sim
+++ b/tests/script/general/compute/last.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_la_db
diff --git a/tests/script/general/compute/last_row.sim b/tests/script/general/compute/last_row.sim
index 55d97fe53c..03fa9bc4af 100644
--- a/tests/script/general/compute/last_row.sim
+++ b/tests/script/general/compute/last_row.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_la_db
diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/general/compute/leastsquare.sim
index 5a28e74bff..20e2cc9d17 100644
--- a/tests/script/general/compute/leastsquare.sim
+++ b/tests/script/general/compute/leastsquare.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_le_db
diff --git a/tests/script/general/compute/max.sim b/tests/script/general/compute/max.sim
index 1029ba78cc..ba87416292 100644
--- a/tests/script/general/compute/max.sim
+++ b/tests/script/general/compute/max.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_ma_db
diff --git a/tests/script/general/compute/min.sim b/tests/script/general/compute/min.sim
index d6a57f4f20..e981f8335f 100644
--- a/tests/script/general/compute/min.sim
+++ b/tests/script/general/compute/min.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_mi_db
diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim
index 47f7a3c1b9..de2a834684 100644
--- a/tests/script/general/compute/null.sim
+++ b/tests/script/general/compute/null.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = db
diff --git a/tests/script/general/compute/percentile.sim b/tests/script/general/compute/percentile.sim
index 0fb88e7a40..9798aa2f5c 100644
--- a/tests/script/general/compute/percentile.sim
+++ b/tests/script/general/compute/percentile.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_pe_db
diff --git a/tests/script/general/compute/stddev.sim b/tests/script/general/compute/stddev.sim
index abe4025e96..2f6ffb097a 100644
--- a/tests/script/general/compute/stddev.sim
+++ b/tests/script/general/compute/stddev.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_st_db
diff --git a/tests/script/general/compute/sum.sim b/tests/script/general/compute/sum.sim
index 9d42e766b6..230248a370 100644
--- a/tests/script/general/compute/sum.sim
+++ b/tests/script/general/compute/sum.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_su_db
diff --git a/tests/script/general/compute/top.sim b/tests/script/general/compute/top.sim
index e6bcd4a5cb..a4f482b127 100644
--- a/tests/script/general/compute/top.sim
+++ b/tests/script/general/compute/top.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_to_db
diff --git a/tests/script/general/connection/connection.sim b/tests/script/general/connection/connection.sim
index abebbacbd9..1af6e1fda6 100644
--- a/tests/script/general/connection/connection.sim
+++ b/tests/script/general/connection/connection.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============= step1
diff --git a/tests/script/general/connection/mqtt.sim b/tests/script/general/connection/mqtt.sim
index 4b291f91ea..c2c50ef17e 100644
--- a/tests/script/general/connection/mqtt.sim
+++ b/tests/script/general/connection/mqtt.sim
@@ -10,7 +10,7 @@ system sh/cfg.sh -n dnode1 -c mqtt -v 1
 
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 sql create database mqttdb;
 sql create table mqttdb.devices(ts timestamp, value double) tags(name binary(32), model binary(32), serial binary(16), param binary(16), unit binary(16));
diff --git a/tests/script/general/db/alter_option.sim b/tests/script/general/db/alter_option.sim
index 1c3f543ffd..b10182baa5 100644
--- a/tests/script/general/db/alter_option.sim
+++ b/tests/script/general/db/alter_option.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
 
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============= create database
diff --git a/tests/script/general/db/alter_tables_d2.sim b/tests/script/general/db/alter_tables_d2.sim
index cd3121057b..f74f98d571 100644
--- a/tests/script/general/db/alter_tables_d2.sim
+++ b/tests/script/general/db/alter_tables_d2.sim
@@ -264,10 +264,10 @@ endi
 print ============================ step7
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 sql reset query cache
 sleep 1000
diff --git a/tests/script/general/db/alter_tables_v4.sim b/tests/script/general/db/alter_tables_v4.sim
index b57b2c0320..10bb4e108b 100644
--- a/tests/script/general/db/alter_tables_v4.sim
+++ b/tests/script/general/db/alter_tables_v4.sim
@@ -232,9 +232,9 @@ endi
 
 print ============================ step7
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql reset query cache
 sleep 1000
diff --git a/tests/script/general/db/alter_vgroups.sim b/tests/script/general/db/alter_vgroups.sim
index 13928cf033..81ffc7d443 100644
--- a/tests/script/general/db/alter_vgroups.sim
+++ b/tests/script/general/db/alter_vgroups.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20
 
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ step1
@@ -70,9 +70,9 @@ endi
 print ============================ step3
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 2
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql create table db.t100 using db.st tags(0)
 sql create table db.t101 using db.st tags(1)
@@ -132,9 +132,9 @@ print ============================ step5
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 3
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql create table db.t200 using db.st tags(0)
 sql create table db.t201 using db.st tags(1)
diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/general/db/backup/keep.sim
index 29771fc978..943022deba 100644
--- a/tests/script/general/db/backup/keep.sim
+++ b/tests/script/general/db/backup/keep.sim
@@ -23,7 +23,7 @@ sql connect
 print ========= start other dnodes
 sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 print ======== step1 create db
 sql create database keepdb replica 1 keep 30 days 7
@@ -50,9 +50,9 @@ endi
 
 print ======== step2 stop dnode
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 sql select * from tb
 print ===> rows $rows
@@ -112,9 +112,9 @@ endi
 
 print ======== step5 stop dnode
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 sql select * from tb
 print ===> rows $rows
@@ -153,9 +153,9 @@ endi
 
 print ======== step7 stop dnode
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 sql select * from tb
 print ===> rows $rows
diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim
index 1c4939256b..684ce825fe 100644
--- a/tests/script/general/db/basic.sim
+++ b/tests/script/general/db/basic.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
 
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ============================ dnode1 start
 
diff --git a/tests/script/general/db/basic1.sim b/tests/script/general/db/basic1.sim
index 302c5ac409..9ec1aabe98 100644
--- a/tests/script/general/db/basic1.sim
+++ b/tests/script/general/db/basic1.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database
diff --git a/tests/script/general/db/basic2.sim b/tests/script/general/db/basic2.sim
index afe5ee5d95..acd035bd74 100644
--- a/tests/script/general/db/basic2.sim
+++ b/tests/script/general/db/basic2.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database d1
diff --git a/tests/script/general/db/basic3.sim b/tests/script/general/db/basic3.sim
index 88f5bf6460..fb64476696 100644
--- a/tests/script/general/db/basic3.sim
+++ b/tests/script/general/db/basic3.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database d1
diff --git a/tests/script/general/db/basic4.sim b/tests/script/general/db/basic4.sim
index a0a9aaa627..ce6d352d12 100644
--- a/tests/script/general/db/basic4.sim
+++ b/tests/script/general/db/basic4.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database d1
diff --git a/tests/script/general/db/basic5.sim b/tests/script/general/db/basic5.sim
index 82b9bf9bf4..08c9db2332 100644
--- a/tests/script/general/db/basic5.sim
+++ b/tests/script/general/db/basic5.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database d1
diff --git a/tests/script/general/db/delete.sim b/tests/script/general/db/delete.sim
index e4d40bf5da..4384044885 100644
--- a/tests/script/general/db/delete.sim
+++ b/tests/script/general/db/delete.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
@@ -44,7 +44,7 @@ endi
 
 print ======= step3
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start 
 
 $x = 0
diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim
index feeb0152c1..b18bb285d1 100644
--- a/tests/script/general/db/delete_reuse1.sim
+++ b/tests/script/general/db/delete_reuse1.sim
@@ -22,7 +22,7 @@ system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim
index 9053e8af01..c82457ec42 100644
--- a/tests/script/general/db/delete_reuse2.sim
+++ b/tests/script/general/db/delete_reuse2.sim
@@ -21,9 +21,9 @@ system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 
 print ========= start dnodes
-sleep 2000
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
+
 sql connect
 sql reset query cache
 
@@ -65,7 +65,7 @@ endi
 
 print ======== step2
 sql drop database d1
-sleep 1000
+sleep 500
 sql insert into d1.t1 values(now, 2) -x step2
   return -1
 step2:
@@ -73,7 +73,7 @@ step2:
 print ========= step3
 sql create database db1 replica 1
 sql reset query cache
-sleep 1000  
+sleep 500  
 sql create table db1.tb1 (ts timestamp, i int)
 sql insert into db1.tb1 values(now, 2)
 sql select * from db1.tb1
@@ -90,7 +90,7 @@ while $x < 20
   sql use $db
   sql drop database $db
   
-  sleep 1000
+  sleep 500
   sql insert into $tb values(now, -1) -x step4
     return -1
   step4:
@@ -100,7 +100,7 @@ while $x < 20
   $tb = tb . $x
   
   sql reset query cache
-  sleep 1000
+  sleep 500
   
   sql create database $db replica 1
   sql use $db
diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim
index 0db2440b3b..c05db6b65a 100644
--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1
diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim
index 8b369b4e3d..98e9a3d66f 100644
--- a/tests/script/general/db/delete_writing1.sim
+++ b/tests/script/general/db/delete_writing1.sim
@@ -43,7 +43,7 @@ while $x < 20
 	sql create database db 
 	sql create table db.tb (ts timestamp, i int)
 
-	sleep 3000
+	sleep 2000
 	
 	$x = $x + 1
 endw
diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim
index 3ea220cb8c..2d1b0c8d9c 100644
--- a/tests/script/general/db/delete_writing2.sim
+++ b/tests/script/general/db/delete_writing2.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c wallevel -v 0
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql create database db 
@@ -39,7 +39,7 @@ while $x < 10
 	sql create database db 
 	sql create table db.tb (ts timestamp, i int)
 
-	sleep 3000
+	sleep 2000
 	
 	$x = $x + 1
 endw
diff --git a/tests/script/general/db/dropdnodes.sim b/tests/script/general/db/dropdnodes.sim
index c7bbdf73a4..8a46d5f9ce 100644
--- a/tests/script/general/db/dropdnodes.sim
+++ b/tests/script/general/db/dropdnodes.sim
@@ -11,7 +11,7 @@ print ==========  prepare data
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 
-sleep 3000
+sleep 2000
 sql connect 
 
 sql create dnode $hostname2
@@ -72,7 +72,7 @@ endi
 print ========== step3
 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 sql drop dnode $hostname2
 sleep 2000
 
diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim
index 30abcbe100..561245e666 100644
--- a/tests/script/general/db/len.sim
+++ b/tests/script/general/db/len.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
 
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
diff --git a/tests/script/general/db/nosuchfile.sim b/tests/script/general/db/nosuchfile.sim
index 98ac4ec012..69db8c0dc5 100644
--- a/tests/script/general/db/nosuchfile.sim
+++ b/tests/script/general/db/nosuchfile.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c wallevel -v 2
 print ========== step1
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 3000
+sleep 2000
 
 print ========== step3
 sql create database d1
@@ -20,7 +20,7 @@ sql insert into d1.t1 values(now+5s, 31)
 print ========== step4
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 
 print ========== step5
 sql select * from d1.t1 order by t desc
diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim
index aaa103234d..b3bbca2d19 100644
--- a/tests/script/general/db/repeat.sim
+++ b/tests/script/general/db/repeat.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ============================ dnode1 start
 
@@ -21,13 +21,13 @@ sql create table d3.t1(ts timestamp, i int)
 sql create database d4
 sql create table d4.t1(ts timestamp, i int)
 
-sleep 3000
+sleep 2000
 
 sql drop database d1
 sql drop database d2
 sql drop database d3
 sql drop database d4
-sleep 3000
+sleep 2000
 
 sql create database d5
 sql create table d5.t1(ts timestamp, i int)
@@ -41,14 +41,14 @@ sql create table d7.t1(ts timestamp, i int)
 sql create database d8
 sql create table d8.t1(ts timestamp, i int)
 
-sleep 3000
+sleep 2000
 
 sql drop database d5
 sql drop database d6
 sql drop database d7
 sql drop database d8
 
-sleep 3000
+sleep 2000
 
 sql create database d9;
 sql create table d9.t1(ts timestamp, i int)
diff --git a/tests/script/general/db/show_create_db.sim b/tests/script/general/db/show_create_db.sim
index baa7b253e1..edaa971c5c 100644
--- a/tests/script/general/db/show_create_db.sim
+++ b/tests/script/general/db/show_create_db.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step2
diff --git a/tests/script/general/db/show_create_table.sim b/tests/script/general/db/show_create_table.sim
index 8338638709..0d7408748a 100644
--- a/tests/script/general/db/show_create_table.sim
+++ b/tests/script/general/db/show_create_table.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ===============create three type table
diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim
index d700bf8068..50b6805eca 100644
--- a/tests/script/general/db/tables.sim
+++ b/tests/script/general/db/tables.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 4
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step2
diff --git a/tests/script/general/db/vnodes.sim b/tests/script/general/db/vnodes.sim
index b01e94206f..b123e91ad1 100644
--- a/tests/script/general/db/vnodes.sim
+++ b/tests/script/general/db/vnodes.sim
@@ -15,7 +15,7 @@ system sh/cfg.sh -n dnode1 -c maxMgmtConnections  -v 100000
 
 print ==========  prepare data
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect 
 sql create database db blocks 3 cache 1
 sql use db
diff --git a/tests/script/general/field/2.sim b/tests/script/general/field/2.sim
index 28506b7cb8..812301dfbd 100644
--- a/tests/script/general/field/2.sim
+++ b/tests/script/general/field/2.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/3.sim b/tests/script/general/field/3.sim
index 453f4968bf..a531caaca0 100644
--- a/tests/script/general/field/3.sim
+++ b/tests/script/general/field/3.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/4.sim b/tests/script/general/field/4.sim
index 243424724f..c530ff62d1 100644
--- a/tests/script/general/field/4.sim
+++ b/tests/script/general/field/4.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/5.sim b/tests/script/general/field/5.sim
index ca1543b54b..a676281313 100644
--- a/tests/script/general/field/5.sim
+++ b/tests/script/general/field/5.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/6.sim b/tests/script/general/field/6.sim
index 23223e5c15..f187d7db10 100644
--- a/tests/script/general/field/6.sim
+++ b/tests/script/general/field/6.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim
index 10060f7422..c9bda687e1 100644
--- a/tests/script/general/field/bigint.sim
+++ b/tests/script/general/field/bigint.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim
index b51f023efe..36a43272ca 100644
--- a/tests/script/general/field/binary.sim
+++ b/tests/script/general/field/binary.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/bool.sim b/tests/script/general/field/bool.sim
index 4528f79bc7..d8e613572a 100644
--- a/tests/script/general/field/bool.sim
+++ b/tests/script/general/field/bool.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/double.sim b/tests/script/general/field/double.sim
index 40650cb9bd..f7dac3192a 100644
--- a/tests/script/general/field/double.sim
+++ b/tests/script/general/field/double.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/float.sim b/tests/script/general/field/float.sim
index 0ead9fb48a..3ab5602c55 100644
--- a/tests/script/general/field/float.sim
+++ b/tests/script/general/field/float.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/int.sim b/tests/script/general/field/int.sim
index a095dc2176..5c3cec99cf 100644
--- a/tests/script/general/field/int.sim
+++ b/tests/script/general/field/int.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/single.sim b/tests/script/general/field/single.sim
index 8540608e96..d572f6df2a 100644
--- a/tests/script/general/field/single.sim
+++ b/tests/script/general/field/single.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/smallint.sim b/tests/script/general/field/smallint.sim
index 578de4ea44..8bd9972321 100644
--- a/tests/script/general/field/smallint.sim
+++ b/tests/script/general/field/smallint.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/field/tinyint.sim b/tests/script/general/field/tinyint.sim
index f132b42702..3a2d7bc44e 100644
--- a/tests/script/general/field/tinyint.sim
+++ b/tests/script/general/field/tinyint.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/http/autocreate.sim b/tests/script/general/http/autocreate.sim
index 98d64ab839..39af990b50 100644
--- a/tests/script/general/http/autocreate.sim
+++ b/tests/script/general/http/autocreate.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/http/chunked.sim b/tests/script/general/http/chunked.sim
index 6592c761c6..c5855e5d29 100644
--- a/tests/script/general/http/chunked.sim
+++ b/tests/script/general/http/chunked.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c maxSQLLength -v 340032
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/http/grafana.sim b/tests/script/general/http/grafana.sim
index c7866e5f4c..128994640d 100644
--- a/tests/script/general/http/grafana.sim
+++ b/tests/script/general/http/grafana.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -94,7 +94,7 @@ if $system_content != @{"status":"error","code":4387,"desc":"invalid format of A
   return -1
 endi
 
-sleep 3000
+sleep 2000
 system_content curl 127.0.0.1:7111/grafana/login/root/taosdata
 print 8-> $system_content
 if $system_content != @{"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"}@ then
diff --git a/tests/script/general/http/grafana_bug.sim b/tests/script/general/http/grafana_bug.sim
index 43c52ba75f..ce039af44c 100644
--- a/tests/script/general/http/grafana_bug.sim
+++ b/tests/script/general/http/grafana_bug.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
@@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sleep 3000
+sleep 2000
 
 print ============================ dnode1 start
 
diff --git a/tests/script/general/http/gzip.sim b/tests/script/general/http/gzip.sim
index 9c77567abb..ce358d84a1 100644
--- a/tests/script/general/http/gzip.sim
+++ b/tests/script/general/http/gzip.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c maxSQLLength -v 340032
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/http/prepare.sim b/tests/script/general/http/prepare.sim
index 0bcb42ad41..6803643caf 100644
--- a/tests/script/general/http/prepare.sim
+++ b/tests/script/general/http/prepare.sim
@@ -1,11 +1,11 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/http/restful.sim b/tests/script/general/http/restful.sim
index 7d1169ca27..a06e899d93 100644
--- a/tests/script/general/http/restful.sim
+++ b/tests/script/general/http/restful.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim
index 645ebd2788..69f8206347 100644
--- a/tests/script/general/http/restful_full.sim
+++ b/tests/script/general/http/restful_full.sim
@@ -1,11 +1,11 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/exec.sh -n dnode1 -s start
 
-#sleep 3000
+#sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -69,7 +69,7 @@ if $system_content != @{"status":"error","code":4387,"desc":"invalid format of A
   return -1
 endi
 
-sleep 3000
+sleep 2000
 
 system_content curl 127.0.0.1:7111/rest/login/root/taosdata/
 print 10-> $system_content
diff --git a/tests/script/general/http/restful_insert.sim b/tests/script/general/http/restful_insert.sim
index f230f98723..90bf7e1b15 100644
--- a/tests/script/general/http/restful_insert.sim
+++ b/tests/script/general/http/restful_insert.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/http/restful_limit.sim b/tests/script/general/http/restful_limit.sim
index 7d2b6e9a02..c925656b36 100644
--- a/tests/script/general/http/restful_limit.sim
+++ b/tests/script/general/http/restful_limit.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/http/telegraf.sim b/tests/script/general/http/telegraf.sim
index 4018d9661a..6825e5c479 100644
--- a/tests/script/general/http/telegraf.sim
+++ b/tests/script/general/http/telegraf.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-sleep 3000
+sleep 2000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/cfg.sh -n dnode1 -c telegrafUseFieldNum -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -245,7 +245,7 @@ if $system_content != @{"metrics":[{"metric":"win_cpu","stable":"win_cpu","table
   return -1
 endi
 
-sleep 3000
+sleep 2000
 
 print ===============  step2 - insert single data
 system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1564641722000}' 127.0.0.1:7111/telegraf/db/
diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim
index 07febb2bd5..50c4059c52 100644
--- a/tests/script/general/import/basic.sim
+++ b/tests/script/general/import/basic.sim
@@ -26,7 +26,7 @@ system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql create database ibadb
diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim
index 36d201e9ef..0aa63b14ff 100644
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/general/import/commit.sim
@@ -26,7 +26,7 @@ system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ========= step1
@@ -72,9 +72,9 @@ endi
 
 print ========= step3
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print ========= step4
 sql select * from ic2db.tb;
diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim
index 5bf05a57fb..3b82c0355a 100644
--- a/tests/script/general/import/large.sim
+++ b/tests/script/general/import/large.sim
@@ -26,7 +26,7 @@ system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql create database db
diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim
index d450b3fb49..48d5455b79 100644
--- a/tests/script/general/import/replica1.sim
+++ b/tests/script/general/import/replica1.sim
@@ -27,7 +27,7 @@ system sh/cfg.sh -n dnode4 -c walLevel -v 2
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql create database ir1db days 7
@@ -93,9 +93,9 @@ endi
 
 print ================== dnode restart
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql use ir1db
 sql select * from tb;
@@ -162,9 +162,9 @@ endi
 
 print ================= step10
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql use ir1db
 sql select * from tb;
diff --git a/tests/script/general/insert/basic.sim b/tests/script/general/insert/basic.sim
index 3f0f25a95b..c688342fc5 100644
--- a/tests/script/general/insert/basic.sim
+++ b/tests/script/general/insert/basic.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim
index 9b68e5a6a6..8592637626 100644
--- a/tests/script/general/insert/insert_drop.sim
+++ b/tests/script/general/insert/insert_drop.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $tbNum = 10
@@ -43,7 +43,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
@@ -69,7 +69,7 @@ endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/general/insert/query_block1_file.sim
index 6d6daca7b5..63f46d84f1 100644
--- a/tests/script/general/insert/query_block1_file.sim
+++ b/tests/script/general/insert/query_block1_file.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim
index bec9190f9b..516085f93f 100644
--- a/tests/script/general/insert/query_block1_memory.sim
+++ b/tests/script/general/insert/query_block1_memory.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/general/insert/query_block2_file.sim
index 34da170a9e..a1fa920c0f 100644
--- a/tests/script/general/insert/query_block2_file.sim
+++ b/tests/script/general/insert/query_block2_file.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/general/insert/query_block2_memory.sim
index 3f2c97a098..9ce0b942d4 100644
--- a/tests/script/general/insert/query_block2_memory.sim
+++ b/tests/script/general/insert/query_block2_memory.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/general/insert/query_file_memory.sim
index f923ebed13..d43328a65a 100644
--- a/tests/script/general/insert/query_file_memory.sim
+++ b/tests/script/general/insert/query_file_memory.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/general/insert/query_multi_file.sim
index 8622fa6f9b..3b70dd6214 100644
--- a/tests/script/general/insert/query_multi_file.sim
+++ b/tests/script/general/insert/query_multi_file.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim
index 6f9752087d..50383efb49 100644
--- a/tests/script/general/insert/tcp.sim
+++ b/tests/script/general/insert/tcp.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 sql create database d1;
diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index eae9b88be9..56a677cc73 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -133,7 +133,7 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 drop column c3
-#sleep 3000
+#sleep 2000
 #sql insert into tb1 values (now, 2, 'taos')
 #sleep 30000
 #sql select * from strm
@@ -144,7 +144,7 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 add column c3 int
-#sleep 3000
+#sleep 2000
 #sql insert into tb1 values (now, 3, 'taos', 3);
 #sleep 100
 #sql select * from strm
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
index 903f8f9881..e19eb0c667 100644
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -208,7 +208,7 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim
index ae6ecb88e2..9fd690a444 100644
--- a/tests/script/general/parser/col_arithmetic_operation.sim
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
@@ -105,7 +105,7 @@ run general/parser/col_arithmetic_query.sim
 #======================================= all in files query =======================================
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 
 print ================== server restart completed
diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim
index 67d98de207..533fbf48f0 100644
--- a/tests/script/general/parser/commit.sim
+++ b/tests/script/general/parser/commit.sim
@@ -82,7 +82,7 @@ endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 sleep 100
 print ================== server restart completed
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index a16b5b1e07..9c1f0774ba 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -77,7 +77,7 @@ run general/parser/first_last_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/function.sim b/tests/script/general/parser/function.sim
index 133c05c6f4..c4d9d910e4 100644
--- a/tests/script/general/parser/function.sim
+++ b/tests/script/general/parser/function.sim
@@ -385,25 +385,26 @@ sql create table car2 using cars tags(2);
 sql insert into car1 (ts, c) values (now,1) car2(ts, c) values(now, 2);
 
 print ========================> TD-2700
-sql create table t1(ts timestamp, k int);
-sql insert into t1 values(1500000001000, 0);
-sql select sum(k) from t1 interval(1d) sliding(1h);
+sql create table tx(ts timestamp, k int);
+sql insert into tx values(1500000001000, 0);
+sql select sum(k) from tx interval(1d) sliding(1h);
 if $rows != 24 then
+  print expect 24, actual:$rows
   return -1
 endi
 
 print ========================> TD-2740
 sql drop table if exists m1;
 sql create table m1(ts timestamp, k int) tags(a int);
-sql create table tm0 using m1 tags(0);
-sql create table tm1 using m1 tags(1);
-sql create table tm2 using m1 tags(2);
-sql create table tm3 using m1 tags(3);
-sql insert into tm0 values('2020-1-1 1:1:1', 0);
-sql insert into tm1 values('2020-1-5 1:1:1', 0);
-sql insert into tm2 values('2020-1-7 1:1:1', 0);
-sql insert into tm3 values('2020-1-1 1:1:1', 0);
-sql select count from m1 where ts='2020-1-1 1:1:1' interval(1h) group by tbname;
+sql create table tm10 using m1 tags(0);
+sql create table tm11 using m1 tags(1);
+sql create table tm12 using m1 tags(2);
+sql create table tm13 using m1 tags(3);
+sql insert into tm10 values('2020-1-1 1:1:1', 0);
+sql insert into tm11 values('2020-1-5 1:1:1', 0);
+sql insert into tm12 values('2020-1-7 1:1:1', 0);
+sql insert into tm13 values('2020-1-1 1:1:1', 0);
+sql select count(*) from m1 where ts='2020-1-1 1:1:1' interval(1h) group by tbname;
 if $rows != 2 then
   return -1
 endi
\ No newline at end of file
diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim
index eb49be947c..27be5560c5 100644
--- a/tests/script/general/parser/import_commit1.sim
+++ b/tests/script/general/parser/import_commit1.sim
@@ -40,7 +40,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 3000
+sleep 2000
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim
index 7222a5412b..72ee2b3844 100644
--- a/tests/script/general/parser/import_commit2.sim
+++ b/tests/script/general/parser/import_commit2.sim
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 3000
+sleep 2000
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim
index ea9980930a..a9f021b20c 100644
--- a/tests/script/general/parser/import_commit3.sim
+++ b/tests/script/general/parser/import_commit3.sim
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 3000
+sleep 2000
 
 $ts = $ts + 1
 sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
@@ -47,7 +47,7 @@ $ts = $ts0 + $delta
 $ts = $ts + 1
 sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
 
-sleep 3000
+sleep 2000
 
 sql show databases
 
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index 4078fc1ead..36a643c424 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -59,7 +59,7 @@ run general/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index f997dc504f..682a6cd5df 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -62,7 +62,7 @@ run general/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index 682b449ca3..22d52c4257 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -66,7 +66,7 @@ run general/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index c047dc2844..0597723490 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index 039a171ad7..43519d2df4 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index f9b46f5c3e..ddc5c10362 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -69,7 +69,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index 772dc1db59..79bf65d147 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -154,7 +154,7 @@ sql insert into t2 values('2020-1-1 1:5:1', 99);
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql select ts from m1 where ts='2020-1-1 1:5:1'
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index df5be140f6..e8a4c75a12 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -409,7 +409,7 @@ sql_error select k, sum(k)+1 from tm0;
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim
index 071dd87bc9..8f18a41d41 100644
--- a/tests/script/general/parser/selectResNum.sim
+++ b/tests/script/general/parser/selectResNum.sim
@@ -118,7 +118,7 @@ endw
 
 print ====== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ====== server restart completed
 sleep 100
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
index 5feae91905..36a749cc3c 100644
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -35,7 +35,7 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index 6f1535c390..651f44a3a4 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -32,7 +32,7 @@ run general/parser/single_row_in_tb_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 9aaf4a35ca..426104c168 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -97,7 +97,7 @@ run general/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 2c8fa28d32..85cbe51aad 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -56,7 +56,7 @@ run general/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index 3fe40dbe2e..1073e0a3cc 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -171,7 +171,7 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index e1d200e716..65ed1ed65d 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -67,7 +67,7 @@ run general/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/topbot.sim b/tests/script/general/parser/topbot.sim
index 6188f42ff5..57378331e8 100644
--- a/tests/script/general/parser/topbot.sim
+++ b/tests/script/general/parser/topbot.sim
@@ -128,7 +128,7 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/stable/disk.sim b/tests/script/general/stable/disk.sim
index a67ef6d790..35088c757c 100644
--- a/tests/script/general/stable/disk.sim
+++ b/tests/script/general/stable/disk.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
@@ -58,7 +58,7 @@ endi
 
 sleep 1000
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 sleep 6000
 
diff --git a/tests/script/general/stable/metrics.sim b/tests/script/general/stable/metrics.sim
index b94c76429d..5bda2ad42e 100644
--- a/tests/script/general/stable/metrics.sim
+++ b/tests/script/general/stable/metrics.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_me_db
diff --git a/tests/script/general/stable/refcount.sim b/tests/script/general/stable/refcount.sim
index 5fe95dde9f..e609ccc055 100644
--- a/tests/script/general/stable/refcount.sim
+++ b/tests/script/general/stable/refcount.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
diff --git a/tests/script/general/stable/show.sim b/tests/script/general/stable/show.sim
index 66755edea7..836a848ce0 100644
--- a/tests/script/general/stable/show.sim
+++ b/tests/script/general/stable/show.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== create stable
diff --git a/tests/script/general/stable/values.sim b/tests/script/general/stable/values.sim
index 51488aabef..5e5416e4e9 100644
--- a/tests/script/general/stable/values.sim
+++ b/tests/script/general/stable/values.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/stable/vnode3.sim b/tests/script/general/stable/vnode3.sim
index 3409aef9f8..0889a8f0b7 100644
--- a/tests/script/general/stable/vnode3.sim
+++ b/tests/script/general/stable/vnode3.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/stream/agg_stream.sim b/tests/script/general/stream/agg_stream.sim
index 814438ac74..65657fc33b 100644
--- a/tests/script/general/stream/agg_stream.sim
+++ b/tests/script/general/stream/agg_stream.sim
@@ -13,7 +13,7 @@ system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 30000
 system sh/cfg.sh -n dnode1 -c maxShellConns       -v 30000
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step2
diff --git a/tests/script/general/stream/column_stream.sim b/tests/script/general/stream/column_stream.sim
index cb94904ff2..c43ca1fd5a 100644
--- a/tests/script/general/stream/column_stream.sim
+++ b/tests/script/general/stream/column_stream.sim
@@ -9,7 +9,7 @@ system sh/cfg.sh -n dnode1 -c monitor         -v 1
 system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
@@ -121,7 +121,7 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print sleep 22 seconds
 sleep 22000 
diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim
index e21fa5999a..030f9fc527 100644
--- a/tests/script/general/stream/metrics_del.sim
+++ b/tests/script/general/stream/metrics_del.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim
index dcbc8ae7de..d7541bac66 100644
--- a/tests/script/general/stream/metrics_replica1_vnoden.sim
+++ b/tests/script/general/stream/metrics_replica1_vnoden.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb   -v 3
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/stream/restart_stream.sim b/tests/script/general/stream/restart_stream.sim
index b5a2038d9b..ce06f24df7 100644
--- a/tests/script/general/stream/restart_stream.sim
+++ b/tests/script/general/stream/restart_stream.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim
index 88105a77d6..632fe78c7f 100644
--- a/tests/script/general/stream/stream_3.sim
+++ b/tests/script/general/stream/stream_3.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/stream/stream_restart.sim b/tests/script/general/stream/stream_restart.sim
index 480b23055e..dd7bdf1a91 100644
--- a/tests/script/general/stream/stream_restart.sim
+++ b/tests/script/general/stream/stream_restart.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim
index ce4065a1a8..7ddce53c4f 100644
--- a/tests/script/general/stream/table_del.sim
+++ b/tests/script/general/stream/table_del.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim
index 13a4a56fb3..3c30897d2b 100644
--- a/tests/script/general/stream/table_replica1_vnoden.sim
+++ b/tests/script/general/stream/table_replica1_vnoden.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb   -v 3
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/table/autocreate.sim b/tests/script/general/table/autocreate.sim
index 8469a6484a..404c714ab4 100644
--- a/tests/script/general/table/autocreate.sim
+++ b/tests/script/general/table/autocreate.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database
diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim
index e8d0cd7bd8..c26c3c33e4 100644
--- a/tests/script/general/table/basic1.sim
+++ b/tests/script/general/table/basic1.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database
diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim
index d1678e8abd..4286f9ee4a 100644
--- a/tests/script/general/table/basic2.sim
+++ b/tests/script/general/table/basic2.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== one table
diff --git a/tests/script/general/table/basic3.sim b/tests/script/general/table/basic3.sim
index ded00e153a..41c276ae98 100644
--- a/tests/script/general/table/basic3.sim
+++ b/tests/script/general/table/basic3.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== create database
diff --git a/tests/script/general/table/bigint.sim b/tests/script/general/table/bigint.sim
index dd61d25ef9..0b2841f0f8 100644
--- a/tests/script/general/table/bigint.sim
+++ b/tests/script/general/table/bigint.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/binary.sim b/tests/script/general/table/binary.sim
index cdbfcd4cbf..fd2aa5ec44 100644
--- a/tests/script/general/table/binary.sim
+++ b/tests/script/general/table/binary.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/bool.sim b/tests/script/general/table/bool.sim
index fbb6fe823c..59297e90a9 100644
--- a/tests/script/general/table/bool.sim
+++ b/tests/script/general/table/bool.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/column2.sim b/tests/script/general/table/column2.sim
index 9251e31daa..85d59fef49 100644
--- a/tests/script/general/table/column2.sim
+++ b/tests/script/general/table/column2.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
diff --git a/tests/script/general/table/column_name.sim b/tests/script/general/table/column_name.sim
index 0b09f65129..480bcd0610 100644
--- a/tests/script/general/table/column_name.sim
+++ b/tests/script/general/table/column_name.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/column_num.sim b/tests/script/general/table/column_num.sim
index d1091528b2..b055027f59 100644
--- a/tests/script/general/table/column_num.sim
+++ b/tests/script/general/table/column_num.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/column_value.sim b/tests/script/general/table/column_value.sim
index 117c288b36..92ce02ade5 100644
--- a/tests/script/general/table/column_value.sim
+++ b/tests/script/general/table/column_value.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/date.sim b/tests/script/general/table/date.sim
index 2e73a217a6..7dea76dbc4 100644
--- a/tests/script/general/table/date.sim
+++ b/tests/script/general/table/date.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/db.table.sim b/tests/script/general/table/db.table.sim
index 50224f83b5..717f5158c4 100644
--- a/tests/script/general/table/db.table.sim
+++ b/tests/script/general/table/db.table.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/delete_reuse1.sim b/tests/script/general/table/delete_reuse1.sim
index 17974ccf4d..26c82e201b 100644
--- a/tests/script/general/table/delete_reuse1.sim
+++ b/tests/script/general/table/delete_reuse1.sim
@@ -22,7 +22,7 @@ system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
diff --git a/tests/script/general/table/delete_reuse2.sim b/tests/script/general/table/delete_reuse2.sim
index 917893b2d2..2e3f01a3a2 100644
--- a/tests/script/general/table/delete_reuse2.sim
+++ b/tests/script/general/table/delete_reuse2.sim
@@ -22,7 +22,7 @@ system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======== step1 
diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim
index 2a7fb09104..342915f0e8 100644
--- a/tests/script/general/table/delete_writing.sim
+++ b/tests/script/general/table/delete_writing.sim
@@ -41,7 +41,7 @@ while $x < 15
 
 	sql create table db.tb (ts timestamp, i int)
 
-	sleep 3000
+	sleep 2000
 	
 	$x = $x + 1
 endw
diff --git a/tests/script/general/table/describe.sim b/tests/script/general/table/describe.sim
index ebec004f19..ca5cf6f6e0 100644
--- a/tests/script/general/table/describe.sim
+++ b/tests/script/general/table/describe.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/double.sim b/tests/script/general/table/double.sim
index 10239568fe..c46029e391 100644
--- a/tests/script/general/table/double.sim
+++ b/tests/script/general/table/double.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/fill.sim b/tests/script/general/table/fill.sim
index 333573e577..fd79e09ba1 100644
--- a/tests/script/general/table/fill.sim
+++ b/tests/script/general/table/fill.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =================== step1
@@ -42,9 +42,9 @@ sql select count(*), last(ts), min(k), max(k), avg(k) from db.mt where a=0 and t
 
 print =================== step2
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
-system sh/exec.sh -n dnode1 -s start
 sleep 3000
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
 
 print =================== step3
 sql select * from db.mt
diff --git a/tests/script/general/table/float.sim b/tests/script/general/table/float.sim
index e4ef8a42d6..bbeb56e370 100644
--- a/tests/script/general/table/float.sim
+++ b/tests/script/general/table/float.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/int.sim b/tests/script/general/table/int.sim
index 81bdcda47d..142c8b4f04 100644
--- a/tests/script/general/table/int.sim
+++ b/tests/script/general/table/int.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim
index 18597f2e1c..45a20f680d 100644
--- a/tests/script/general/table/limit.sim
+++ b/tests/script/general/table/limit.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 129
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 8
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/table/smallint.sim b/tests/script/general/table/smallint.sim
index b6f0d6948f..53dfbe15bf 100644
--- a/tests/script/general/table/smallint.sim
+++ b/tests/script/general/table/smallint.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/table.sim b/tests/script/general/table/table.sim
index 6ad1b13b1c..5d6f2ee1a3 100644
--- a/tests/script/general/table/table.sim
+++ b/tests/script/general/table/table.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/general/table/table_len.sim b/tests/script/general/table/table_len.sim
index 2568ebc7a5..f4c27926fb 100644
--- a/tests/script/general/table/table_len.sim
+++ b/tests/script/general/table/table_len.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/tinyint.sim b/tests/script/general/table/tinyint.sim
index 017c007e84..5ad8a6933a 100644
--- a/tests/script/general/table/tinyint.sim
+++ b/tests/script/general/table/tinyint.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim
index f4496e2f19..f7806e316e 100644
--- a/tests/script/general/table/vgroup.sim
+++ b/tests/script/general/table/vgroup.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 print ============================ dnode1 start
 
diff --git a/tests/script/general/tag/3.sim b/tests/script/general/tag/3.sim
index 4b3104fe1b..878fdc0414 100644
--- a/tests/script/general/tag/3.sim
+++ b/tests/script/general/tag/3.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/4.sim b/tests/script/general/tag/4.sim
index 120ef4e4e3..d5ac6476d9 100644
--- a/tests/script/general/tag/4.sim
+++ b/tests/script/general/tag/4.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 sql reset query cache
 
diff --git a/tests/script/general/tag/5.sim b/tests/script/general/tag/5.sim
index efe88b3650..ae6d49e9f8 100644
--- a/tests/script/general/tag/5.sim
+++ b/tests/script/general/tag/5.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 sql reset query cache
 
diff --git a/tests/script/general/tag/6.sim b/tests/script/general/tag/6.sim
index d5f0a6c4af..71957dad9f 100644
--- a/tests/script/general/tag/6.sim
+++ b/tests/script/general/tag/6.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 sql reset query cache
 
diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim
index 301ec4f825..4a3871235e 100644
--- a/tests/script/general/tag/add.sim
+++ b/tests/script/general/tag/add.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/bigint.sim b/tests/script/general/tag/bigint.sim
index 4fa22d3995..c8e6e72825 100644
--- a/tests/script/general/tag/bigint.sim
+++ b/tests/script/general/tag/bigint.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/binary.sim b/tests/script/general/tag/binary.sim
index 7c6f95b1ef..771e7dc263 100644
--- a/tests/script/general/tag/binary.sim
+++ b/tests/script/general/tag/binary.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/binary_binary.sim b/tests/script/general/tag/binary_binary.sim
index 077ec85b52..5660b1b320 100644
--- a/tests/script/general/tag/binary_binary.sim
+++ b/tests/script/general/tag/binary_binary.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/bool.sim b/tests/script/general/tag/bool.sim
index 349cb738bf..828e89f3c7 100644
--- a/tests/script/general/tag/bool.sim
+++ b/tests/script/general/tag/bool.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/bool_binary.sim b/tests/script/general/tag/bool_binary.sim
index a3f99e25ad..fc25399c5a 100644
--- a/tests/script/general/tag/bool_binary.sim
+++ b/tests/script/general/tag/bool_binary.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/bool_int.sim b/tests/script/general/tag/bool_int.sim
index 1a2726dbaa..aa443cca62 100644
--- a/tests/script/general/tag/bool_int.sim
+++ b/tests/script/general/tag/bool_int.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim
index a7b8554bd9..6f294c0f48 100644
--- a/tests/script/general/tag/change.sim
+++ b/tests/script/general/tag/change.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
@@ -175,7 +175,7 @@ sql alter table $mt change tag tgcol3 tgcol9
 sql alter table $mt change tag tgcol5 tgcol10
 sql alter table $mt change tag tgcol6 tgcol11
 
-sleep 5000
+sleep 3000
 sql reset query cache
 
 print =============== step2
diff --git a/tests/script/general/tag/column.sim b/tests/script/general/tag/column.sim
index 4a36e832f1..36610d78da 100644
--- a/tests/script/general/tag/column.sim
+++ b/tests/script/general/tag/column.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim
index 8b07d98afb..bcd9d7c618 100644
--- a/tests/script/general/tag/commit.sim
+++ b/tests/script/general/tag/commit.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
@@ -821,9 +821,9 @@ if $data07 != 12 then
 endi
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 print =============== step1
 $i = 0
diff --git a/tests/script/general/tag/create.sim b/tests/script/general/tag/create.sim
index adbb14e88a..d387b4345f 100644
--- a/tests/script/general/tag/create.sim
+++ b/tests/script/general/tag/create.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim
index f3d0735b5c..2a0aa27bde 100644
--- a/tests/script/general/tag/delete.sim
+++ b/tests/script/general/tag/delete.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
@@ -409,7 +409,7 @@ sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol6
 
-sleep 5000
+sleep 3000
 
 print =============== step2
 $i = 2
diff --git a/tests/script/general/tag/double.sim b/tests/script/general/tag/double.sim
index 13dcb1fc72..514c35dc47 100644
--- a/tests/script/general/tag/double.sim
+++ b/tests/script/general/tag/double.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/filter.sim b/tests/script/general/tag/filter.sim
index 75a6ed00da..7a899a7e67 100644
--- a/tests/script/general/tag/filter.sim
+++ b/tests/script/general/tag/filter.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/float.sim b/tests/script/general/tag/float.sim
index 2352bbaf2e..bfc7e0f569 100644
--- a/tests/script/general/tag/float.sim
+++ b/tests/script/general/tag/float.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/int.sim b/tests/script/general/tag/int.sim
index a93df9a57a..2518aeb285 100644
--- a/tests/script/general/tag/int.sim
+++ b/tests/script/general/tag/int.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/int_binary.sim b/tests/script/general/tag/int_binary.sim
index d379500668..cb7aa16209 100644
--- a/tests/script/general/tag/int_binary.sim
+++ b/tests/script/general/tag/int_binary.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/int_float.sim b/tests/script/general/tag/int_float.sim
index 510c4f92d0..afd0a3644a 100644
--- a/tests/script/general/tag/int_float.sim
+++ b/tests/script/general/tag/int_float.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim
index 112695d37b..cbc964fad7 100644
--- a/tests/script/general/tag/set.sim
+++ b/tests/script/general/tag/set.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/smallint.sim b/tests/script/general/tag/smallint.sim
index 18b0957b15..598b397890 100644
--- a/tests/script/general/tag/smallint.sim
+++ b/tests/script/general/tag/smallint.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/tag/tinyint.sim b/tests/script/general/tag/tinyint.sim
index f104f8df04..3c173a66bf 100644
--- a/tests/script/general/tag/tinyint.sim
+++ b/tests/script/general/tag/tinyint.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/user/authority.sim b/tests/script/general/user/authority.sim
index 71f185043b..45230e3e8a 100644
--- a/tests/script/general/user/authority.sim
+++ b/tests/script/general/user/authority.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 3000
+sleep 2000
 
 print ============= step1
 sql create user read pass 'taosdata'
diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim
index eb543612f5..fe12df9baa 100644
--- a/tests/script/general/user/monitor.sim
+++ b/tests/script/general/user/monitor.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c monitor -v 1
 system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ========== step2
@@ -23,7 +23,7 @@ step23:
 
 print ========== step3
 
-sleep 3000
+sleep 2000
 sql select * from log.dn
 if $rows == 0 then
   return -1
diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim
index 857d658db1..964e311ec0 100644
--- a/tests/script/general/user/pass_alter.sim
+++ b/tests/script/general/user/pass_alter.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============= step1
diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim
index d5d7b3250f..5eb200b51f 100644
--- a/tests/script/general/user/pass_len.sim
+++ b/tests/script/general/user/pass_len.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim
index 79b72468bb..55e5eb19ef 100644
--- a/tests/script/general/user/user_len.sim
+++ b/tests/script/general/user/user_len.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/general/vector/metrics_field.sim
index 2a03ccea19..84c1ed37e7 100644
--- a/tests/script/general/vector/metrics_field.sim
+++ b/tests/script/general/vector/metrics_field.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_mf_db
diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/general/vector/metrics_mix.sim
index 96b2f6a7a0..2c7fc86f9f 100644
--- a/tests/script/general/vector/metrics_mix.sim
+++ b/tests/script/general/vector/metrics_mix.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_mx_db
diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/general/vector/metrics_query.sim
index 824aa6f22e..46afe7df20 100644
--- a/tests/script/general/vector/metrics_query.sim
+++ b/tests/script/general/vector/metrics_query.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_mq_db
diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/general/vector/metrics_tag.sim
index e7575cc9df..be13ac764b 100644
--- a/tests/script/general/vector/metrics_tag.sim
+++ b/tests/script/general/vector/metrics_tag.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_mtg_db
diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/general/vector/metrics_time.sim
index bbcabfd1b7..0b82153860 100644
--- a/tests/script/general/vector/metrics_time.sim
+++ b/tests/script/general/vector/metrics_time.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_mt_db
diff --git a/tests/script/general/vector/multi.sim b/tests/script/general/vector/multi.sim
index 105f210950..2ca9b7f48f 100644
--- a/tests/script/general/vector/multi.sim
+++ b/tests/script/general/vector/multi.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_mu_db
diff --git a/tests/script/general/vector/single.sim b/tests/script/general/vector/single.sim
index 2292d6f44a..eee5364a4f 100644
--- a/tests/script/general/vector/single.sim
+++ b/tests/script/general/vector/single.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_si_db
diff --git a/tests/script/general/vector/table_field.sim b/tests/script/general/vector/table_field.sim
index a9d6910f4d..65c50dadc2 100644
--- a/tests/script/general/vector/table_field.sim
+++ b/tests/script/general/vector/table_field.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_tf_db
diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/general/vector/table_mix.sim
index a6c4dc92da..12808fd6a6 100644
--- a/tests/script/general/vector/table_mix.sim
+++ b/tests/script/general/vector/table_mix.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_tm_db
diff --git a/tests/script/general/vector/table_query.sim b/tests/script/general/vector/table_query.sim
index 812229afc4..3e9d2d0b77 100644
--- a/tests/script/general/vector/table_query.sim
+++ b/tests/script/general/vector/table_query.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_tq_db
diff --git a/tests/script/general/vector/table_time.sim b/tests/script/general/vector/table_time.sim
index a83195beba..552bdb2a99 100644
--- a/tests/script/general/vector/table_time.sim
+++ b/tests/script/general/vector/table_time.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $dbPrefix = m_tt_db
diff --git a/tests/script/general/wal/kill.sim b/tests/script/general/wal/kill.sim
index 7f103874a5..94a35b636e 100644
--- a/tests/script/general/wal/kill.sim
+++ b/tests/script/general/wal/kill.sim
@@ -13,62 +13,62 @@ sql create table t1 (ts timestamp, i int)
 sql insert into t1 values(now, 1);
 
 print ===============  step3
-sleep 3000
+sleep 2000
 sql select * from t1;
 print rows: $rows
 if $rows != 1 then
   return -1
 endi
 system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 3000
+sleep 2000
 
 print ===============  step4
 system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 3000
+sleep 2000
 sql select * from t1;
 print rows: $rows
 if $rows != 1 then
   return -1
 endi
 system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 3000
+sleep 2000
 
 print ===============  step5
 system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 3000
+sleep 2000
 sql select * from t1;
 print rows: $rows
 if $rows != 1 then
   return -1
 endi
 system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 3000
+sleep 2000
 
 print ===============  step6
 system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 3000
+sleep 2000
 sql select * from t1;
 print rows: $rows
 if $rows != 1 then
   return -1
 endi
 system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 3000
+sleep 2000
 
 print ===============  step7
 system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 3000
+sleep 2000
 sql select * from t1;
 print rows: $rows
 if $rows != 1 then
   return -1
 endi
 system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 3000
+sleep 2000
 
 print ===============  step8
 system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 3000
+sleep 2000
 sql select * from t1;
 print rows: $rows
 if $rows != 1 then
diff --git a/tests/script/general/wal/maxtables.sim b/tests/script/general/wal/maxtables.sim
index e504c7e92e..acd6af1d1a 100644
--- a/tests/script/general/wal/maxtables.sim
+++ b/tests/script/general/wal/maxtables.sim
@@ -32,11 +32,11 @@ endi
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
-sleep 3000
+sleep 2000
 
 print ===============  step4
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 
 sql select * from st;
 if $rows != 100 then
diff --git a/tests/script/tmp/mnodes.sim b/tests/script/tmp/mnodes.sim
index 23f59d1d00..8bca76c38b 100644
--- a/tests/script/tmp/mnodes.sim
+++ b/tests/script/tmp/mnodes.sim
@@ -107,7 +107,7 @@ if $data4_3 != ready then
 endi
 
 $x = $x + 1
-sleep 5000
+sleep 3000
 if $x == 100000 then
   return -1
 endi
diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim
index 9eecceb39d..e36de29e7c 100644
--- a/tests/script/unique/account/account_create.sim
+++ b/tests/script/unique/account/account_create.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim
index 564512228e..d99a8b559d 100644
--- a/tests/script/unique/account/account_delete.sim
+++ b/tests/script/unique/account/account_delete.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============= step1
diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim
index 75636be513..f8379bdf95 100644
--- a/tests/script/unique/account/account_len.sim
+++ b/tests/script/unique/account/account_len.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim
index f88f254a79..8f2408de14 100644
--- a/tests/script/unique/account/authority.sim
+++ b/tests/script/unique/account/authority.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============= step1
diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim
index 0861c9305b..00e706a448 100644
--- a/tests/script/unique/account/basic.sim
+++ b/tests/script/unique/account/basic.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== show accounts
diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim
index ae511fe2b0..102f5b6a38 100644
--- a/tests/script/unique/account/paras.sim
+++ b/tests/script/unique/account/paras.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== show accounts
diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim
index bf939acce3..8b857b014a 100644
--- a/tests/script/unique/account/pass_alter.sim
+++ b/tests/script/unique/account/pass_alter.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============= step1
diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim
index 1dd0a616f2..f4ceb76f7b 100644
--- a/tests/script/unique/account/pass_len.sim
+++ b/tests/script/unique/account/pass_len.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim
index 7fde365201..3b9c20b159 100644
--- a/tests/script/unique/account/usage.sim
+++ b/tests/script/unique/account/usage.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 #system sh/exec.sh -n monitor -s 1
 system sh/exec.sh -n monitorInterval -s 1
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== show accounts
diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim
index 029bda22ea..e54a380f0d 100644
--- a/tests/script/unique/account/user_create.sim
+++ b/tests/script/unique/account/user_create.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim
index 91a5ebfaab..b8d448f0ff 100644
--- a/tests/script/unique/account/user_len.sim
+++ b/tests/script/unique/account/user_len.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/unique/arbitrator/check_cluster_cfg_para.sim b/tests/script/unique/arbitrator/check_cluster_cfg_para.sim
index 915fef47da..7bf2c2ac42 100644
--- a/tests/script/unique/arbitrator/check_cluster_cfg_para.sim
+++ b/tests/script/unique/arbitrator/check_cluster_cfg_para.sim
@@ -90,7 +90,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2~7 and add into cluster 
diff --git a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
index 6f0f61d2e2..dbd0e2bd87 100644
--- a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
+++ b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
@@ -49,7 +49,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
@@ -57,7 +57,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 $totalTableNum = 1
 $sleepTimer = 3000
@@ -178,7 +178,7 @@ endi
 
 print ============== step7: restart dnode3, waiting sync end
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 
 $loopCnt = 0
 wait_dnode3_ready:
diff --git a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync_second.sim b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync_second.sim
index 80a050f883..e15edb3f3d 100644
--- a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync_second.sim
+++ b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync_second.sim
@@ -9,11 +9,11 @@
 # expect: in dnode2, the files 1837 and 1839 will be removed
 
 sql connect
-sleep 3000
+sleep 2000
 
 print ============== step7: restart dnode2, waiting sync end
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 wait_dnode2_ready:
 sql show dnodes
diff --git a/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim b/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim
index 97433741f5..057654abb4 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim
@@ -39,7 +39,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table to max tables
@@ -49,7 +49,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 16
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim b/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
index a6a9129090..c597c576e2 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
@@ -40,7 +40,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table to max tables
@@ -50,7 +50,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 16
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim b/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
index 7bb37c5ebb..49e1dba067 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $sleepTimer = 3000
 
@@ -143,7 +143,7 @@ endi
 
 print ============== step5: create the middle table 5 and insert data
 sql create table tb5 using $stb tags( 5 )
-sleep 3000
+sleep 2000
 
 $tsStart = 1420041620000
 $i = 5
@@ -212,7 +212,7 @@ endi
 
 print ============== step8: create the first table 0 and insert data
 sql create table tb0 using $stb tags( 0 )
-sleep 3000
+sleep 2000
 
 $tsStart = 1420041640000
 $i = 0
@@ -277,7 +277,7 @@ endi
 
 print ============== step11: create the last table 9 and insert data
 sql create table tb9 using $stb tags( 9 )
-sleep 3000
+sleep 2000
 
 $tsStart = 1420041660000
 $i = 0
diff --git a/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim b/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
index e11dd69598..2af7cf56b7 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
@@ -49,7 +49,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster, then create database, create table , and insert data
@@ -59,7 +59,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $rowNum = 10
 $tblNum = 16
diff --git a/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
index 318a89f96b..96fde9061a 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -53,7 +53,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 5000
+sleep 3000
 
 $sleepTimer = 3000
 
@@ -225,7 +225,7 @@ if $data00 != $totalRows then
 endi
 
 print ============== step5: stop dnode2, and remove its vnode
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 sleep $sleepTimer
 
diff --git a/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
index 9fc19d588a..da76cc467b 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $sleepTimer = 3000
 
@@ -359,13 +359,13 @@ endi
 print ============== step7: stop dnode3/dnode2, and cluster unable to provide services
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 sql select count(*) from $stb -x s71
 s71:
 
 print ============== step8: restart dnode2, and cluster Still unable to provide services
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 sql select count(*) from $stb -x s81
 s81:
 
diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim b/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
index 986df81bf6..c924fee1ae 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
@@ -70,7 +70,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster, then create database replica 2, create table , and insert data
@@ -78,7 +78,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 $rowNum = 100
 $tblNum = 16
@@ -139,7 +139,7 @@ if $data00 != $totalRows then
 	return -1
 endi
 
-#sleep 3000
+#sleep 2000
 #sql show dnodes
 #print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 #print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
@@ -175,7 +175,7 @@ endi
 
 sql show dnodes
 if $rows != 3 then
-  sleep 3000
+  sleep 2000
   goto wait_drop
 endi
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
@@ -218,7 +218,7 @@ system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 16
 
 system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 $loopCnt = 0
 wait_dnode3_ready:
@@ -230,7 +230,7 @@ endi
 sql show dnodes
 print rows: $rows
 if $rows != 4 then
-  sleep 3000
+  sleep 2000
   goto wait_dnode3_ready
 endi
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
@@ -271,7 +271,7 @@ sql drop database $db
 sleep 1000
 system sh/exec.sh -n dnode5 -s start
 sql create dnode $hostname5
-sleep 3000
+sleep 2000
 $loopCnt = 0
 wait_dnode5:
 $loopCnt = $loopCnt + 1
@@ -281,7 +281,7 @@ endi
 
 sql show dnodes
 if $rows != 5 then
-  sleep 3000
+  sleep 2000
   goto wait_dnode5
 endi
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
@@ -352,7 +352,7 @@ endw
 print       info: select count(*) from $stb
 sleep 2000
 sql reset query cache
-sleep 3000
+sleep 2000
 sql select count(*) from $stb
 print data00 $data00
 if $data00 != $totalRows then
diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
index 08d2db207b..73702835f4 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 10000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
index 438e4af34f..27b308411a 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
@@ -50,7 +50,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster, then create database, create table , and insert data
@@ -60,7 +60,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $rowNum = 10
 $tblNum = 16
@@ -152,7 +152,7 @@ endi
 
 print ============== step4: restart dnode4, but there are not dnode4 in cluster 
 system sh/exec.sh -n dnode4 -s start
-sleep 3000
+sleep 2000
 sql show dnodes
 if $rows != 3 then
   return -1
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
index 4f80c2389e..6d81effab6 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
index 3b208e6f1a..d22aca07cb 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 #sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
index fb0650b78a..884a43bce1 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data to can fall disc
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 #sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 4
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
index f50081ea70..3c74de4916 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 #sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim
index df41e4df36..d0399222f1 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $sleepTimer = 3000
 
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
index d814398d06..19b29bf342 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 #sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
index 8f2cd9169b..8e15c4f527 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
@@ -50,7 +50,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -60,7 +60,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $sleepTimer = 3000
 
@@ -170,7 +170,7 @@ s31:
 
 print ============== step4: restart dnode2, then create database with replica 2, and create table, insert data
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim b/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim
index 7906718b08..d90853d2e4 100644
--- a/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim
+++ b/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim
@@ -39,7 +39,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 3, and create table to max tables
@@ -47,10 +47,10 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 #system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
-sleep 3000
+sleep 2000
 sql create dnode $hostname3
 #sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 4
 $sleepTimer = 3000
@@ -92,7 +92,7 @@ endi
 
 print ============== step3: stop dnode2
 system sh/exec.sh -n dnode2 -s stop
-sleep 3000
+sleep 2000
 
 sql show mnodes
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
diff --git a/tests/script/unique/arbitrator/insert_duplicationTs.sim b/tests/script/unique/arbitrator/insert_duplicationTs.sim
index d58f903dcf..4af47ca336 100644
--- a/tests/script/unique/arbitrator/insert_duplicationTs.sim
+++ b/tests/script/unique/arbitrator/insert_duplicationTs.sim
@@ -49,7 +49,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
@@ -57,7 +57,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 $totalTableNum = 1
 $sleepTimer = 3000
@@ -181,7 +181,7 @@ $totalRows = $totalRows + 2
 
 print ============== step6: restart dnode2, waiting sync end
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 $loopCnt = 0
 wait_dnode2_ready:
 $loopCnt = $loopCnt + 1
@@ -213,7 +213,7 @@ endi
 
 sleep $sleepTimer
 # check using select
-sleep 5000
+sleep 3000
 sql select count(*) from $stb
 print data00 $data00
 if $data00 != $totalRows then
diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim
index 9527d230e4..0adb6b4759 100644
--- a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim
index 1da8d749d5..a0877ad89c 100644
--- a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim
index 791ba76a8d..376484a066 100644
--- a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim
index 0d5abb2b91..9f21193400 100644
--- a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim
index 0c59ee8525..cb3bbb3a73 100644
--- a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim
index ce7151f78e..8a9995f891 100644
--- a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim
index e29f8267c3..6eed563bbc 100644
--- a/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
index 8f8b996c09..2633d822c9 100644
--- a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim
index f3779cf20a..3abfc40161 100644
--- a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim
index f70ef1fc8c..f2acb8b90a 100644
--- a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim
+++ b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim
index 8d1a508ef0..9d0e967f4e 100644
--- a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim
+++ b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim
@@ -60,7 +60,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: replica is 1, and start 1 dnode, then create tables and insert data
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 $totalTableNum = 12
@@ -105,7 +105,7 @@ endi
 print ============== step2: add 1 new dnode, expect balanced
 system sh/exec.sh -n dnode2 -s start
 sql create dnode $hostname2
-sleep 3000
+sleep 2000
 
 # expect after balanced, 2 vondes in dnode1, 1 vonde in dnode2
 $cnt = 0
@@ -137,7 +137,7 @@ endi
 print ============== step3: stop dnode1/dnode2, modify cfg numOfMnodes to 2, and restart dnode1/dnode2
 system sh/exec.sh -n dnode1 -s stop
 system sh/exec.sh -n dnode2 -s stop
-sleep 3000
+sleep 2000
 
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
@@ -150,7 +150,7 @@ system sh/cfg.sh -n dnode2 -c role -v 0
 
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 
 print ============= step4: wait dnode ready
@@ -193,9 +193,9 @@ if $data00 != $totalRows then
 endi
 
 print ============== step5: stop dnode1
-sleep 5000
-system sh/exec.sh -n dnode1 -s stop
 sleep 3000
+system sh/exec.sh -n dnode1 -s stop
+sleep 2000
 
 $cnt = 0
 wait_dnode2_master:
diff --git a/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim b/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim
index 12db84cbb3..a8c0e83cc1 100644
--- a/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim b/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim
index 06d67a1cc9..951d26635b 100644
--- a/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica2_dropDb.sim b/tests/script/unique/arbitrator/sync_replica2_dropDb.sim
index b388bc73a6..e4e7f95188 100644
--- a/tests/script/unique/arbitrator/sync_replica2_dropDb.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_dropDb.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica2_dropTable.sim b/tests/script/unique/arbitrator/sync_replica2_dropTable.sim
index 2e20d7b5d4..0049dc6fba 100644
--- a/tests/script/unique/arbitrator/sync_replica2_dropTable.sim
+++ b/tests/script/unique/arbitrator/sync_replica2_dropTable.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 #sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim b/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim
index 69cdb9f942..4990899601 100644
--- a/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim b/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim
index 491b858500..10bd4fc8bd 100644
--- a/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica3_createTable.sim b/tests/script/unique/arbitrator/sync_replica3_createTable.sim
index d593577bee..a0b391dd76 100644
--- a/tests/script/unique/arbitrator/sync_replica3_createTable.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_createTable.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 20
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim b/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
index 1ef499534f..68c6ecbd6e 100644
--- a/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 20
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica3_dropDb.sim b/tests/script/unique/arbitrator/sync_replica3_dropDb.sim
index 7a5966f60c..83e53eaeeb 100644
--- a/tests/script/unique/arbitrator/sync_replica3_dropDb.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_dropDb.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/arbitrator/sync_replica3_dropTable.sim b/tests/script/unique/arbitrator/sync_replica3_dropTable.sim
index abd2d8a788..7496541b76 100644
--- a/tests/script/unique/arbitrator/sync_replica3_dropTable.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_dropTable.sim
@@ -45,7 +45,7 @@ system sh/exec_tarbitrator.sh -s start
 
 print ============== step1: start dnode1, only deploy mnode
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
@@ -55,7 +55,7 @@ system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-sleep 3000
+sleep 2000
 
 $totalTableNum = 10
 $sleepTimer = 3000
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index eb17929ff4..10dbc8bbff 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -17,7 +17,7 @@ system sh/cfg.sh -n dnode2 -c balanceInterval     -v 1
 
 print ==========  prepare data
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect 
 sql create database db blocks 3 cache 1 
 sql use db
@@ -51,7 +51,7 @@ system sh/exec.sh -n dnode2 -s start
 $x = 0
 show3: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 1000 then 
 		return -1
 	endi
diff --git a/tests/script/unique/big/restartSpeed.sim b/tests/script/unique/big/restartSpeed.sim
index ea4edefda8..bdc4a8678b 100644
--- a/tests/script/unique/big/restartSpeed.sim
+++ b/tests/script/unique/big/restartSpeed.sim
@@ -14,7 +14,7 @@ system sh/cfg.sh -n dnode2 -c walLevel            -v 2
 
 print ==========  prepare data
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect 
 sql create database db blocks 3 cache 1 
 sql use db
diff --git a/tests/script/unique/cluster/alter.sim b/tests/script/unique/cluster/alter.sim
index 7e56707a69..77e040c6cd 100644
--- a/tests/script/unique/cluster/alter.sim
+++ b/tests/script/unique/cluster/alter.sim
@@ -28,11 +28,11 @@ system sh/cfg.sh -n dnode4 -c balance -v 0
 print ========== step1
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 3000
+sleep 2000
 
 sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 print ========== step2
 sql create database d1
diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim
index ffd13445ed..026678af7c 100644
--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -335,8 +335,8 @@ print dnode5 ==> $dnode5Role
 
 print ============================== step6
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-print stop dnode1 and sleep 10000
-sleep 5000
+print stop dnode1 and sleep 3000
+sleep 3000
 
 sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
diff --git a/tests/script/unique/cluster/cache.sim b/tests/script/unique/cluster/cache.sim
index e23b407828..7a5afae79d 100644
--- a/tests/script/unique/cluster/cache.sim
+++ b/tests/script/unique/cluster/cache.sim
@@ -17,7 +17,7 @@ system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
 system sh/cfg.sh -n dnode2 -c monitorInterval     -v 1
 
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql create database testdb
@@ -33,7 +33,7 @@ while $x < 30
 	$x = $x + 1
 endw 
 
-sleep 3000
+sleep 2000
 system sh/exec.sh -n dnode2 -s start
 sql create dnode $hostname2
 
diff --git a/tests/script/unique/cluster/cluster_main.sim b/tests/script/unique/cluster/cluster_main.sim
index f0a9b1a214..d3750be6b4 100644
--- a/tests/script/unique/cluster/cluster_main.sim
+++ b/tests/script/unique/cluster/cluster_main.sim
@@ -48,11 +48,11 @@ print ============== step1: start dnode1/dnode2/dnode3
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 print ============== step2: create db1 with replica 3
 $db = db1
@@ -84,7 +84,7 @@ sql select count(tbname) from $stb
 print select count(tbname) from $stb
 print data00 $data00
 if $data00 < 1000 then
-  sleep 3000
+  sleep 2000
   goto wait_subsim_insert_complete_create_tables
 endi
 
@@ -93,12 +93,12 @@ print select count(*) from $stb
 sql select count(*) from $stb
 print data00 $data00
 if $data00 < 1000 then
-  sleep 3000
+  sleep 2000
   goto wait_subsim_insert_data
 endi
 
 print wait for a while to let clients start insert data
-sleep 5000    
+sleep 3000
 
 print ============== step4-1: add dnode4/dnode5 into cluster
 sql create dnode $hostname4
@@ -116,7 +116,7 @@ print ============== step6: stop dnode1
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 10000
 #sql drop dnode $hostname1
-#sleep 5000
+#sleep 3000
 
 #system rm -rf ../../../sim/dnode1/data
 #sleep 20000
@@ -152,7 +152,7 @@ print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step7: stop dnode2 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 sql show mnodes
 print show mnodes
diff --git a/tests/script/unique/cluster/cluster_main0.sim b/tests/script/unique/cluster/cluster_main0.sim
index 9f775c0cef..48403d011b 100644
--- a/tests/script/unique/cluster/cluster_main0.sim
+++ b/tests/script/unique/cluster/cluster_main0.sim
@@ -48,11 +48,11 @@ print ============== step1: start dnode1/dnode2/dnode3
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 print ============== step2: create db1 with replica 3
 $db = db1
@@ -85,7 +85,7 @@ sql select count(tbname) from $stb
 print select count(tbname) from $stb
 print data00 $data00
 if $data00 < 1000 then
-  sleep 3000
+  sleep 2000
   goto wait_subsim_insert_complete_create_tables
 endi
 
@@ -94,12 +94,12 @@ print select count(*) from $stb
 sql select count(*) from $stb
 print data00 $data00
 if $data00 < 1000 then
-  sleep 3000
+  sleep 2000
   goto wait_subsim_insert_data
 endi
 
 print wait for a while to let clients start insert data
-sleep 5000    
+sleep 3000
 
 $loop_cnt = 0
 loop_cluster_do:
@@ -110,14 +110,14 @@ system sh/exec.sh -n dnode5 -s start
 sql create dnode $hostname4
 sql create dnode $hostname5
 
-sleep 5000
+sleep 3000
 
 
 print ============== step6: stop dnode1
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 10000
 #sql drop dnode $hostname1
-#sleep 5000
+#sleep 3000
 #system rm -rf ../../../sim/dnode1/data
 #sleep 20000
 print ============== step6-1: restart dnode1
@@ -139,7 +139,7 @@ print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step7: stop dnode2 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 sql show mnodes
 print show mnodes
@@ -235,7 +235,7 @@ endi
 print ============== step14: stop and drop dnode4/dnode5, then remove data dir of dnode4/dnode5 
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
 system sh/exec.sh -n dnode5 -s stop -x SIGINT
-sleep 3000
+sleep 2000
 sql drop dnode $hostname4
 sql drop dnode $hostname5
 system rm -rf ../../../sim/dnode4/data
diff --git a/tests/script/unique/cluster/cluster_main1.sim b/tests/script/unique/cluster/cluster_main1.sim
index 7796f1ea00..a2426dc574 100644
--- a/tests/script/unique/cluster/cluster_main1.sim
+++ b/tests/script/unique/cluster/cluster_main1.sim
@@ -48,11 +48,11 @@ print ============== step1: start dnode1/dnode2/dnode3
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 print ============== step2: create db1 with replica 3
 $replica = 3
@@ -92,17 +92,17 @@ print select count(*) from $stb
 sql select count(*) from $stb
 print data00 $data00
 if $data00 < 1000 then
-  sleep 3000
+  sleep 2000
   goto wait_subsim_insert_data
 endi
 
 print wait for a while to let clients start insert data
-sleep 5000    
+sleep 3000
 
 print ============== step4-1: add dnode4/dnode5 into cluster
 sql create dnode $hostname4
 sql create dnode $hostname5
-sleep 5000
+sleep 3000
 
 $loop_cnt = 0
 loop_cluster_do:
@@ -116,7 +116,7 @@ print ============== step6: stop dnode1
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 10000
 #sql drop dnode $hostname1
-#sleep 5000
+#sleep 3000
 #system rm -rf ../../../sim/dnode1/data
 #sleep 20000
 print ============== step6-1: restart dnode1
@@ -138,7 +138,7 @@ print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step7: stop dnode2 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 sql show mnodes
 print show mnodes
diff --git a/tests/script/unique/cluster/cluster_main2.sim b/tests/script/unique/cluster/cluster_main2.sim
index 4866154681..e050ab3acf 100644
--- a/tests/script/unique/cluster/cluster_main2.sim
+++ b/tests/script/unique/cluster/cluster_main2.sim
@@ -48,11 +48,11 @@ print ============== step1: start dnode1/dnode2/dnode3
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 print ============== step2: create db1 with replica 3
 $replica = 3
@@ -87,7 +87,7 @@ sql select count(tbname) from $stb
 print select count(tbname) from $stb
 print data00 $data00
 if $data00 < 1000 then
-  sleep 3000
+  sleep 2000
   goto wait_subsim_insert_complete_create_tables
 endi
 
@@ -96,17 +96,17 @@ print select count(*) from $stb
 sql select count(*) from $stb
 print data00 $data00
 if $data00 < 1000 then
-  sleep 3000
+  sleep 2000
   goto wait_subsim_insert_data
 endi
 
 print wait for a while to let clients start insert data
-sleep 5000    
+sleep 3000
 
 print ============== step4-1: add dnode4/dnode5 into cluster
 sql create dnode $hostname4
 sql create dnode $hostname5
-sleep 5000
+sleep 3000
 
 
 $loop_cnt = 0
@@ -120,7 +120,7 @@ print ============== step6: stop dnode1
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 10000
 #sql drop dnode $hostname1
-#sleep 5000
+#sleep 3000
 #system rm -rf ../../../sim/dnode1/data
 #sleep 20000
 print ============== step6-1: restart dnode1
@@ -142,7 +142,7 @@ print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
 
 print ============== step7: stop dnode2 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 sql show mnodes
 print show mnodes
diff --git a/tests/script/unique/cluster/flowctrl.sim b/tests/script/unique/cluster/flowctrl.sim
index 6dc60d9fba..700fa0a3f1 100644
--- a/tests/script/unique/cluster/flowctrl.sim
+++ b/tests/script/unique/cluster/flowctrl.sim
@@ -79,14 +79,14 @@ while $x < 100
 endw 
 
 print  =============== step3
-sleep 3000
+sleep 2000
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
 system sh/exec.sh -n dnode2 -s stop  -x SIGINT
 system sh/exec.sh -n dnode3 -s stop  -x SIGINT
 
 print  =============== step4
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start 
 system sh/exec.sh -n dnode2 -s start 
 system sh/exec.sh -n dnode3 -s start 
@@ -101,7 +101,7 @@ endw
 
 print  =============== step6
 system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-sleep 3000
+sleep 2000
 while $x < 300
   $ms = $x . s
   sql insert into tb values (now + $ms , $x )
diff --git a/tests/script/unique/clusterSimCase/cluster_main.sim b/tests/script/unique/clusterSimCase/cluster_main.sim
index 39607c2915..274ce85974 100644
--- a/tests/script/unique/clusterSimCase/cluster_main.sim
+++ b/tests/script/unique/clusterSimCase/cluster_main.sim
@@ -88,8 +88,8 @@ sql connect
 print ============== step1: add dnode2/dnode3 into cluster
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
-sleep 3000
+sleep 2000
+sleep 2000
 print ============== step3: start back client-01.sim
 #run_back unique/clusterSimCase/client-01.sim
 #run_back unique/clusterSimCase/client-02.sim
@@ -142,7 +142,7 @@ if $vg2Dnode2Status != master then
 endi
 
 
-sleep 3000
+sleep 2000
 print ============== step3: restart dnode3
 system sh/exec.sh -n dnode3 -s start
 
@@ -174,7 +174,7 @@ if $vg2Dnode2Status != master then
   goto wait_vgroup_chang_1
 endi
 
-sleep 3000
+sleep 2000
 print ============== step4: stop dnode2
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 
@@ -207,7 +207,7 @@ if $vg2Dnode2Status != offline then
 endi
 
 
-sleep 3000
+sleep 2000
 print ============== step5: restart dnode2
 system sh/exec.sh -n dnode2 -s start
 
@@ -239,7 +239,7 @@ if $vg2Dnode3Status != master then
   goto wait_vgroup_chang_3
 endi
 
-sleep 3000
+sleep 2000
 print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
 $loop_cnt = $loop_cnt + 1
 if $loop_cnt == 50 then
diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim
index caff3c6a78..661dd4505f 100644
--- a/tests/script/unique/db/commit.sim
+++ b/tests/script/unique/db/commit.sim
@@ -16,12 +16,12 @@ system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 print ========= start dnode1 as master
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 3000
+sleep 2000
 
 print ========= start other dnodes
 sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 print ======== step1 create db
 sql create database commitdb replica 1 days 7 keep 30
@@ -48,9 +48,9 @@ endi
 
 print ======== step2 stop dnode
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 sql select * from tb order by ts desc
 print ===> rows $rows
@@ -99,9 +99,9 @@ endi
 
 print ======== step5 stop dnode
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 sql select * from tb
 print ===> rows $rows
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
index f84339be79..c876f23de3 100644
--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -23,7 +23,7 @@ sql create dnode $hostname2
 sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 
 print ======== step1 
 sql create database db replica 3 blocks 3
@@ -49,7 +49,7 @@ if $rows != 0 then
   return -1
 endi 
 
-sleep 3000
+sleep 2000
 sql show dnodes
 print dnode1 openVnodes $data2_1
 print dnode2 openVnodes $data2_2
diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim
index a5eb78dacb..ead265d5d5 100644
--- a/tests/script/unique/db/replica_reduce32.sim
+++ b/tests/script/unique/db/replica_reduce32.sim
@@ -169,7 +169,7 @@ sleep 200
 
 print ========= step4
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 sql insert into d1.t1 values(now, 3) -x s41
 s41:
diff --git a/tests/script/unique/dnode/alternativeRole.sim b/tests/script/unique/dnode/alternativeRole.sim
index af627490ba..955b757f06 100644
--- a/tests/script/unique/dnode/alternativeRole.sim
+++ b/tests/script/unique/dnode/alternativeRole.sim
@@ -23,14 +23,14 @@ system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
 
 print ========== step1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
-sleep 5000
+sleep 3000
 
 sql show dnodes
 print dnode1 $data5_1
diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim
index 7b07eb3f37..4c67e20c3e 100644
--- a/tests/script/unique/dnode/balance2.sim
+++ b/tests/script/unique/dnode/balance2.sim
@@ -120,7 +120,7 @@ system sh/exec.sh -n dnode4 -s start
 $x = 0
 show3: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then
 		return -1
 	endi
diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim
index da8197e22d..d2c738ee97 100644
--- a/tests/script/unique/dnode/balancex.sim
+++ b/tests/script/unique/dnode/balancex.sim
@@ -23,7 +23,7 @@ system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
 print ========== step1
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 3000
+sleep 2000
 
 sql create database d1 
 sql create table d1.t1 (t timestamp, i int)
@@ -102,7 +102,7 @@ system sh/exec.sh -n dnode3 -s start
 $x = 0
 show4: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then
 	  return -1
 	endi
@@ -145,7 +145,7 @@ if $data2_3 != 3 then
 endi
 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 sql reset query cache
 sleep 1000
diff --git a/tests/script/unique/dnode/data1.sim b/tests/script/unique/dnode/data1.sim
index 61a991148b..75a484abb6 100644
--- a/tests/script/unique/dnode/data1.sim
+++ b/tests/script/unique/dnode/data1.sim
@@ -23,7 +23,7 @@ system sh/cfg.sh -n dnode4 -c wallevel -v 2
 print ========== step1
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 3000
+sleep 2000
 
 print ========== step2
 sql create dnode $hostname2
@@ -36,7 +36,7 @@ system sh/exec.sh -n dnode4 -s start
 $x = 0
 show2: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 10 then 
 		return -1
 	endi
@@ -71,7 +71,7 @@ sql insert into d1.t1 values(now+5s, 31)
 $x = 0
 show3: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 10 then 
 		return -1
 	endi
diff --git a/tests/script/unique/dnode/datatrans_1node.sim b/tests/script/unique/dnode/datatrans_1node.sim
index bc38bfaf2d..a156c32672 100644
--- a/tests/script/unique/dnode/datatrans_1node.sim
+++ b/tests/script/unique/dnode/datatrans_1node.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print =============== step1
@@ -40,7 +40,7 @@ system sh/exec.sh -n dnode2 -s start
 
 
 print =============== step 4
-sleep 3000
+sleep 2000
 sql connect
 
 sql select * from db.m1
diff --git a/tests/script/unique/dnode/datatrans_3node.sim b/tests/script/unique/dnode/datatrans_3node.sim
index 7c3708c111..7948eb6d3a 100644
--- a/tests/script/unique/dnode/datatrans_3node.sim
+++ b/tests/script/unique/dnode/datatrans_3node.sim
@@ -31,7 +31,7 @@ system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
 
 print ============== step1: start dnode1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
@@ -39,7 +39,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 # create table 
 sql drop database -x step1
@@ -76,7 +76,7 @@ system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
 print =============== step 4
-sleep 3000
+sleep 2000
 sql connect
 
 sql select * from db.m1
diff --git a/tests/script/unique/dnode/datatrans_3node_2.sim b/tests/script/unique/dnode/datatrans_3node_2.sim
index 4fb3b4535f..844afc5b02 100644
--- a/tests/script/unique/dnode/datatrans_3node_2.sim
+++ b/tests/script/unique/dnode/datatrans_3node_2.sim
@@ -31,7 +31,7 @@ system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
 
 print ============== step1: start dnode1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
@@ -39,7 +39,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sql create dnode $hostname2
 sql create dnode $hostname3
-sleep 3000
+sleep 2000
 
 # create table 
 sql drop database -x step1
@@ -76,7 +76,7 @@ system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
 print =============== step 4
-sleep 3000
+sleep 2000
 sql connect
 
 sql select * from db.m1
diff --git a/tests/script/unique/dnode/monitor.sim b/tests/script/unique/dnode/monitor.sim
index 1e5b0f6f56..b9b5e41889 100644
--- a/tests/script/unique/dnode/monitor.sim
+++ b/tests/script/unique/dnode/monitor.sim
@@ -23,7 +23,7 @@ system sh/cfg.sh -n dnode2 -c monitor -v 1
 print ========== step1
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 5000
+sleep 3000
 
 sql show dnodes
 print dnode1 openVnodes $data3_1
@@ -65,7 +65,7 @@ sql select * from log.dn1
 print $rows
 $rows1 = $rows
 
-sleep 3000
+sleep 2000
 sql select * from log.dn1
 print $rows
 $rows2 = $rows
@@ -79,7 +79,7 @@ sql select * from log.dn2
 print $rows
 $rows1 = $rows
 
-sleep 3000
+sleep 2000
 sql select * from log.dn2
 print $rows
 $rows2 = $rows
diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim
index 3169c7cdba..efdf5e94b9 100644
--- a/tests/script/unique/dnode/monitor_bug.sim
+++ b/tests/script/unique/dnode/monitor_bug.sim
@@ -15,7 +15,7 @@ system sh/cfg.sh -n dnode2 -c monitor -v 0
 print ========== step1
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 5000
+sleep 3000
 
 sql show dnodes
 print dnode1 openVnodes $data2_1
@@ -64,7 +64,7 @@ sql select * from log.dn1
 print $rows
 $rows1 = $rows
 
-sleep 3000
+sleep 2000
 sql select * from log.dn1
 print $rows
 $rows2 = $rows
diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim
index beebbfda60..9bbd14cf07 100644
--- a/tests/script/unique/dnode/offline1.sim
+++ b/tests/script/unique/dnode/offline1.sim
@@ -25,7 +25,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 sql show dnodes
 print dnode1 $data4_1
diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim
index e8a5460de4..fa5e0b72e4 100644
--- a/tests/script/unique/dnode/offline2.sim
+++ b/tests/script/unique/dnode/offline2.sim
@@ -32,7 +32,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sleep 3000
+sleep 2000
 
 sql create database d1 replica 2 
 sql create table d1.t1(ts timestamp, i int)
@@ -84,11 +84,11 @@ system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode2 -s start
 sql drop dnode $hostname2
 
-sleep 5000
+sleep 3000
 $x = 0
 show4: 
 	$x = $x + 1
-	sleep 5000
+	sleep 3000
 	if $x == 10 then 
 	  return -1
 	endi
diff --git a/tests/script/unique/dnode/simple.sim b/tests/script/unique/dnode/simple.sim
index 014e2dd04f..38d8c08d75 100644
--- a/tests/script/unique/dnode/simple.sim
+++ b/tests/script/unique/dnode/simple.sim
@@ -13,7 +13,7 @@ sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 
 sql create database d1 replica 2  
 sql create table d1.t1 (t timestamp, i int)
@@ -44,7 +44,7 @@ endi
 print ========== step2
 sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
-sleep 3000
+sleep 2000
 
 sql show dnodes
 print dnode1 openVnodes $data2_1
diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim
index 8833397487..acc28a4e13 100644
--- a/tests/script/unique/http/admin.sim
+++ b/tests/script/unique/http/admin.sim
@@ -8,7 +8,7 @@ system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sleep 3000
+sleep 2000
 
 print ============================ dnode1 start
 
@@ -79,7 +79,7 @@ if $system_content != @{"status":"error","code":4389,"desc":"invalid taosd Autho
   return -1
 endi
 
-sleep 3000
+sleep 2000
 system_content curl 127.0.0.1:7111/admin/login/root/taosdata
 print 9 -----> $system_content
 
diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim
index 5269817165..3d8e5a8c44 100644
--- a/tests/script/unique/http/opentsdb.sim
+++ b/tests/script/unique/http/opentsdb.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -152,7 +152,7 @@ if $system_content != @{"status":"error","code":4515,"desc":"tag value is null"}
   return -1
 endi
 
-sleep 3000
+sleep 2000
 
 print ===============  step2 - insert single data
 system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400000,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim
index 714141c412..5da9e141a5 100644
--- a/tests/script/unique/import/replica3.sim
+++ b/tests/script/unique/import/replica3.sim
@@ -241,9 +241,9 @@ endi
 
 print ================= step13
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 print ================= step14
 #1520000000000
diff --git a/tests/script/unique/mnode/mgmt20.sim b/tests/script/unique/mnode/mgmt20.sim
index ee9c2b914f..8945cffab2 100644
--- a/tests/script/unique/mnode/mgmt20.sim
+++ b/tests/script/unique/mnode/mgmt20.sim
@@ -68,7 +68,7 @@ if $data2_2 != slave then
 	goto show4
 endi
 
-sleep 3000
+sleep 2000
 sql select * from log.dn1
 $d1_second  = $rows
 sql select * from log.dn2
diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim
index 1dc419b17d..399805312b 100644
--- a/tests/script/unique/mnode/mgmt22.sim
+++ b/tests/script/unique/mnode/mgmt22.sim
@@ -46,7 +46,7 @@ print should not drop master
 
 print ============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 sql_error show mnodes
 print error of no master
 
diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim
index 9b534cca06..2816845052 100644
--- a/tests/script/unique/mnode/mgmt26.sim
+++ b/tests/script/unique/mnode/mgmt26.sim
@@ -90,7 +90,7 @@ print ============== step5
 system sh/exec.sh -n dnode2 -s stop
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
 sql create dnode $hostname2
 sleep 6000
diff --git a/tests/script/unique/mnode/mgmt30.sim b/tests/script/unique/mnode/mgmt30.sim
index a948879933..d0858c0d6c 100644
--- a/tests/script/unique/mnode/mgmt30.sim
+++ b/tests/script/unique/mnode/mgmt30.sim
@@ -32,7 +32,7 @@ endi
 print ============== step2
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 5000
+sleep 3000
 
 sql create dnode $hostname2
 sql create dnode $hostname3
diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim
index 0c9f961d25..5afb419058 100644
--- a/tests/script/unique/mnode/mgmtr2.sim
+++ b/tests/script/unique/mnode/mgmtr2.sim
@@ -9,7 +9,7 @@ system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
 
 print ============== step1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql show mnodes
diff --git a/tests/script/unique/stable/dnode2_stop.sim b/tests/script/unique/stable/dnode2_stop.sim
index 19c6de33b3..c10f04338d 100644
--- a/tests/script/unique/stable/dnode2_stop.sim
+++ b/tests/script/unique/stable/dnode2_stop.sim
@@ -72,7 +72,7 @@ endi
 sleep 100
 
 system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-sleep 5000
+sleep 3000
 
 print =============== step2
 sql select count(*) from $mt -x step2
@@ -84,7 +84,7 @@ sql select count(tbcol) from $mt  -x step21
 step21:
 
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 print =============== step3
 sql select count(tbcol) as c from $mt where ts <= 1519833840000
diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim
index 3cb0d73ab8..b78cfc33a1 100644
--- a/tests/script/unique/stream/metrics_balance.sim
+++ b/tests/script/unique/stream/metrics_balance.sim
@@ -175,7 +175,7 @@ print rows0=>$r0 rows3=>$r3 rows6=>$r6  rows9=>$r9
 $x = 0
 show1: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then 
 	  return -1
 	endi
@@ -200,7 +200,7 @@ sleep 8000
 $x = 0
 show2: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then 
 	  return -1
 	endi
diff --git a/tests/script/unique/stream/metrics_vnode_stop.sim b/tests/script/unique/stream/metrics_vnode_stop.sim
index 1f9cab48e5..f1a0981d70 100644
--- a/tests/script/unique/stream/metrics_vnode_stop.sim
+++ b/tests/script/unique/stream/metrics_vnode_stop.sim
@@ -112,11 +112,11 @@ connectTbase2:
 	  return -1
 	endi
 sql connect -x connectTbase2
-sleep 3000
+sleep 2000
 
 sql create dnode $hostname1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 print ======================== dnode start
 
 $dbPrefix = db
diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim
index facb7df459..e8dec54e3e 100644
--- a/tests/script/unique/stream/table_balance.sim
+++ b/tests/script/unique/stream/table_balance.sim
@@ -112,7 +112,7 @@ print rows1=>$r1 rows5=>$r5 rows8=>$r8
 $x = 0
 show1: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then 
 	  return -1
 	endi
@@ -137,7 +137,7 @@ sleep 8000
 $x = 0
 show2: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then 
 	  return -1
 	endi
diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim
index fe19e6f402..964a0c0253 100644
--- a/tests/script/unique/stream/table_move.sim
+++ b/tests/script/unique/stream/table_move.sim
@@ -63,7 +63,7 @@ print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sleep 3000
+sleep 2000
 
 $i = 0
 $db = $dbPrefix . $i
@@ -170,7 +170,7 @@ sleep 8000
 $x = 0
 show2: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then 
 	  return -1
 	endi
@@ -199,7 +199,7 @@ sleep 9000
 $x = 0
 show6: 
 	$x = $x + 1
-	sleep 3000
+	sleep 2000
 	if $x == 20 then 
 	  return -1
 	endi
diff --git a/tests/script/unique/stream/table_vnode_stop.sim b/tests/script/unique/stream/table_vnode_stop.sim
index 16350949b1..229d814e42 100644
--- a/tests/script/unique/stream/table_vnode_stop.sim
+++ b/tests/script/unique/stream/table_vnode_stop.sim
@@ -113,11 +113,11 @@ connectTbase2:
 	  return -1
 	endi
 sql connect -x connectTbase2
-sleep 3000
+sleep 2000
 
 sql create dnode $hostname1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 print ======================== dnode start
 
 $dbPrefix = db
diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim
index 869c7f8295..a9298b1cf2 100644
--- a/tests/script/unique/vnode/many.sim
+++ b/tests/script/unique/vnode/many.sim
@@ -80,7 +80,7 @@ $lastRows4 = $rows
 
 print ======== step2
 run_back unique/vnode/back_insert_many.sim
-sleep 5000
+sleep 3000
 
 print ======== step3
 
@@ -89,15 +89,15 @@ loop:
 
 print ======== step4
 system sh/exec.sh -n dnode3 -s stop
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode3 -s start
-sleep 5000
+sleep 3000
 
 print ======== step5
 system sh/exec.sh -n dnode2 -s stop
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 print ======== step6
 sql select count(*) from db1.tb1
diff --git a/tests/script/unique/vnode/replica2_a_large.sim b/tests/script/unique/vnode/replica2_a_large.sim
index 801570dd9c..6f31803845 100644
--- a/tests/script/unique/vnode/replica2_a_large.sim
+++ b/tests/script/unique/vnode/replica2_a_large.sim
@@ -29,14 +29,14 @@ print ============== step0: start tarbitrator
 system sh/exec_tarbitrator.sh -s start
 
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 
 sql create dnode $hostname2
 sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start -t
 system sh/exec.sh -n dnode3 -s start -t
-sleep 3000
+sleep 2000
 
 print ========= step1
 sql create database db replica 2 
@@ -56,7 +56,7 @@ $lastRows = $rows
 print ======== step2
 #run_back unique/vnode/back_insert_many.sim
 run_back unique/vnode/back_insert.sim
-sleep 3000
+sleep 2000
 
 print ======== step3
 
diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim
index 6976353f3e..c081f878dd 100644
--- a/tests/script/unique/vnode/replica2_basic2.sim
+++ b/tests/script/unique/vnode/replica2_basic2.sim
@@ -22,13 +22,13 @@ system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 2000
 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 
 sql reset query cache
 
@@ -126,7 +126,7 @@ endi
 
 print ========= step3 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 #sql insert into d1.t1 values(now, 3)
 #sql insert into d2.t2 values(now, 3)
@@ -155,9 +155,9 @@ sleep 5000
 
 print ========= step4
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 
 #sql insert into d1.t1 values(now, 4)
 #sql insert into d2.t2 values(now, 4)
@@ -186,7 +186,7 @@ sleep 5000
 
 print ========= step5
 system sh/exec.sh -n dnode3 -s start
-sleep 5000
+sleep 3000
 
 sql insert into d1.t1 values(now, 5)
 sql insert into d2.t2 values(now, 5)
diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim
index 5dbb24437d..ac68d59164 100644
--- a/tests/script/unique/vnode/replica2_repeat.sim
+++ b/tests/script/unique/vnode/replica2_repeat.sim
@@ -65,7 +65,7 @@ $lastRows = $rows
 
 print ======== step2
 run_back unique/vnode/back_insert.sim
-sleep 3000
+sleep 2000
 
 print ======== step3
 
@@ -74,15 +74,15 @@ loop:
 
 print ======== step4
 system sh/exec.sh -n dnode2 -s stop
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 
 print ======== step5
 system sh/exec.sh -n dnode3 -s stop
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode3 -s start
-sleep 5000
+sleep 3000
 
 print ======== step6
 sql select count(*) from db.tb
diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim
index d866fb05d8..636bc64f89 100644
--- a/tests/script/unique/vnode/replica3_repeat.sim
+++ b/tests/script/unique/vnode/replica3_repeat.sim
@@ -72,32 +72,32 @@ $lastRows = $rows
 
 print ======== step2
 run_back unique/vnode/back_insert.sim
-sleep 3000
+sleep 2000
 
 print ======== step3
 system sh/exec.sh -n dnode2 -s stop
-sleep 5000
+sleep 3000
 
 $x = 0
 loop:
 
 print ======== step4
 system sh/exec.sh -n dnode2 -s start
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode3 -s stop
-sleep 5000
+sleep 3000
 
 print ======== step5
 system sh/exec.sh -n dnode3 -s start
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode4 -s stop
-sleep 5000
+sleep 3000
 
 print ======== step6
 system sh/exec.sh -n dnode4 -s start
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode2 -s stop
-sleep 5000
+sleep 3000
 
 print ======== step7
 sql select count(*) from db.tb
diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim
index 11295ba0a4..de4c48eca5 100644
--- a/tests/script/unique/vnode/replica3_vgroup.sim
+++ b/tests/script/unique/vnode/replica3_vgroup.sim
@@ -16,13 +16,13 @@ sql create dnode $hostname2
 sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 2000
 
 $N = 10
 $table = table_r3
 $db = db1
 
-sleep 3000
+sleep 2000
 
 print =================== step 1 
 
diff --git a/tests/script/windows/alter/metrics.sim b/tests/script/windows/alter/metrics.sim
index 7d5dc77949..7dfda05bd0 100644
--- a/tests/script/windows/alter/metrics.sim
+++ b/tests/script/windows/alter/metrics.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
@@ -368,9 +368,9 @@ endi
 print ======== step9
 print ======== step10
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql use d2
 sql describe tb
diff --git a/tests/script/windows/alter/table.sim b/tests/script/windows/alter/table.sim
index 03182e613d..52757da20e 100644
--- a/tests/script/windows/alter/table.sim
+++ b/tests/script/windows/alter/table.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
@@ -319,9 +319,9 @@ endi
 print ======== step9
 print ======== step10
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 
 sql use d1
 sql describe tb
diff --git a/tests/script/windows/compute/avg.sim b/tests/script/windows/compute/avg.sim
index b655abf163..7445808db5 100644
--- a/tests/script/windows/compute/avg.sim
+++ b/tests/script/windows/compute/avg.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/compute/bottom.sim b/tests/script/windows/compute/bottom.sim
index dc104a8ebd..18f6c0bd09 100644
--- a/tests/script/windows/compute/bottom.sim
+++ b/tests/script/windows/compute/bottom.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/compute/count.sim b/tests/script/windows/compute/count.sim
index 9c9d8821b0..227b49a8bd 100644
--- a/tests/script/windows/compute/count.sim
+++ b/tests/script/windows/compute/count.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/compute/diff.sim b/tests/script/windows/compute/diff.sim
index 667fcdbcff..bdc5a0e3d8 100644
--- a/tests/script/windows/compute/diff.sim
+++ b/tests/script/windows/compute/diff.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/first.sim b/tests/script/windows/compute/first.sim
index d6e1b1deea..a83939c2a6 100644
--- a/tests/script/windows/compute/first.sim
+++ b/tests/script/windows/compute/first.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/interval.sim b/tests/script/windows/compute/interval.sim
index 4bf548ccf2..feacce1606 100644
--- a/tests/script/windows/compute/interval.sim
+++ b/tests/script/windows/compute/interval.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/last.sim b/tests/script/windows/compute/last.sim
index 63d4d3ecbd..379a5ae64a 100644
--- a/tests/script/windows/compute/last.sim
+++ b/tests/script/windows/compute/last.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/leastsquare.sim b/tests/script/windows/compute/leastsquare.sim
index 69c8fb377b..20353a409e 100644
--- a/tests/script/windows/compute/leastsquare.sim
+++ b/tests/script/windows/compute/leastsquare.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/max.sim b/tests/script/windows/compute/max.sim
index e480736550..641b31fe36 100644
--- a/tests/script/windows/compute/max.sim
+++ b/tests/script/windows/compute/max.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/min.sim b/tests/script/windows/compute/min.sim
index 1ff637cecd..3528f573ce 100644
--- a/tests/script/windows/compute/min.sim
+++ b/tests/script/windows/compute/min.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/percentile.sim b/tests/script/windows/compute/percentile.sim
index 5e327055a8..fa6212f013 100644
--- a/tests/script/windows/compute/percentile.sim
+++ b/tests/script/windows/compute/percentile.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/stddev.sim b/tests/script/windows/compute/stddev.sim
index 2aa481248a..eea6c8aa05 100644
--- a/tests/script/windows/compute/stddev.sim
+++ b/tests/script/windows/compute/stddev.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/sum.sim b/tests/script/windows/compute/sum.sim
index 30e98a5b25..a429ce99e0 100644
--- a/tests/script/windows/compute/sum.sim
+++ b/tests/script/windows/compute/sum.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/compute/top.sim b/tests/script/windows/compute/top.sim
index 9590997ef7..65e448b0fa 100644
--- a/tests/script/windows/compute/top.sim
+++ b/tests/script/windows/compute/top.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/db/basic.sim b/tests/script/windows/db/basic.sim
index fffde94d66..914e456fe1 100644
--- a/tests/script/windows/db/basic.sim
+++ b/tests/script/windows/db/basic.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/db/len.sim b/tests/script/windows/db/len.sim
index 5afa2496dd..3356165117 100644
--- a/tests/script/windows/db/len.sim
+++ b/tests/script/windows/db/len.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 2000
 sql connect
 
 sql show databases
diff --git a/tests/script/windows/field/2.sim b/tests/script/windows/field/2.sim
index 8ac6fa1a1b..e258fbe80e 100644
--- a/tests/script/windows/field/2.sim
+++ b/tests/script/windows/field/2.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/3.sim b/tests/script/windows/field/3.sim
index 331e930b31..e3fe0b0b11 100644
--- a/tests/script/windows/field/3.sim
+++ b/tests/script/windows/field/3.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/4.sim b/tests/script/windows/field/4.sim
index c6224c46ee..aabfe2be2c 100644
--- a/tests/script/windows/field/4.sim
+++ b/tests/script/windows/field/4.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/5.sim b/tests/script/windows/field/5.sim
index d1f40059d0..874730ff1c 100644
--- a/tests/script/windows/field/5.sim
+++ b/tests/script/windows/field/5.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/6.sim b/tests/script/windows/field/6.sim
index 98071f87df..77277df35b 100644
--- a/tests/script/windows/field/6.sim
+++ b/tests/script/windows/field/6.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/bigint.sim b/tests/script/windows/field/bigint.sim
index bef571f445..f912ee968b 100644
--- a/tests/script/windows/field/bigint.sim
+++ b/tests/script/windows/field/bigint.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/binary.sim b/tests/script/windows/field/binary.sim
index 72a356e684..aa641878e4 100644
--- a/tests/script/windows/field/binary.sim
+++ b/tests/script/windows/field/binary.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/bool.sim b/tests/script/windows/field/bool.sim
index abc970264d..3ef56a1d95 100644
--- a/tests/script/windows/field/bool.sim
+++ b/tests/script/windows/field/bool.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/double.sim b/tests/script/windows/field/double.sim
index e805e0373b..ef404d28dc 100644
--- a/tests/script/windows/field/double.sim
+++ b/tests/script/windows/field/double.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/float.sim b/tests/script/windows/field/float.sim
index 4178ab4e1e..8435f31c1f 100644
--- a/tests/script/windows/field/float.sim
+++ b/tests/script/windows/field/float.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/int.sim b/tests/script/windows/field/int.sim
index 05dc19094d..781b939484 100644
--- a/tests/script/windows/field/int.sim
+++ b/tests/script/windows/field/int.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/single.sim b/tests/script/windows/field/single.sim
index 6422b7f697..b6b4402091 100644
--- a/tests/script/windows/field/single.sim
+++ b/tests/script/windows/field/single.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/smallint.sim b/tests/script/windows/field/smallint.sim
index 8bf41f45a5..5f1839226b 100644
--- a/tests/script/windows/field/smallint.sim
+++ b/tests/script/windows/field/smallint.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/field/tinyint.sim b/tests/script/windows/field/tinyint.sim
index 16c19ba38d..c90ff3f932 100644
--- a/tests/script/windows/field/tinyint.sim
+++ b/tests/script/windows/field/tinyint.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/import/basic.sim b/tests/script/windows/import/basic.sim
index 491b4f8b34..ee19893ae2 100644
--- a/tests/script/windows/import/basic.sim
+++ b/tests/script/windows/import/basic.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/insert/basic.sim b/tests/script/windows/insert/basic.sim
index 54cbd3f4d9..a516f80e10 100644
--- a/tests/script/windows/insert/basic.sim
+++ b/tests/script/windows/insert/basic.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/insert/query_block1_file.sim b/tests/script/windows/insert/query_block1_file.sim
index 388ed061e5..62b74ac19c 100644
--- a/tests/script/windows/insert/query_block1_file.sim
+++ b/tests/script/windows/insert/query_block1_file.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/insert/query_block1_memory.sim b/tests/script/windows/insert/query_block1_memory.sim
index 9e4fc68d09..6c3e58d70e 100644
--- a/tests/script/windows/insert/query_block1_memory.sim
+++ b/tests/script/windows/insert/query_block1_memory.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/insert/query_block2_file.sim b/tests/script/windows/insert/query_block2_file.sim
index 9fd4434476..164c8a1124 100644
--- a/tests/script/windows/insert/query_block2_file.sim
+++ b/tests/script/windows/insert/query_block2_file.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/insert/query_block2_memory.sim b/tests/script/windows/insert/query_block2_memory.sim
index ede7f3efc6..f3ceb503ac 100644
--- a/tests/script/windows/insert/query_block2_memory.sim
+++ b/tests/script/windows/insert/query_block2_memory.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/insert/query_file_memory.sim b/tests/script/windows/insert/query_file_memory.sim
index 083beb4ac5..d9752c40c9 100644
--- a/tests/script/windows/insert/query_file_memory.sim
+++ b/tests/script/windows/insert/query_file_memory.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/insert/query_multi_file.sim b/tests/script/windows/insert/query_multi_file.sim
index 465970f942..ba617ce63c 100644
--- a/tests/script/windows/insert/query_multi_file.sim
+++ b/tests/script/windows/insert/query_multi_file.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/binary.sim b/tests/script/windows/table/binary.sim
index 64a081c72f..5efa0bc666 100644
--- a/tests/script/windows/table/binary.sim
+++ b/tests/script/windows/table/binary.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/bool.sim b/tests/script/windows/table/bool.sim
index 9486c42221..0d185d31e8 100644
--- a/tests/script/windows/table/bool.sim
+++ b/tests/script/windows/table/bool.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/column_name.sim b/tests/script/windows/table/column_name.sim
index fffb1334e5..6f9f954461 100644
--- a/tests/script/windows/table/column_name.sim
+++ b/tests/script/windows/table/column_name.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/column_num.sim b/tests/script/windows/table/column_num.sim
index d182696ce0..395ee02cde 100644
--- a/tests/script/windows/table/column_num.sim
+++ b/tests/script/windows/table/column_num.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/column_value.sim b/tests/script/windows/table/column_value.sim
index c59e7af8ba..8db85f16ad 100644
--- a/tests/script/windows/table/column_value.sim
+++ b/tests/script/windows/table/column_value.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/db.table.sim b/tests/script/windows/table/db.table.sim
index 97a9e6fbe9..0e207c9982 100644
--- a/tests/script/windows/table/db.table.sim
+++ b/tests/script/windows/table/db.table.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/double.sim b/tests/script/windows/table/double.sim
index 93bf3bb149..b88ac4a199 100644
--- a/tests/script/windows/table/double.sim
+++ b/tests/script/windows/table/double.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/float.sim b/tests/script/windows/table/float.sim
index 684f78a386..741525830d 100644
--- a/tests/script/windows/table/float.sim
+++ b/tests/script/windows/table/float.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/table/table.sim b/tests/script/windows/table/table.sim
index 985620152a..13d1576277 100644
--- a/tests/script/windows/table/table.sim
+++ b/tests/script/windows/table/table.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ============================ dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/table/table_len.sim b/tests/script/windows/table/table_len.sim
index 367f1c6895..72ed549466 100644
--- a/tests/script/windows/table/table_len.sim
+++ b/tests/script/windows/table/table_len.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/tag/3.sim b/tests/script/windows/tag/3.sim
index 63a8766727..5479be158b 100644
--- a/tests/script/windows/tag/3.sim
+++ b/tests/script/windows/tag/3.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/4.sim b/tests/script/windows/tag/4.sim
index 7e9af7ece7..17552010b0 100644
--- a/tests/script/windows/tag/4.sim
+++ b/tests/script/windows/tag/4.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/5.sim b/tests/script/windows/tag/5.sim
index 5dc128a0e0..f06d78e7b5 100644
--- a/tests/script/windows/tag/5.sim
+++ b/tests/script/windows/tag/5.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/6.sim b/tests/script/windows/tag/6.sim
index 12e9c597f0..64cb9df6f0 100644
--- a/tests/script/windows/tag/6.sim
+++ b/tests/script/windows/tag/6.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/add.sim b/tests/script/windows/tag/add.sim
index 0a1416b68c..02d027ccf4 100644
--- a/tests/script/windows/tag/add.sim
+++ b/tests/script/windows/tag/add.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/bigint.sim b/tests/script/windows/tag/bigint.sim
index d988ad1fdc..ebb67d452c 100644
--- a/tests/script/windows/tag/bigint.sim
+++ b/tests/script/windows/tag/bigint.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/binary.sim b/tests/script/windows/tag/binary.sim
index 9dc18cfa94..c59039b6a6 100644
--- a/tests/script/windows/tag/binary.sim
+++ b/tests/script/windows/tag/binary.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/binary_binary.sim b/tests/script/windows/tag/binary_binary.sim
index ba688aa80e..361a6edb8b 100644
--- a/tests/script/windows/tag/binary_binary.sim
+++ b/tests/script/windows/tag/binary_binary.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/bool.sim b/tests/script/windows/tag/bool.sim
index a7e5d909c5..adf12338d0 100644
--- a/tests/script/windows/tag/bool.sim
+++ b/tests/script/windows/tag/bool.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/bool_binary.sim b/tests/script/windows/tag/bool_binary.sim
index 639f6c5f2f..064677ee40 100644
--- a/tests/script/windows/tag/bool_binary.sim
+++ b/tests/script/windows/tag/bool_binary.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/bool_int.sim b/tests/script/windows/tag/bool_int.sim
index 900cc9e8a1..ef5cd27553 100644
--- a/tests/script/windows/tag/bool_int.sim
+++ b/tests/script/windows/tag/bool_int.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/change.sim b/tests/script/windows/tag/change.sim
index 75a976bbb1..4126ea1181 100644
--- a/tests/script/windows/tag/change.sim
+++ b/tests/script/windows/tag/change.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
@@ -175,7 +175,7 @@ sql alter table $mt change tag tgcol3 tgcol9
 sql alter table $mt change tag tgcol5 tgcol10
 sql alter table $mt change tag tgcol6 tgcol11
 
-sleep 5000
+sleep 3000
 sql reset query cache
 
 print =============== step2
diff --git a/tests/script/windows/tag/column.sim b/tests/script/windows/tag/column.sim
index 9f5bfce07e..40159bcae3 100644
--- a/tests/script/windows/tag/column.sim
+++ b/tests/script/windows/tag/column.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/create.sim b/tests/script/windows/tag/create.sim
index 6a76c93d83..62dc8a7a21 100644
--- a/tests/script/windows/tag/create.sim
+++ b/tests/script/windows/tag/create.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/delete.sim b/tests/script/windows/tag/delete.sim
index 9e8ea9aba0..2b503fdf47 100644
--- a/tests/script/windows/tag/delete.sim
+++ b/tests/script/windows/tag/delete.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
@@ -409,7 +409,7 @@ sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol6
 
-sleep 5000
+sleep 3000
 
 print =============== step2
 $i = 2
diff --git a/tests/script/windows/tag/double.sim b/tests/script/windows/tag/double.sim
index 5445b1dbea..4381aa20f9 100644
--- a/tests/script/windows/tag/double.sim
+++ b/tests/script/windows/tag/double.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/filter.sim b/tests/script/windows/tag/filter.sim
index f704f32cd2..802e9a312f 100644
--- a/tests/script/windows/tag/filter.sim
+++ b/tests/script/windows/tag/filter.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/float.sim b/tests/script/windows/tag/float.sim
index 64424c1e20..8df44c24a5 100644
--- a/tests/script/windows/tag/float.sim
+++ b/tests/script/windows/tag/float.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/int.sim b/tests/script/windows/tag/int.sim
index 7d7b5271d1..dbff8c15b6 100644
--- a/tests/script/windows/tag/int.sim
+++ b/tests/script/windows/tag/int.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/int_binary.sim b/tests/script/windows/tag/int_binary.sim
index 1dd4771605..94aa9eb7f4 100644
--- a/tests/script/windows/tag/int_binary.sim
+++ b/tests/script/windows/tag/int_binary.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/int_float.sim b/tests/script/windows/tag/int_float.sim
index cdb9032d8c..9789c9ea06 100644
--- a/tests/script/windows/tag/int_float.sim
+++ b/tests/script/windows/tag/int_float.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/set.sim b/tests/script/windows/tag/set.sim
index 16103c6ce8..54b87c7d0c 100644
--- a/tests/script/windows/tag/set.sim
+++ b/tests/script/windows/tag/set.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/smallint.sim b/tests/script/windows/tag/smallint.sim
index dbab4f2d43..bc668b164d 100644
--- a/tests/script/windows/tag/smallint.sim
+++ b/tests/script/windows/tag/smallint.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/tag/tinyint.sim b/tests/script/windows/tag/tinyint.sim
index 7a0237c0d9..44fc9ba4dc 100644
--- a/tests/script/windows/tag/tinyint.sim
+++ b/tests/script/windows/tag/tinyint.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 print ======================== dnode1 start
 
 sql show databases
diff --git a/tests/script/windows/vector/metrics_field.sim b/tests/script/windows/vector/metrics_field.sim
index e7c926e141..dfaa7e1d99 100644
--- a/tests/script/windows/vector/metrics_field.sim
+++ b/tests/script/windows/vector/metrics_field.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/metrics_mix.sim b/tests/script/windows/vector/metrics_mix.sim
index 3d94a96385..111fdebb05 100644
--- a/tests/script/windows/vector/metrics_mix.sim
+++ b/tests/script/windows/vector/metrics_mix.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/metrics_query.sim b/tests/script/windows/vector/metrics_query.sim
index c292c6b306..45e734f468 100644
--- a/tests/script/windows/vector/metrics_query.sim
+++ b/tests/script/windows/vector/metrics_query.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/metrics_tag.sim b/tests/script/windows/vector/metrics_tag.sim
index f51a449d71..80c204fa10 100644
--- a/tests/script/windows/vector/metrics_tag.sim
+++ b/tests/script/windows/vector/metrics_tag.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/metrics_time.sim b/tests/script/windows/vector/metrics_time.sim
index 716f49d1e5..c127fe78fc 100644
--- a/tests/script/windows/vector/metrics_time.sim
+++ b/tests/script/windows/vector/metrics_time.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/multi.sim b/tests/script/windows/vector/multi.sim
index 415384d243..ff63cda9a5 100644
--- a/tests/script/windows/vector/multi.sim
+++ b/tests/script/windows/vector/multi.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/single.sim b/tests/script/windows/vector/single.sim
index f3f3862e54..fb3a52760b 100644
--- a/tests/script/windows/vector/single.sim
+++ b/tests/script/windows/vector/single.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/table_field.sim b/tests/script/windows/vector/table_field.sim
index 0c5df695fb..10c5148243 100644
--- a/tests/script/windows/vector/table_field.sim
+++ b/tests/script/windows/vector/table_field.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/table_mix.sim b/tests/script/windows/vector/table_mix.sim
index 3d660b5611..7418cb453d 100644
--- a/tests/script/windows/vector/table_mix.sim
+++ b/tests/script/windows/vector/table_mix.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/table_query.sim b/tests/script/windows/vector/table_query.sim
index 27fcd0f654..7654688b26 100644
--- a/tests/script/windows/vector/table_query.sim
+++ b/tests/script/windows/vector/table_query.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1
diff --git a/tests/script/windows/vector/table_time.sim b/tests/script/windows/vector/table_time.sim
index 8a3804c619..bea9d41d1b 100644
--- a/tests/script/windows/vector/table_time.sim
+++ b/tests/script/windows/vector/table_time.sim
@@ -1,5 +1,5 @@
 sql connect
-sleep 3000
+sleep 2000
 
 sql show databases
 sql drop database $data00 -x e1

From 3fdc978244a0cbb9ab4556eed9a44c1ad5ed31fe Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 13:44:31 +0800
Subject: [PATCH 19/25] [TD-225]fix bugs in regression test.

---
 src/client/src/tscSQLParser.c | 22 ++++++++++++----------
 src/client/src/tscServer.c    |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 53bf91cd05..fb92efd40a 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -917,19 +917,21 @@ int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pTableNam
     }
   } else {  // get current DB name first, and then set it into path
     char* t = getCurrentDBName(pSql);
-    assert(strlen(t) > 0);
+    if (strlen(t) == 0) {
+      return TSDB_CODE_TSC_DB_NOT_SELECTED;
+    }
 
-    code = tNameFromString(&pTableMetaInfo->name, t, T_NAME_ACCT|T_NAME_DB);
+    code = tNameFromString(&pTableMetaInfo->name, t, T_NAME_ACCT | T_NAME_DB);
     if (code != 0) {
-      code = TSDB_CODE_TSC_DB_NOT_SELECTED;
-    } else {
-      char name[TSDB_TABLE_FNAME_LEN] = {0};
-      strncpy(name, pTableName->z, pTableName->n);
+      return TSDB_CODE_TSC_DB_NOT_SELECTED;
+    }
 
-      code = tNameFromString(&pTableMetaInfo->name, name, T_NAME_TABLE);
-      if (code != 0) {
-        code = invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
-      }
+    char name[TSDB_TABLE_FNAME_LEN] = {0};
+    strncpy(name, pTableName->z, pTableName->n);
+
+    code = tNameFromString(&pTableMetaInfo->name, name, T_NAME_TABLE);
+    if (code != 0) {
+      code = invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
   }
 
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 3afae07fbb..4b8fa45619 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2398,7 +2398,7 @@ int tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex) {
   STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
   if (pTableMeta) {
     tscDebug("%p update table meta:%s, old meta numOfTags:%d, numOfCols:%d, uid:%" PRId64, pSql, name,
-        tscGetNumOfTags(pTableMeta), tscGetNumOfColumns(pTableMeta), pTableMeta->id.uid);
+             tscGetNumOfTags(pTableMeta), tscGetNumOfColumns(pTableMeta), pTableMeta->id.uid);
   }
 
   // remove stored tableMeta info in hash table

From 034a3e9858a524c46a955cce71fba91e00b9d783 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Jan 2021 16:19:23 +0800
Subject: [PATCH 20/25] [TD-225]fix bugs in regression test.

---
 src/client/src/tscSQLParser.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index fb92efd40a..9d7b0006f0 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -926,6 +926,10 @@ int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pTableNam
       return TSDB_CODE_TSC_DB_NOT_SELECTED;
     }
 
+    if (pTableName->n >= TSDB_TABLE_NAME_LEN) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+    }
+
     char name[TSDB_TABLE_FNAME_LEN] = {0};
     strncpy(name, pTableName->z, pTableName->n);
 

From db4502c18639bddb9ac41782b9b71867a7e7cd02 Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Wed, 20 Jan 2021 16:52:38 +0800
Subject: [PATCH 21/25] []cd ..

---
 cmake/version.inc | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/cmake/version.inc b/cmake/version.inc
index 0509a5ce1b..2f8130f5f9 100644
--- a/cmake/version.inc
+++ b/cmake/version.inc
@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.0.14.0")
+  SET(TD_VER_NUMBER "2.0.12.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)
@@ -16,13 +16,25 @@ ENDIF ()
 IF (DEFINED GITINFO)
   SET(TD_VER_GIT ${GITINFO})
 ELSE ()
-  SET(TD_VER_GIT "community")
+  execute_process(
+	  COMMAND	git log -1 --format=%H
+	  WORKING_DIRECTORY ${TD_COMMUNITY_DIR} 
+	  OUTPUT_VARIABLE GIT_COMMITID
+  )
+  string (REGEX REPLACE "[\n\t\r]" "" GIT_COMMITID ${GIT_COMMITID})
+  SET(TD_VER_GIT ${GIT_COMMITID})
 ENDIF ()
 
 IF (DEFINED GITINFOI)
   SET(TD_VER_GIT_INTERNAL ${GITINFOI})
 ELSE ()
-  SET(TD_VER_GIT_INTERNAL "internal")
+  execute_process(
+	  COMMAND	git log -1 --format=%H
+	  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
+	  OUTPUT_VARIABLE GIT_COMMITID
+  )
+  string (REGEX REPLACE "[\n\t\r]" "" GIT_COMMITID ${GIT_COMMITID})
+  SET(TD_VER_GIT_INTERNAL ${GIT_COMMITID})
 ENDIF ()
 
 IF (DEFINED VERDATE)

From b055dd6665fe4f5c3c26d620bc0021ad6e120839 Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Thu, 21 Jan 2021 09:59:30 +0800
Subject: [PATCH 22/25] [TD-1077]<fix> add git commit id when make install

---
 cmake/version.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 cmake/version.inc

diff --git a/cmake/version.inc b/cmake/version.inc
old mode 100644
new mode 100755
index 2f8130f5f9..f9927bf1c6
--- a/cmake/version.inc
+++ b/cmake/version.inc
@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.0.12.0")
+  SET(TD_VER_NUMBER "2.0.14.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)
@@ -17,7 +17,7 @@ IF (DEFINED GITINFO)
   SET(TD_VER_GIT ${GITINFO})
 ELSE ()
   execute_process(
-	  COMMAND	git log -1 --format=%H
+	  COMMAND git log -1 --format=%H
 	  WORKING_DIRECTORY ${TD_COMMUNITY_DIR} 
 	  OUTPUT_VARIABLE GIT_COMMITID
   )
@@ -29,7 +29,7 @@ IF (DEFINED GITINFOI)
   SET(TD_VER_GIT_INTERNAL ${GITINFOI})
 ELSE ()
   execute_process(
-	  COMMAND	git log -1 --format=%H
+	  COMMAND git log -1 --format=%H
 	  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
 	  OUTPUT_VARIABLE GIT_COMMITID
   )

From 18f70372f3868a2750b0e606dd4c48dbecc9bdee Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 21 Jan 2021 10:37:50 +0800
Subject: [PATCH 23/25] [TD-225]fix bugs found in regression test.

---
 src/client/src/tscSQLParser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 9d7b0006f0..9745597d99 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -481,7 +481,6 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
       SStrToken* t0 = taosArrayGet(pMiscInfo->a, 0);
       SStrToken* t1 = taosArrayGet(pMiscInfo->a, 1);
-      SStrToken* t2 = taosArrayGet(pMiscInfo->a, 2);
 
       t0->n = strdequote(t0->z);
       strncpy(pCfg->ep, t0->z, t0->n);
@@ -493,6 +492,8 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       strncpy(pCfg->config, t1->z, t1->n);
 
       if (taosArrayGetSize(pMiscInfo->a) == 3) {
+        SStrToken* t2 = taosArrayGet(pMiscInfo->a, 2);
+
         pCfg->config[t1->n] = ' ';  // add sep
         strncpy(&pCfg->config[t1->n + 1], t2->z, t2->n);
       }

From 02867fb037985a0b8bf4bc8e24bf0144e515b9d0 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 21 Jan 2021 14:25:26 +0800
Subject: [PATCH 24/25] [show dnodes result add arbitrator]

---
 tests/script/unique/arbitrator/dn3_mn1_replica_change.sim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
index 387ae4625f..b9008e4c42 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
@@ -321,7 +321,7 @@ step9:
 	endi
 
 sql show dnodes
-if $rows != 2 then
+if $rows != 3 then
   goto step9
 endi
 

From 052e42f9a5ded6bcb4ec7dfd028ab2f03f3ee8fa Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 21 Jan 2021 15:15:33 +0800
Subject: [PATCH 25/25] [NONE]

---
 tests/script/sh/mv_old_data.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/script/sh/mv_old_data.sh b/tests/script/sh/mv_old_data.sh
index 112e9760d6..87fcbb6def 100755
--- a/tests/script/sh/mv_old_data.sh
+++ b/tests/script/sh/mv_old_data.sh
@@ -35,3 +35,6 @@ rm -rf $SIM_DIR/dnode3
 rm -rf $SIM_DIR/tsim
 
 tar zxf $SCRIPT_DIR/general/connection/sim.tar.gz -C $SIM_DIR/../
+cd $SIM_DIR/../sim
+fqdn=`hostname`
+grep '${fqdn}' -l -r ./* | xargs sed -i 's/${fqdn}/${fqdn}/g'