diff --git a/include/libs/function/functionMgt.h b/include/libs/function/functionMgt.h
index 3d86adb573..922136b590 100644
--- a/include/libs/function/functionMgt.h
+++ b/include/libs/function/functionMgt.h
@@ -23,6 +23,9 @@ extern "C" {
 #include "function.h"
 #include "querynodes.h"
 
+#define FUNC_AGGREGATE_UDF_ID 5001
+#define FUNC_SCALAR_UDF_ID    5002
+
 typedef enum EFunctionType {
   // aggregate function
   FUNCTION_TYPE_APERCENTILE = 1,
@@ -126,21 +129,12 @@ typedef enum EFunctionType {
 struct SqlFunctionCtx;
 struct SResultRowEntryInfo;
 struct STimeWindow;
-struct SCatalog;
-
-typedef struct SFmGetFuncInfoParam {
-  struct SCatalog* pCtg;
-  void*            pRpc;
-  const SEpSet*    pMgmtEps;
-  char*            pErrBuf;
-  int32_t          errBufLen;
-} SFmGetFuncInfoParam;
 
 int32_t fmFuncMgtInit();
 
 void fmFuncMgtDestroy();
 
-int32_t fmGetFuncInfo(SFmGetFuncInfoParam* pParam, SFunctionNode* pFunc);
+int32_t fmGetFuncInfo(SFunctionNode* pFunc, char* pMsg, int32_t msgLen);
 
 bool fmIsBuiltinFunc(const char* pFunc);
 
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index c63d8668b5..b0bd1dc319 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -655,7 +655,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_FUNC_FUNTION_PARA_NUM         TAOS_DEF_ERROR_CODE(0, 0x2801)
 #define TSDB_CODE_FUNC_FUNTION_PARA_TYPE        TAOS_DEF_ERROR_CODE(0, 0x2802)
 #define TSDB_CODE_FUNC_FUNTION_PARA_VALUE       TAOS_DEF_ERROR_CODE(0, 0x2803)
-#define TSDB_CODE_FUNC_INVALID_FUNTION          TAOS_DEF_ERROR_CODE(0, 0x2804)
+#define TSDB_CODE_FUNC_NOT_BUILTIN_FUNTION      TAOS_DEF_ERROR_CODE(0, 0x2804)
 
 //udf
 #define TSDB_CODE_UDF_STOPPING                  TAOS_DEF_ERROR_CODE(0, 0x2901)
diff --git a/source/dnode/mnode/impl/src/mndSync.c b/source/dnode/mnode/impl/src/mndSync.c
index c6ab916ee1..39f28c8dea 100644
--- a/source/dnode/mnode/impl/src/mndSync.c
+++ b/source/dnode/mnode/impl/src/mndSync.c
@@ -48,6 +48,10 @@ void mndSyncCommitMsg(struct SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbM
       mError("trans:%d, failed to propose since %s", transId, tstrerror(pMgmt->errCode));
     }
     tsem_post(&pMgmt->syncSem);
+  } else {
+    if (cbMeta.index - sdbGetApplyIndex(pMnode->pSdb) > 100) {
+      sdbWriteFile(pMnode->pSdb);
+    }
   }
 }
 
@@ -71,33 +75,28 @@ int32_t mndSnapshotRead(struct SSyncFSM *pFsm, const SSnapshot *pSnapshot, void
   SMnode *pMnode = pFsm->data;
   mInfo("start to read snapshot from sdb");
 
-  int32_t code = sdbReadSnapshot(pMnode->pSdb, (SSdbIter **)ppIter, ppBuf, len);
-  if (code != 0) {
-    mError("failed to read snapshot from sdb since %s", terrstr());
-  } else {
-    if (*ppIter == NULL) {
-      mInfo("successfully to read snapshot from sdb");
-    }
-  }
+  // sdbStartRead
+  // sdbDoRead
+  // sdbStopRead
 
-  return code;
+  return 0;
 }
 
 int32_t mndSnapshotApply(struct SSyncFSM *pFsm, const SSnapshot *pSnapshot, char *pBuf, int32_t len) {
   SMnode *pMnode = pFsm->data;
-  mndSetRestore(pMnode, false);
-  mInfo("start to apply snapshot to sdb, len:%d", len);
 
-  int32_t code = sdbApplySnapshot(pMnode->pSdb, pBuf, len);
-  if (code != 0) {
-    mError("failed to apply snapshot to sdb, len:%d", len);
-  } else {
-    mInfo("successfully to apply snapshot to sdb, len:%d", len);
-    mndSetRestore(pMnode, true);
-  }
+  // sdbStartWrite
+  // sdbDoWrite
+
+  mndSetRestore(pMnode, false);
+  mInfo("start to apply snapshot to sdb");
+
+  // sdbStopWrite
+  mInfo("successfully to apply snapshot to sdb");
+  mndSetRestore(pMnode, true);
 
   // taosMemoryFree(pBuf);
-  return code;
+  return 0;
 }
 
 void mndReConfig(struct SSyncFSM *pFsm, SSyncCfg newCfg, SReConfigCbMeta cbMeta) {
diff --git a/source/dnode/mnode/impl/test/sdb/sdbTest.cpp b/source/dnode/mnode/impl/test/sdb/sdbTest.cpp
index df535c4456..43be55dd1d 100644
--- a/source/dnode/mnode/impl/test/sdb/sdbTest.cpp
+++ b/source/dnode/mnode/impl/test/sdb/sdbTest.cpp
@@ -492,7 +492,7 @@ TEST_F(MndTestSdb, 01_Write_Str) {
 
   ASSERT_EQ(sdbGetSize(pSdb, SDB_USER), 2);
   ASSERT_EQ(sdbGetMaxId(pSdb, SDB_USER), -1);
-  ASSERT_EQ(sdbGetTableVer(pSdb, SDB_USER), 2 );
+  ASSERT_EQ(sdbGetTableVer(pSdb, SDB_USER), 2);
   sdbSetApplyIndex(pSdb, -1);
   ASSERT_EQ(sdbGetApplyIndex(pSdb), -1);
   ASSERT_EQ(mnode.insertTimes, 2);
@@ -895,7 +895,35 @@ TEST_F(MndTestSdb, 01_Read_Str) {
     ASSERT_EQ(code, TSDB_CODE_SDB_OBJ_CREATING);
   }
 
+  {
+    SSdbIter *pReader = NULL;
+    SSdbIter *pWritter = NULL;
+    void     *pBuf = NULL;
+    int32_t   len = 0;
+    int32_t   code = 0;
+
+    code = sdbStartRead(pSdb, &pReader);
+    ASSERT_EQ(code, 0);
+    code = sdbStartWrite(pSdb, &pWritter);
+    ASSERT_EQ(code, 0);
+
+    while (sdbDoRead(pSdb, pReader, &pBuf, &len) == 0) {
+      if (pBuf != NULL && len != 0) {
+        sdbDoWrite(pSdb, pWritter, pBuf, len);
+        taosMemoryFree(pBuf);
+      } else {
+        break;
+      }
+    }
+
+    sdbStopRead(pSdb, pReader);
+    sdbStopWrite(pSdb, pWritter, true);
+  }
+
+  ASSERT_EQ(sdbGetSize(pSdb, SDB_CONSUMER), 1);
+  ASSERT_EQ(sdbGetTableVer(pSdb, SDB_CONSUMER), 4);
+
   sdbCleanup(pSdb);
-  ASSERT_EQ(mnode.insertTimes, 5);
-  ASSERT_EQ(mnode.deleteTimes, 5);
+  ASSERT_EQ(mnode.insertTimes, 9);
+  ASSERT_EQ(mnode.deleteTimes, 9);
 }
\ No newline at end of file
diff --git a/source/dnode/mnode/sdb/inc/sdb.h b/source/dnode/mnode/sdb/inc/sdb.h
index 411d4c59ea..c66b47a24b 100644
--- a/source/dnode/mnode/sdb/inc/sdb.h
+++ b/source/dnode/mnode/sdb/inc/sdb.h
@@ -187,6 +187,7 @@ typedef struct SSdb {
 typedef struct SSdbIter {
   TdFilePtr file;
   int64_t   total;
+  char     *name;
 } SSdbIter;
 
 typedef struct {
@@ -380,8 +381,13 @@ SSdbRow *sdbAllocRow(int32_t objSize);
 void    *sdbGetRowObj(SSdbRow *pRow);
 void     sdbFreeRow(SSdb *pSdb, SSdbRow *pRow, bool callFunc);
 
-int32_t sdbReadSnapshot(SSdb *pSdb, SSdbIter **ppIter, char **ppBuf, int32_t *len);
-int32_t sdbApplySnapshot(SSdb *pSdb, char *pBuf, int32_t len);
+int32_t sdbStartRead(SSdb *pSdb, SSdbIter **ppIter);
+int32_t sdbStopRead(SSdb *pSdb, SSdbIter *pIter);
+int32_t sdbDoRead(SSdb *pSdb, SSdbIter *pIter, void **ppBuf, int32_t *len);
+
+int32_t sdbStartWrite(SSdb *pSdb, SSdbIter **ppIter);
+int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply);
+int32_t sdbDoWrite(SSdb *pSdb, SSdbIter *pIter, void *pBuf, int32_t len);
 
 const char *sdbTableName(ESdbType type);
 void        sdbPrintOper(SSdb *pSdb, SSdbRow *pRow, const char *oper);
diff --git a/source/dnode/mnode/sdb/src/sdb.c b/source/dnode/mnode/sdb/src/sdb.c
index aef3476440..485b729deb 100644
--- a/source/dnode/mnode/sdb/src/sdb.c
+++ b/source/dnode/mnode/sdb/src/sdb.c
@@ -71,6 +71,7 @@ void sdbCleanup(SSdb *pSdb) {
   }
 
   if (pSdb->tmpDir != NULL) {
+    taosRemoveDir(pSdb->tmpDir);
     taosMemoryFreeClear(pSdb->tmpDir);
   }
 
diff --git a/source/dnode/mnode/sdb/src/sdbFile.c b/source/dnode/mnode/sdb/src/sdbFile.c
index b2dcbd68e3..1ca5097ce6 100644
--- a/source/dnode/mnode/sdb/src/sdbFile.c
+++ b/source/dnode/mnode/sdb/src/sdbFile.c
@@ -445,168 +445,167 @@ int32_t sdbDeploy(SSdb *pSdb) {
   return 0;
 }
 
-static SSdbIter *sdbOpenIter(SSdb *pSdb) {
-  char datafile[PATH_MAX] = {0};
-  char tmpfile[PATH_MAX] = {0};
-  snprintf(datafile, sizeof(datafile), "%s%ssdb.data", pSdb->currDir, TD_DIRSEP);
-  snprintf(tmpfile, sizeof(tmpfile), "%s%ssdb.data", pSdb->tmpDir, TD_DIRSEP);
-
-  taosThreadMutexLock(&pSdb->filelock);
-  if (taosCopyFile(datafile, tmpfile) != 0) {
-    taosThreadMutexUnlock(&pSdb->filelock);
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    mError("failed to copy file %s to %s since %s", datafile, tmpfile, terrstr());
-    return NULL;
-  }
-  taosThreadMutexUnlock(&pSdb->filelock);
-
+static SSdbIter *sdbCreateIter(SSdb *pSdb) {
   SSdbIter *pIter = taosMemoryCalloc(1, sizeof(SSdbIter));
   if (pIter == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return NULL;
   }
 
-  pIter->file = taosOpenFile(tmpfile, TD_FILE_READ);
-  if (pIter->file == NULL) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    mError("failed to read file:%s since %s", tmpfile, terrstr());
+  char name[PATH_MAX + 100] = {0};
+  snprintf(name, sizeof(name), "%s%ssdb.data.%" PRIu64, pSdb->tmpDir, TD_DIRSEP, (uint64_t)pIter);
+  pIter->name = strdup(name);
+  if (pIter->name == NULL) {
     taosMemoryFree(pIter);
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
     return NULL;
   }
 
   return pIter;
 }
 
-static void sdbCloseIter(SSdb *pSdb, SSdbIter *pIter) {
+static void sdbCloseIter(SSdbIter *pIter) {
   if (pIter == NULL) return;
+
   if (pIter->file != NULL) {
     taosCloseFile(&pIter->file);
+    pIter->file = NULL;
   }
 
-  char tmpfile[PATH_MAX] = {0};
-  snprintf(tmpfile, sizeof(tmpfile), "%s%ssdb.data", pSdb->tmpDir, TD_DIRSEP);
-  taosRemoveFile(tmpfile);
+  if (pIter->name != NULL) {
+    taosRemoveFile(pIter->name);
+    taosMemoryFree(pIter->name);
+    pIter->name = NULL;
+  }
 
+  mInfo("sdbiter:%p, is closed, total:%" PRId64, pIter, pIter->total);
   taosMemoryFree(pIter);
-  mInfo("sdbiter:%p, is closed", pIter);
 }
 
-static SSdbIter *sdbGetIter(SSdb *pSdb, SSdbIter **ppIter) {
-  SSdbIter *pIter = NULL;
-  if (ppIter != NULL) pIter = *ppIter;
-
-  if (pIter == NULL) {
-    pIter = sdbOpenIter(pSdb);
-    if (pIter != NULL) {
-      mInfo("sdbiter:%p, is created to read snapshot", pIter);
-      *ppIter = pIter;
-    } else {
-      mError("failed to create sdbiter to read snapshot since %s", terrstr());
-      *ppIter = NULL;
-      return NULL;
-    }
-  } else {
-    mInfo("sdbiter:%p, continue to read snapshot, total:%" PRId64, pIter, pIter->total);
-  }
-
-  return pIter;
-}
-
-int32_t sdbReadSnapshot(SSdb *pSdb, SSdbIter **ppIter, char **ppBuf, int32_t *len) {
-  SSdbIter *pIter = sdbGetIter(pSdb, ppIter);
+int32_t sdbStartRead(SSdb *pSdb, SSdbIter **ppIter) {
+  SSdbIter *pIter = sdbCreateIter(pSdb);
   if (pIter == NULL) return -1;
 
+  char datafile[PATH_MAX] = {0};
+  snprintf(datafile, sizeof(datafile), "%s%ssdb.data", pSdb->currDir, TD_DIRSEP);
+
+  taosThreadMutexLock(&pSdb->filelock);
+  if (taosCopyFile(datafile, pIter->name) < 0) {
+    taosThreadMutexUnlock(&pSdb->filelock);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    mError("failed to copy file %s to %s since %s", datafile, pIter->name, terrstr());
+    sdbCloseIter(pIter);
+    return -1;
+  }
+  taosThreadMutexUnlock(&pSdb->filelock);
+
+  pIter->file = taosOpenFile(pIter->name, TD_FILE_READ);
+  if (pIter->file == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    mError("failed to open file:%s since %s", pIter->name, terrstr());
+    sdbCloseIter(pIter);
+    return -1;
+  }
+
+  *ppIter = pIter;
+  mInfo("sdbiter:%p, is created to read snapshot, file:%s", pIter, pIter->name);
+  return 0;
+}
+
+int32_t sdbStopRead(SSdb *pSdb, SSdbIter *pIter) {
+  sdbCloseIter(pIter);
+  return 0;
+}
+
+int32_t sdbDoRead(SSdb *pSdb, SSdbIter *pIter, void **ppBuf, int32_t *len) {
   int32_t maxlen = 100;
-  char   *pBuf = taosMemoryCalloc(1, maxlen);
+  void   *pBuf = taosMemoryCalloc(1, maxlen);
   if (pBuf == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    sdbCloseIter(pSdb, pIter);
+    sdbCloseIter(pIter);
     return -1;
   }
 
   int32_t readlen = taosReadFile(pIter->file, pBuf, maxlen);
-  if (readlen < 0 || (readlen == 0 && errno != 0)) {
+  if (readlen < 0 || readlen > maxlen) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     mError("sdbiter:%p, failed to read snapshot since %s, total:%" PRId64, pIter, terrstr(), pIter->total);
     *ppBuf = NULL;
     *len = 0;
-    *ppIter = NULL;
-    sdbCloseIter(pSdb, pIter);
     taosMemoryFree(pBuf);
     return -1;
   } else if (readlen == 0) {
     mInfo("sdbiter:%p, read snapshot to the end, total:%" PRId64, pIter, pIter->total);
     *ppBuf = NULL;
     *len = 0;
-    *ppIter = NULL;
-    sdbCloseIter(pSdb, pIter);
     taosMemoryFree(pBuf);
     return 0;
-  } else if ((readlen < maxlen && errno != 0) || readlen == maxlen) {
+  } else {  // (readlen <= maxlen)
     pIter->total += readlen;
     mInfo("sdbiter:%p, read:%d bytes from snapshot, total:%" PRId64, pIter, readlen, pIter->total);
     *ppBuf = pBuf;
     *len = readlen;
     return 0;
-  } else if (readlen < maxlen && errno == 0) {
-    mInfo("sdbiter:%p, read snapshot to the end, total:%" PRId64, pIter, pIter->total);
-    *ppBuf = pBuf;
-    *len = readlen;
-    *ppIter = NULL;
-    sdbCloseIter(pSdb, pIter);
-    return 0;
-  } else {
-    // impossible
-    mError("sdbiter:%p, read:%d bytes from snapshot, total:%" PRId64, pIter, readlen, pIter->total);
-    *ppBuf = NULL;
-    *len = 0;
-    *ppIter = NULL;
-    sdbCloseIter(pSdb, pIter);
-    taosMemoryFree(pBuf);
-    return -1;
   }
 }
 
-int32_t sdbApplySnapshot(SSdb *pSdb, char *pBuf, int32_t len) {
-  char datafile[PATH_MAX] = {0};
-  char tmpfile[PATH_MAX] = {0};
-  snprintf(datafile, sizeof(datafile), "%s%ssdb.data", pSdb->currDir, TD_DIRSEP);
-  snprintf(tmpfile, sizeof(tmpfile), "%s%ssdb.data", pSdb->tmpDir, TD_DIRSEP);
+int32_t sdbStartWrite(SSdb *pSdb, SSdbIter **ppIter) {
+  SSdbIter *pIter = sdbCreateIter(pSdb);
+  if (pIter == NULL) return -1;
 
-  TdFilePtr pFile = taosOpenFile(tmpfile, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
-  if (pFile == NULL) {
+  pIter->file = taosOpenFile(pIter->name, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+  if (pIter->file == NULL) {
     terrno = TAOS_SYSTEM_ERROR(errno);
-    mError("failed to write %s since %s", tmpfile, terrstr());
+    mError("failed to open %s since %s", pIter->name, terrstr());
     return -1;
   }
 
-  int32_t writelen = taosWriteFile(pFile, pBuf, len);
+  *ppIter = pIter;
+  mInfo("sdbiter:%p, is created to write snapshot, file:%s", pIter, pIter->name);
+  return 0;
+}
+
+int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply) {
+  int32_t code = 0;
+
+  if (!isApply) {
+    sdbCloseIter(pIter);
+    mInfo("sdbiter:%p, not apply to sdb", pIter);
+    return 0;
+  }
+
+  taosFsyncFile(pIter->file);
+  taosCloseFile(&pIter->file);
+  pIter->file = NULL;
+
+  char datafile[PATH_MAX] = {0};
+  snprintf(datafile, sizeof(datafile), "%s%ssdb.data", pSdb->currDir, TD_DIRSEP);
+  if (taosRenameFile(pIter->name, datafile) != 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    mError("sdbiter:%p, failed to rename file %s to %s since %s", pIter, pIter->name, datafile, terrstr());
+    sdbCloseIter(pIter);
+    return -1;
+  }
+
+  sdbCloseIter(pIter);
+  if (sdbReadFile(pSdb) != 0) {
+    mError("sdbiter:%p, failed to read from %s since %s", pIter, datafile, terrstr());
+    return -1;
+  }
+
+  mInfo("sdbiter:%p, successfully applyed to sdb", pIter);
+  return 0;
+}
+
+int32_t sdbDoWrite(SSdb *pSdb, SSdbIter *pIter, void *pBuf, int32_t len) {
+  int32_t writelen = taosWriteFile(pIter->file, pBuf, len);
   if (writelen != len) {
     terrno = TAOS_SYSTEM_ERROR(errno);
-    mError("failed to write %s since %s", tmpfile, terrstr());
-    taosCloseFile(&pFile);
-    return -1;
-  }
-
-  if (taosFsyncFile(pFile) != 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    mError("failed to fsync %s since %s", tmpfile, terrstr());
-    taosCloseFile(&pFile);
-    return -1;
-  }
-
-  (void)taosCloseFile(&pFile);
-
-  if (taosRenameFile(tmpfile, datafile) != 0) {
-    terrno = TAOS_SYSTEM_ERROR(errno);
-    mError("failed to rename file %s to %s since %s", tmpfile, datafile, terrstr());
-    return -1;
-  }
-
-  if (sdbReadFile(pSdb) != 0) {
-    mError("failed to read from %s since %s", datafile, terrstr());
+    mError("failed to write len:%d since %s, total:%" PRId64, len, terrstr(), pIter->total);
     return -1;
   }
 
+  pIter->total += writelen;
+  mInfo("sdbiter:%p, write:%d bytes to snapshot, total:%" PRId64, pIter, writelen, pIter->total);
   return 0;
 }
\ No newline at end of file
diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt
index 7a4cd80922..ea401e56e5 100644
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(
 
 target_link_libraries(
     function
-    PRIVATE os util common nodes scalar catalog qcom transport
+    PRIVATE os util common nodes scalar qcom transport
     PUBLIC uv_a
 )
 
diff --git a/source/libs/function/inc/functionMgtInt.h b/source/libs/function/inc/functionMgtInt.h
index 21d2776658..29dd0bcd90 100644
--- a/source/libs/function/inc/functionMgtInt.h
+++ b/source/libs/function/inc/functionMgtInt.h
@@ -44,9 +44,7 @@ extern "C" {
 
 #define FUNC_MGT_TEST_MASK(val, mask) (((val) & (mask)) != 0)
 
-#define FUNC_UDF_ID_START     5000
-#define FUNC_AGGREGATE_UDF_ID 5001
-#define FUNC_SCALAR_UDF_ID    5002
+#define FUNC_UDF_ID_START 5000
 
 extern const int funcMgtUdfNum;
 
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 10526e1a1c..24a781855a 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -746,7 +746,7 @@ static int32_t translateDiff(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
   }
 
   uint8_t resType;
-  if (IS_SIGNED_NUMERIC_TYPE(colType)) {
+  if (IS_SIGNED_NUMERIC_TYPE(colType) || TSDB_DATA_TYPE_BOOL == colType) {
     resType = TSDB_DATA_TYPE_BIGINT;
   } else {
     resType = TSDB_DATA_TYPE_DOUBLE;
diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c
index 506b0eb8da..c2b325bc92 100644
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
@@ -16,7 +16,6 @@
 #include "functionMgt.h"
 
 #include "builtins.h"
-#include "catalog.h"
 #include "functionMgtInt.h"
 #include "taos.h"
 #include "taoserror.h"
@@ -65,35 +64,19 @@ static bool isSpecificClassifyFunc(int32_t funcId, uint64_t classification) {
   return FUNC_MGT_TEST_MASK(funcMgtBuiltins[funcId].classification, classification);
 }
 
-static int32_t getUdfInfo(SFmGetFuncInfoParam* pParam, SFunctionNode* pFunc) {
-  SFuncInfo funcInfo = {0};
-  int32_t    code = catalogGetUdfInfo(pParam->pCtg, pParam->pRpc, pParam->pMgmtEps, pFunc->functionName, &funcInfo);
-  if (TSDB_CODE_SUCCESS != code) {
-    return code;
-  }
-
-  pFunc->funcType = FUNCTION_TYPE_UDF;
-  pFunc->funcId = TSDB_FUNC_TYPE_AGGREGATE == funcInfo.funcType ? FUNC_AGGREGATE_UDF_ID : FUNC_SCALAR_UDF_ID;
-  pFunc->node.resType.type = funcInfo.outputType;
-  pFunc->node.resType.bytes = funcInfo.outputLen;
-  pFunc->udfBufSize = funcInfo.bufSize;
-  tFreeSFuncInfo(&funcInfo);
-  return TSDB_CODE_SUCCESS;
-}
-
 int32_t fmFuncMgtInit() {
   taosThreadOnce(&functionHashTableInit, doInitFunctionTable);
   return initFunctionCode;
 }
 
-int32_t fmGetFuncInfo(SFmGetFuncInfoParam* pParam, SFunctionNode* pFunc) {
+int32_t fmGetFuncInfo(SFunctionNode* pFunc, char* pMsg, int32_t msgLen) {
   void* pVal = taosHashGet(gFunMgtService.pFuncNameHashTable, pFunc->functionName, strlen(pFunc->functionName));
   if (NULL != pVal) {
     pFunc->funcId = *(int32_t*)pVal;
     pFunc->funcType = funcMgtBuiltins[pFunc->funcId].type;
-    return funcMgtBuiltins[pFunc->funcId].translateFunc(pFunc, pParam->pErrBuf, pParam->errBufLen);
+    return funcMgtBuiltins[pFunc->funcId].translateFunc(pFunc, pMsg, msgLen);
   }
-  return getUdfInfo(pParam, pFunc);
+  return TSDB_CODE_FUNC_NOT_BUILTIN_FUNTION;
 }
 
 bool fmIsBuiltinFunc(const char* pFunc) {
diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c
index 9c742cfb46..78710569cb 100644
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
@@ -2555,7 +2555,7 @@ static const char* jkSessionWindowTsPrimaryKey = "TsPrimaryKey";
 static const char* jkSessionWindowGap = "Gap";
 
 static int32_t sessionWindowNodeToJson(const void* pObj, SJson* pJson) {
-  const SSessionWindowNode * pNode = (const SSessionWindowNode*)pObj;
+  const SSessionWindowNode* pNode = (const SSessionWindowNode*)pObj;
 
   int32_t code = tjsonAddObject(pJson, jkSessionWindowTsPrimaryKey, nodeToJson, pNode->pCol);
   if (TSDB_CODE_SUCCESS == code) {
@@ -2567,9 +2567,9 @@ static int32_t sessionWindowNodeToJson(const void* pObj, SJson* pJson) {
 static int32_t jsonToSessionWindowNode(const SJson* pJson, void* pObj) {
   SSessionWindowNode* pNode = (SSessionWindowNode*)pObj;
 
-  int32_t code = jsonToNodeObject(pJson, jkSessionWindowTsPrimaryKey, (SNode **)&pNode->pCol);
+  int32_t code = jsonToNodeObject(pJson, jkSessionWindowTsPrimaryKey, (SNode**)&pNode->pCol);
   if (TSDB_CODE_SUCCESS == code) {
-    code = jsonToNodeObject(pJson, jkSessionWindowGap, (SNode **)&pNode->pGap);
+    code = jsonToNodeObject(pJson, jkSessionWindowGap, (SNode**)&pNode->pGap);
   }
   return code;
 }
@@ -2796,6 +2796,150 @@ static int32_t jsonToDownstreamSourceNode(const SJson* pJson, void* pObj) {
   return code;
 }
 
+static const char* jkDatabaseOptionsBuffer = "Buffer";
+static const char* jkDatabaseOptionsCachelast = "Cachelast";
+static const char* jkDatabaseOptionsCompressionLevel = "CompressionLevel";
+static const char* jkDatabaseOptionsDaysPerFileNode = "DaysPerFileNode";
+static const char* jkDatabaseOptionsDaysPerFile = "DaysPerFile";
+static const char* jkDatabaseOptionsFsyncPeriod = "FsyncPeriod";
+static const char* jkDatabaseOptionsMaxRowsPerBlock = "MaxRowsPerBlock";
+static const char* jkDatabaseOptionsMinRowsPerBlock = "MinRowsPerBlock";
+static const char* jkDatabaseOptionsKeep = "Keep";
+static const char* jkDatabaseOptionsPages = "Pages";
+static const char* jkDatabaseOptionsPagesize = "Pagesize";
+static const char* jkDatabaseOptionsPrecision = "Precision";
+static const char* jkDatabaseOptionsReplica = "Replica";
+static const char* jkDatabaseOptionsStrict = "Strict";
+static const char* jkDatabaseOptionsWalLevel = "WalLevel";
+static const char* jkDatabaseOptionsNumOfVgroups = "NumOfVgroups";
+static const char* jkDatabaseOptionsSingleStable = "SingleStable";
+static const char* jkDatabaseOptionsRetentions = "Retentions";
+static const char* jkDatabaseOptionsSchemaless = "Schemaless";
+
+static int32_t databaseOptionsToJson(const void* pObj, SJson* pJson) {
+  const SDatabaseOptions* pNode = (const SDatabaseOptions*)pObj;
+
+  int32_t code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsBuffer, pNode->buffer);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsCachelast, pNode->cachelast);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsCompressionLevel, pNode->compressionLevel);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddObject(pJson, jkDatabaseOptionsDaysPerFileNode, nodeToJson, pNode->pDaysPerFile);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsDaysPerFile, pNode->daysPerFile);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsFsyncPeriod, pNode->fsyncPeriod);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsMaxRowsPerBlock, pNode->maxRowsPerBlock);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsMinRowsPerBlock, pNode->minRowsPerBlock);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = nodeListToJson(pJson, jkDatabaseOptionsKeep, pNode->pKeep);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsPages, pNode->pages);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsPagesize, pNode->pagesize);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddStringToObject(pJson, jkDatabaseOptionsPrecision, pNode->precisionStr);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsReplica, pNode->replica);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsStrict, pNode->strict);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsWalLevel, pNode->walLevel);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsNumOfVgroups, pNode->numOfVgroups);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsSingleStable, pNode->singleStable);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = nodeListToJson(pJson, jkDatabaseOptionsRetentions, pNode->pRetentions);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkDatabaseOptionsSchemaless, pNode->schemaless);
+  }
+
+  return code;
+}
+
+static int32_t jsonToDatabaseOptions(const SJson* pJson, void* pObj) {
+  SDatabaseOptions* pNode = (SDatabaseOptions*)pObj;
+
+  int32_t code = tjsonGetIntValue(pJson, jkDatabaseOptionsBuffer, &pNode->buffer);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkDatabaseOptionsCachelast, &pNode->cachelast);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkDatabaseOptionsCompressionLevel, &pNode->compressionLevel);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeObject(pJson, jkDatabaseOptionsDaysPerFileNode, (SNode**)&pNode->pDaysPerFile);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetIntValue(pJson, jkDatabaseOptionsDaysPerFile, &pNode->daysPerFile);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetIntValue(pJson, jkDatabaseOptionsFsyncPeriod, &pNode->fsyncPeriod);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetIntValue(pJson, jkDatabaseOptionsMaxRowsPerBlock, &pNode->maxRowsPerBlock);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetIntValue(pJson, jkDatabaseOptionsMinRowsPerBlock, &pNode->minRowsPerBlock);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeList(pJson, jkDatabaseOptionsKeep, &pNode->pKeep);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetIntValue(pJson, jkDatabaseOptionsPages, &pNode->pages);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetIntValue(pJson, jkDatabaseOptionsPagesize, &pNode->pagesize);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetStringValue(pJson, jkDatabaseOptionsPrecision, pNode->precisionStr);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkDatabaseOptionsReplica, &pNode->replica);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkDatabaseOptionsStrict, &pNode->strict);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkDatabaseOptionsWalLevel, &pNode->walLevel);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetIntValue(pJson, jkDatabaseOptionsNumOfVgroups, &pNode->numOfVgroups);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkDatabaseOptionsSingleStable, &pNode->singleStable);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeList(pJson, jkDatabaseOptionsRetentions, &pNode->pRetentions);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkDatabaseOptionsSchemaless, &pNode->schemaless);
+  }
+
+  return code;
+}
+
 static const char* jkDataBlockDescDataBlockId = "DataBlockId";
 static const char* jkDataBlockDescSlots = "Slots";
 static const char* jkDataBlockTotalRowSize = "TotalRowSize";
@@ -2998,6 +3142,130 @@ static int32_t jsonToSelectStmt(const SJson* pJson, void* pObj) {
   return code;
 }
 
+static const char* jkAlterDatabaseStmtDbName = "DbName";
+static const char* jkAlterDatabaseStmtOptions = "Options";
+
+static int32_t alterDatabaseStmtToJson(const void* pObj, SJson* pJson) {
+  const SAlterDatabaseStmt* pNode = (const SAlterDatabaseStmt*)pObj;
+
+  int32_t code = tjsonAddStringToObject(pJson, jkAlterDatabaseStmtDbName, pNode->dbName);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddObject(pJson, jkAlterDatabaseStmtOptions, nodeToJson, pNode->pOptions);
+  }
+
+  return code;
+}
+
+static int32_t jsonToAlterDatabaseStmt(const SJson* pJson, void* pObj) {
+  SAlterDatabaseStmt* pNode = (SAlterDatabaseStmt*)pObj;
+
+  int32_t code = tjsonGetStringValue(pJson, jkAlterDatabaseStmtDbName, pNode->dbName);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeObject(pJson, jkAlterDatabaseStmtOptions, (SNode**)&pNode->pOptions);
+  }
+
+  return code;
+}
+
+static const char* jkAlterTableStmtDbName = "DbName";
+static const char* jkAlterTableStmtTableName = "TableName";
+static const char* jkAlterTableStmtAlterType = "AlterType";
+static const char* jkAlterTableStmtColName = "ColName";
+static const char* jkAlterTableStmtNewColName = "NewColName";
+static const char* jkAlterTableStmtOptions = "Options";
+static const char* jkAlterTableStmtNewDataType = "NewDataType";
+static const char* jkAlterTableStmtNewTagVal = "NewTagVal";
+
+static int32_t alterTableStmtToJson(const void* pObj, SJson* pJson) {
+  const SAlterTableStmt* pNode = (const SAlterTableStmt*)pObj;
+
+  int32_t code = tjsonAddStringToObject(pJson, jkAlterTableStmtDbName, pNode->dbName);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddStringToObject(pJson, jkAlterTableStmtTableName, pNode->tableName);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddIntegerToObject(pJson, jkAlterTableStmtAlterType, pNode->alterType);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddStringToObject(pJson, jkAlterTableStmtColName, pNode->colName);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddStringToObject(pJson, jkAlterTableStmtNewColName, pNode->newColName);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddObject(pJson, jkAlterTableStmtOptions, nodeToJson, pNode->pOptions);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddObject(pJson, jkAlterTableStmtNewDataType, dataTypeToJson, &pNode->dataType);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddObject(pJson, jkAlterTableStmtOptions, nodeToJson, pNode->pVal);
+  }
+
+  return code;
+}
+
+static int32_t jsonToAlterTableStmt(const SJson* pJson, void* pObj) {
+  SAlterTableStmt* pNode = (SAlterTableStmt*)pObj;
+
+  int32_t code = tjsonGetStringValue(pJson, jkAlterTableStmtDbName, pNode->dbName);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetStringValue(pJson, jkAlterTableStmtTableName, pNode->tableName);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetTinyIntValue(pJson, jkAlterTableStmtAlterType, &pNode->alterType);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetStringValue(pJson, jkAlterTableStmtColName, pNode->colName);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetStringValue(pJson, jkAlterTableStmtNewColName, pNode->newColName);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeObject(pJson, jkAlterTableStmtOptions, (SNode**)&pNode->pOptions);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonToObject(pJson, jkAlterTableStmtNewDataType, jsonToDataType, &pNode->dataType);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = jsonToNodeObject(pJson, jkAlterTableStmtOptions, (SNode**)&pNode->pVal);
+  }
+
+  return code;
+}
+
+static const char* jkAlterDnodeStmtDnodeId = "DnodeId";
+static const char* jkAlterDnodeStmtConfig = "Config";
+static const char* jkAlterDnodeStmtValue = "Value";
+
+static int32_t alterDnodeStmtToJson(const void* pObj, SJson* pJson) {
+  const SAlterDnodeStmt* pNode = (const SAlterDnodeStmt*)pObj;
+
+  int32_t code = tjsonAddIntegerToObject(pJson, jkAlterDnodeStmtDnodeId, pNode->dnodeId);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddStringToObject(pJson, jkAlterDnodeStmtConfig, pNode->config);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonAddStringToObject(pJson, jkAlterDnodeStmtValue, pNode->value);
+  }
+
+  return code;
+}
+
+static int32_t jsonToAlterDnodeStmt(const SJson* pJson, void* pObj) {
+  SAlterDnodeStmt* pNode = (SAlterDnodeStmt*)pObj;
+
+  int32_t code = tjsonGetIntValue(pJson, jkAlterDnodeStmtDnodeId, &pNode->dnodeId);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetStringValue(pJson, jkAlterDnodeStmtConfig, pNode->config);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = tjsonGetStringValue(pJson, jkAlterDnodeStmtValue, pNode->value);
+  }
+
+  return code;
+}
+
 static const char* jkCreateTopicStmtTopicName = "TopicName";
 static const char* jkCreateTopicStmtSubscribeDbName = "SubscribeDbName";
 static const char* jkCreateTopicStmtIgnoreExists = "IgnoreExists";
@@ -3082,6 +3350,8 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
       break;
     case QUERY_NODE_DOWNSTREAM_SOURCE:
       return downstreamSourceNodeToJson(pObj, pJson);
+    case QUERY_NODE_DATABASE_OPTIONS:
+      return databaseOptionsToJson(pObj, pJson);
     case QUERY_NODE_LEFT_VALUE:
       return TSDB_CODE_SUCCESS;  // SLeftValueNode has no fields to serialize.
     case QUERY_NODE_SET_OPERATOR:
@@ -3090,8 +3360,17 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
       return selectStmtToJson(pObj, pJson);
     case QUERY_NODE_VNODE_MODIF_STMT:
     case QUERY_NODE_CREATE_DATABASE_STMT:
+      break;
+    case QUERY_NODE_ALTER_DATABASE_STMT:
+      return alterDatabaseStmtToJson(pObj, pJson);
     case QUERY_NODE_CREATE_TABLE_STMT:
+      break;
+    case QUERY_NODE_ALTER_TABLE_STMT:
+      return alterTableStmtToJson(pObj, pJson);
     case QUERY_NODE_USE_DATABASE_STMT:
+      break;
+    case QUERY_NODE_ALTER_DNODE_STMT:
+      return alterDnodeStmtToJson(pObj, pJson);
     case QUERY_NODE_SHOW_DATABASES_STMT:
     case QUERY_NODE_SHOW_TABLES_STMT:
       break;
@@ -3198,12 +3477,20 @@ static int32_t jsonToSpecificNode(const SJson* pJson, void* pObj) {
       return jsonToSlotDescNode(pJson, pObj);
     case QUERY_NODE_DOWNSTREAM_SOURCE:
       return jsonToDownstreamSourceNode(pJson, pObj);
+    case QUERY_NODE_DATABASE_OPTIONS:
+      return jsonToDatabaseOptions(pJson, pObj);
     case QUERY_NODE_LEFT_VALUE:
       return TSDB_CODE_SUCCESS;  // SLeftValueNode has no fields to deserialize.
     case QUERY_NODE_SET_OPERATOR:
       return jsonToSetOperator(pJson, pObj);
     case QUERY_NODE_SELECT_STMT:
       return jsonToSelectStmt(pJson, pObj);
+    case QUERY_NODE_ALTER_DATABASE_STMT:
+      return jsonToAlterDatabaseStmt(pJson, pObj);
+    case QUERY_NODE_ALTER_TABLE_STMT:
+      return jsonToAlterTableStmt(pJson, pObj);
+    case QUERY_NODE_ALTER_DNODE_STMT:
+      return jsonToAlterDnodeStmt(pJson, pObj);
     case QUERY_NODE_CREATE_TOPIC_STMT:
       return jsonToCreateTopicStmt(pJson, pObj);
     case QUERY_NODE_LOGIC_PLAN_SCAN:
diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h
index 50c05170b3..a1c304118b 100644
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@@ -27,14 +27,13 @@ extern "C" {
 #include "querynodes.h"
 
 typedef struct SAstCreateContext {
-  SParseContext*   pQueryCxt;
-  SMsgBuf          msgBuf;
-  bool             notSupport;
-  SNode*           pRootNode;
-  int16_t          placeholderNo;
-  SArray*          pPlaceholderValues;
-  int32_t          errCode;
-  SParseMetaCache* pMetaCache;
+  SParseContext* pQueryCxt;
+  SMsgBuf        msgBuf;
+  bool           notSupport;
+  SNode*         pRootNode;
+  int16_t        placeholderNo;
+  SArray*        pPlaceholderValues;
+  int32_t        errCode;
 } SAstCreateContext;
 
 typedef enum EDatabaseOptionType {
@@ -75,7 +74,7 @@ typedef struct SAlterOption {
 
 extern SToken nil_token;
 
-int32_t initAstCreateContext(SParseContext* pParseCxt, SAstCreateContext* pCxt);
+void initAstCreateContext(SParseContext* pParseCxt, SAstCreateContext* pCxt);
 
 SNode* createRawExprNode(SAstCreateContext* pCxt, const SToken* pToken, SNode* pNode);
 SNode* createRawExprNodeExt(SAstCreateContext* pCxt, const SToken* pStart, const SToken* pEnd, SNode* pNode);
diff --git a/source/libs/parser/inc/parInt.h b/source/libs/parser/inc/parInt.h
index 2ad1ebc112..184ed7d8b2 100644
--- a/source/libs/parser/inc/parInt.h
+++ b/source/libs/parser/inc/parInt.h
@@ -26,6 +26,7 @@ extern "C" {
 
 int32_t parseInsertSql(SParseContext* pContext, SQuery** pQuery);
 int32_t parse(SParseContext* pParseCxt, SQuery** pQuery);
+int32_t collectMetaKey(SParseContext* pParseCxt, SQuery* pQuery);
 int32_t authenticate(SParseContext* pParseCxt, SQuery* pQuery);
 int32_t translate(SParseContext* pParseCxt, SQuery* pQuery);
 int32_t extractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** pSchema);
diff --git a/source/libs/parser/inc/parUtil.h b/source/libs/parser/inc/parUtil.h
index 7ad5a7ecab..80288dbc44 100644
--- a/source/libs/parser/inc/parUtil.h
+++ b/source/libs/parser/inc/parUtil.h
@@ -24,12 +24,12 @@ extern "C" {
 #include "os.h"
 #include "query.h"
 
-#define parserFatal(param, ...) qFatal("PARSER: " param, __VA_ARGS__)
-#define parserError(param, ...) qError("PARSER: " param, __VA_ARGS__)
-#define parserWarn(param, ...)  qWarn("PARSER: " param, __VA_ARGS__)
-#define parserInfo(param, ...)  qInfo("PARSER: " param, __VA_ARGS__)
-#define parserDebug(param, ...) qDebug("PARSER: " param, __VA_ARGS__)
-#define parserTrace(param, ...) qTrace("PARSER: " param, __VA_ARGS__)
+#define parserFatal(param, ...) qFatal("PARSER: " param, ##__VA_ARGS__)
+#define parserError(param, ...) qError("PARSER: " param, ##__VA_ARGS__)
+#define parserWarn(param, ...)  qWarn("PARSER: " param, ##__VA_ARGS__)
+#define parserInfo(param, ...)  qInfo("PARSER: " param, ##__VA_ARGS__)
+#define parserDebug(param, ...) qDebug("PARSER: " param, ##__VA_ARGS__)
+#define parserTrace(param, ...) qTrace("PARSER: " param, ##__VA_ARGS__)
 
 #define PK_TS_COL_INTERNAL_NAME "_rowts"
 
@@ -42,7 +42,10 @@ typedef struct SParseMetaCache {
   SHashObj* pTableMeta;    // key is tbFName, element is STableMeta*
   SHashObj* pDbVgroup;     // key is dbFName, element is SArray<SVgroupInfo>*
   SHashObj* pTableVgroup;  // key is tbFName, element is SVgroupInfo*
-  SHashObj* pDbCfg;        // key is tbFName, element is SDbCfgInfo
+  SHashObj* pDbCfg;        // key is tbFName, element is SDbCfgInfo*
+  SHashObj* pDbInfo;       // key is tbFName, element is SDbInfo*
+  SHashObj* pUserAuth;     // key is SUserAuthInfo serialized string, element is bool indicating whether or not to pass
+  SHashObj* pUdf;          // key is funcName, element is SFuncInfo*
 } SParseMetaCache;
 
 int32_t generateSyntaxErrMsg(SMsgBuf* pBuf, int32_t errCode, ...);
@@ -62,12 +65,22 @@ int32_t trimString(const char* src, int32_t len, char* dst, int32_t dlen);
 int32_t buildCatalogReq(const SParseMetaCache* pMetaCache, SCatalogReq* pCatalogReq);
 int32_t putMetaDataToCache(const SCatalogReq* pCatalogReq, const SMetaData* pMetaData, SParseMetaCache* pMetaCache);
 int32_t reserveTableMetaInCache(int32_t acctId, const char* pDb, const char* pTable, SParseMetaCache* pMetaCache);
+int32_t reserveDbVgInfoInCache(int32_t acctId, const char* pDb, SParseMetaCache* pMetaCache);
+int32_t reserveTableVgroupInCache(int32_t acctId, const char* pDb, const char* pTable, SParseMetaCache* pMetaCache);
+int32_t reserveDbVgVersionInCache(int32_t acctId, const char* pDb, SParseMetaCache* pMetaCache);
+int32_t reserveDbCfgInCache(int32_t acctId, const char* pDb, SParseMetaCache* pMetaCache);
+int32_t reserveUserAuthInCache(int32_t acctId, const char* pUser, const char* pDb, AUTH_TYPE type,
+                               SParseMetaCache* pMetaCache);
+int32_t reserveUdfInCache(const char* pFunc, SParseMetaCache* pMetaCache);
 int32_t getTableMetaFromCache(SParseMetaCache* pMetaCache, const SName* pName, STableMeta** pMeta);
-int32_t getDBVgInfoFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SArray** pVgInfo);
-int32_t getTableHashVgroupFromCache(SParseMetaCache* pMetaCache, const SName* pName, SVgroupInfo* pVgroup);
-int32_t getDBVgVersionFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, int32_t* pVersion, int64_t* pDbId,
+int32_t getDbVgInfoFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SArray** pVgInfo);
+int32_t getTableVgroupFromCache(SParseMetaCache* pMetaCache, const SName* pName, SVgroupInfo* pVgroup);
+int32_t getDbVgVersionFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, int32_t* pVersion, int64_t* pDbId,
                                 int32_t* pTableNum);
-int32_t getDBCfgFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SDbCfgInfo* pInfo);
+int32_t getDbCfgFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SDbCfgInfo* pInfo);
+int32_t getUserAuthFromCache(SParseMetaCache* pMetaCache, const char* pUser, const char* pDb, AUTH_TYPE type,
+                             bool* pPass);
+int32_t getUdfInfoFromCache(SParseMetaCache* pMetaCache, const char* pFunc, SFuncInfo* pInfo);
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index 4aa28409b7..836a0cb520 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -38,7 +38,7 @@
 
 SToken nil_token = {.type = TK_NK_NIL, .n = 0, .z = NULL};
 
-int32_t initAstCreateContext(SParseContext* pParseCxt, SAstCreateContext* pCxt) {
+void initAstCreateContext(SParseContext* pParseCxt, SAstCreateContext* pCxt) {
   memset(pCxt, 0, sizeof(SAstCreateContext));
   pCxt->pQueryCxt = pParseCxt;
   pCxt->msgBuf.buf = pParseCxt->pMsg;
@@ -48,13 +48,6 @@ int32_t initAstCreateContext(SParseContext* pParseCxt, SAstCreateContext* pCxt)
   pCxt->placeholderNo = 0;
   pCxt->pPlaceholderValues = NULL;
   pCxt->errCode = TSDB_CODE_SUCCESS;
-  if (pParseCxt->async) {
-    pCxt->pMetaCache = taosMemoryCalloc(1, sizeof(SParseMetaCache));
-    if (NULL == pCxt->pMetaCache) {
-      return TSDB_CODE_OUT_OF_MEMORY;
-    }
-  }
-  return TSDB_CODE_SUCCESS;
 }
 
 static void copyStringFormStringToken(SToken* pToken, char* pBuf, int32_t len) {
@@ -472,13 +465,6 @@ SNode* createRealTableNode(SAstCreateContext* pCxt, SToken* pDbName, SToken* pTa
     strncpy(realTable->table.tableAlias, pTableName->z, pTableName->n);
   }
   strncpy(realTable->table.tableName, pTableName->z, pTableName->n);
-  if (NULL != pCxt->pMetaCache) {
-    if (TSDB_CODE_SUCCESS != reserveTableMetaInCache(pCxt->pQueryCxt->acctId, realTable->table.dbName,
-                                                     realTable->table.tableName, pCxt->pMetaCache)) {
-      nodesDestroyNode(realTable);
-      CHECK_OUT_OF_MEM(NULL);
-    }
-  }
   return (SNode*)realTable;
 }
 
diff --git a/source/libs/parser/src/parAstParser.c b/source/libs/parser/src/parAstParser.c
index 28c79a88f0..5d65a0b80b 100644
--- a/source/libs/parser/src/parAstParser.c
+++ b/source/libs/parser/src/parAstParser.c
@@ -13,11 +13,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "functionMgt.h"
 #include "os.h"
-#include "parInt.h"
-
 #include "parAst.h"
+#include "parInt.h"
 #include "parToken.h"
+#include "systable.h"
 
 typedef void* (*FMalloc)(size_t);
 typedef void (*FFree)(void*);
@@ -82,8 +83,386 @@ abort_parse:
     (*pQuery)->pRoot = cxt.pRootNode;
     (*pQuery)->placeholderNum = cxt.placeholderNo;
     TSWAP((*pQuery)->pPlaceholderValues, cxt.pPlaceholderValues);
-    TSWAP((*pQuery)->pMetaCache, cxt.pMetaCache);
   }
   taosArrayDestroy(cxt.pPlaceholderValues);
   return cxt.errCode;
 }
+
+typedef struct SCollectMetaKeyCxt {
+  SParseContext*   pParseCxt;
+  SParseMetaCache* pMetaCache;
+} SCollectMetaKeyCxt;
+
+static void destroyCollectMetaKeyCxt(SCollectMetaKeyCxt* pCxt) {
+  if (NULL != pCxt->pMetaCache) {
+    // TODO
+  }
+}
+
+typedef struct SCollectMetaKeyFromExprCxt {
+  SCollectMetaKeyCxt* pComCxt;
+  int32_t             errCode;
+} SCollectMetaKeyFromExprCxt;
+
+static int32_t collectMetaKeyFromQuery(SCollectMetaKeyCxt* pCxt, SNode* pStmt);
+
+static EDealRes collectMetaKeyFromFunction(SCollectMetaKeyFromExprCxt* pCxt, SFunctionNode* pFunc) {
+  if (fmIsBuiltinFunc(pFunc->functionName)) {
+    return TSDB_CODE_SUCCESS;
+  }
+  return reserveUdfInCache(pFunc->functionName, pCxt->pComCxt->pMetaCache);
+}
+
+static EDealRes collectMetaKeyFromRealTable(SCollectMetaKeyFromExprCxt* pCxt, SRealTableNode* pRealTable) {
+  pCxt->errCode = reserveTableMetaInCache(pCxt->pComCxt->pParseCxt->acctId, pRealTable->table.dbName,
+                                          pRealTable->table.tableName, pCxt->pComCxt->pMetaCache);
+  if (TSDB_CODE_SUCCESS == pCxt->errCode) {
+    pCxt->errCode = reserveTableVgroupInCache(pCxt->pComCxt->pParseCxt->acctId, pRealTable->table.dbName,
+                                              pRealTable->table.tableName, pCxt->pComCxt->pMetaCache);
+  }
+  if (TSDB_CODE_SUCCESS == pCxt->errCode) {
+    pCxt->errCode = reserveUserAuthInCache(pCxt->pComCxt->pParseCxt->acctId, pCxt->pComCxt->pParseCxt->pUser,
+                                           pRealTable->table.dbName, AUTH_TYPE_READ, pCxt->pComCxt->pMetaCache);
+  }
+  return TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_CONTINUE : DEAL_RES_ERROR;
+}
+
+static EDealRes collectMetaKeyFromTempTable(SCollectMetaKeyFromExprCxt* pCxt, STempTableNode* pTempTable) {
+  pCxt->errCode = collectMetaKeyFromQuery(pCxt->pComCxt, pTempTable->pSubquery);
+  return TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_CONTINUE : DEAL_RES_ERROR;
+}
+
+static EDealRes collectMetaKeyFromExprImpl(SNode* pNode, void* pContext) {
+  SCollectMetaKeyFromExprCxt* pCxt = pContext;
+  switch (nodeType(pNode)) {
+    case QUERY_NODE_FUNCTION:
+      return collectMetaKeyFromFunction(pCxt, (SFunctionNode*)pNode);
+    case QUERY_NODE_REAL_TABLE:
+      return collectMetaKeyFromRealTable(pCxt, (SRealTableNode*)pNode);
+    case QUERY_NODE_TEMP_TABLE:
+      return collectMetaKeyFromTempTable(pCxt, (STempTableNode*)pNode);
+    default:
+      break;
+  }
+  return DEAL_RES_CONTINUE;
+}
+
+static int32_t collectMetaKeyFromExprs(SCollectMetaKeyCxt* pCxt, SNodeList* pList) {
+  SCollectMetaKeyFromExprCxt cxt = {.pComCxt = pCxt, .errCode = TSDB_CODE_SUCCESS};
+  nodesWalkExprs(pList, collectMetaKeyFromExprImpl, &cxt);
+  return cxt.errCode;
+}
+
+static int32_t collectMetaKeyFromSetOperator(SCollectMetaKeyCxt* pCxt, SSetOperator* pStmt) {
+  int32_t code = collectMetaKeyFromQuery(pCxt, pStmt->pLeft);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = collectMetaKeyFromQuery(pCxt, pStmt->pRight);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = collectMetaKeyFromExprs(pCxt, pStmt->pOrderByList);
+  }
+  return code;
+}
+
+static int32_t collectMetaKeyFromSelect(SCollectMetaKeyCxt* pCxt, SSelectStmt* pStmt) {
+  SCollectMetaKeyFromExprCxt cxt = {.pComCxt = pCxt, .errCode = TSDB_CODE_SUCCESS};
+  nodesWalkSelectStmt(pStmt, SQL_CLAUSE_FROM, collectMetaKeyFromExprImpl, &cxt);
+  return cxt.errCode;
+}
+
+static int32_t collectMetaKeyFromCreateTable(SCollectMetaKeyCxt* pCxt, SCreateTableStmt* pStmt) {
+  if (NULL == pStmt->pTags) {
+    return reserveTableVgroupInCache(pCxt->pParseCxt->acctId, pStmt->dbName, pStmt->tableName, pCxt->pMetaCache);
+  } else {
+    return reserveDbCfgInCache(pCxt->pParseCxt->acctId, pStmt->dbName, pCxt->pMetaCache);
+  }
+}
+
+static int32_t collectMetaKeyFromCreateMultiTable(SCollectMetaKeyCxt* pCxt, SCreateMultiTableStmt* pStmt) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  SNode*  pNode = NULL;
+  FOREACH(pNode, pStmt->pSubTables) {
+    SCreateSubTableClause* pClause = (SCreateSubTableClause*)pNode;
+    code =
+        reserveTableMetaInCache(pCxt->pParseCxt->acctId, pClause->useDbName, pClause->useTableName, pCxt->pMetaCache);
+    if (TSDB_CODE_SUCCESS == code) {
+      code = reserveTableVgroupInCache(pCxt->pParseCxt->acctId, pClause->dbName, pClause->tableName, pCxt->pMetaCache);
+    }
+    if (TSDB_CODE_SUCCESS != code) {
+      break;
+    }
+  }
+  return code;
+}
+
+static int32_t collectMetaKeyFromAlterTable(SCollectMetaKeyCxt* pCxt, SAlterTableStmt* pStmt) {
+  int32_t code = reserveTableMetaInCache(pCxt->pParseCxt->acctId, pStmt->dbName, pStmt->tableName, pCxt->pMetaCache);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = reserveTableVgroupInCache(pCxt->pParseCxt->acctId, pStmt->dbName, pStmt->tableName, pCxt->pMetaCache);
+  }
+  return code;
+}
+
+static int32_t collectMetaKeyFromUseDatabase(SCollectMetaKeyCxt* pCxt, SUseDatabaseStmt* pStmt) {
+  return reserveDbVgVersionInCache(pCxt->pParseCxt->acctId, pStmt->dbName, pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromCreateIndex(SCollectMetaKeyCxt* pCxt, SCreateIndexStmt* pStmt) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  if (INDEX_TYPE_SMA == pStmt->indexType) {
+    code = reserveTableMetaInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->db, pStmt->tableName, pCxt->pMetaCache);
+    if (TSDB_CODE_SUCCESS == code) {
+      code =
+          reserveTableVgroupInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->db, pStmt->tableName, pCxt->pMetaCache);
+    }
+  }
+  return code;
+}
+
+static int32_t collectMetaKeyFromCreateTopic(SCollectMetaKeyCxt* pCxt, SCreateTopicStmt* pStmt) {
+  if (NULL != pStmt->pQuery) {
+    return collectMetaKeyFromQuery(pCxt, pStmt->pQuery);
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t collectMetaKeyFromExplain(SCollectMetaKeyCxt* pCxt, SExplainStmt* pStmt) {
+  return collectMetaKeyFromQuery(pCxt, pStmt->pQuery);
+}
+
+static int32_t collectMetaKeyFromCreateStream(SCollectMetaKeyCxt* pCxt, SCreateStreamStmt* pStmt) {
+  return collectMetaKeyFromQuery(pCxt, pStmt->pQuery);
+}
+
+static int32_t collectMetaKeyFromShowDnodes(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_DNODES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowMnodes(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_MNODES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowModules(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_MODULES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowQnodes(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_QNODES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowSnodes(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_SNODES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowBnodes(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_BNODES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowDatabases(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_USER_DATABASES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowFunctions(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_USER_FUNCTIONS,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowIndexes(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_USER_INDEXES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowStables(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_USER_STABLES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowStreams(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_PERFORMANCE_SCHEMA_DB, TSDB_PERFS_TABLE_STREAMS,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowTables(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  int32_t code = reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB,
+                                         TSDB_INS_TABLE_USER_TABLES, pCxt->pMetaCache);
+  if (TSDB_CODE_SUCCESS == code) {
+    if (NULL != pStmt->pDbName) {
+      code = reserveDbVgInfoInCache(pCxt->pParseCxt->acctId, ((SValueNode*)pStmt->pDbName)->literal, pCxt->pMetaCache);
+    } else {
+      code = reserveDbVgInfoInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, pCxt->pMetaCache);
+    }
+  }
+  return code;
+}
+
+static int32_t collectMetaKeyFromShowUsers(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_USER_USERS,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowLicence(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_LICENCES,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowVgroups(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_VGROUPS,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowTopics(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_PERFORMANCE_SCHEMA_DB, TSDB_PERFS_TABLE_TOPICS,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromShowTransactions(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
+  return reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_PERFORMANCE_SCHEMA_DB, TSDB_PERFS_TABLE_TRANS,
+                                 pCxt->pMetaCache);
+}
+
+static int32_t collectMetaKeyFromQuery(SCollectMetaKeyCxt* pCxt, SNode* pStmt) {
+  switch (nodeType(pStmt)) {
+    case QUERY_NODE_SET_OPERATOR:
+      return collectMetaKeyFromSetOperator(pCxt, (SSetOperator*)pStmt);
+    case QUERY_NODE_SELECT_STMT:
+      return collectMetaKeyFromSelect(pCxt, (SSelectStmt*)pStmt);
+    case QUERY_NODE_VNODE_MODIF_STMT:
+    case QUERY_NODE_CREATE_DATABASE_STMT:
+    case QUERY_NODE_DROP_DATABASE_STMT:
+    case QUERY_NODE_ALTER_DATABASE_STMT:
+      break;
+    case QUERY_NODE_CREATE_TABLE_STMT:
+      return collectMetaKeyFromCreateTable(pCxt, (SCreateTableStmt*)pStmt);
+    case QUERY_NODE_CREATE_SUBTABLE_CLAUSE:
+      break;
+    case QUERY_NODE_CREATE_MULTI_TABLE_STMT:
+      return collectMetaKeyFromCreateMultiTable(pCxt, (SCreateMultiTableStmt*)pStmt);
+    case QUERY_NODE_DROP_TABLE_CLAUSE:
+    case QUERY_NODE_DROP_TABLE_STMT:
+    case QUERY_NODE_DROP_SUPER_TABLE_STMT:
+      break;
+    case QUERY_NODE_ALTER_TABLE_STMT:
+      return collectMetaKeyFromAlterTable(pCxt, (SAlterTableStmt*)pStmt);
+    case QUERY_NODE_CREATE_USER_STMT:
+    case QUERY_NODE_ALTER_USER_STMT:
+    case QUERY_NODE_DROP_USER_STMT:
+      break;
+    case QUERY_NODE_USE_DATABASE_STMT:
+      return collectMetaKeyFromUseDatabase(pCxt, (SUseDatabaseStmt*)pStmt);
+    case QUERY_NODE_CREATE_DNODE_STMT:
+    case QUERY_NODE_DROP_DNODE_STMT:
+    case QUERY_NODE_ALTER_DNODE_STMT:
+      break;
+    case QUERY_NODE_CREATE_INDEX_STMT:
+      return collectMetaKeyFromCreateIndex(pCxt, (SCreateIndexStmt*)pStmt);
+    case QUERY_NODE_DROP_INDEX_STMT:
+    case QUERY_NODE_CREATE_QNODE_STMT:
+    case QUERY_NODE_DROP_QNODE_STMT:
+    case QUERY_NODE_CREATE_BNODE_STMT:
+    case QUERY_NODE_DROP_BNODE_STMT:
+    case QUERY_NODE_CREATE_SNODE_STMT:
+    case QUERY_NODE_DROP_SNODE_STMT:
+    case QUERY_NODE_CREATE_MNODE_STMT:
+    case QUERY_NODE_DROP_MNODE_STMT:
+      break;
+    case QUERY_NODE_CREATE_TOPIC_STMT:
+      return collectMetaKeyFromCreateTopic(pCxt, (SCreateTopicStmt*)pStmt);
+    case QUERY_NODE_DROP_TOPIC_STMT:
+    case QUERY_NODE_DROP_CGROUP_STMT:
+    case QUERY_NODE_ALTER_LOCAL_STMT:
+      break;
+    case QUERY_NODE_EXPLAIN_STMT:
+      return collectMetaKeyFromExplain(pCxt, (SExplainStmt*)pStmt);
+    case QUERY_NODE_DESCRIBE_STMT:
+    case QUERY_NODE_RESET_QUERY_CACHE_STMT:
+    case QUERY_NODE_COMPACT_STMT:
+    case QUERY_NODE_CREATE_FUNCTION_STMT:
+    case QUERY_NODE_DROP_FUNCTION_STMT:
+      break;
+    case QUERY_NODE_CREATE_STREAM_STMT:
+      return collectMetaKeyFromCreateStream(pCxt, (SCreateStreamStmt*)pStmt);
+    case QUERY_NODE_DROP_STREAM_STMT:
+    case QUERY_NODE_MERGE_VGROUP_STMT:
+    case QUERY_NODE_REDISTRIBUTE_VGROUP_STMT:
+    case QUERY_NODE_SPLIT_VGROUP_STMT:
+    case QUERY_NODE_SYNCDB_STMT:
+    case QUERY_NODE_GRANT_STMT:
+    case QUERY_NODE_REVOKE_STMT:
+    case QUERY_NODE_SHOW_DNODES_STMT:
+      return collectMetaKeyFromShowDnodes(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_MNODES_STMT:
+      return collectMetaKeyFromShowMnodes(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_MODULES_STMT:
+      return collectMetaKeyFromShowModules(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_QNODES_STMT:
+      return collectMetaKeyFromShowQnodes(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_SNODES_STMT:
+      return collectMetaKeyFromShowSnodes(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_BNODES_STMT:
+      return collectMetaKeyFromShowBnodes(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_CLUSTER_STMT:
+      break;
+    case QUERY_NODE_SHOW_DATABASES_STMT:
+      return collectMetaKeyFromShowDatabases(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_FUNCTIONS_STMT:
+      return collectMetaKeyFromShowFunctions(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_INDEXES_STMT:
+      return collectMetaKeyFromShowIndexes(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_STABLES_STMT:
+      return collectMetaKeyFromShowStables(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_STREAMS_STMT:
+      return collectMetaKeyFromShowStreams(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_TABLES_STMT:
+      return collectMetaKeyFromShowTables(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_USERS_STMT:
+      return collectMetaKeyFromShowUsers(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_LICENCE_STMT:
+      return collectMetaKeyFromShowLicence(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_VGROUPS_STMT:
+      return collectMetaKeyFromShowVgroups(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_TOPICS_STMT:
+      return collectMetaKeyFromShowTopics(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_SHOW_CONSUMERS_STMT:
+    case QUERY_NODE_SHOW_SUBSCRIBES_STMT:
+    case QUERY_NODE_SHOW_SMAS_STMT:
+    case QUERY_NODE_SHOW_CONFIGS_STMT:
+    case QUERY_NODE_SHOW_CONNECTIONS_STMT:
+    case QUERY_NODE_SHOW_QUERIES_STMT:
+    case QUERY_NODE_SHOW_VNODES_STMT:
+    case QUERY_NODE_SHOW_APPS_STMT:
+    case QUERY_NODE_SHOW_SCORES_STMT:
+    case QUERY_NODE_SHOW_VARIABLE_STMT:
+    case QUERY_NODE_SHOW_CREATE_DATABASE_STMT:
+    case QUERY_NODE_SHOW_CREATE_TABLE_STMT:
+    case QUERY_NODE_SHOW_CREATE_STABLE_STMT:
+      break;
+    case QUERY_NODE_SHOW_TRANSACTIONS_STMT:
+      return collectMetaKeyFromShowTransactions(pCxt, (SShowStmt*)pStmt);
+    case QUERY_NODE_KILL_CONNECTION_STMT:
+    case QUERY_NODE_KILL_QUERY_STMT:
+    case QUERY_NODE_KILL_TRANSACTION_STMT:
+    default:
+      break;
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t collectMetaKey(SParseContext* pParseCxt, SQuery* pQuery) {
+  SCollectMetaKeyCxt cxt = {.pParseCxt = pParseCxt, .pMetaCache = taosMemoryCalloc(1, sizeof(SParseMetaCache))};
+  if (NULL == cxt.pMetaCache) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+  int32_t code = collectMetaKeyFromQuery(&cxt, pQuery->pRoot);
+  if (TSDB_CODE_SUCCESS == code) {
+    TSWAP(pQuery->pMetaCache, cxt.pMetaCache);
+  }
+  destroyCollectMetaKeyCxt(&cxt);
+  return code;
+}
diff --git a/source/libs/parser/src/parAuthenticator.c b/source/libs/parser/src/parAuthenticator.c
index 250e7910d6..2670e5710b 100644
--- a/source/libs/parser/src/parAuthenticator.c
+++ b/source/libs/parser/src/parAuthenticator.c
@@ -18,23 +18,30 @@
 #include "parInt.h"
 
 typedef struct SAuthCxt {
-  SParseContext* pParseCxt;
-  int32_t        errCode;
+  SParseContext*   pParseCxt;
+  SParseMetaCache* pMetaCache;
+  int32_t          errCode;
 } SAuthCxt;
 
 static int32_t authQuery(SAuthCxt* pCxt, SNode* pStmt);
 
-static int32_t checkAuth(SParseContext* pCxt, const char* pDbName, AUTH_TYPE type) {
-  if (pCxt->isSuperUser) {
+static int32_t checkAuth(SAuthCxt* pCxt, const char* pDbName, AUTH_TYPE type) {
+  SParseContext* pParseCxt = pCxt->pParseCxt;
+  if (pParseCxt->isSuperUser) {
     return TSDB_CODE_SUCCESS;
   }
   SName name;
-  tNameSetDbName(&name, pCxt->acctId, pDbName, strlen(pDbName));
+  tNameSetDbName(&name, pParseCxt->acctId, pDbName, strlen(pDbName));
   char dbFname[TSDB_DB_FNAME_LEN] = {0};
   tNameGetFullDbName(&name, dbFname);
+  int32_t code = TSDB_CODE_SUCCESS;
   bool    pass = false;
-  int32_t code =
-      catalogChkAuth(pCxt->pCatalog, pCxt->pTransporter, &pCxt->mgmtEpSet, pCxt->pUser, dbFname, type, &pass);
+  if (NULL != pCxt->pMetaCache) {
+    code = getUserAuthFromCache(pCxt->pMetaCache, pParseCxt->pUser, dbFname, type, &pass);
+  } else {
+    code = catalogChkAuth(pParseCxt->pCatalog, pParseCxt->pTransporter, &pParseCxt->mgmtEpSet, pParseCxt->pUser,
+                          dbFname, type, &pass);
+  }
   return TSDB_CODE_SUCCESS == code ? (pass ? TSDB_CODE_SUCCESS : TSDB_CODE_PAR_PERMISSION_DENIED) : code;
 }
 
@@ -45,7 +52,7 @@ static EDealRes authSubquery(SAuthCxt* pCxt, SNode* pStmt) {
 static EDealRes authSelectImpl(SNode* pNode, void* pContext) {
   SAuthCxt* pCxt = pContext;
   if (QUERY_NODE_REAL_TABLE == nodeType(pNode)) {
-    pCxt->errCode = checkAuth(pCxt->pParseCxt, ((SRealTableNode*)pNode)->table.dbName, AUTH_TYPE_READ);
+    pCxt->errCode = checkAuth(pCxt, ((SRealTableNode*)pNode)->table.dbName, AUTH_TYPE_READ);
     return TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_CONTINUE : DEAL_RES_ERROR;
   } else if (QUERY_NODE_TEMP_TABLE == nodeType(pNode)) {
     return authSubquery(pCxt, ((STempTableNode*)pNode)->pSubquery);
@@ -79,87 +86,8 @@ static int32_t authQuery(SAuthCxt* pCxt, SNode* pStmt) {
       return authSetOperator(pCxt, (SSetOperator*)pStmt);
     case QUERY_NODE_SELECT_STMT:
       return authSelect(pCxt, (SSelectStmt*)pStmt);
-    case QUERY_NODE_CREATE_DATABASE_STMT:
-    case QUERY_NODE_DROP_DATABASE_STMT:
-    case QUERY_NODE_ALTER_DATABASE_STMT:
-    case QUERY_NODE_CREATE_TABLE_STMT:
-    case QUERY_NODE_CREATE_SUBTABLE_CLAUSE:
-    case QUERY_NODE_CREATE_MULTI_TABLE_STMT:
-    case QUERY_NODE_DROP_TABLE_CLAUSE:
-    case QUERY_NODE_DROP_TABLE_STMT:
-    case QUERY_NODE_DROP_SUPER_TABLE_STMT:
-    case QUERY_NODE_ALTER_TABLE_STMT:
-    case QUERY_NODE_CREATE_USER_STMT:
-    case QUERY_NODE_ALTER_USER_STMT:
-      break;
-    case QUERY_NODE_DROP_USER_STMT: {
+    case QUERY_NODE_DROP_USER_STMT:
       return authDropUser(pCxt, (SDropUserStmt*)pStmt);
-    }
-    case QUERY_NODE_USE_DATABASE_STMT:
-    case QUERY_NODE_CREATE_DNODE_STMT:
-    case QUERY_NODE_DROP_DNODE_STMT:
-    case QUERY_NODE_ALTER_DNODE_STMT:
-    case QUERY_NODE_CREATE_INDEX_STMT:
-    case QUERY_NODE_DROP_INDEX_STMT:
-    case QUERY_NODE_CREATE_QNODE_STMT:
-    case QUERY_NODE_DROP_QNODE_STMT:
-    case QUERY_NODE_CREATE_BNODE_STMT:
-    case QUERY_NODE_DROP_BNODE_STMT:
-    case QUERY_NODE_CREATE_SNODE_STMT:
-    case QUERY_NODE_DROP_SNODE_STMT:
-    case QUERY_NODE_CREATE_MNODE_STMT:
-    case QUERY_NODE_DROP_MNODE_STMT:
-    case QUERY_NODE_CREATE_TOPIC_STMT:
-    case QUERY_NODE_DROP_TOPIC_STMT:
-    case QUERY_NODE_ALTER_LOCAL_STMT:
-    case QUERY_NODE_EXPLAIN_STMT:
-    case QUERY_NODE_DESCRIBE_STMT:
-    case QUERY_NODE_RESET_QUERY_CACHE_STMT:
-    case QUERY_NODE_COMPACT_STMT:
-    case QUERY_NODE_CREATE_FUNCTION_STMT:
-    case QUERY_NODE_DROP_FUNCTION_STMT:
-    case QUERY_NODE_CREATE_STREAM_STMT:
-    case QUERY_NODE_DROP_STREAM_STMT:
-    case QUERY_NODE_MERGE_VGROUP_STMT:
-    case QUERY_NODE_REDISTRIBUTE_VGROUP_STMT:
-    case QUERY_NODE_SPLIT_VGROUP_STMT:
-    case QUERY_NODE_SYNCDB_STMT:
-    case QUERY_NODE_GRANT_STMT:
-    case QUERY_NODE_REVOKE_STMT:
-    case QUERY_NODE_SHOW_DNODES_STMT:
-    case QUERY_NODE_SHOW_MNODES_STMT:
-    case QUERY_NODE_SHOW_MODULES_STMT:
-    case QUERY_NODE_SHOW_QNODES_STMT:
-    case QUERY_NODE_SHOW_SNODES_STMT:
-    case QUERY_NODE_SHOW_BNODES_STMT:
-    case QUERY_NODE_SHOW_CLUSTER_STMT:
-    case QUERY_NODE_SHOW_DATABASES_STMT:
-    case QUERY_NODE_SHOW_FUNCTIONS_STMT:
-    case QUERY_NODE_SHOW_INDEXES_STMT:
-    case QUERY_NODE_SHOW_STABLES_STMT:
-    case QUERY_NODE_SHOW_STREAMS_STMT:
-    case QUERY_NODE_SHOW_TABLES_STMT:
-    case QUERY_NODE_SHOW_USERS_STMT:
-    case QUERY_NODE_SHOW_LICENCE_STMT:
-    case QUERY_NODE_SHOW_VGROUPS_STMT:
-    case QUERY_NODE_SHOW_TOPICS_STMT:
-    case QUERY_NODE_SHOW_CONSUMERS_STMT:
-    case QUERY_NODE_SHOW_SUBSCRIBES_STMT:
-    case QUERY_NODE_SHOW_SMAS_STMT:
-    case QUERY_NODE_SHOW_CONFIGS_STMT:
-    case QUERY_NODE_SHOW_CONNECTIONS_STMT:
-    case QUERY_NODE_SHOW_QUERIES_STMT:
-    case QUERY_NODE_SHOW_VNODES_STMT:
-    case QUERY_NODE_SHOW_APPS_STMT:
-    case QUERY_NODE_SHOW_SCORES_STMT:
-    case QUERY_NODE_SHOW_VARIABLE_STMT:
-    case QUERY_NODE_SHOW_CREATE_DATABASE_STMT:
-    case QUERY_NODE_SHOW_CREATE_TABLE_STMT:
-    case QUERY_NODE_SHOW_CREATE_STABLE_STMT:
-    case QUERY_NODE_SHOW_TRANSACTIONS_STMT:
-    case QUERY_NODE_KILL_CONNECTION_STMT:
-    case QUERY_NODE_KILL_QUERY_STMT:
-    case QUERY_NODE_KILL_TRANSACTION_STMT:
     default:
       break;
   }
@@ -168,6 +96,6 @@ static int32_t authQuery(SAuthCxt* pCxt, SNode* pStmt) {
 }
 
 int32_t authenticate(SParseContext* pParseCxt, SQuery* pQuery) {
-  SAuthCxt cxt = {.pParseCxt = pParseCxt, .errCode = TSDB_CODE_SUCCESS};
+  SAuthCxt cxt = {.pParseCxt = pParseCxt, .pMetaCache = pQuery->pMetaCache, .errCode = TSDB_CODE_SUCCESS};
   return authQuery(&cxt, pQuery->pRoot);
 }
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index d142d89373..d84b005f7f 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -152,7 +152,7 @@ static int32_t getDBVgInfoImpl(STranslateContext* pCxt, const SName* pName, SArr
   tNameGetFullDbName(pName, fullDbName);
   int32_t code = TSDB_CODE_SUCCESS;
   if (pParCxt->async) {
-    code = getDBVgInfoFromCache(pCxt->pMetaCache, fullDbName, pVgInfo);
+    code = getDbVgInfoFromCache(pCxt->pMetaCache, fullDbName, pVgInfo);
   } else {
     code = collectUseDatabaseImpl(fullDbName, pCxt->pDbs);
     if (TSDB_CODE_SUCCESS == code) {
@@ -177,7 +177,7 @@ static int32_t getTableHashVgroupImpl(STranslateContext* pCxt, const SName* pNam
   SParseContext* pParCxt = pCxt->pParseCxt;
   int32_t        code = TSDB_CODE_SUCCESS;
   if (pParCxt->async) {
-    code = getTableHashVgroupFromCache(pCxt->pMetaCache, pName, pInfo);
+    code = getTableVgroupFromCache(pCxt->pMetaCache, pName, pInfo);
   } else {
     code = collectUseDatabase(pName, pCxt->pDbs);
     if (TSDB_CODE_SUCCESS == code) {
@@ -205,7 +205,7 @@ static int32_t getDBVgVersion(STranslateContext* pCxt, const char* pDbFName, int
   SParseContext* pParCxt = pCxt->pParseCxt;
   int32_t        code = TSDB_CODE_SUCCESS;
   if (pParCxt->async) {
-    code = getDBVgVersionFromCache(pCxt->pMetaCache, pDbFName, pVersion, pDbId, pTableNum);
+    code = getDbVgVersionFromCache(pCxt->pMetaCache, pDbFName, pVersion, pDbId, pTableNum);
   } else {
     code = collectUseDatabaseImpl(pDbFName, pCxt->pDbs);
     if (TSDB_CODE_SUCCESS == code) {
@@ -226,7 +226,7 @@ static int32_t getDBCfg(STranslateContext* pCxt, const char* pDbName, SDbCfgInfo
   tNameGetFullDbName(&name, dbFname);
   int32_t code = TSDB_CODE_SUCCESS;
   if (pParCxt->async) {
-    code = getDBCfgFromCache(pCxt->pMetaCache, dbFname, pInfo);
+    code = getDbCfgFromCache(pCxt->pMetaCache, dbFname, pInfo);
   } else {
     code = collectUseDatabaseImpl(dbFname, pCxt->pDbs);
     if (TSDB_CODE_SUCCESS == code) {
@@ -239,6 +239,27 @@ static int32_t getDBCfg(STranslateContext* pCxt, const char* pDbName, SDbCfgInfo
   return code;
 }
 
+static int32_t getUdfInfo(STranslateContext* pCxt, SFunctionNode* pFunc) {
+  SParseContext* pParCxt = pCxt->pParseCxt;
+  SFuncInfo      funcInfo = {0};
+  int32_t        code = TSDB_CODE_SUCCESS;
+  if (pParCxt->async) {
+    code = getUdfInfoFromCache(pCxt->pMetaCache, pFunc->functionName, &funcInfo);
+  } else {
+    code = catalogGetUdfInfo(pParCxt->pCatalog, pParCxt->pTransporter, &pParCxt->mgmtEpSet, pFunc->functionName,
+                             &funcInfo);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    pFunc->funcType = FUNCTION_TYPE_UDF;
+    pFunc->funcId = TSDB_FUNC_TYPE_AGGREGATE == funcInfo.funcType ? FUNC_AGGREGATE_UDF_ID : FUNC_SCALAR_UDF_ID;
+    pFunc->node.resType.type = funcInfo.outputType;
+    pFunc->node.resType.bytes = funcInfo.outputLen;
+    pFunc->udfBufSize = funcInfo.bufSize;
+    tFreeSFuncInfo(&funcInfo);
+  }
+  return code;
+}
+
 static int32_t initTranslateContext(SParseContext* pParseCxt, SParseMetaCache* pMetaCache, STranslateContext* pCxt) {
   pCxt->pParseCxt = pParseCxt;
   pCxt->errCode = TSDB_CODE_SUCCESS;
@@ -873,12 +894,11 @@ static bool hasInvalidFuncNesting(SNodeList* pParameterList) {
 }
 
 static int32_t getFuncInfo(STranslateContext* pCxt, SFunctionNode* pFunc) {
-  SFmGetFuncInfoParam param = {.pCtg = pCxt->pParseCxt->pCatalog,
-                               .pRpc = pCxt->pParseCxt->pTransporter,
-                               .pMgmtEps = &pCxt->pParseCxt->mgmtEpSet,
-                               .pErrBuf = pCxt->msgBuf.buf,
-                               .errBufLen = pCxt->msgBuf.len};
-  return fmGetFuncInfo(&param, pFunc);
+  int32_t code = fmGetFuncInfo(pFunc, pCxt->msgBuf.buf, pCxt->msgBuf.len);
+  if (TSDB_CODE_FUNC_NOT_BUILTIN_FUNTION == code) {
+    code = getUdfInfo(pCxt, pFunc);
+  }
+  return code;
 }
 
 static int32_t translateAggFunc(STranslateContext* pCxt, SFunctionNode* pFunc) {
@@ -1212,7 +1232,6 @@ static int32_t setSysTableVgroupList(STranslateContext* pCxt, SName* pName, SRea
   int32_t code = TSDB_CODE_SUCCESS;
   SArray* vgroupList = NULL;
   if ('\0' != pRealTable->qualDbName[0]) {
-    // todo release after mnode can be processed
     if (0 != strcmp(pRealTable->qualDbName, TSDB_INFORMATION_SCHEMA_DB)) {
       code = getDBVgInfo(pCxt, pRealTable->qualDbName, &vgroupList);
     }
@@ -1220,7 +1239,6 @@ static int32_t setSysTableVgroupList(STranslateContext* pCxt, SName* pName, SRea
     code = getDBVgInfoImpl(pCxt, pName, &vgroupList);
   }
 
-  // todo release after mnode can be processed
   if (TSDB_CODE_SUCCESS == code) {
     code = addMnodeToVgroupList(&pCxt->pParseCxt->mgmtEpSet, &vgroupList);
   }
diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
index 9de43b8cd3..34b0199154 100644
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@@ -15,6 +15,9 @@
 
 #include "parUtil.h"
 #include "cJSON.h"
+#include "querynodes.h"
+
+#define USER_AUTH_KEY_MAX_LEN TSDB_USER_LEN + TSDB_DB_FNAME_LEN + 2
 
 static char* getSyntaxErrFormat(int32_t errCode) {
   switch (errCode) {
@@ -255,17 +258,8 @@ STableComInfo getTableInfo(const STableMeta* pTableMeta) {
   return pTableMeta->tableInfo;
 }
 
-static uint32_t getTableMetaSize(const STableMeta* pTableMeta) {
-  int32_t totalCols = 0;
-  if (pTableMeta->tableInfo.numOfColumns >= 0) {
-    totalCols = pTableMeta->tableInfo.numOfColumns + pTableMeta->tableInfo.numOfTags;
-  }
-
-  return sizeof(STableMeta) + totalCols * sizeof(SSchema);
-}
-
 STableMeta* tableMetaDup(const STableMeta* pTableMeta) {
-  size_t size = getTableMetaSize(pTableMeta);
+  size_t size = TABLE_META_SIZE(pTableMeta);
 
   STableMeta* p = taosMemoryMalloc(size);
   memcpy(p, pTableMeta, size);
@@ -449,6 +443,26 @@ end:
   return retCode;
 }
 
+static int32_t userAuthToString(int32_t acctId, const char* pUser, const char* pDb, AUTH_TYPE type, char* pStr) {
+  return sprintf(pStr, "%s*%d.%s*%d", pUser, acctId, pDb, type);
+}
+
+static int32_t userAuthToStringExt(const char* pUser, const char* pDbFName, AUTH_TYPE type, char* pStr) {
+  return sprintf(pStr, "%s*%s*%d", pUser, pDbFName, type);
+}
+
+static void stringToUserAuth(const char* pStr, int32_t len, SUserAuthInfo* pUserAuth) {
+  char* p1 = strchr(pStr, '*');
+  strncpy(pUserAuth->user, pStr, p1 - pStr);
+  ++p1;
+  char* p2 = strchr(p1, '*');
+  strncpy(pUserAuth->dbFName, p1, p2 - p1);
+  ++p2;
+  char buf[10] = {0};
+  strncpy(buf, p2, len - (p2 - pStr));
+  pUserAuth->type = taosStr2Int32(buf, NULL, 10);
+}
+
 static int32_t buildTableReq(SHashObj* pTablesHash, SArray** pTables) {
   if (NULL != pTablesHash) {
     *pTables = taosArrayInit(taosHashGetSize(pTablesHash), sizeof(SName));
@@ -503,6 +517,44 @@ static int32_t buildTableVgroupReq(SHashObj* pTableVgroupHash, SArray** pTableVg
 
 static int32_t buildDbCfgReq(SHashObj* pDbCfgHash, SArray** pDbCfg) { return buildDbReq(pDbCfgHash, pDbCfg); }
 
+static int32_t buildUserAuthReq(SHashObj* pUserAuthHash, SArray** pUserAuth) {
+  if (NULL != pUserAuthHash) {
+    *pUserAuth = taosArrayInit(taosHashGetSize(pUserAuthHash), sizeof(SUserAuthInfo));
+    if (NULL == *pUserAuth) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+    void* p = taosHashIterate(pUserAuthHash, NULL);
+    while (NULL != p) {
+      size_t        len = 0;
+      char*         pKey = taosHashGetKey(p, &len);
+      SUserAuthInfo userAuth = {0};
+      stringToUserAuth(pKey, len, &userAuth);
+      taosArrayPush(*pUserAuth, &userAuth);
+      p = taosHashIterate(pUserAuthHash, p);
+    }
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t buildUdfReq(SHashObj* pUdfHash, SArray** pUdf) {
+  if (NULL != pUdfHash) {
+    *pUdf = taosArrayInit(taosHashGetSize(pUdfHash), TSDB_FUNC_NAME_LEN);
+    if (NULL == *pUdf) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+    void* p = taosHashIterate(pUdfHash, NULL);
+    while (NULL != p) {
+      size_t len = 0;
+      char*  pFunc = taosHashGetKey(p, &len);
+      char   func[TSDB_FUNC_NAME_LEN] = {0};
+      strncpy(func, pFunc, len);
+      taosArrayPush(*pUdf, func);
+      p = taosHashIterate(pUdfHash, p);
+    }
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t buildCatalogReq(const SParseMetaCache* pMetaCache, SCatalogReq* pCatalogReq) {
   int32_t code = buildTableMetaReq(pMetaCache->pTableMeta, &pCatalogReq->pTableMeta);
   if (TSDB_CODE_SUCCESS == code) {
@@ -512,7 +564,13 @@ int32_t buildCatalogReq(const SParseMetaCache* pMetaCache, SCatalogReq* pCatalog
     code = buildTableVgroupReq(pMetaCache->pTableVgroup, &pCatalogReq->pTableHash);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    code = buildDbCfgReq(pMetaCache->pDbVgroup, &pCatalogReq->pDbCfg);
+    code = buildDbCfgReq(pMetaCache->pDbCfg, &pCatalogReq->pDbCfg);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = buildUserAuthReq(pMetaCache->pUserAuth, &pCatalogReq->pUser);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = buildUdfReq(pMetaCache->pUdf, &pCatalogReq->pUdf);
   }
   return code;
 }
@@ -568,6 +626,31 @@ static int32_t putDbCfgToCache(const SArray* pDbCfgReq, const SArray* pDbCfgData
   return TSDB_CODE_SUCCESS;
 }
 
+static int32_t putUserAuthToCache(const SArray* pUserAuthReq, const SArray* pUserAuthData, SHashObj* pUserAuth) {
+  int32_t nvgs = taosArrayGetSize(pUserAuthReq);
+  for (int32_t i = 0; i < nvgs; ++i) {
+    SUserAuthInfo* pUser = taosArrayGet(pUserAuthReq, i);
+    char           key[USER_AUTH_KEY_MAX_LEN] = {0};
+    int32_t        len = userAuthToStringExt(pUser->user, pUser->dbFName, pUser->type, key);
+    if (TSDB_CODE_SUCCESS != taosHashPut(pUserAuth, key, len, taosArrayGet(pUserAuthData, i), sizeof(bool))) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t putUdfToCache(const SArray* pUdfReq, const SArray* pUdfData, SHashObj* pUdf) {
+  int32_t num = taosArrayGetSize(pUdfReq);
+  for (int32_t i = 0; i < num; ++i) {
+    char*      pFunc = taosArrayGet(pUdfReq, i);
+    SFuncInfo* pInfo = taosArrayGet(pUdfData, i);
+    if (TSDB_CODE_SUCCESS != taosHashPut(pUdf, pFunc, strlen(pFunc), &pInfo, POINTER_BYTES)) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t putMetaDataToCache(const SCatalogReq* pCatalogReq, const SMetaData* pMetaData, SParseMetaCache* pMetaCache) {
   int32_t code = putTableMetaToCache(pCatalogReq->pTableMeta, pMetaData->pTableMeta, pMetaCache->pTableMeta);
   if (TSDB_CODE_SUCCESS == code) {
@@ -579,54 +662,161 @@ int32_t putMetaDataToCache(const SCatalogReq* pCatalogReq, const SMetaData* pMet
   if (TSDB_CODE_SUCCESS == code) {
     code = putDbCfgToCache(pCatalogReq->pDbCfg, pMetaData->pDbCfg, pMetaCache->pDbCfg);
   }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = putUserAuthToCache(pCatalogReq->pUser, pMetaData->pUser, pMetaCache->pUserAuth);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = putUdfToCache(pCatalogReq->pUdf, pMetaData->pUdfList, pMetaCache->pUdf);
+  }
   return code;
 }
 
-int32_t reserveTableMetaInCache(int32_t acctId, const char* pDb, const char* pTable, SParseMetaCache* pMetaCache) {
-  if (NULL == pMetaCache->pTableMeta) {
-    pMetaCache->pTableMeta = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
-    if (NULL == pMetaCache->pTableMeta) {
+static int32_t reserveTableReqInCache(int32_t acctId, const char* pDb, const char* pTable, SHashObj** pTables) {
+  if (NULL == *pTables) {
+    *pTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
+    if (NULL == *pTables) {
       return TSDB_CODE_OUT_OF_MEMORY;
     }
   }
   char    fullName[TSDB_TABLE_FNAME_LEN];
   int32_t len = snprintf(fullName, sizeof(fullName), "%d.%s.%s", acctId, pDb, pTable);
-  return taosHashPut(pMetaCache->pTableMeta, fullName, len, &len, POINTER_BYTES);
+  return taosHashPut(*pTables, fullName, len, &pTables, POINTER_BYTES);
+}
+
+int32_t reserveTableMetaInCache(int32_t acctId, const char* pDb, const char* pTable, SParseMetaCache* pMetaCache) {
+  return reserveTableReqInCache(acctId, pDb, pTable, &pMetaCache->pTableMeta);
 }
 
 int32_t getTableMetaFromCache(SParseMetaCache* pMetaCache, const SName* pName, STableMeta** pMeta) {
   char fullName[TSDB_TABLE_FNAME_LEN];
   tNameExtractFullName(pName, fullName);
-  *pMeta = taosHashGet(pMetaCache->pTableMeta, fullName, strlen(fullName));
-  return NULL == *pMeta ? TSDB_CODE_PAR_INTERNAL_ERROR : TSDB_CODE_SUCCESS;
+  STableMeta** pRes = taosHashGet(pMetaCache->pTableMeta, fullName, strlen(fullName));
+  if (NULL == pRes || NULL == *pRes) {
+    return TSDB_CODE_PAR_INTERNAL_ERROR;
+  }
+  *pMeta = tableMetaDup(*pRes);
+  if (NULL == *pMeta) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+  return TSDB_CODE_SUCCESS;
 }
 
-int32_t getDBVgInfoFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SArray** pVgInfo) {
-  *pVgInfo = taosHashGet(pMetaCache->pDbVgroup, pDbFName, strlen(pDbFName));
-  return NULL == *pVgInfo ? TSDB_CODE_PAR_INTERNAL_ERROR : TSDB_CODE_SUCCESS;
+static int32_t reserveDbReqInCache(int32_t acctId, const char* pDb, SHashObj** pDbs) {
+  if (NULL == *pDbs) {
+    *pDbs = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
+    if (NULL == *pDbs) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+  }
+  char    fullName[TSDB_TABLE_FNAME_LEN];
+  int32_t len = snprintf(fullName, sizeof(fullName), "%d.%s", acctId, pDb);
+  return taosHashPut(*pDbs, fullName, len, &pDbs, POINTER_BYTES);
 }
 
-int32_t getTableHashVgroupFromCache(SParseMetaCache* pMetaCache, const SName* pName, SVgroupInfo* pVgroup) {
+int32_t reserveDbVgInfoInCache(int32_t acctId, const char* pDb, SParseMetaCache* pMetaCache) {
+  return reserveDbReqInCache(acctId, pDb, &pMetaCache->pDbVgroup);
+}
+
+int32_t getDbVgInfoFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SArray** pVgInfo) {
+  SArray** pRes = taosHashGet(pMetaCache->pDbVgroup, pDbFName, strlen(pDbFName));
+  if (NULL == pRes) {
+    return TSDB_CODE_PAR_INTERNAL_ERROR;
+  }
+  // *pRes is null, which is a legal value, indicating that the user DB has not been created
+  if (NULL != *pRes) {
+    *pVgInfo = taosArrayDup(*pRes);
+    if (NULL == *pVgInfo) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t reserveTableVgroupInCache(int32_t acctId, const char* pDb, const char* pTable, SParseMetaCache* pMetaCache) {
+  return reserveTableReqInCache(acctId, pDb, pTable, &pMetaCache->pTableVgroup);
+}
+
+int32_t getTableVgroupFromCache(SParseMetaCache* pMetaCache, const SName* pName, SVgroupInfo* pVgroup) {
   char fullName[TSDB_TABLE_FNAME_LEN];
   tNameExtractFullName(pName, fullName);
-  SVgroupInfo* pInfo = taosHashGet(pMetaCache->pTableVgroup, fullName, strlen(fullName));
-  if (NULL == pInfo) {
+  SVgroupInfo** pRes = taosHashGet(pMetaCache->pTableVgroup, fullName, strlen(fullName));
+  if (NULL == pRes || NULL == *pRes) {
     return TSDB_CODE_PAR_INTERNAL_ERROR;
   }
-  memcpy(pVgroup, pInfo, sizeof(SVgroupInfo));
+  memcpy(pVgroup, *pRes, sizeof(SVgroupInfo));
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t getDBVgVersionFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, int32_t* pVersion, int64_t* pDbId,
+int32_t reserveDbVgVersionInCache(int32_t acctId, const char* pDb, SParseMetaCache* pMetaCache) {
+  return reserveDbReqInCache(acctId, pDb, &pMetaCache->pDbCfg);
+}
+
+int32_t getDbVgVersionFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, int32_t* pVersion, int64_t* pDbId,
                                 int32_t* pTableNum) {
-  return TSDB_CODE_PAR_INTERNAL_ERROR;
-}
-
-int32_t getDBCfgFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SDbCfgInfo* pInfo) {
-  SDbCfgInfo* pDbCfg = taosHashGet(pMetaCache->pDbCfg, pDbFName, strlen(pDbFName));
-  if (NULL == pDbCfg) {
+  SDbInfo** pRes = taosHashGet(pMetaCache->pDbCfg, pDbFName, strlen(pDbFName));
+  if (NULL == pRes || NULL == *pRes) {
     return TSDB_CODE_PAR_INTERNAL_ERROR;
   }
-  memcpy(pInfo, pDbCfg, sizeof(SDbCfgInfo));
+  *pVersion = (*pRes)->vgVer;
+  *pDbId = (*pRes)->dbId;
+  *pTableNum = (*pRes)->tbNum;
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t reserveDbCfgInCache(int32_t acctId, const char* pDb, SParseMetaCache* pMetaCache) {
+  return reserveDbReqInCache(acctId, pDb, &pMetaCache->pDbCfg);
+}
+
+int32_t getDbCfgFromCache(SParseMetaCache* pMetaCache, const char* pDbFName, SDbCfgInfo* pInfo) {
+  SDbCfgInfo** pRes = taosHashGet(pMetaCache->pDbCfg, pDbFName, strlen(pDbFName));
+  if (NULL == pRes || NULL == *pRes) {
+    return TSDB_CODE_PAR_INTERNAL_ERROR;
+  }
+  memcpy(pInfo, *pRes, sizeof(SDbCfgInfo));
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t reserveUserAuthInCache(int32_t acctId, const char* pUser, const char* pDb, AUTH_TYPE type,
+                               SParseMetaCache* pMetaCache) {
+  if (NULL == pMetaCache->pUserAuth) {
+    pMetaCache->pUserAuth = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
+    if (NULL == pMetaCache->pUserAuth) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+  }
+  char    key[USER_AUTH_KEY_MAX_LEN] = {0};
+  int32_t len = userAuthToString(acctId, pUser, pDb, type, key);
+  bool    pass = false;
+  return taosHashPut(pMetaCache->pUserAuth, key, len, &pass, sizeof(pass));
+}
+
+int32_t getUserAuthFromCache(SParseMetaCache* pMetaCache, const char* pUser, const char* pDbFName, AUTH_TYPE type,
+                             bool* pPass) {
+  char    key[USER_AUTH_KEY_MAX_LEN] = {0};
+  int32_t len = userAuthToStringExt(pUser, pDbFName, type, key);
+  bool*   pRes = taosHashGet(pMetaCache->pUserAuth, key, len);
+  if (NULL == pRes) {
+    return TSDB_CODE_PAR_INTERNAL_ERROR;
+  }
+  *pPass = *pRes;
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t reserveUdfInCache(const char* pFunc, SParseMetaCache* pMetaCache) {
+  if (NULL == pMetaCache->pUdf) {
+    pMetaCache->pUdf = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
+    if (NULL == pMetaCache->pUdf) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+  }
+  return taosHashPut(pMetaCache->pUdf, pFunc, strlen(pFunc), &pMetaCache, POINTER_BYTES);
+}
+
+int32_t getUdfInfoFromCache(SParseMetaCache* pMetaCache, const char* pFunc, SFuncInfo* pInfo) {
+  SFuncInfo** pRes = taosHashGet(pMetaCache->pUdf, pFunc, strlen(pFunc));
+  if (NULL == pRes || NULL == *pRes) {
+    return TSDB_CODE_PAR_INTERNAL_ERROR;
+  }
+  memcpy(pInfo, *pRes, sizeof(SFuncInfo));
   return TSDB_CODE_SUCCESS;
 }
diff --git a/source/libs/parser/src/parser.c b/source/libs/parser/src/parser.c
index a9962b0444..deef477b5d 100644
--- a/source/libs/parser/src/parser.c
+++ b/source/libs/parser/src/parser.c
@@ -59,6 +59,14 @@ static int32_t parseSqlIntoAst(SParseContext* pCxt, SQuery** pQuery) {
   return code;
 }
 
+static int32_t syntaxParseSql(SParseContext* pCxt, SQuery** pQuery) {
+  int32_t code = parse(pCxt, pQuery);
+  if (TSDB_CODE_SUCCESS == code) {
+    code = collectMetaKey(pCxt, *pQuery);
+  }
+  return code;
+}
+
 static int32_t setValueByBindParam(SValueNode* pVal, TAOS_MULTI_BIND* pParam) {
   if (pParam->is_null && 1 == *(pParam->is_null)) {
     pVal->node.resType.type = TSDB_DATA_TYPE_NULL;
@@ -188,7 +196,7 @@ int32_t qSyntaxParseSql(SParseContext* pCxt, SQuery** pQuery, struct SCatalogReq
   if (qIsInsertSql(pCxt->pSql, pCxt->sqlLen)) {
     // todo insert sql
   } else {
-    code = parse(pCxt, pQuery);
+    code = syntaxParseSql(pCxt, pQuery);
   }
   if (TSDB_CODE_SUCCESS == code) {
     code = buildCatalogReq((*pQuery)->pMetaCache, pCatalogReq);
diff --git a/source/libs/parser/test/mockCatalog.cpp b/source/libs/parser/test/mockCatalog.cpp
index 19460fb87a..154f13ea68 100644
--- a/source/libs/parser/test/mockCatalog.cpp
+++ b/source/libs/parser/test/mockCatalog.cpp
@@ -103,7 +103,7 @@ void generatePerformanceSchema(MockCatalogService* mcs) {
   }
   {
     ITableBuilder& builder = mcs->createTableBuilder("performance_schema", "streams", TSDB_SYSTEM_TABLE, 1)
-        .addColumn("stream_name", TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN);
+                                 .addColumn("stream_name", TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN);
     builder.done();
   }
 }
@@ -157,6 +157,12 @@ void generateTestST1(MockCatalogService* mcs) {
   mcs->createSubTable("test", "st1", "st1s3", 1);
 }
 
+void generateFunctions(MockCatalogService* mcs) {
+  mcs->createFunction("udf1", TSDB_FUNC_TYPE_SCALAR, TSDB_DATA_TYPE_INT, tDataTypes[TSDB_DATA_TYPE_INT].bytes, 0);
+  mcs->createFunction("udf2", TSDB_FUNC_TYPE_AGGREGATE, TSDB_DATA_TYPE_DOUBLE, tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes,
+                      8);
+}
+
 }  // namespace
 
 int32_t __catalogGetHandle(const char* clusterId, struct SCatalog** catalogHandle) { return 0; }
@@ -196,6 +202,11 @@ int32_t __catalogChkAuth(SCatalog* pCtg, void* pRpc, const SEpSet* pMgmtEps, con
   return 0;
 }
 
+int32_t __catalogGetUdfInfo(SCatalog* pCtg, void* pTrans, const SEpSet* pMgmtEps, const char* funcName,
+                            SFuncInfo* pInfo) {
+  return g_mockCatalogService->catalogGetUdfInfo(funcName, pInfo);
+}
+
 void initMetaDataEnv() {
   g_mockCatalogService.reset(new MockCatalogService());
 
@@ -209,6 +220,7 @@ void initMetaDataEnv() {
   stub.set(catalogGetDBVgInfo, __catalogGetDBVgInfo);
   stub.set(catalogGetDBCfg, __catalogGetDBCfg);
   stub.set(catalogChkAuth, __catalogChkAuth);
+  stub.set(catalogGetUdfInfo, __catalogGetUdfInfo);
   // {
   //   AddrAny any("libcatalog.so");
   //   std::map<std::string,void*> result;
@@ -256,6 +268,7 @@ void generateMetaData() {
   generatePerformanceSchema(g_mockCatalogService.get());
   generateTestT1(g_mockCatalogService.get());
   generateTestST1(g_mockCatalogService.get());
+  generateFunctions(g_mockCatalogService.get());
   g_mockCatalogService->showTables();
 }
 
diff --git a/source/libs/parser/test/mockCatalogService.cpp b/source/libs/parser/test/mockCatalogService.cpp
index 9e9e5cd2af..1b03b96830 100644
--- a/source/libs/parser/test/mockCatalogService.cpp
+++ b/source/libs/parser/test/mockCatalogService.cpp
@@ -120,11 +120,35 @@ class MockCatalogServiceImpl {
     return copyTableVgroup(db, tNameGetTableName(pTableName), vgList);
   }
 
+  int32_t catalogGetUdfInfo(const std::string& funcName, SFuncInfo* pInfo) const {
+    auto it = udf_.find(funcName);
+    if (udf_.end() == it) {
+      return TSDB_CODE_FAILED;
+    }
+    memcpy(pInfo, it->second.get(), sizeof(SFuncInfo));
+    return TSDB_CODE_SUCCESS;
+  }
+
   int32_t catalogGetAllMeta(const SCatalogReq* pCatalogReq, SMetaData* pMetaData) const {
     int32_t code = getAllTableMeta(pCatalogReq->pTableMeta, &pMetaData->pTableMeta);
     if (TSDB_CODE_SUCCESS == code) {
       code = getAllTableVgroup(pCatalogReq->pTableHash, &pMetaData->pTableHash);
     }
+    if (TSDB_CODE_SUCCESS == code) {
+      code = getAllDbVgroup(pCatalogReq->pDbVgroup, &pMetaData->pDbVgroup);
+    }
+    if (TSDB_CODE_SUCCESS == code) {
+      code = getAllDbCfg(pCatalogReq->pDbCfg, &pMetaData->pDbCfg);
+    }
+    if (TSDB_CODE_SUCCESS == code) {
+      code = getAllDbInfo(pCatalogReq->pDbInfo, &pMetaData->pDbInfo);
+    }
+    if (TSDB_CODE_SUCCESS == code) {
+      code = getAllUserAuth(pCatalogReq->pUser, &pMetaData->pUser);
+    }
+    if (TSDB_CODE_SUCCESS == code) {
+      code = getAllUdf(pCatalogReq->pUdf, &pMetaData->pUdfList);
+    }
     return code;
   }
 
@@ -211,21 +235,21 @@ class MockCatalogServiceImpl {
     }
   }
 
-  std::shared_ptr<MockTableMeta> getTableMeta(const std::string& db, const std::string& tbname) const {
-    DbMetaCache::const_iterator it = meta_.find(db);
-    if (meta_.end() == it) {
-      return std::shared_ptr<MockTableMeta>();
-    }
-    TableMetaCache::const_iterator tit = it->second.find(tbname);
-    if (it->second.end() == tit) {
-      return std::shared_ptr<MockTableMeta>();
-    }
-    return tit->second;
+  void createFunction(const std::string& func, int8_t funcType, int8_t outputType, int32_t outputLen, int32_t bufSize) {
+    std::shared_ptr<SFuncInfo> info(new SFuncInfo);
+    strcpy(info->name, func.c_str());
+    info->funcType = funcType;
+    info->scriptType = TSDB_FUNC_SCRIPT_BIN_LIB;
+    info->outputType = outputType;
+    info->outputLen = outputLen;
+    info->bufSize = bufSize;
+    udf_.insert(std::make_pair(func, info));
   }
 
  private:
   typedef std::map<std::string, std::shared_ptr<MockTableMeta>> TableMetaCache;
   typedef std::map<std::string, TableMetaCache>                 DbMetaCache;
+  typedef std::map<std::string, std::shared_ptr<SFuncInfo>>     UdfMetaCache;
 
   std::string toDbname(const std::string& dbFullName) const {
     std::string::size_type n = dbFullName.find(".");
@@ -308,6 +332,18 @@ class MockCatalogServiceImpl {
     return TSDB_CODE_SUCCESS;
   }
 
+  std::shared_ptr<MockTableMeta> getTableMeta(const std::string& db, const std::string& tbname) const {
+    DbMetaCache::const_iterator it = meta_.find(db);
+    if (meta_.end() == it) {
+      return std::shared_ptr<MockTableMeta>();
+    }
+    TableMetaCache::const_iterator tit = it->second.find(tbname);
+    if (it->second.end() == tit) {
+      return std::shared_ptr<MockTableMeta>();
+    }
+    return tit->second;
+  }
+
   int32_t getAllTableMeta(SArray* pTableMetaReq, SArray** pTableMetaData) const {
     int32_t code = TSDB_CODE_SUCCESS;
     if (NULL != pTableMetaReq) {
@@ -330,12 +366,82 @@ class MockCatalogServiceImpl {
     int32_t code = TSDB_CODE_SUCCESS;
     if (NULL != pTableVgroupReq) {
       int32_t ntables = taosArrayGetSize(pTableVgroupReq);
-      *pTableVgroupData = taosArrayInit(ntables, POINTER_BYTES);
+      *pTableVgroupData = taosArrayInit(ntables, sizeof(SVgroupInfo));
       for (int32_t i = 0; i < ntables; ++i) {
-        SVgroupInfo* pVgInfo = (SVgroupInfo*)taosMemoryCalloc(1, sizeof(SVgroupInfo));
-        code = catalogGetTableHashVgroup((const SName*)taosArrayGet(pTableVgroupReq, i), pVgInfo);
+        SVgroupInfo vgInfo = {0};
+        code = catalogGetTableHashVgroup((const SName*)taosArrayGet(pTableVgroupReq, i), &vgInfo);
         if (TSDB_CODE_SUCCESS == code) {
-          taosArrayPush(*pTableVgroupData, &pVgInfo);
+          taosArrayPush(*pTableVgroupData, &vgInfo);
+        } else {
+          break;
+        }
+      }
+    }
+    return code;
+  }
+
+  int32_t getAllDbVgroup(SArray* pDbVgroupReq, SArray** pDbVgroupData) const {
+    int32_t code = TSDB_CODE_SUCCESS;
+    if (NULL != pDbVgroupReq) {
+      int32_t ndbs = taosArrayGetSize(pDbVgroupReq);
+      *pDbVgroupData = taosArrayInit(ndbs, POINTER_BYTES);
+      for (int32_t i = 0; i < ndbs; ++i) {
+        int64_t zeroVg = 0;
+        taosArrayPush(*pDbVgroupData, &zeroVg);
+      }
+    }
+    return code;
+  }
+
+  int32_t getAllDbCfg(SArray* pDbCfgReq, SArray** pDbCfgData) const {
+    int32_t code = TSDB_CODE_SUCCESS;
+    if (NULL != pDbCfgReq) {
+      int32_t ndbs = taosArrayGetSize(pDbCfgReq);
+      *pDbCfgData = taosArrayInit(ndbs, sizeof(SDbCfgInfo));
+      for (int32_t i = 0; i < ndbs; ++i) {
+        SDbCfgInfo dbCfg = {0};
+        taosArrayPush(*pDbCfgData, &dbCfg);
+      }
+    }
+    return code;
+  }
+
+  int32_t getAllDbInfo(SArray* pDbInfoReq, SArray** pDbInfoData) const {
+    int32_t code = TSDB_CODE_SUCCESS;
+    if (NULL != pDbInfoReq) {
+      int32_t ndbs = taosArrayGetSize(pDbInfoReq);
+      *pDbInfoData = taosArrayInit(ndbs, sizeof(SDbCfgInfo));
+      for (int32_t i = 0; i < ndbs; ++i) {
+        SDbInfo dbInfo = {0};
+        taosArrayPush(*pDbInfoData, &dbInfo);
+      }
+    }
+    return code;
+  }
+
+  int32_t getAllUserAuth(SArray* pUserAuthReq, SArray** pUserAuthData) const {
+    int32_t code = TSDB_CODE_SUCCESS;
+    if (NULL != pUserAuthReq) {
+      int32_t num = taosArrayGetSize(pUserAuthReq);
+      *pUserAuthData = taosArrayInit(num, sizeof(bool));
+      for (int32_t i = 0; i < num; ++i) {
+        bool pass = true;
+        taosArrayPush(*pUserAuthData, &pass);
+      }
+    }
+    return code;
+  }
+
+  int32_t getAllUdf(SArray* pUdfReq, SArray** pUdfData) const {
+    int32_t code = TSDB_CODE_SUCCESS;
+    if (NULL != pUdfReq) {
+      int32_t num = taosArrayGetSize(pUdfReq);
+      *pUdfData = taosArrayInit(num, sizeof(SFuncInfo));
+      for (int32_t i = 0; i < num; ++i) {
+        SFuncInfo info = {0};
+        code = catalogGetUdfInfo((char*)taosArrayGet(pUdfReq, i), &info);
+        if (TSDB_CODE_SUCCESS == code) {
+          taosArrayPush(*pUdfData, &info);
         } else {
           break;
         }
@@ -347,6 +453,7 @@ class MockCatalogServiceImpl {
   uint64_t                      id_;
   std::unique_ptr<TableBuilder> builder_;
   DbMetaCache                   meta_;
+  UdfMetaCache                  udf_;
 };
 
 MockCatalogService::MockCatalogService() : impl_(new MockCatalogServiceImpl()) {}
@@ -365,9 +472,9 @@ void MockCatalogService::createSubTable(const std::string& db, const std::string
 
 void MockCatalogService::showTables() const { impl_->showTables(); }
 
-std::shared_ptr<MockTableMeta> MockCatalogService::getTableMeta(const std::string& db,
-                                                                const std::string& tbname) const {
-  return impl_->getTableMeta(db, tbname);
+void MockCatalogService::createFunction(const std::string& func, int8_t funcType, int8_t outputType, int32_t outputLen,
+                                        int32_t bufSize) {
+  impl_->createFunction(func, funcType, outputType, outputLen, bufSize);
 }
 
 int32_t MockCatalogService::catalogGetTableMeta(const SName* pTableName, STableMeta** pTableMeta) const {
@@ -382,6 +489,10 @@ int32_t MockCatalogService::catalogGetTableDistVgInfo(const SName* pTableName, S
   return impl_->catalogGetTableDistVgInfo(pTableName, pVgList);
 }
 
+int32_t MockCatalogService::catalogGetUdfInfo(const std::string& funcName, SFuncInfo* pInfo) const {
+  return impl_->catalogGetUdfInfo(funcName, pInfo);
+}
+
 int32_t MockCatalogService::catalogGetAllMeta(const SCatalogReq* pCatalogReq, SMetaData* pMetaData) const {
   return impl_->catalogGetAllMeta(pCatalogReq, pMetaData);
 }
diff --git a/source/libs/parser/test/mockCatalogService.h b/source/libs/parser/test/mockCatalogService.h
index bfc35247fe..cb0f10e95b 100644
--- a/source/libs/parser/test/mockCatalogService.h
+++ b/source/libs/parser/test/mockCatalogService.h
@@ -56,11 +56,12 @@ class MockCatalogService {
                                     int32_t numOfColumns, int32_t numOfTags = 0);
   void createSubTable(const std::string& db, const std::string& stbname, const std::string& tbname, int16_t vgid);
   void showTables() const;
-  std::shared_ptr<MockTableMeta> getTableMeta(const std::string& db, const std::string& tbname) const;
+  void createFunction(const std::string& func, int8_t funcType, int8_t outputType, int32_t outputLen, int32_t bufSize);
 
   int32_t catalogGetTableMeta(const SName* pTableName, STableMeta** pTableMeta) const;
   int32_t catalogGetTableHashVgroup(const SName* pTableName, SVgroupInfo* vgInfo) const;
   int32_t catalogGetTableDistVgInfo(const SName* pTableName, SArray** pVgList) const;
+  int32_t catalogGetUdfInfo(const std::string& funcName, SFuncInfo* pInfo) const;
   int32_t catalogGetAllMeta(const SCatalogReq* pCatalogReq, SMetaData* pMetaData) const;
 
  private:
diff --git a/source/libs/parser/test/parInitialCTest.cpp b/source/libs/parser/test/parInitialCTest.cpp
index a5e7ef51a7..e55f36376c 100644
--- a/source/libs/parser/test/parInitialCTest.cpp
+++ b/source/libs/parser/test/parInitialCTest.cpp
@@ -228,7 +228,44 @@ TEST_F(ParserInitialCTest, createDnode) {
   run("CREATE DNODE 1.1.1.1 PORT 9000");
 }
 
-// todo CREATE FUNCTION
+// CREATE [AGGREGATE] FUNCTION [IF NOT EXISTS] func_name AS library_path OUTPUTTYPE type_name [BUFSIZE value]
+TEST_F(ParserInitialCTest, createFunction) {
+  useDb("root", "test");
+
+  SCreateFuncReq expect = {0};
+
+  auto setCreateFuncReqFunc = [&](const char* pUdfName, int8_t outputType, int32_t outputBytes = 0,
+                                  int8_t funcType = TSDB_FUNC_TYPE_SCALAR, int8_t igExists = 0, int32_t bufSize = 0) {
+    memset(&expect, 0, sizeof(SCreateFuncReq));
+    strcpy(expect.name, pUdfName);
+    expect.igExists = igExists;
+    expect.funcType = funcType;
+    expect.scriptType = TSDB_FUNC_SCRIPT_BIN_LIB;
+    expect.outputType = outputType;
+    expect.outputLen = outputBytes > 0 ? outputBytes : tDataTypes[outputType].bytes;
+    expect.bufSize = bufSize;
+  };
+
+  setCheckDdlFunc([&](const SQuery* pQuery, ParserStage stage) {
+    ASSERT_EQ(nodeType(pQuery->pRoot), QUERY_NODE_CREATE_FUNCTION_STMT);
+    SCreateFuncReq req = {0};
+    ASSERT_TRUE(TSDB_CODE_SUCCESS == tDeserializeSCreateFuncReq(pQuery->pCmdMsg->pMsg, pQuery->pCmdMsg->msgLen, &req));
+
+    ASSERT_EQ(std::string(req.name), std::string(expect.name));
+    ASSERT_EQ(req.igExists, expect.igExists);
+    ASSERT_EQ(req.funcType, expect.funcType);
+    ASSERT_EQ(req.scriptType, expect.scriptType);
+    ASSERT_EQ(req.outputType, expect.outputType);
+    ASSERT_EQ(req.outputLen, expect.outputLen);
+    ASSERT_EQ(req.bufSize, expect.bufSize);
+  });
+
+  setCreateFuncReqFunc("udf1", TSDB_DATA_TYPE_INT);
+  // run("CREATE FUNCTION udf1 AS './build/lib/libudf1.so' OUTPUTTYPE INT");
+
+  setCreateFuncReqFunc("udf2", TSDB_DATA_TYPE_DOUBLE, 0, TSDB_FUNC_TYPE_AGGREGATE, 1, 8);
+  // run("CREATE AGGREGATE FUNCTION IF NOT EXISTS udf2 AS './build/lib/libudf2.so' OUTPUTTYPE DOUBLE BUFSIZE 8");
+}
 
 TEST_F(ParserInitialCTest, createIndexSma) {
   useDb("root", "test");
diff --git a/source/libs/parser/test/parInitialDTest.cpp b/source/libs/parser/test/parInitialDTest.cpp
index 7cf3337fea..57d349e7ee 100644
--- a/source/libs/parser/test/parInitialDTest.cpp
+++ b/source/libs/parser/test/parInitialDTest.cpp
@@ -103,6 +103,7 @@ TEST_F(ParserInitialDTest, dropTopic) {
 }
 
 TEST_F(ParserInitialDTest, dropUser) {
+  login("root");
   useDb("root", "test");
 
   run("drop user wxy");
diff --git a/source/libs/parser/test/parSelectTest.cpp b/source/libs/parser/test/parSelectTest.cpp
index f00500faa4..2d4fe41d4f 100644
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
@@ -141,6 +141,14 @@ TEST_F(ParserSelectTest, IndefiniteRowsFuncSemanticCheck) {
   // run("SELECT DIFF(c1) FROM t1 INTERVAL(10s)");
 }
 
+TEST_F(ParserSelectTest, useDefinedFunc) {
+  useDb("root", "test");
+
+  run("SELECT udf1(c1) FROM t1");
+
+  run("SELECT udf2(c1) FROM t1 GROUP BY c2");
+}
+
 TEST_F(ParserSelectTest, groupBy) {
   useDb("root", "test");
 
diff --git a/source/libs/parser/test/parTestMain.cpp b/source/libs/parser/test/parTestMain.cpp
index aadf8e7c66..820b8cca3c 100644
--- a/source/libs/parser/test/parTestMain.cpp
+++ b/source/libs/parser/test/parTestMain.cpp
@@ -37,6 +37,7 @@ class ParserEnv : public testing::Environment {
   virtual void SetUp() {
     initMetaDataEnv();
     generateMetaData();
+    initLog(TD_TMP_DIR_PATH "td");
   }
 
   virtual void TearDown() {
@@ -47,20 +48,55 @@ class ParserEnv : public testing::Environment {
 
   ParserEnv() {}
   virtual ~ParserEnv() {}
+
+ private:
+  void initLog(const char* path) {
+    int32_t logLevel = getLogLevel();
+    dDebugFlag = logLevel;
+    vDebugFlag = logLevel;
+    mDebugFlag = logLevel;
+    cDebugFlag = logLevel;
+    jniDebugFlag = logLevel;
+    tmrDebugFlag = logLevel;
+    uDebugFlag = logLevel;
+    rpcDebugFlag = logLevel;
+    qDebugFlag = logLevel;
+    wDebugFlag = logLevel;
+    sDebugFlag = logLevel;
+    tsdbDebugFlag = logLevel;
+    tsLogEmbedded = 1;
+    tsAsyncLog = 0;
+
+    taosRemoveDir(path);
+    taosMkDir(path);
+    tstrncpy(tsLogDir, path, PATH_MAX);
+    if (taosInitLog("taoslog", 1) != 0) {
+      std::cout << "failed to init log file" << std::endl;
+    }
+  }
 };
 
 static void parseArg(int argc, char* argv[]) {
-  int                  opt = 0;
-  const char*          optstring = "";
+  int         opt = 0;
+  const char* optstring = "";
+  // clang-format off
   static struct option long_options[] = {
-      {"dump", no_argument, NULL, 'd'}, {"async", no_argument, NULL, 'a'}, {0, 0, 0, 0}};
+    {"dump", no_argument, NULL, 'd'},
+    {"async", required_argument, NULL, 'a'},
+    {"skipSql", required_argument, NULL, 's'},
+    {0, 0, 0, 0}
+  };
+  // clang-format on
   while ((opt = getopt_long(argc, argv, optstring, long_options, NULL)) != -1) {
     switch (opt) {
       case 'd':
         g_dump = true;
         break;
       case 'a':
-        g_testAsyncApis = true;
+        setAsyncFlag(optarg);
+        break;
+      case 's':
+        setSkipSqlNum(optarg);
         break;
       default:
         break;
diff --git a/source/libs/parser/test/parTestUtil.cpp b/source/libs/parser/test/parTestUtil.cpp
index 8b15cc8a23..e0fe0de0e6 100644
--- a/source/libs/parser/test/parTestUtil.cpp
+++ b/source/libs/parser/test/parTestUtil.cpp
@@ -44,23 +44,40 @@ namespace ParserTest {
     }                                                                                                                \
   } while (0);
 
-bool g_dump = false;
-bool g_testAsyncApis = false;
+bool    g_dump = false;
+bool    g_testAsyncApis = true;
+int32_t g_logLevel = 131;
+int32_t g_skipSql = 0;
+
+void setAsyncFlag(const char* pFlag) { g_testAsyncApis = stoi(pFlag) > 0 ? true : false; }
+void setSkipSqlNum(const char* pNum) { g_skipSql = stoi(optarg); }
 
 struct TerminateFlag : public exception {
   const char* what() const throw() { return "success and terminate"; }
 };
 
+void setLogLevel(const char* pLogLevel) { g_logLevel = stoi(pLogLevel); }
+
+int32_t getLogLevel() { return g_logLevel; }
+
 class ParserTestBaseImpl {
  public:
   ParserTestBaseImpl(ParserTestBase* pBase) : pBase_(pBase) {}
 
+  void login(const std::string& user) { caseEnv_.user_ = user; }
+
   void useDb(const string& acctId, const string& db) {
     caseEnv_.acctId_ = acctId;
     caseEnv_.db_ = db;
+    caseEnv_.nsql_ = g_skipSql;
   }
 
   void run(const string& sql, int32_t expect, ParserStage checkStage) {
+    if (caseEnv_.nsql_ > 0) {
+      --(caseEnv_.nsql_);
+      return;
+    }
+
     reset(expect, checkStage);
     try {
       SParseContext cxt = {0};
@@ -69,6 +86,8 @@ class ParserTestBaseImpl {
       SQuery* pQuery = nullptr;
       doParse(&cxt, &pQuery);
 
+      doAuthenticate(&cxt, pQuery);
+
       doTranslate(&cxt, pQuery);
 
       doCalculateConstant(&cxt, pQuery);
@@ -89,59 +108,14 @@ class ParserTestBaseImpl {
     }
   }
 
-  void runAsync(const string& sql, int32_t expect, ParserStage checkStage) {
-    reset(expect, checkStage);
-    try {
-      SParseContext cxt = {0};
-      setParseContext(sql, &cxt, true);
-
-      SQuery* pQuery = nullptr;
-      doParse(&cxt, &pQuery);
-
-      SCatalogReq catalogReq = {0};
-      doBuildCatalogReq(pQuery->pMetaCache, &catalogReq);
-
-      string err;
-      thread t1([&]() {
-        try {
-          SMetaData metaData = {0};
-          doGetAllMeta(&catalogReq, &metaData);
-
-          doPutMetaDataToCache(&catalogReq, &metaData, pQuery->pMetaCache);
-
-          doTranslate(&cxt, pQuery);
-
-          doCalculateConstant(&cxt, pQuery);
-        } catch (const TerminateFlag& e) {
-          // success and terminate
-        } catch (const runtime_error& e) {
-          err = e.what();
-        } catch (...) {
-          err = "unknown error";
-        }
-      });
-
-      t1.join();
-      if (!err.empty()) {
-        throw runtime_error(err);
-      }
-
-      if (g_dump) {
-        dump();
-      }
-    } catch (const TerminateFlag& e) {
-      // success and terminate
-      return;
-    } catch (...) {
-      dump();
-      throw;
-    }
-  }
-
  private:
   struct caseEnv {
-    string acctId_;
-    string db_;
+    string  acctId_;
+    string  user_;
+    string  db_;
+    int32_t nsql_;
+
+    caseEnv() : user_("wangxiaoyu"), nsql_(0) {}
   };
 
   struct stmtEnv {
@@ -207,6 +181,8 @@ class ParserTestBaseImpl {
 
     pCxt->acctId = atoi(caseEnv_.acctId_.c_str());
     pCxt->db = caseEnv_.db_.c_str();
+    pCxt->pUser = caseEnv_.user_.c_str();
+    pCxt->isSuperUser = caseEnv_.user_ == "root";
     pCxt->pSql = stmtEnv_.sql_.c_str();
     pCxt->sqlLen = stmtEnv_.sql_.length();
     pCxt->pMsg = stmtEnv_.msgBuf_.data();
@@ -220,6 +196,11 @@ class ParserTestBaseImpl {
     res_.parsedAst_ = toString((*pQuery)->pRoot);
   }
 
+  void doCollectMetaKey(SParseContext* pCxt, SQuery* pQuery) {
+    DO_WITH_THROW(collectMetaKey, pCxt, pQuery);
+    ASSERT_NE(pQuery->pMetaCache, nullptr);
+  }
+
   void doBuildCatalogReq(const SParseMetaCache* pMetaCache, SCatalogReq* pCatalogReq) {
     DO_WITH_THROW(buildCatalogReq, pMetaCache, pCatalogReq);
   }
@@ -232,6 +213,8 @@ class ParserTestBaseImpl {
     DO_WITH_THROW(putMetaDataToCache, pCatalogReq, pMetaData, pMetaCache);
   }
 
+  void doAuthenticate(SParseContext* pCxt, SQuery* pQuery) { DO_WITH_THROW(authenticate, pCxt, pQuery); }
+
   void doTranslate(SParseContext* pCxt, SQuery* pQuery) {
     DO_WITH_THROW(translate, pCxt, pQuery);
     checkQuery(pQuery, PARSER_STAGE_TRANSLATE);
@@ -254,6 +237,59 @@ class ParserTestBaseImpl {
 
   void checkQuery(const SQuery* pQuery, ParserStage stage) { pBase_->checkDdl(pQuery, stage); }
 
+  void runAsync(const string& sql, int32_t expect, ParserStage checkStage) {
+    reset(expect, checkStage);
+    try {
+      SParseContext cxt = {0};
+      setParseContext(sql, &cxt, true);
+
+      SQuery* pQuery = nullptr;
+      doParse(&cxt, &pQuery);
+
+      doCollectMetaKey(&cxt, pQuery);
+
+      SCatalogReq catalogReq = {0};
+      doBuildCatalogReq(pQuery->pMetaCache, &catalogReq);
+
+      string err;
+      thread t1([&]() {
+        try {
+          SMetaData metaData = {0};
+          doGetAllMeta(&catalogReq, &metaData);
+
+          doPutMetaDataToCache(&catalogReq, &metaData, pQuery->pMetaCache);
+
+          doAuthenticate(&cxt, pQuery);
+
+          doTranslate(&cxt, pQuery);
+
+          doCalculateConstant(&cxt, pQuery);
+        } catch (const TerminateFlag& e) {
+          // success and terminate
+        } catch (const runtime_error& e) {
+          err = e.what();
+        } catch (...) {
+          err = "unknown error";
+        }
+      });
+
+      t1.join();
+      if (!err.empty()) {
+        throw runtime_error(err);
+      }
+
+      if (g_dump) {
+        dump();
+      }
+    } catch (const TerminateFlag& e) {
+      // success and terminate
+      return;
+    } catch (...) {
+      dump();
+      throw;
+    }
+  }
+
   caseEnv         caseEnv_;
   stmtEnv         stmtEnv_;
   stmtRes         res_;
@@ -264,16 +300,14 @@ ParserTestBase::ParserTestBase() : impl_(new ParserTestBaseImpl(this)) {}
 
 ParserTestBase::~ParserTestBase() {}
 
+void ParserTestBase::login(const std::string& user) { return impl_->login(user); }
+
 void ParserTestBase::useDb(const std::string& acctId, const std::string& db) { impl_->useDb(acctId, db); }
 
 void ParserTestBase::run(const std::string& sql, int32_t expect, ParserStage checkStage) {
   return impl_->run(sql, expect, checkStage);
 }
 
-void ParserTestBase::runAsync(const std::string& sql, int32_t expect, ParserStage checkStage) {
-  return impl_->runAsync(sql, expect, checkStage);
-}
-
 void ParserTestBase::checkDdl(const SQuery* pQuery, ParserStage stage) { return; }
 
 }  // namespace ParserTest
diff --git a/source/libs/parser/test/parTestUtil.h b/source/libs/parser/test/parTestUtil.h
index 43feb3d5f1..44be7a2474 100644
--- a/source/libs/parser/test/parTestUtil.h
+++ b/source/libs/parser/test/parTestUtil.h
@@ -34,9 +34,9 @@ class ParserTestBase : public testing::Test {
   ParserTestBase();
   virtual ~ParserTestBase();
 
+  void login(const std::string& user);
   void useDb(const std::string& acctId, const std::string& db);
   void run(const std::string& sql, int32_t expect = TSDB_CODE_SUCCESS, ParserStage checkStage = PARSER_STAGE_ALL);
-  void runAsync(const std::string& sql, int32_t expect = TSDB_CODE_SUCCESS, ParserStage checkStage = PARSER_STAGE_ALL);
 
   virtual void checkDdl(const SQuery* pQuery, ParserStage stage);
 
@@ -65,7 +65,11 @@ class ParserDdlTest : public ParserTestBase {
 };
 
 extern bool g_dump;
-extern bool g_testAsyncApis;
+
+extern void    setAsyncFlag(const char* pFlag);
+extern void    setLogLevel(const char* pLogLevel);
+extern int32_t getLogLevel();
+extern void    setSkipSqlNum(const char* pNum);
 
 }  // namespace ParserTest
 
diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim
deleted file mode 100644
index e36de29e7c..0000000000
--- a/tests/script/unique/account/account_create.sim
+++ /dev/null
@@ -1,80 +0,0 @@
-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 2000
-sql connect
-
-print ============================ dnode1 start
-
-$i = 0
-$dbPrefix = acdb
-$tbPrefix = actb
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-$accountPrefix = acac
-
-print =============== step1-4
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-$i = 0
-$acc = $accountPrefix . $i
-sql_error create account $acc PASS pass123
-sql create account $acc PASS 'pass123'
-#sql create account $acc PASS 'pass123' -x step1
-#	return -1
-#step1:
-sql create user $acc PASS 'pass123' -x step2
-	return -1
-step2:
-
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step5-6
-sql drop account $acc
-sql drop account $acc -x step5
-	return -1
-step5:
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step7
-sql create account $acc PASS 'pass123'
-#sql create account $acc PASS 'pass123' -x step7
-#	return -1
-#step7:
-
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-sql drop account $acc
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim
deleted file mode 100644
index d99a8b559d..0000000000
--- a/tests/script/unique/account/account_delete.sim
+++ /dev/null
@@ -1,99 +0,0 @@
-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 2000
-sql connect
-
-print ============= step1
-sql create account oroot pass 'taosdata' 
-sql close
-sql connect oroot
-sleep 2000
-
-print ============= step2
-sql create user read pass 'taosdata'
-sql create user write pass 'taosdata'
-
-sql create database d1
-sql create database d2
-sql create table d1.t1 (ts timestamp, i int)
-sql create table d2.t2 (ts timestamp, i int)
-sql insert into d1.t1 values(now, 1)
-sql insert into d2.t2 values(now, 1)
-sql insert into d2.t2 values(now+1s, 2)
-
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2 
-if $rows != 2 then 
-  return -1
-endi
-
-print ============= step3
-sql close
-sql connect
-sleep 2000
-
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-sql show dnodes
-print $data00 $data01 $data02 $data03
-if $data02 != 2 then
-  return -1
-endi
-sql drop account oroot
-
-print ============= step4
-$x = 0
-show4: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-		return -1
-	endi
-
-sql show dnodes
-if $data02 != 0 then
-  goto show4
-endi
-
-print ============= step5
-sql create account oroot pass 'taosdata'
-
-sql close
-sql connect oroot
-sleep 2000
-
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-sql show users
-if $rows != 2 then 
-  return -1
-endi
-
-sql close
-sql connect
-sleep 2000
-sql drop account oroot
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim
deleted file mode 100644
index f8379bdf95..0000000000
--- a/tests/script/unique/account/account_len.sim
+++ /dev/null
@@ -1,92 +0,0 @@
-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 2000
-sql connect
-
-$i = 0
-$dbPrefix = aldb
-$tbPrefix = altb
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-
-print =============== step1
-sql drop account ac -x step0
-	return -1
-step0:
-
-sql create account PASS 123 -x step1
-	return -1
-step1:
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-print =============== step2
-sql drop account a -x step2
-step2:
-sql create account a PASS '123'
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-sql drop account a
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-print =============== step3
-sql drop account abc01234567890123456789 -x step3
-step3:
-sql create account abc01234567890123456789 PASS '123'
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-sql drop account abc01234567890123456789
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-print =============== step4
-sql create account abcd01234567890123456789012345689012345 PASS '123' -x step4
-	return -1
-step4:
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-print =============== step5
-sql drop account 123 -x step5
-step5:
-sql create account 123 pass '123' -x step51
-  return -1
-step51:
-
-sql create account a123 PASS '123'
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-sql drop account a123
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim
deleted file mode 100644
index 8f2408de14..0000000000
--- a/tests/script/unique/account/authority.sim
+++ /dev/null
@@ -1,346 +0,0 @@
-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 2000
-sql connect
-
-print ============= step1
-
-sql create user read pass 'taosdata'
-sql create user write pass 'taosdata'
-sql create user manage pass 'taosdata'
-
-sql create user a PASS 'ade' privilege  -x step11
-  return -1
-step11:
-
-sql create user a PASS 'ade' privilege a -x step12
-  return -1
-step12:
-
-sql create user a PASS 'ade' privilege read -x step13
-  return -1
-step13:
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-
-sql alter user read privilege read
-sql alter user write privilege write
-sql_error alter user manage privilege super
-
-print ============= step2
-sql close
-sql connect write
-sleep 2000
-
-sql create database d1
-sql create database d2
-sql create table d1.t1 (ts timestamp, i int)
-sql create table d2.t2 (ts timestamp, i int)
-sql insert into d1.t1 values(now, 1)
-sql insert into d2.t2 values(now, 1)
-sql insert into d2.t2 values(now+1s, 2)
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2
-if $rows != 2 then 
-  return -1
-endi
-
-sql create account t1 pass 'taosdata' -x step21
-  return -1
-step21:
-
-sql create user t1 pass 'taosdata' -x step22
-  return -1
-step22:
-
-sql alter user read pass 'taosdata' -x step23
-  return -1
-step23:
-
-sql create dnode $hostname2 -x step24
-  return -1
-step24:
-
-sql drop dnode $hostname2 -x step25
-  return -1
-step25:
-
-sql create mnode 192.168.0.2 -x step26
-  return -1
-step26:
-
-sql drop mnode 192.168.0.2 -x step27
-  return -1
-step27:
-
-sql drop account root -x step28
-  return -1 
-step28:
-
-sql alter user write pass 'taosdata'
-
-print ============= step3
-sql close
-sql connect read
-sleep 2000
-
-sql create database d3 -x step31
-  return -1
-step31:
-
-sql create table d1.t3 (ts timestamp, i int) -x step32
-  return -1
-step32:
-
-#sql insert into d1.t1 values(now, 2) -x step33
-#  return -1
-#step33:
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-
-sql select * from d2.t2
-if $rows != 2 then 
-  return -1
-endi
-
-sql sql create account t1 pass 'taosdata' -x step34
-  return -1
-step34:
-
-sql sql create user t1 pass 'taosdata' -x step35
-  return -1
-step35:
-
-print ============= step4
-sql close
-sql connect manage
-sleep 2000
-
-sql create database d3
-sql create database d4
-sql create table d3.t3 (ts timestamp, i int)
-sql create table d4.t4 (ts timestamp, i int)
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-sql show databases
-if $rows != 4 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2
-if $rows != 2 then 
-  return -1
-endi
-
-sql create account other pass 'taosdata'  -x step41
-  return -1
-step41:  
-
-sql close
-sql connect
-sleep 2000
-sql create account other pass 'taosdata'
-
-print ============= step5
-sql close
-sql connect other
-sleep 2000
-sql create user read pass 'taosdata' -x step51
-  return -1
-step51:
-sql create other write pass 'taosdata' -x step52
-  return -1
-step52:
-
-sql create user oread pass 'taosdata'
-sql create user owrite pass 'taosdata'
-sql create user omanage pass 'taosdata' 
-
-sql show users
-print show users $rows
-if $rows != 5 then 
-  return -1
-endi
-
-sql alter user oread privilege read
-sql alter user owrite privilege write
-sql alter user oroot privilege super -x step53
-  return -1
-step53:
-sql alter user read privilege read -x step54
-  return -1
-step54:
-
-print ============= step6
-sql close
-sql connect owrite
-sleep 2000
-sql reset query cache
-sleep 1000
-sql create database d1
-sql create database d3
-sql create table d1.t1 (ts timestamp, i int)
-sql create table d3.t3 (ts timestamp, i int)
-sql insert into d1.t1 values(now, 11)
-sql insert into d3.t3 values(now, 11)
-sql insert into d3.t3 values(now+1s, 12)
-
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2 -x step6
-  return -1
-step6:
-sql select * from d3.t3
-if $rows != 2 then 
-  return -1
-endi
-
-sql sql create account t1 pass 'taosdata' -x step61
-  return -1
-step61:
-
-sql sql create user t1 pass 'taosdata' -x step62
-  return -1
-step62:
-
-print ============= step7
-sql close
-sql connect oread
-sleep 2000
-
-sql create database d7 -x step71
-  return -1
-step71:
-
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2 -x step72
-  return -1
-step72:
-sql select * from d3.t3
-if $rows != 2 then 
-  return -1
-endi
-
-sql sql create account t1 pass 'taosdata' -x step73
-  return -1
-step73:
-
-sql sql create user t1 pass 'taosdata' -x step74
-  return -1
-step74:
-
-print ============= step8
-sql close
-sql connect omanage
-sleep 2000
-
-sql create account t1 pass 'taosdata' -x step81
-  return -1
-step81:
-
-sql create database d4
-sql create table d4.t4 (ts timestamp, i int)
-
-sql show databases
-if $rows != 3 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2 -x step82
-  return -1
-step82:
-sql select * from d3.t3
-if $rows != 2 then 
-  return -1
-endi
-
-print ============= step9
-sql close
-sql connect
-sleep 2000
-sql show databases
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop account other
-sql drop user read
-sql drop user manage
-sql drop user write
-
-sql close
-sql connect
-sleep 2000
-sql drop database d1
-sql drop database d2
-sql drop database d3
-sql drop database d4
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim
deleted file mode 100644
index 00e706a448..0000000000
--- a/tests/script/unique/account/basic.sim
+++ /dev/null
@@ -1,46 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sleep 2000
-sql connect
-
-print =============== show accounts
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-print $data00 $data01 $data02
-
-print =============== create account1
-sql create account account1 PASS 'account1'
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-print $data00 $data01 $data02
-print $data10 $data11 $data22
-
-print =============== create account2
-sql create account account2 PASS 'account2'
-sql show accounts
-if $rows != 3 then 
-  return -1
-endi
-
-print $data00 $data01 $data02
-print $data10 $data11 $data22
-print $data20 $data11 $data22
-
-print =============== drop account1
-sql drop account account1
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-print $data00 $data01 $data02
-print $data10 $data11 $data22
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim
deleted file mode 100644
index 102f5b6a38..0000000000
--- a/tests/script/unique/account/paras.sim
+++ /dev/null
@@ -1,114 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sleep 2000
-sql connect
-
-print =============== show accounts
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != root then 
-  return -1
-endi
-if $data02 != 3/128 then 
-  return -1
-endi
-if $data03 != 0/128 then 
-  return -1
-endi
-if $data04 != 0/2147483647 then 
-  return -1
-endi
-if $data05 != 0/1000 then 
-  return -1
-endi
-if $data06 != 0.000/unlimited then 
-  return -1
-endi
-
-print =============== create account
-sql create account hou pass "hou" tseries 80000 storage 10737418240 streams 10 qtime 3600 dbs 3 users 3 conns 10 
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-print $data10 $data11 $data12 $data13 $data14 $data15 $data16
-if $data10 != hou then 
-  return -1
-endi
-if $data12 != 2/3 then 
-  return -1
-endi
-if $data13 != 0/3 then 
-  return -1
-endi
-if $data14 != 0/80000 then 
-  return -1
-endi
-if $data15 != 0/10 then 
-  return -1
-endi
-if $data16 != 0.000/10.000 then 
-  return -1
-endi
-  
-print =============== alter account
-sql alter account hou pass "hou" tseries 8000 streams 10 dbs 5 users 5  
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-print $data10 $data11 $data12 $data13 $data14 $data15 $data16
-if $data10 != hou then 
-  return -1
-endi
-if $data12 != 2/5 then 
-  return -1
-endi
-if $data13 != 0/5 then 
-  return -1
-endi
-if $data14 != 0/8000 then 
-  return -1
-endi
-if $data15 != 0/10 then 
-  return -1
-endi
-if $data16 != 0.000/10.000 then 
-  return -1
-endi  
-
-print =============== alter account
-sql create account hou pass "hou" tseries 8000 streams 10 dbs 5 users 6
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-
-print $data10 $data11 $data12 $data13 $data14 $data15 $data16
-if $data10 != hou then 
-  return -1
-endi
-if $data12 != 2/6 then 
-  return -1
-endi
-if $data13 != 0/5 then 
-  return -1
-endi
-if $data14 != 0/8000 then 
-  return -1
-endi
-if $data15 != 0/10 then 
-  return -1
-endi
-if $data16 != 0.000/10.000 then 
-  return -1
-endi  
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim
deleted file mode 100644
index 8b857b014a..0000000000
--- a/tests/script/unique/account/pass_alter.sim
+++ /dev/null
@@ -1,116 +0,0 @@
-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 2000
-sql connect
-
-print ============= step1
-sql create user read pass 'taosdata1'
-sql create user write pass 'taosdata1'
-
-sql alter user read pass 'taosdata'
-sql alter user write pass 'taosdata'
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 5 then 
-  return -1
-endi
-
-print ============= step2
-sql close
-sql connect read
-sleep 2000
-sql alter user read pass 'taosdata'
-sql alter user write pass 'taosdata1' -x step2
-  return -1
-step2:
-
-
-print ============= step3
-sql close
-sql connect write
-sleep 2000
-sql alter user write pass 'taosdata'
-sql alter user read pass 'taosdata' -x step3
-  return -1
-step3:
-
-print ============= step4
-sql close 
-sleep 1000
-sql connect
-sleep 2000
-sql create account oroot pass 'taosdata'
-sql show accounts
-if $rows != 2 then 
-  return -1
-endi
-sql show users
-if $rows != 5 then 
-  return -1
-endi
-
-print ============= step5
-sql close
-sql connect oroot
-sleep 2000
-
-sql create user oread pass 'taosdata1'
-sql create user owrite pass 'taosdata1'
-sql alter user oread pass 'taosdata'
-sql alter user owrite pass 'taosdata'
-
-sql create user read pass 'taosdata1' -x step51
-  return -1
-step51:
-sql alter user read pass 'taosdata1' -x step52
-  return -1
-step52:
-
-sql show accounts -x step53
-  return -1
-step53:
-sql show users
-print show users $rows
-if $rows != 4 then 
-  return -1
-endi
-
-print ============= step6
-sql close
-sql connect oread
-sleep 2000
-sql alter user oread pass 'taosdata'
-sql alter user owrite pass 'taosdata1' -x step6
-  return -1
-step6:
-
-
-print ============= step7
-sql close
-sql connect owrite
-sleep 2000
-sql alter user owrite pass 'taosdata'
-sql alter user oread pass 'taosdata' -x step7
-  return -1
-step7:
-
-print ============= step8
-sql close
-sql connect
-sleep 2000
-sql alter user oread pass 'taosdata'
-sql alter user owrite pass 'taosdata'
-sql alter user oroot pass 'taosdata'
-
-sql drop account oroot
-sql drop user read
-sql drop user write
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim
deleted file mode 100644
index f4ceb76f7b..0000000000
--- a/tests/script/unique/account/pass_len.sim
+++ /dev/null
@@ -1,81 +0,0 @@
-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 2000
-sql connect
-
-$i = 0
-$dbPrefix = apdb
-$tbPrefix = aptb
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-$userPrefix = apusr
-
-print =============== step1
-$i = 0
-$user = $userPrefix . $i
-
-sql drop user $user -x step11
-  return -1
-step11:
-
-sql create user $user PASS -x step12
-  return -1
-step12:
-
-sql create user $user PASS 'taosdata'
-
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-print =============== step2
-$i = 1
-$user = $userPrefix . $i
-sql drop user $user -x step2
-step2:
-sql create user $user PASS '1'
-sql show users
-if $rows != 5 then 
-  return -1
-endi
-
-print =============== step3
-$i = 2
-$user = $userPrefix . $i
-sql drop user $user -x step3
-step3:
-
-sql create user $user PASS 'abc0123456789'
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-
-print =============== step4
-$i = 3
-$user = $userPrefix . $i
-sql create user $user PASS 'abcd012345678901234567891234567890' -x step4
-	return -1
-step4:
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-
-$i = 0
-while $i < 3
-  $user = $userPrefix . $i
-  sql drop user $user 
-  $i = $i + 1
-endw
-
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/testSuite.sim b/tests/script/unique/account/testSuite.sim
deleted file mode 100644
index 9d4141cfe0..0000000000
--- a/tests/script/unique/account/testSuite.sim
+++ /dev/null
@@ -1,11 +0,0 @@
-run unique/account/account_create.sim
-run unique/account/account_delete.sim
-run unique/account/account_len.sim
-run unique/account/authority.sim
-run unique/account/basic.sim
-run unique/account/paras.sim
-run unique/account/pass_alter.sim
-run unique/account/pass_len.sim
-run unique/account/usage.sim
-run unique/account/user_create.sim
-run unique/account/user_len.sim
diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim
deleted file mode 100644
index 3b9c20b159..0000000000
--- a/tests/script/unique/account/usage.sim
+++ /dev/null
@@ -1,154 +0,0 @@
-system sh/stop_dnodes.sh
-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 2000
-sql connect
-
-print =============== show accounts
-
-print =============== create account
-sql alter account root pass "taosdata" tseries 8000 streams 10 dbs 5 users 5  
-sql show accounts
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != root then 
-  return -1
-endi
-if $data02 != 3/5 then 
-  return -1
-endi
-if $data03 != 0/5 then 
-  return -1
-endi
-if $data04 != 0/8000 then 
-  return -1
-endi
-if $data05 != 0/10 then 
-  return -1
-endi
-if $data06 != 0.000/unlimited then 
-  return -1
-endi  
-
-print =============== check usage account
-sql create database d1 wal 2
-sql create database d2 wal 2
-sql create database d3 wal 2
-sql create database d4 wal 2
-sql create database d5 wal 2
-
-sql create table d1.t1 (ts timestamp, i int);
-sql create user u1 pass "u1"
-
-sql show accounts
-print $data10 $data11 $data12 $data13 $data14 $data15 $data16
-if $data00 != root then 
-  return -1
-endi
-if $data02 != 4/5 then 
-  return -1
-endi
-if $data03 != 5/5 then 
-  return -1
-endi
-if $data04 != 1/8000 then 
-  return -1
-endi
-if $data05 != 0/10 then 
-  return -1
-endi
-if $data06 != 0.000/unlimited then 
-  return -1
-endi
-
-print =============== step2
-sql alter account root pass "taosdata" tseries 10 storage 1073741824 streams 10 dbs 5 users 5
-sql show accounts
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != root then 
-  return -1
-endi
-if $data02 != 4/5 then 
-  return -1
-endi
-if $data03 != 5/5 then 
-  return -1
-endi
-if $data04 != 1/10 then 
-  return -1
-endi
-if $data05 != 0/10 then 
-  return -1
-endi
-if $data06 != 0.000/1.000 then 
-  return -1
-endi
-  
-print =============== step3
-sql alter account root pass "taosdata" tseries 10 storage 16 streams 10 dbs 5 users 5
-sql show accounts
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != root then 
-  return -1
-endi
-if $data02 != 4/5 then 
-  return -1
-endi
-if $data03 != 5/5 then 
-  return -1
-endi
-if $data04 != 1/10 then 
-  return -1
-endi
-if $data05 != 0/10 then 
-  return -1
-endi
-if $data06 != 0.000/0.000 then 
-  return -1
-endi
-
-print =============== step4
-sql insert into d1.t1 values(now + 1s, 1)
-sql insert into d1.t1 values(now + 2s, 2)
-
-sleep 10000
-print no write auth
-sql_error insert into d1.t1 values(now + 3s, 2)
-sql_error insert into d1.t1 values(now + 4s, 2)
-
-sql alter account root pass "taosdata" tseries 10 storage 36 streams 10 dbs 5 users 5
-sleep 10000
-print has write auth
-sql insert into d1.t1 values(now + 5s, 1)
-sql insert into d1.t1 values(now + 6s, 2)
-
-# no write auth
-sleep 10000
-print no write auth
-sql_error insert into d1.t1 values(now + 7s, 2)
-sql_error insert into d1.t1 values(now + 8s, 2)
-
-print =============== step5
-sql alter account root pass "taosdata" tseries 10 storage 3600 streams 10 dbs 5 users 5 state all
-sleep 10000
-
-sql insert into d1.t1 values(now + 11s, 1)
-sql insert into d1.t1 values(now + 12s, 2)
-
-sql alter account root pass "taosdata" tseries 10 storage 3600 streams 10 dbs 5 users 5 state no
-sleep 10000
-print no write auth
-sql_error insert into d1.t1 values(now + 13s, 2)
-sql_error insert into d1.t1 values(now + 14s, 2)
-
-sql alter account root pass "taosdata" tseries 10 storage 3600 streams 10 dbs 5 users 5 state all
-sleep 10000
-print has write auth
-sql insert into d1.t1 values(now + 15s, 1)
-sql insert into d1.t1 values(now + 16s, 2)
-
-print =============== check grant
-sql_error create database d6
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim
deleted file mode 100644
index e54a380f0d..0000000000
--- a/tests/script/unique/account/user_create.sim
+++ /dev/null
@@ -1,84 +0,0 @@
-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 2000
-sql connect
-
-print =============== step1
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-sql create user read PASS 'pass123'
-sql create user read PASS 'pass123' -x step1
-	return -1
-step1:
-
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql alter user read PASS 'taosdata'
-
-print =============== step2
-sql close
-sql connect read
-sleep 2000
-
-sql alter user read PASS 'taosdata'
-
-print =============== step3
-sql drop user read -x step31
-  return -1
-step31:
-sql drop user _root -x step32
-  return -1
-step32:
-sql drop user monitor -x step33
-  return -1
-step33:
-
-print =============== step4
-sql close
-sql connect
-sleep 2000
-
-sql alter user read privilege read
-sql show users
-print $data1_read
-if $data1_read != readable then 
-  return -1
-endi
-
-sql_error alter user read privilege super
-sql show users
-print $data1_read
-if $data1_read != readable then
-  return -1
-endi
-
-sql alter user read privilege write
-sql show users
-if $data1_read != writable then 
-  return -1
-endi
-
-sql alter user read privilege 1 -x step43
-  return -1
-step43:
-
-sql drop user _root -x step41
-  return -1
-step41:
-
-sql drop user monitor -x step42
-  return -1
-step42:
-
-sql drop user read
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim
deleted file mode 100644
index b8d448f0ff..0000000000
--- a/tests/script/unique/account/user_len.sim
+++ /dev/null
@@ -1,94 +0,0 @@
-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 2000
-sql connect
-
-$i = 0
-$dbPrefix = lm_us_db
-$tbPrefix = lm_us_tb
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-
-print =============== step1
-sql drop user ac -x step0
-	return -1
-step0:
-
-sql create user PASS '123' -x step1
-	return -1
-step1:
-
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step2
-sql drop user a -x step2
-step2:
-sleep 1000
-sql create user a PASS '123'
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop user a
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step3
-sql drop user abc01234567890123456789 -x step3
-step3:
-
-sql create user abc01234567890123456789 PASS '123'
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop user abc01234567890123456789
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step4
-sql create user abcd0123456789012345678901234567890111 PASS '123' -x step4
-	return -1
-step4:
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step5
-sql drop user 123 -x step5
-step5:
-sql create user 123 PASS '123' -x step61
-  return -1
-step61:
-
-sql create user a123 PASS '123'
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop user a123
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim
deleted file mode 100644
index ae206744c4..0000000000
--- a/tests/script/unique/http/admin.sim
+++ /dev/null
@@ -1,192 +0,0 @@
-system sh/stop_dnodes.sh
-
-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
-#system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
-system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-sleep 2000
-
-print ============================ dnode1 start
-
-print ===============  step0 - prepare data
-sql create database d1
-sql use d1
-
-sql create table table_admin (ts timestamp, i int)
-
-sql insert into table_admin values('2017-12-25 21:28:41.022', 1)
-sql insert into table_admin values('2017-12-25 21:28:42.022', 2)
-sql insert into table_admin values('2017-12-25 21:28:43.022', 3)
-sql insert into table_admin values('2017-12-25 21:28:44.022', 4)
-sql insert into table_admin values('2017-12-25 21:28:45.022', 5)
-sql insert into table_admin values('2017-12-25 21:28:46.022', 6)
-sql insert into table_admin values('2017-12-25 21:28:47.022', 7)
-sql insert into table_admin values('2017-12-25 21:28:48.022', 8)
-sql insert into table_admin values('2017-12-25 21:28:49.022', 9)
-sql insert into table_admin values('2017-12-25 21:28:50.022', 10)
-
-print ===============  step1 - login
-
-system_content curl 127.0.0.1:7111/admin/
-print 1-> $system_content
-if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
-  print actual: $system_content
-  return -1
-endi
-
-system_content curl 127.0.0.1:7111/admin/xx
-print 2-> $system_content
-if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
-  return -1
-endi
-
-system_content curl 127.0.0.1:7111/admin/login
-print 3-> $system_content
-if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
-  return -1
-endi
-
-system_content curl 127.0.0.1:7111/admin/login/root
-print 4-> $system_content
-if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
-  return -1
-endi
-
-system_content curl 127.0.0.1:7111/admin/login/root/123
-print 5-> $system_content
-if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
-  return -1
-endi
-
-system_content curl 127.0.0.1:7111/admin/login/root/123/1/1/3
-print 6-> $system_content
-if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
-  return -1
-endi
-
-system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.'  -d 'show databases' 127.0.0.1:7111/admin/login/root/1
-print 7-> $system_content
-if $system_content != @{"status":"error","code":4387,"desc":"invalid format of Authorization"}@ then
-  return -1
-endi
-
-system_content curl -H 'Authorization: Taosd eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi' 127.0.0.1:7111/admin/login/root/1
-print 8-> $system_content
-if $system_content != @{"status":"error","code":4387,"desc":"invalid format of Authorization"}@ then
-  return -1
-endi
-
-sleep 2000
-system_content curl 127.0.0.1:7111/admin/login/root/taosdata
-print 9 -----> $system_content
-
-if $system_content != {"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"} then
-  return -1
-endi
-
-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:7111/admin/login/root/1
-#print 10-> $system_content
-#if $system_content != @{"status":"error","code":29,"desc":"failed to connect to server"}@ then
-#  return -1
-#endi
-
-print ===============  step2 - logout
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'   127.0.0.1:7111/admin/logout
-print 10 -----> $system_content
-
-if $system_content != @{"status":"succ","code":0,"desc":"logout success"}@ then
-  return -1
-endi
-
-system_content curl  127.0.0.1:7111/admin/logout
-print 11 -----> $system_content
-
-if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
-  return -1
-endi
-
-print ===============  step3 - info
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  127.0.0.1:7111/admin/info
-print curl 127.0.0.1:7111/admin/info -----> $system_content
-if $system_content != {"status":"succ","data":[{"dbs":1,"tables":1,"users":3,"mnodes":1,"dnodes":1}]} then
-  return -1
-endi
-
-print ===============  step4 - meta
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show mnodes' 127.0.0.1:7111/admin/meta
-print curl 127.0.0.1:7111/admin/meta -----> $system_content
-#if $system_content != @{"status":"succ","head":["column type","column name","column bytes"],"data":[["binary","IP",16],["timestamp","created time",8],["binary","status",10],["binary","role",10],["binary","public ip",16]],"rows":5}@ then
-#  return -1
-#endi
-
-print ===============  step5 - query data
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/sql
-print curl 127.0.0.1:7111/admin/all -----> $system_content
-if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10]],"rows":10}@ then
-  return -1
-endi
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/sql
-print curl 127.0.0.1:7111/admin/sql -----> $system_content
-if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10]],"rows":10}@ then
-  return -1
-endi
-
-print ===============  step6 - insert data
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d "insert into d1.table_admin values('2017-12-25 21:28:51.022', 11)" 127.0.0.1:7111/admin/sql
-print curl 127.0.0.1:7111/admin/sql -----> $system_content
-if $system_content != @{"status":"succ","head":["affect_rows"],"data":[[1]],"rows":1}@ then
-  return -1
-endi
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/all
-print curl 127.0.0.1:7111/admin/all -----> $system_content
-if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}@ then
-  print actual: $system_content
-  print expect =======> {"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}
-  return -1
-endi
-
-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/sql
-#print curl 127.0.0.1:7111/admin/sql -----> $system_content
-#if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:51.022",11],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:42.022",2]],"rows":10}@ then
-#  return -1
-#endi
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' 127.0.0.1:7111/admin/info
-print curl 127.0.0.1:7111/admin/info -----> $system_content
-if $system_content != {"status":"succ","data":[{"dbs":1,"tables":1,"users":3,"mnodes":1,"dnodes":1}]} then
-  return -1
-endi
-
-print ===============  step7 - use dbs
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'use d1;' 127.0.0.1:7111/admin/all
-print 23-> $system_content
-if $system_content != @{"status":"error","code":4360,"desc":"no need to execute use db cmd"}@ then
-  return -1
-endi
-
-print ===============  step8 - monitor dbs
-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'show dnodes;show mnodes;' 127.0.0.1:7111/admin/sqls
-#print 24-> $system_content
-#if $system_content != @[{"status":"succ","head":["IP","created time","open vnodes","free vnodes","status","balance state"],"data":[["127.0.0.1","2018-09-04 #11:16:13.985",1,3,"ready","balanced"]],"rows":1},{"status":"succ","head":["IP","created time","status","role"],"data":[["127.0.0.1","2018-09-04 11:16:13.371","serving","master"]],"rows":1}]@ then
-#  return -1
-#	endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim
deleted file mode 100644
index 7d1e6b03d4..0000000000
--- a/tests/script/unique/http/opentsdb.sim
+++ /dev/null
@@ -1,247 +0,0 @@
-system sh/stop_dnodes.sh
-
-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
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ============================ dnode1 start
-
-print ===============  step1 - parse
-system_content curl -u root:taosdata -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/
-print $system_content
-if $system_content != @{"status":"error","code":4496,"desc":"database name can not be null"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db123456789012345678901234567890db
-print $system_content
-if $system_content != @{"status":"error","code":4497,"desc":"database name too long"}@ then
-  return -1
-endi
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/
-print $system_content
-if $system_content != @{"status":"error","code":4496,"desc":"database name can not be null"}@ then
-  return -1
-endi
-
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put2
-print $system_content
-if $system_content != @{"status":"error","code":4354,"desc":"invalid url format"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4499,"desc":"metrics size is 0"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4498,"desc":"invalid opentsdb json fromat"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '{}' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4499,"desc":"metrics size is 0"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-
-if $system_content != @{"status":"error","code":4501,"desc":"metric name not find"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": 1,"timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4502,"desc":"metric name type should be string"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4503,"desc":"metric name length is 0"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "ab1234567890123456789012345678ab1234567890123456789012345678","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"errors":[{"datapoint":{"metric":"ab1234567890123456789012345678ab1234567890123456789012345678","stable":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb","table":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb_lga_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"status":"error","code":1547,"desc":"Timestamp data out of range"}}],"failed":1,"success":0,"affected_rows":0}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4505,"desc":"timestamp not find"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": "2","value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4506,"desc":"timestamp type should be integer"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": -1,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4507,"desc":"timestamp value smaller than 0"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4517,"desc":"value not find"}@ then
-  return -1
-endi
-
-#######
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4508,"desc":"tags not find"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4509,"desc":"tags size is 0"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": 0}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4509,"desc":"tags size is 0"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","group1": "1","group1": "1","group1": "1","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbbbbbb","table":"sys_cpu_d_bbbbbbb_lga_1_1_1_1_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","group1":"1","group1":"1","group1":"1","group1":"1","host":"web01"},"status":"error","code":866,"desc":"failed to create table"}}],"failed":1,"success":0,"affected_rows":0}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"": "web01"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4512,"desc":"tag name is null"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host01123456789001123456789001123456789001123456789001123456789001123456789": "01"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4513,"desc":"tag name length too long"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web011234567890011234567890011234567890011234567890011234567890011234567890011234567890011234567890"}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4516,"desc":"tag value can not more than 64"}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": ""}}]' 127.0.0.1:7111/opentsdb/db/put
-print $system_content
-if $system_content != @{"status":"error","code":4515,"desc":"tag value is null"}@ then
-  return -1
-endi
-
-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
-print $system_content
-if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web01","timestamp":1346846400000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"affected_rows":1,"status":"succ"}}],"failed":0,"success":1,"affected_rows":1}@ then
-  return -1
-endi
-
-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
-print $system_content
-if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web01","timestamp":1346846400000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"affected_rows":1,"status":"succ"}}],"failed":0,"success":1,"affected_rows":1}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  'select * from db.sys_cpu_d_bbb_lga_1_web01' 127.0.0.1:7111/rest/sql/
-print $system_content
-if $system_content != @{"status":"succ","head":["ts","value"],"column_meta":[["ts",9,8],["value",7,8]],"data":[["2012-09-05 20:00:00.000",18.000000000]],"rows":1}@ then
-  return -1
-endi
-
-print ===============  step3 - multi-query data
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846405000,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846402000,"value": 18,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-
-print $system_content
-
-if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web01","timestamp":1346846405000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"affected_rows":1,"status":"succ"}},{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web02","timestamp":1346846402000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web02"},"affected_rows":1,"status":"succ"}}],"failed":0,"success":2,"affected_rows":2}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  'select * from db.sys_cpu_d_bbb_lga_1_web01' 127.0.0.1:7111/rest/sql/
-
-print $system_content
-
-if $system_content != @{"status":"succ","head":["ts","value"],"column_meta":[["ts",9,8],["value",7,8]],"data":[["2012-09-05 20:00:00.000",18.000000000],["2012-09-05 20:00:05.000",18.000000000]],"rows":2}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  'select count(*) from db.sys_cpu_d_bbb' 127.0.0.1:7111/rest/sql/
-
-print $system_content
-
-if $system_content != @{"status":"succ","head":["count(*)"],"column_meta":[["count(*)",5,8]],"data":[[3]],"rows":1}@ then
-  return -1
-endi
-
-print ===============  step4 - summary-put data
-system_content curl -u root:taosdata -d  '[{"metric": "sys_mem","timestamp": 1346846400000,"value": 8,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_mem","timestamp": 1346846405000,"value": 9,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put?details=false
-
-print $system_content
-
-if $system_content != @{"failed":0,"success":2}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  'select * from db.sys_mem_d_bbb_lga_1_web01' 127.0.0.1:7111/rest/sql/
-
-print $system_content
-
-if $system_content != @{"status":"succ","head":["ts","value"],"column_meta":[["ts",9,8],["value",7,8]],"data":[["2012-09-05 20:00:00.000",8.000000000],["2012-09-05 20:00:05.000",9.000000000]],"rows":2}@ then
-  return -1
-endi
-
-system_content curl -u root:taosdata -d  'select count(*) from db.sys_mem_d_bbb' 127.0.0.1:7111/rest/sql/
-
-print $system_content
-
-if $system_content != @{"status":"succ","head":["count(*)"],"column_meta":[["count(*)",5,8]],"data":[[2]],"rows":1}@ then
-  return -1
-endi
-
-print ===============  step5 - prepare data
-
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846402000,"value": 19,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846402,"value": 19,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846403000,"value": 20,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846403,"value": 20,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846404000,"value": 21,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846404,"value": 21,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846405000,"value": 22,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846405,"value": 22,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846406000,"value": 23,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846406,"value": 23,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
-
-system_content curl -u root:taosdata -d  'select count(*) from db.sys_cpu_d_bbb' 127.0.0.1:7111/rest/sql/
-print $system_content
-if $system_content != @{"status":"succ","head":["count(*)"],"column_meta":[["count(*)",5,8]],"data":[[7]],"rows":1}@ then
-  return -1
-endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
diff --git a/tests/script/unique/http/testSuite.sim b/tests/script/unique/http/testSuite.sim
deleted file mode 100644
index 3a9753e744..0000000000
--- a/tests/script/unique/http/testSuite.sim
+++ /dev/null
@@ -1,2 +0,0 @@
-run unique/http/admin.sim
-run general/http/opentsdb.sim
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt20.sim b/tests/script/unique/mnode/mgmt20.sim
deleted file mode 100644
index 8945cffab2..0000000000
--- a/tests/script/unique/mnode/mgmt20.sim
+++ /dev/null
@@ -1,88 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-
-system sh/cfg.sh -n dnode1 -c monitor -v 1
-system sh/cfg.sh -n dnode2 -c monitor -v 1
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-system sh/exec.sh -n dnode2 -s start
-sql connect
-
-print ============== step2
-sql create dnode $hostname2
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-		return -1
-	endi
-	
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show2
-endi
-if $data2_2 != slave then
-	goto show2
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-
-print ============== step3
-system sh/exec.sh -n dnode2 -s start
-sleep 10000
-
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-print =============== step4
-sql select * from log.dn1
-$d1_first  = $rows
-sql select * from log.dn2
-$d2_first  = $rows
-
-$x = 0
-show4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-		return -1
-	endi
-	
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show4
-endi
-if $data2_2 != slave then
-	goto show4
-endi
-
-sleep 2000
-sql select * from log.dn1
-$d1_second  = $rows
-sql select * from log.dn2
-$d2_second  = $rows
-
-print dnode1 $d1_first $d1_second
-print dnode2 $d2_first $d2_second
-if $d1_first >= $d1_second then
-  return -1
-endi
-
-if $d2_first >= $d2_second then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt21.sim b/tests/script/unique/mnode/mgmt21.sim
deleted file mode 100644
index 8409383309..0000000000
--- a/tests/script/unique/mnode/mgmt21.sim
+++ /dev/null
@@ -1,44 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-
-print ============== step1
-system sh/exec.sh -n dnode2 -s start
-sleep 10000
-
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-  return -1
-endi
-
-print ============== step2
-sql create dnode $hostname2
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 5 then 
-		return -1
-	endi
-	
-sql show mnodes -x show2
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show2
-endi
-if $data2_2 != slave then
-	goto show2
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim
deleted file mode 100644
index 399805312b..0000000000
--- a/tests/script/unique/mnode/mgmt22.sim
+++ /dev/null
@@ -1,114 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-		return -1
-	endi
-	
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show2
-endi
-if $data2_2 != slave then
-	goto show2
-endi
-
-print ============== step3
-sql_error drop dnode $hostname1 -x error1
-print should not drop master
-
-print ============== step4
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
-sql_error show mnodes
-print error of no master
-
-print ============== step5
-sql_error drop dnode $hostname1
-print error of no master
-
-print ============== step6
-system sh/exec.sh -n dnode1 -s start
-sleep 2000
-sql close
-sql connect
-
-$x = 0
-show6: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-		return -1
-	endi
-	
-sql show mnodes -x show6
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show6
-endi
-if $data2_2 != slave then
-	goto show6
-endi
-
-print ============== step7
-system sh/exec.sh -n dnode3 -s start
-sql create dnode $hostname3
-
-$x = 0
-show7: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-		return -1
-	endi
-	
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-print dnode3 ==> $data2_3
-if $data2_1 != master then
-	goto show7
-endi
-if $data2_2 != slave then
-	goto show7
-endi
-if $data3_3 != null then
-	goto show7
-endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim
deleted file mode 100644
index 19c7b4ba76..0000000000
--- a/tests/script/unique/mnode/mgmt23.sim
+++ /dev/null
@@ -1,141 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-
-$x = 0
-show2:
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then
-		return -1
-	endi
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show2
-endi
-if $data2_2 != slave then
-	goto show2
-endi
-
-print ============== step3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode $hostname3
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-
-print ============== step4
-sql drop dnode $hostname2
-
-$x = 0
-step4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step4
-endi
-if $dnode2Role != null then
-  goto step4
-endi
-if $dnode3Role != slave then
-  goto step4
-endi
-
-system sh/exec.sh -n dnode2 -s stop
-
-print ============== step5
-sleep 2000
-sql create dnode $hostname2
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/exec.sh -n dnode2 -s start
-
-$x = 0
-step5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step5
-endi
-if $dnode2Role != null then
-  goto step5
-endi
-if $dnode3Role != slave then
-  goto step5
-endi
-
-print ============== step6
-system sh/exec.sh -n dnode1 -s stop
-sql_error show mnodes
-
-print ============== step7
-sql_error drop dnode $hostname1
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim
deleted file mode 100644
index a7bcc59ac0..0000000000
--- a/tests/script/unique/mnode/mgmt24.sim
+++ /dev/null
@@ -1,84 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-		return -1
-	endi
-	
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show2
-endi
-if $data2_2 != slave then
-	goto show2
-endi
-
-print ============== step3
-system sh/exec.sh -n dnode1 -s stop
-sleep 2000
-sql_error show mnodes
-
-print ============== step4
-sql_error drop dnode $hostname1 
-
-print ============== step5
-system sh/exec.sh -n dnode1 -s start
-sql_error create dnode $hostname1
-
-sql close
-sql connect
-
-$x = 0
-step5:
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes -x step5
-    
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto step5
-endi
-if $data2_2 != slave then
-	goto step5
-endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim
deleted file mode 100644
index 9cca9c8448..0000000000
--- a/tests/script/unique/mnode/mgmt25.sim
+++ /dev/null
@@ -1,95 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-		return -1
-	endi
-	
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show2
-endi
-if $data2_2 != slave then
-	goto show2
-endi
-
-print ============== step3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode $hostname3
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-
-print ============== step4
-sql drop dnode $hostname2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim
deleted file mode 100644
index 2816845052..0000000000
--- a/tests/script/unique/mnode/mgmt26.sim
+++ /dev/null
@@ -1,123 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-		return -1
-	endi
-	
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-if $data2_1 != master then
-	goto show2
-endi
-if $data2_2 != slave then
-	goto show2
-endi
-
-print ============== step3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode $hostname3
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-
-
-print ============== step4
-sql drop dnode $hostname2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-
-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 3000
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt30.sim b/tests/script/unique/mnode/mgmt30.sim
deleted file mode 100644
index d0858c0d6c..0000000000
--- a/tests/script/unique/mnode/mgmt30.sim
+++ /dev/null
@@ -1,68 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-
-system sh/cfg.sh -n dnode1 -c balanceInterval -v 3000
-system sh/cfg.sh -n dnode2 -c balanceInterval -v 3000
-system sh/cfg.sh -n dnode3 -c balanceInterval -v 3000
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-print dnode3 ==> $data3_3
-if $data2_1 != master then
-  return -1
-endi
-if $data3_2 != null then
-  return -1
-endi
-if $data3_3 != null then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-sleep 3000
-
-sql create dnode $hostname2
-sql create dnode $hostname3
-
-$x = 0
-step2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step2
-endi
-if $dnode2Role != slave then
-  goto step2
-endi
-if $dnode3Role != slave then
-  goto step2
-endi
-
-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
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim
deleted file mode 100644
index ce7cdce35d..0000000000
--- a/tests/script/unique/mnode/mgmt33.sim
+++ /dev/null
@@ -1,214 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-print dnode3 ==> $data3_3
-if $data2_1 != master then
-  return -1
-endi
-if $data3_2 != null then
-  return -1
-endi
-if $data3_3 != null then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-
-$x = 0
-step2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step2
-endi
-if $dnode2Role != slave then
-  goto step2
-endi
-if $dnode3Role != null then
-  goto step2
-endi
-
-print ============== step3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode $hostname3
-
-$x = 0
-step3: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step3
-endi
-if $dnode2Role != slave then
-  goto step3
-endi
-if $dnode3Role != slave then
-  goto step3
-endi
-
-print ============== step4
-sql drop dnode $hostname2
-
-$x = 0
-step4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step4
-endi
-if $dnode2Role != null then
-  goto step4
-endi
-if $dnode3Role != slave then
-  goto step4
-endi
-
-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 3
-system sh/exec.sh -n dnode2 -s start
-
-print ============== step5
-sql create dnode $hostname2
-
-$x = 0
-step5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_4
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step5
-endi
-if $dnode2Role != slave then
-  goto step5
-endi
-if $dnode3Role != slave then
-  goto step5
-endi
-
-print ============== step6
-system sh/exec.sh -n dnode1 -s stop
-$x = 0
-step6: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes -x step6
-$dnode1Role = $data2_1
-$dnode2Role = $data2_4
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != offline then
-  goto step6
-endi
-#if $dnode2Role != master then
-#  return -1
-#endi
-#if $dnode3Role != slave then
-#  return -1
-#endi
-
-print ============== step7
-sql drop dnode $hostname1
-$x = 0
-step7: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes -x step7
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != null then
-  goto step7
-endi
-#if $dnode2Role != master then
-#  return -1
-#endi
-#if $dnode3Role != slave then
-#  return -1
-#endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim
deleted file mode 100644
index d8a46b0955..0000000000
--- a/tests/script/unique/mnode/mgmt34.sim
+++ /dev/null
@@ -1,269 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql show mnodes
-print dnode1 ==> $data2_1
-print dnode2 ==> $data2_2
-print dnode3 ==> $data3_3
-if $data2_1 != master then
-  return -1
-endi
-if $data3_2 != null then
-  return -1
-endi
-if $data3_3 != null then
-  return -1
-endi
-
-print ============== step2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
-$x = 0
-step2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  goto step2
-endi
-if $dnode2Role != slave then
-  goto step2
-endi
-if $dnode3Role != null then
-  goto step2
-endi
-if $dnode4Role != null then
-  goto step2
-endi
-
-print ============== step3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode $hostname3
-
-$x = 0
-step3: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  goto step3
-endi
-if $dnode2Role != slave then
-  goto step3
-endi
-if $dnode3Role != slave then
-  goto step3
-endi
-if $dnode4Role != null then
-  goto step3
-endi
-
-
-print ============== step4
-system sh/exec.sh -n dnode4 -s start
-sql create dnode $hostname4
-$x = 0
-step4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  goto step4
-endi
-if $dnode2Role != slave then
-  goto step4
-endi
-if $dnode3Role != slave then
-  goto step4
-endi
-if $dnode4Role != null then
-  goto step4
-endi
-
-print ============== step5
-sql drop dnode $hostname2
-$x = 0
-step5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  goto step5
-endi
-if $dnode2Role != null then
-  goto step5
-endi
-if $dnode3Role != slave then
-  goto step5
-endi
-if $dnode4Role != slave then
-  goto step5
-endi
-
-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 3
-system sh/exec.sh -n dnode2 -s start
-
-print ============== step6
-sql create dnode $hostname2
-$x = 0
-step6: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  goto step6
-endi
-if $dnode2Role != null then
-  goto step6
-endi
-if $dnode3Role != slave then
-  goto step6
-endi
-if $dnode4Role != slave then
-  goto step6
-endi
-
-print ============== step7
-system sh/exec.sh -n dnode1 -s stop
-$x = 0
-step7: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes -x step7
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != offline then
-  goto step7
-endi
-
-print ============== step8
-sql drop dnode $hostname1
-step8: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show mnodes -x step8
-$dnode1Role = $data2_1
-$dnode2Role = $data2_5
-$dnode3Role = $data2_3
-$dnode4Role = $data2_4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-if $dnode1Role != null then
-  goto step8
-endi
-if $dnode2Role != slave then
-  goto step8
-endi
-#if $dnode3Role != master then
-#  return -1
-#endi
-#if $dnode4Role != slave then
-#  return -1
-#endi
-
-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
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim
deleted file mode 100644
index 5afb419058..0000000000
--- a/tests/script/unique/mnode/mgmtr2.sim
+++ /dev/null
@@ -1,87 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sleep 2000
-sql connect
-
-sql show mnodes
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-
-print ============== step2
-sql create dnode $hostname2 
-sql create dnode $hostname3
-
-print ============== step3
-print ========= start dnode2 and dnode3
-
-system sh/exec.sh -n dnode2 -s start
-sleep 1000
-system sh/exec.sh -n dnode3 -s start
-
-sleep 8000
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-sleep 4000
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-sleep 4000
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-sleep 4000
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-
-print ============== step4
-$x = 0
-step4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then
-		return -1
-	endi
-
-sql show mnodes
-
-$dnode1Role = $data2_1
-$dnode2Role = $data2_2
-$dnode3Role = $data2_3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-if $dnode1Role != master then
-  goto step4
-endi
-if $dnode2Role != slave then
-  goto step4
-endi
-if $dnode3Role != null then
-  goto step4
-endi
-
-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
\ No newline at end of file
diff --git a/tests/script/unique/mnode/testSuite.sim b/tests/script/unique/mnode/testSuite.sim
deleted file mode 100644
index b9adbe06a2..0000000000
--- a/tests/script/unique/mnode/testSuite.sim
+++ /dev/null
@@ -1,9 +0,0 @@
-run unique/mnode/mgmt21.sim
-run unique/mnode/mgmt22.sim
-run unique/mnode/mgmt23.sim
-run unique/mnode/mgmt24.sim
-run unique/mnode/mgmt25.sim
-run unique/mnode/mgmt26.sim
-run unique/mnode/mgmt33.sim
-run unique/mnode/mgmt34.sim
-run unique/mnode/mgmtr2.sim
diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim
deleted file mode 100644
index ff48c22367..0000000000
--- a/tests/script/unique/stream/metrics_balance.sim
+++ /dev/null
@@ -1,312 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c statusInterval -v 1
-system sh/cfg.sh -n dnode2 -c statusInterval -v 1
-system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-
-$dbPrefix = db
-$tbPrefix = tb
-$mtPrefix = mt
-$stPrefix = st
-$tbNum = 3
-$rowNum = 200
-
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-print ============== step1
-$db = $dbPrefix
-sql create database $db 
-sql use $db
-
-$i = 0
-$st = $stPrefix . $i
-$mt = $mtPrefix . $i
-$tbNum = 3
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  if $i == 0 then 
-    sleep 2000
-  endi
-  
-  $x = 0
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . s
-    sql insert into $tb values (now + $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-$st = $stPrefix . $i
-$mt = $mtPrefix . $i
-$tbNum = 6
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  if $i == 0 then 
-    sleep 2000
-  endi
-  
-  $x = 0
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . s
-    sql insert into $tb values (now + $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-$st = $stPrefix . $i
-$mt = $mtPrefix . $i
-$tbNum = 9
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  if $i == 0 then 
-    sleep 2000
-  endi
-  
-  $x = 0
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . s
-    sql insert into $tb values (now + $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-$st = $stPrefix . $i
-$mt = $mtPrefix . $i
-$tbNum = 12
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  if $i == 0 then 
-    sleep 2000
-  endi
-  
-  $x = 0
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . s
-    sql insert into $tb values (now + $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-
-print =============== step2
-
-sql show tables
-if $rows != 16 then 
-  return -1
-endi
-
-print =============== step3
-print sleep 22 seconds
-sleep 22000 
-
-$i = 0
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-$r0 = $rows
-print $st ==> $r0 $data00 $data01 $data10 $data11
-
-$i = 3
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-$r3 = $rows
-print $st ==> $r3 $data00 $data01 $data10 $data11
-
-$i = 6
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-$r6 = $rows
-print $st ==> $r6 $data00 $data01 $data10 $data11
-
-$i = 9
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-$r9 = $rows
-print $st ==> $r9 $data00 $data01 $data10 $data11
-
-print rows0=>$r0 rows3=>$r3 rows6=>$r6  rows9=>$r9
-
-$x = 0
-show1: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 0 then
-  goto show1
-endi
-if $dnode2Vnodes != NULL then
-  goto show1
-endi
-
-print =============== step4 start dnode2
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-sleep 8000
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show2
-endi
-if $dnode2Vnodes != 2 then
-  goto show2
-endi
-
-print rows0=>$r0 rows3=>$r3 rows6=>$r6  rows9=>$r9
-print =============== step5
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step6
-$i = 0
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-if $rows != $rowNum then
-  return -1
-endi
-
-$i = 3
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-if $rows != $rowNum then
-  return -1
-endi
-
-$i = 6
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-if $rows != $rowNum then
-  return -1
-endi
-
-$i = 9
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-if $rows != $rowNum then
-  return -1
-endi
-
-print rows0=>$r0 rows3=>$r3 rows6=>$r6  rows9=>$r9
-print =============== step7
-$i = 0
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $r0 $rows , $data00 $data01 $data10 $data11
-if $rows == 0 then
-  return -1
-endi
-if $rows <= $r0 then
-  return -1
-endi
-
-$i = 3
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $r3 $rows , $data00 $data01 $data10 $data11
-if $rows == 0 then
-  return -1
-endi
-if $rows <= $r3 then
-  return -1
-endi
-
-
-$i = 6
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $r6 $rows , $data00 $data01 $data10 $data11
-if $rows == 0 then
-  return -1
-endi
-if $rows <= $r6 then
-  return -1
-endi
-
-$i = 9
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $r0 $rows , $data00 $data01 $data10 $data11
-if $rows == 0 then
-  return -1
-endi
-if $rows <= $r9 then
-  return -1
-endi
-
-print  =============== clear
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-
diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim
deleted file mode 100644
index 20c37cefc3..0000000000
--- a/tests/script/unique/stream/metrics_replica1_dnode2.sim
+++ /dev/null
@@ -1,260 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-print ======================== dnode1 start
-
-$dbPrefix = m1d_db
-$tbPrefix = m1d_tb
-$mtPrefix = m1d_mt
-$stPrefix = m1d_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $mt interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $mt interval(1d)
-print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $mt interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $mt interval(1d)
-print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $mt interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $mt interval(1d)
-print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $mt interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $mt interval(1d)
-print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $mt interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $mt interval(1d)
-print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $mt interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $mt interval(1d)
-print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $mt interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $mt interval(1d)
-print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $mt interval(1d)
-
-print =============== step11 wh
-sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
-print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
-
-print =============== step12 as
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $mt interval(1d)
-
-print =============== step13
-print sleep 22 seconds
-sleep 32000 
-
-print =============== step14
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != 200 then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/metrics_replica2_dnode2.sim b/tests/script/unique/stream/metrics_replica2_dnode2.sim
deleted file mode 100644
index aa8c187101..0000000000
--- a/tests/script/unique/stream/metrics_replica2_dnode2.sim
+++ /dev/null
@@ -1,260 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi    
-
-
-print ======================== dnode1 start
-
-$dbPrefix = m2d_db
-$tbPrefix = m2d_tb
-$mtPrefix = m2d_mt
-$stPrefix = m2d_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $mt interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $mt interval(1d)
-print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $mt interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $mt interval(1d)
-print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $mt interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $mt interval(1d)
-print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $mt interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $mt interval(1d)
-print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $mt interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $mt interval(1d)
-print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $mt interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $mt interval(1d)
-print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $mt interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $mt interval(1d)
-print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $mt interval(1d)
-
-print =============== step11 wh
-sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
-print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
-
-print =============== step12 as
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $mt interval(1d)
-
-print =============== step13
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step14
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != 200 then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
deleted file mode 100644
index be2fcefe66..0000000000
--- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
+++ /dev/null
@@ -1,261 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode1 start
-
-$dbPrefix = m2dv_db
-$tbPrefix = m2dv_tb
-$mtPrefix = m2dv_mt
-$stPrefix = m2dv_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $mt interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $mt interval(1d)
-print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $mt interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $mt interval(1d)
-print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $mt interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $mt interval(1d)
-print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $mt interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $mt interval(1d)
-print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $mt interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $mt interval(1d)
-print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $mt interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $mt interval(1d)
-print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $mt interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $mt interval(1d)
-print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $mt interval(1d)
-
-print =============== step11 wh
-sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
-print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
-
-print =============== step12 as
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $mt interval(1d)
-
-print =============== step13
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step14
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != 200 then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim
deleted file mode 100644
index f7b17610c3..0000000000
--- a/tests/script/unique/stream/metrics_replica2_dnode3.sim
+++ /dev/null
@@ -1,270 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-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
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-if $data4_192.168.0.3 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode1 start
-
-$dbPrefix = m2d3_db
-$tbPrefix = m2d3_tb
-$mtPrefix = m2d3_mt
-$stPrefix = m2d3_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $mt interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $mt interval(1d)
-print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $mt interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $mt interval(1d)
-print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $mt interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $mt interval(1d)
-print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $mt interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $mt interval(1d)
-print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $mt interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $mt interval(1d)
-print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $mt interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $mt interval(1d)
-print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $mt interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $mt interval(1d)
-print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $mt interval(1d)
-
-print =============== step11 wh
-sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
-print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
-
-print =============== step12 as
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $mt interval(1d)
-
-print =============== step13
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step14
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != 200 then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim
deleted file mode 100644
index 4027128003..0000000000
--- a/tests/script/unique/stream/metrics_replica3_dnode4.sim
+++ /dev/null
@@ -1,280 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode4 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-sql create dnode $hostname3
-sql create dnode $hostname4
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-system sh/exec.sh -n dnode4 -s start
-
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-if $data4_192.168.0.3 == offline then
-  goto createDnode
-endi 
-if $data4_192.168.0.4 == offline then
-  goto createDnode
-endi   
-
-print ======================== dnode1 start
-
-$dbPrefix = m2d3_db
-$tbPrefix = m2d3_tb
-$mtPrefix = m2d3_mt
-$stPrefix = m2d3_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $mt interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $mt interval(1d)
-print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $mt interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $mt interval(1d)
-print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $mt interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $mt interval(1d)
-print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $mt interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $mt interval(1d)
-print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $mt interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $mt interval(1d)
-print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $mt interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $mt interval(1d)
-print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $mt interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $mt interval(1d)
-print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $mt interval(1d)
-
-print =============== step11 wh
-sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
-print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
-
-print =============== step12 as
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $mt interval(1d)
-
-print =============== step13
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step14
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 1900 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != 200 then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/metrics_vnode_stop.sim b/tests/script/unique/stream/metrics_vnode_stop.sim
deleted file mode 100644
index cd84cb3cdf..0000000000
--- a/tests/script/unique/stream/metrics_vnode_stop.sim
+++ /dev/null
@@ -1,188 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-print ======================== dnode start
-
-$dbPrefix = db
-$tbPrefix = tb
-$mtPrefix = mt
-$stPrefix = st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step3  
-system sh/exec.sh -n dnode2 -s stop
-
-print =============== step4
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step5
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-print =============   step6
-
-sql close
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/exec.sh -n dnode2 -s start
-sleep 2000
-
-$x = 0
-connectTbase2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql connect -x connectTbase2
-sleep 2000
-
-sql create dnode $hostname1
-system sh/exec.sh -n dnode1 -s start
-sleep 2000
-print ======================== dnode start
-
-$dbPrefix = db
-$tbPrefix = tb
-$mtPrefix = mt
-$stPrefix = st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step7
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step8 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step9 
-system sh/exec.sh -n dnode1 -s stop
-
-print =============== step10
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step11
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-
-
diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim
deleted file mode 100644
index 45e054e2ef..0000000000
--- a/tests/script/unique/stream/table_balance.sim
+++ /dev/null
@@ -1,238 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c statusInterval -v 1
-system sh/cfg.sh -n dnode2 -c statusInterval -v 1
-system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-
-$dbPrefix = tb_db
-$tbPrefix = tb_tb
-$mtPrefix = tb_mt
-$stPrefix = tb_st
-$tbNum = 10
-$rowNum = 200
-$totalNum = 200
-
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-print ============== step1
-$i = 0
-$db = $dbPrefix
-$mt = $mtPrefix
-$st = $stPrefix . $i
-
-sql create database $db 
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  if $i == 0 then 
-    sleep 2000
-  endi
-  
-  $x = 0
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . s
-    sql insert into $tb values (now + $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2
-
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-sql show tables
-if $rows != 13 then 
-  return -1
-endi
-
-print =============== step3
-print sleep 22 seconds
-sleep 22000 
-
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-$r1 = $rows
-print $st ==> $r1 $data00 $data01 $data10 $data11
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-$r5 = $rows
-print $st ==> $r5 $data00 $data01 $data10 $data11
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-$r8 = $rows
-print $st ==> $r8 $data00 $data01 $data10 $data11
-
-print rows1=>$r1 rows5=>$r5 rows8=>$r8 
-
-$x = 0
-show1: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 0 then
-  goto show1
-endi
-if $dnode2Vnodes != NULL then
-  goto show1
-endi
-
-print =============== step4 start dnode2
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-sleep 8000
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show2
-endi
-if $dnode2Vnodes != 2 then
-  goto show2
-endi
-
-print rows1=>$r1 rows5=>$r5 rows8=>$r8 
-print =============== step5
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step6
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-if $rows != $rowNum then
-  return -1
-endi
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-if $rows != $rowNum then
-  return -1
-endi
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-if $rows != $rowNum then
-  return -1
-endi
-
-print rows1=>$r1 rows5=>$r5 rows8=>$r8 
-print =============== step7
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $r1 $rows , $data00 $data01 $data10 $data11
-if $rows == 0 then
-  return -1
-endi
-if $rows <= $r1 then
-  return -1
-endi
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $r5 $rows , $data00 $data01 $data10 $data11
-if $rows == 0 then
-  return -1
-endi
-if $rows <= $r5 then
-  return -1
-endi
-
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $r8 $rows , $data00 $data01 $data10 $data11
-if $rows == 0 then
-  return -1
-endi
-if $rows <= $r8 then
-  return -1
-endi
-
-
-if $r1 != $r5 then
-  return -1
-endi
-
-if $r8 != $r5 then
-  return -1
-endi
-
-print  =============== clear
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-
diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim
deleted file mode 100644
index 964a0c0253..0000000000
--- a/tests/script/unique/stream/table_move.sim
+++ /dev/null
@@ -1,269 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-
-system sh/cfg.sh -n dnode1 -c statusInterval -v 1
-system sh/cfg.sh -n dnode2 -c statusInterval -v 1
-system sh/cfg.sh -n dnode3 -c statusInterval -v 1
-system sh/cfg.sh -n dnode4 -c statusInterval -v 1
-
-system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
-system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
-
-system sh/cfg.sh -n dnode1 -c wallevel -v 1
-system sh/cfg.sh -n dnode2 -c wallevel -v 1
-system sh/cfg.sh -n dnode3 -c wallevel -v 1
-system sh/cfg.sh -n dnode4 -c wallevel -v 1
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 0
-
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
-
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
-
-system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 1000
-system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 1000
-system sh/cfg.sh -n dnode1 -c maxShellConns       -v 1000
-system sh/cfg.sh -n dnode1 -c maxMgmtConnections  -v 1000
-
-system sh/cfg.sh -n dnode2 -c maxVnodeConnections -v 1000
-system sh/cfg.sh -n dnode2 -c maxMeterConnections -v 1000
-system sh/cfg.sh -n dnode2 -c maxShellConns       -v 1000
-system sh/cfg.sh -n dnode2 -c maxMgmtConnections  -v 1000
-
-$dbPrefix = db
-$tbPrefix = tb
-$mtPrefix = mt
-$stPrefix = st
-$tbNum = 5
-$rowNum = 20
-$totalNum = 200
-
-print ============== step1
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-sleep 2000
-
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql create database $db 
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -20
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . s 
-    sql insert into $tb values (now $ms , $x , $x ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2
-$i = 0
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
-if $data01 != $rowNum then 
-  return -1
-endi
-if $data02 != $rowNum then 
-  return -1
-endi
-if $data03 != $rowNum then 
-  return -1
-endi
-
-sql show tables
-if $rows != 5 then 
-  return -1
-endi
-
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-sql show tables
-if $rows != 6 then 
-  return -1
-endi
-
-print =============== step3
-print sleep 22 seconds
-sleep 22000 
-
-sql select * from $tb
-if $rows != 20 then
-  return -1
-endi
-
-sql select * from $mt
-if $rows != 100 then
-  return -1
-endi
-
-sql select * from $st
-print select * from $st => $data01
-if $rows == 0 then 
-  return -1
-endi
-
-$x = 0
-show1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 6 then
-  goto show1
-endi
-if $dnode2Vnodes != NULL then
-  goto show1
-endi
-
-print =============== step4 start dnode2
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-sleep 8000
-
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 7 then
-  goto show2
-endi
-if $dnode2Vnodes != 7 then
-  goto show2
-endi
-
-print =============== step5 drop dnode1
-system sh/exec.sh -n dnode1 -s stop
-print stop dnode1 and sleep 10000
-sleep 10000
-
-sql drop dnode $hostname1
-print drop dnode1 and sleep 9000
-sleep 9000
-
-$x = 0
-show6: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show6
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != NULL then
-  goto show6
-endi
-if $dnode2Vnodes != 6 then
-  goto show6
-endi
-
-print =============== step6
-
-print select * from $tb
-sql select * from $tb
-if $rows != 20 then
-  return -1
-endi
-
-print select * from $mt
-sql select * from $mt
-if $rows != 80 then
-  return -1
-endi
-
-
-print =============== step7
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  
-  $x = 0
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . s
-    sql insert into $tb values (now + $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-$i = 0
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-
-print =============== step8
-print sleep 22 seconds
-sleep 22000 
-
-print select * from $st
-sql select * from $st
-if $rows == 0 then
-  return -1
-endi
-
-
-print  =============== clear
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-
diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim
deleted file mode 100644
index ccc6026e9c..0000000000
--- a/tests/script/unique/stream/table_replica1_dnode2.sim
+++ /dev/null
@@ -1,137 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-print ======================== dnode1 start
-
-$dbPrefix = t1d_db
-$tbPrefix = t1d_tb
-$mtPrefix = t1d_mt
-$stPrefix = t1d_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2
-
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) --> $data00 $data01 $data02 $data03
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) --> $data00 $data01 $data02 $data03
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) --> $data00 $data01 $data02 $data03
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-
-sql show tables
-if $rows != 13 then 
-  return -1
-endi
-
-print =============== step3
-print sleep 22 seconds
-sleep 22000 
-
-
-print =============== step4
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $rows $data00 $data01 $data10 $data11
-$rows1 = $rows
-if $data01 != 20 then
-  return -1
-endi
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st => $rows $data00 $data01 $data10 $data11
-$rows5 = $rows
-if $data01 != 20 then
-  return -1
-endi
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $rows $data00 $data01 $data10 $data11
-$rows8 = $rows
-if $data01 != 20 then
-  return -1
-endi
-
-if $rows8 != $rows5 then
-  return -1
-endi
-
-if $rows8 != $rows1 then
-  return -1
-endi
\ No newline at end of file
diff --git a/tests/script/unique/stream/table_replica2_dnode2.sim b/tests/script/unique/stream/table_replica2_dnode2.sim
deleted file mode 100644
index 947fa0d2f9..0000000000
--- a/tests/script/unique/stream/table_replica2_dnode2.sim
+++ /dev/null
@@ -1,312 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-print ======================== dnode1 start
-
-$dbPrefix = t2d_db
-$tbPrefix = t2d_tb
-$mtPrefix = t2d_mt
-$stPrefix = t2d_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop database $db -x step1
-step1:
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $tb interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $tb interval(1d)
-print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $tb interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $tb interval(1d)
-print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $tb interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $tb interval(1d)
-print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $tb interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $tb interval(1d)
-print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $tb interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $tb interval(1d)
-print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $tb interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $tb interval(1d)
-print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $tb interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $tb interval(1d)
-print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $tb interval(1d)
-
-print =============== step11 st
-sql select stddev(tbcol) from $tb interval(1d)
-print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql create table $st as select stddev(tbcol) from $tb interval(1d)
-
-print =============== step12 le
-sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
-#if $data01 != @(0.000017, -25362055.126740)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . le
-sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-
-print =============== step13 pe
-
-sql select percentile(tbcol, 1) from $tb interval(1d)
-print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . pe
-sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
-
-print =============== step14 wh
-sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
-print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
-
-print =============== step15 as
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $tb interval(1d)
-
-print =============== step16
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step17
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . le
-sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != @(0.000017, -25270086.331047)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . pe
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != $rowNum then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
deleted file mode 100644
index 7530036239..0000000000
--- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
+++ /dev/null
@@ -1,314 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-print ======================== dnode1 start
-
-$dbPrefix = t2dv_db
-$tbPrefix = t2dv_tb
-$mtPrefix = t2dv_mt
-$stPrefix = t2dv_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $tb interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $tb interval(1d)
-print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $tb interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $tb interval(1d)
-print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $tb interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $tb interval(1d)
-print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $tb interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $tb interval(1d)
-print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $tb interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $tb interval(1d)
-print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $tb interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $tb interval(1d)
-print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $tb interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $tb interval(1d)
-print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $tb interval(1d)
-
-print =============== step11 st
-sql select stddev(tbcol) from $tb interval(1d)
-print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql create table $st as select stddev(tbcol) from $tb interval(1d)
-
-print =============== step12 le
-sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
-#if $data01 != @(0.000017, -25362055.126740)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . le
-sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-
-print =============== step13 pe
-
-sql select percentile(tbcol, 1) from $tb interval(1d)
-print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . pe
-sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
-
-print =============== step14 wh
-sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
-print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
-
-print =============== step15 as
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $tb interval(1d)
-
-print =============== step16
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step17
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . le
-sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != @(0.000017, -25270086.331047)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . pe
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != $rowNum then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim
deleted file mode 100644
index 49eb3563b3..0000000000
--- a/tests/script/unique/stream/table_replica2_dnode3.sim
+++ /dev/null
@@ -1,325 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-
-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
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-if $data4_192.168.0.3 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode1 start
-
-$dbPrefix = t2d3_db
-$tbPrefix = t2d3_tb
-$mtPrefix = t2d3_mt
-$stPrefix = t2d3_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $tb interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $tb interval(1d)
-print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $tb interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $tb interval(1d)
-print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $tb interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $tb interval(1d)
-print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $tb interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $tb interval(1d)
-print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $tb interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $tb interval(1d)
-print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $tb interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $tb interval(1d)
-print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $tb interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $tb interval(1d)
-print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $tb interval(1d)
-
-print =============== step11 st
-sql select stddev(tbcol) from $tb interval(1d)
-print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql create table $st as select stddev(tbcol) from $tb interval(1d)
-
-print =============== step12 le
-sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
-#if $data01 != @(0.000017, -25362055.126740)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . le
-sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-
-print =============== step13 pe
-
-sql select percentile(tbcol, 1) from $tb interval(1d)
-print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . pe
-sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
-
-print =============== step14 wh
-sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
-print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
-
-print =============== step15 as
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $tb interval(1d)
-
-print =============== step16
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step17
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . le
-sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != @(0.000017, -25270086.331047)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . pe
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != $rowNum then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim
deleted file mode 100644
index 2cc443c72f..0000000000
--- a/tests/script/unique/stream/table_replica3_dnode4.sim
+++ /dev/null
@@ -1,333 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode4 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-sql create dnode $hostname3
-sql create dnode $hostname4
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-system sh/exec.sh -n dnode4 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-if $data4_192.168.0.3 == offline then
-  goto createDnode
-endi  
-if $data4_192.168.0.4 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode1 start
-
-$dbPrefix = t3d_db
-$tbPrefix = t3d_tb
-$mtPrefix = t3d_mt
-$stPrefix = t3d_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db replica 3
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $tb interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $tb interval(1d)
-print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $tb interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $tb interval(1d)
-print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $tb interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $tb interval(1d)
-print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $tb interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $tb interval(1d)
-print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $tb interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $tb interval(1d)
-print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $tb interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $tb interval(1d)
-print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $tb interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $tb interval(1d)
-print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $tb interval(1d)
-
-print =============== step11 st
-sql select stddev(tbcol) from $tb interval(1d)
-print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql create table $st as select stddev(tbcol) from $tb interval(1d)
-
-print =============== step12 le
-sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
-#if $data01 != @(0.000017, -25362055.126740)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . le
-sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-
-print =============== step13 pe
-
-sql select percentile(tbcol, 1) from $tb interval(1d)
-print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . pe
-sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
-
-print =============== step14 wh
-sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
-print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
-
-print =============== step15 as
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $tb interval(1d)
-
-print =============== step16
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step17
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then 
-  return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 190 then 
-  return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then 
-  return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then 
-  return -1
-endi
-
-$st = $stPrefix . std
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-$st = $stPrefix . le
-sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != @(0.000017, -25270086.331047)@ then 
-#  return -1
-#endi
-
-$st = $stPrefix . pe
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0.190000000 then 
-  return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != $rowNum then 
-#  return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
diff --git a/tests/script/unique/stream/table_vnode_stop.sim b/tests/script/unique/stream/table_vnode_stop.sim
deleted file mode 100644
index 625de32a8d..0000000000
--- a/tests/script/unique/stream/table_vnode_stop.sim
+++ /dev/null
@@ -1,189 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_192.168.0.2 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode start
-
-$dbPrefix = db
-$tbPrefix = tb
-$mtPrefix = mt
-$stPrefix = st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3  
-system sh/exec.sh -n dnode2 -s stop
-
-print =============== step4
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step5
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-print =============   step6
-
-sql close
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-sleep 2000
-system sh/exec.sh -n dnode2 -s start
-
-$x = 0
-connectTbase2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql connect -x connectTbase2
-sleep 2000
-
-sql create dnode $hostname1
-system sh/exec.sh -n dnode1 -s start
-sleep 2000
-print ======================== dnode start
-
-$dbPrefix = db
-$tbPrefix = tb
-$mtPrefix = mt
-$stPrefix = st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step7
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql create database $db replica 2
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = -1440
-  $y = 0
-  while $y < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now $ms , $y , $y ) 
-    $x = $x + 1
-	$y = $y + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step8 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step9 
-system sh/exec.sh -n dnode1 -s stop
-
-print =============== step10
-print sleep 22 seconds
-sleep 22000 
-
-print =============== step11
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-
-
diff --git a/tests/script/unique/stream/testSuite.sim b/tests/script/unique/stream/testSuite.sim
deleted file mode 100644
index bbf5da3d37..0000000000
--- a/tests/script/unique/stream/testSuite.sim
+++ /dev/null
@@ -1,15 +0,0 @@
-#run unique/stream/table_replica1_dnode2.sim
-#run unique/stream/metrics_replica1_dnode2.sim
-#run unique/stream/table_replica2_dnode2.sim
-#run unique/stream/metrics_replica2_dnode2.sim
-#run unique/stream/table_replica2_dnode2_vnoden.sim
-#run unique/stream/metrics_replica2_dnode2_vnoden.sim
-#run unique/stream/table_replica2_dnode3.sim
-#run unique/stream/metrics_replica2_dnode3.sim
-#run unique/stream/table_replica3_dnode4.sim
-#run unique/stream/metrics_replica3_dnode4.sim
-#run unique/stream/table_vnode_stop.sim
-#run unique/stream/metrics_vnode_stop.sim
-##run unique/stream/table_balance.sim
-##run unique/stream/metrics_balance.sim
-##run unique/stream/table_move.sim
\ No newline at end of file