diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 10ca75f785..794d45da6f 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -97,7 +97,7 @@ typedef void *SDataRow;
 #define TD_DATA_ROW_HEAD_SIZE sizeof(int32_t)
 
 #define dataRowLen(r) (*(int32_t *)(r))
-#define dataRowTuple(r) POINTER_DRIFT(r, TD_DATA_ROW_HEAD_SIZE)
+#define dataRowTuple(r) POINTER_SHIFT(r, TD_DATA_ROW_HEAD_SIZE)
 #define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r)))
 #define dataRowSetLen(r, l) (dataRowLen(r) = (l))
 #define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r))
@@ -114,10 +114,10 @@ static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t o
   switch (type) {
     case TSDB_DATA_TYPE_BINARY:
     case TSDB_DATA_TYPE_NCHAR:
-      return POINTER_DRIFT(row, *(VarDataOffsetT *)POINTER_DRIFT(row, offset));
+      return POINTER_SHIFT(row, *(VarDataOffsetT *)POINTER_SHIFT(row, offset));
       break;
     default:
-      return POINTER_DRIFT(row, offset);
+      return POINTER_SHIFT(row, offset);
       break;
   }
 }
@@ -149,11 +149,11 @@ static FORCE_INLINE void *tdGetColDataOfRow(SDataCol *pCol, int row) {
   switch (pCol->type) {
     case TSDB_DATA_TYPE_BINARY:
     case TSDB_DATA_TYPE_NCHAR:
-      return POINTER_DRIFT(pCol->pData, pCol->dataOff[row]);
+      return POINTER_SHIFT(pCol->pData, pCol->dataOff[row]);
       break;
 
     default:
-      return POINTER_DRIFT(pCol->pData, TYPE_BYTES[pCol->type] * row);
+      return POINTER_SHIFT(pCol->pData, TYPE_BYTES[pCol->type] * row);
       break;
   }
 }
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 28f42f85a5..9d81cd07af 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -167,17 +167,17 @@ void tdFreeDataRow(SDataRow row) {
 int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_t offset) {
   ASSERT(value != NULL);
   int32_t toffset = offset + TD_DATA_ROW_HEAD_SIZE;
-  char *  ptr = POINTER_DRIFT(row, dataRowLen(row));
+  char *  ptr = POINTER_SHIFT(row, dataRowLen(row));
 
   switch (type) {
     case TSDB_DATA_TYPE_BINARY:
     case TSDB_DATA_TYPE_NCHAR:
-      *(VarDataOffsetT *)POINTER_DRIFT(row, toffset) = dataRowLen(row);
+      *(VarDataOffsetT *)POINTER_SHIFT(row, toffset) = dataRowLen(row);
       memcpy(ptr, value, varDataTLen(value));
       dataRowLen(row) += varDataTLen(value);
       break;
     default:
-      memcpy(POINTER_DRIFT(row, toffset), value, TYPE_BYTES[type]);
+      memcpy(POINTER_SHIFT(row, toffset), value, TYPE_BYTES[type]);
       break;
   }
 
@@ -202,13 +202,13 @@ void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints)
   if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
     pDataCol->spaceSize = (sizeof(VarDataLenT) + pDataCol->bytes) * maxPoints;
     pDataCol->dataOff = (VarDataOffsetT *)(*pBuf);
-    pDataCol->pData = POINTER_DRIFT(*pBuf, TYPE_BYTES[pDataCol->type] * maxPoints);
-    *pBuf = POINTER_DRIFT(*pBuf, pDataCol->spaceSize + TYPE_BYTES[pDataCol->type] * maxPoints);
+    pDataCol->pData = POINTER_SHIFT(*pBuf, TYPE_BYTES[pDataCol->type] * maxPoints);
+    *pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize + TYPE_BYTES[pDataCol->type] * maxPoints);
   } else {
     pDataCol->spaceSize = pDataCol->bytes * maxPoints;
     pDataCol->dataOff = NULL;
     pDataCol->pData = *pBuf;
-    *pBuf = POINTER_DRIFT(*pBuf, pDataCol->spaceSize);
+    *pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize);
   }
 
 }
@@ -222,13 +222,13 @@ void dataColAppendVal(SDataCol *pCol, void *value, int numOfPoints, int maxPoint
       // set offset
       pCol->dataOff[numOfPoints] = pCol->len;
       // Copy data
-      memcpy(POINTER_DRIFT(pCol->pData, pCol->len), value, varDataTLen(value));
+      memcpy(POINTER_SHIFT(pCol->pData, pCol->len), value, varDataTLen(value));
       // Update the length
       pCol->len += varDataTLen(value);
       break;
     default:
       ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfPoints);
-      memcpy(POINTER_DRIFT(pCol->pData, pCol->len), value, pCol->bytes);
+      memcpy(POINTER_SHIFT(pCol->pData, pCol->len), value, pCol->bytes);
       pCol->len += pCol->bytes;
       break;
   }
@@ -244,12 +244,12 @@ void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfPoints) {
     VarDataOffsetT toffset = pCol->dataOff[pointsToPop];
     pCol->len = pCol->len - toffset;
     ASSERT(pCol->len > 0);
-    memmove(pCol->pData, POINTER_DRIFT(pCol->pData, toffset), pCol->len);
+    memmove(pCol->pData, POINTER_SHIFT(pCol->pData, toffset), pCol->len);
     dataColSetOffset(pCol, pointsLeft);
   } else {
     ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfPoints);
     pCol->len = TYPE_BYTES[pCol->type] * pointsLeft;
-    memmove(pCol->pData, POINTER_DRIFT(pCol->pData, TYPE_BYTES[pCol->type] * pointsToPop), pCol->len);
+    memmove(pCol->pData, POINTER_SHIFT(pCol->pData, TYPE_BYTES[pCol->type] * pointsToPop), pCol->len);
   }
 }
 
@@ -301,7 +301,7 @@ void dataColSetOffset(SDataCol *pCol, int nEle) {
   for (int i = 0; i < nEle; i++) {
     pCol->dataOff[i] = offset;
     offset += varDataTLen(tptr);
-    tptr = POINTER_DRIFT(tptr, varDataTLen(tptr));
+    tptr = POINTER_SHIFT(tptr, varDataTLen(tptr));
   }
 }
 
diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c
index e288760bf0..fe25699b5f 100644
--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
@@ -324,7 +324,6 @@ void sdbCleanUp() {
 
   tsSdbObj.status = SDB_STATUS_CLOSING;
   syncStop(tsSdbObj.sync);
-  free(tsSdbObj.sync);
   walClose(tsSdbObj.wal);
   sem_destroy(&tsSdbObj.sem);
   pthread_mutex_destroy(&tsSdbObj.mutex);
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 3e4e05cd11..20404511f6 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -1083,6 +1083,7 @@ static void rpcSendMsgToPeer(SRpcConn *pConn, void *msg, int msgLen) {
              pRpc->label, pConn, taosMsg[pHead->msgType], pConn->peerFqdn,
              pConn->peerPort, msgLen, pHead->sourceId, pHead->destId, pHead->tranId);
   } else {
+    if (pHead->code == 0) pConn->secured = 1; // for success response, set link as secured
     if (pHead->msgType < TSDB_MSG_TYPE_CM_HEARTBEAT || (rpcDebugFlag & 16))
       tTrace( "%s %p, %s is sent to %s:%hu, code:0x%x len:%d sig:0x%08x:0x%08x:%d",
           pRpc->label, pConn, taosMsg[pHead->msgType], pConn->peerFqdn, pConn->peerPort, 
diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index e056a10bba..a681c865c9 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -21,6 +21,7 @@
 #include "tskiplist.h"
 #include "tutil.h"
 #include "tlog.h"
+#include "tcoding.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c
index b1228b0230..ad98bb7b20 100644
--- a/src/tsdb/src/tsdbFile.c
+++ b/src/tsdb/src/tsdbFile.c
@@ -178,7 +178,7 @@ void tsdbFitRetention(STsdbRepo *pRepo) {
   SFileGroup *pGroup = pFileH->fGroup;
 
   int mfid =
-      tsdbGetKeyFileId(taosGetTimestamp(pRepo->config.precision), pRepo->config.daysPerFile, pRepo->config.precision);
+      tsdbGetKeyFileId(taosGetTimestamp(pRepo->config.precision), pRepo->config.daysPerFile, pRepo->config.precision) - pFileH->maxFGroups + 3;
 
   while (pFileH->numOfFGroups > 0 && pGroup[0].fileId < mfid) {
     tsdbRemoveFileGroup(pFileH, pGroup[0].fileId);
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index ec4fb2a33f..63ccb538ed 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -535,5 +535,5 @@ static int tsdbEstimateTableEncodeSize(STable *pTable) {
 char *getTupleKey(const void * data) {
   SDataRow row = (SDataRow)data;
 
-  return POINTER_DRIFT(row, TD_DATA_ROW_HEAD_SIZE);
+  return POINTER_SHIFT(row, TD_DATA_ROW_HEAD_SIZE);
 }
\ No newline at end of file
diff --git a/src/util/inc/tcoding.h b/src/util/inc/tcoding.h
index f3e7a52942..9f64f127e1 100644
--- a/src/util/inc/tcoding.h
+++ b/src/util/inc/tcoding.h
@@ -24,98 +24,188 @@ extern "C" {
 
 #include "tutil.h"
 
-const int TNUMBER = 1;
-#define IS_LITTLE_ENDIAN() (*(char *)(&TNUMBER) != 0)
+// TODO: move this to a platform file
+#define ENCODE_LIMIT (((uint8_t)1) << 7)
+static const int32_t TNUMBER = 1;
+#define IS_LITTLE_ENDIAN() (*(uint8_t *)(&TNUMBER) != 0)
 
 static FORCE_INLINE void *taosEncodeFixed16(void *buf, uint16_t value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(buf, &value, sizeof(value));
   } else {
-    ((char *)buf)[0] = value & 0xff;
-    ((char *)buf)[1] = (value >> 8) & 0xff;
+    ((uint8_t *)buf)[0] = value & 0xff;
+    ((uint8_t *)buf)[1] = (value >> 8) & 0xff;
   }
 
-  return POINTER_DRIFT(buf, sizeof(value));
+  return POINTER_SHIFT(buf, sizeof(value));
 }
 
 static FORCE_INLINE void *taosEncodeFixed32(void *buf, uint32_t value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(buf, &value, sizeof(value));
   } else {
-    ((char *)buf)[0] = value & 0xff;
-    ((char *)buf)[1] = (value >> 8) & 0xff;
-    ((char *)buf)[2] = (value >> 16) & 0xff;
-    ((char *)buf)[3] = (value >> 24) & 0xff;
+    ((uint8_t *)buf)[0] = value & 0xff;
+    ((uint8_t *)buf)[1] = (value >> 8) & 0xff;
+    ((uint8_t *)buf)[2] = (value >> 16) & 0xff;
+    ((uint8_t *)buf)[3] = (value >> 24) & 0xff;
   }
 
-  return POINTER_DRIFT(buf, sizeof(value));
+  return POINTER_SHIFT(buf, sizeof(value));
 }
 
 static FORCE_INLINE void *taosEncodeFixed64(void *buf, uint64_t value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(buf, &value, sizeof(value));
   } else {
-    ((char *)buf)[0] = value & 0xff;
-    ((char *)buf)[1] = (value >> 8) & 0xff;
-    ((char *)buf)[2] = (value >> 16) & 0xff;
-    ((char *)buf)[3] = (value >> 24) & 0xff;
-    ((char *)buf)[4] = (value >> 32) & 0xff;
-    ((char *)buf)[5] = (value >> 40) & 0xff;
-    ((char *)buf)[6] = (value >> 48) & 0xff;
-    ((char *)buf)[7] = (value >> 56) & 0xff;
+    ((uint8_t *)buf)[0] = value & 0xff;
+    ((uint8_t *)buf)[1] = (value >> 8) & 0xff;
+    ((uint8_t *)buf)[2] = (value >> 16) & 0xff;
+    ((uint8_t *)buf)[3] = (value >> 24) & 0xff;
+    ((uint8_t *)buf)[4] = (value >> 32) & 0xff;
+    ((uint8_t *)buf)[5] = (value >> 40) & 0xff;
+    ((uint8_t *)buf)[6] = (value >> 48) & 0xff;
+    ((uint8_t *)buf)[7] = (value >> 56) & 0xff;
   }
 
-  return POINTER_DRIFT(buf, sizeof(value));
+  return POINTER_SHIFT(buf, sizeof(value));
 }
 
 static FORCE_INLINE void *taosDecodeFixed16(void *buf, uint16_t *value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(value, buf, sizeof(*value));
   } else {
-    ((char *)value)[1] = ((char *)buf)[0];
-    ((char *)value)[0] = ((char *)buf)[1];
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[1];
   }
 
-  return POINTER_DRIFT(buf, sizeof(*value));
+  return POINTER_SHIFT(buf, sizeof(*value));
 }
 
 static FORCE_INLINE void *taosDecodeFixed32(void *buf, uint32_t *value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(value, buf, sizeof(*value));
   } else {
-    ((char *)value)[3] = ((char *)buf)[0];
-    ((char *)value)[2] = ((char *)buf)[1];
-    ((char *)value)[1] = ((char *)buf)[2];
-    ((char *)value)[0] = ((char *)buf)[3];
+    ((uint8_t *)value)[3] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[2] = ((uint8_t *)buf)[1];
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[2];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[3];
   }
 
-  return POINTER_DRIFT(buf, sizeof(*value));
+  return POINTER_SHIFT(buf, sizeof(*value));
 }
 
 static FORCE_INLINE void *taosDecodeFixed64(void *buf, uint64_t *value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(value, buf, sizeof(*value));
   } else {
-    ((char *)value)[7] = ((char *)buf)[0];
-    ((char *)value)[6] = ((char *)buf)[1];
-    ((char *)value)[5] = ((char *)buf)[2];
-    ((char *)value)[4] = ((char *)buf)[3];
-    ((char *)value)[3] = ((char *)buf)[4];
-    ((char *)value)[2] = ((char *)buf)[5];
-    ((char *)value)[1] = ((char *)buf)[6];
-    ((char *)value)[0] = ((char *)buf)[7];
+    ((uint8_t *)value)[7] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[6] = ((uint8_t *)buf)[1];
+    ((uint8_t *)value)[5] = ((uint8_t *)buf)[2];
+    ((uint8_t *)value)[4] = ((uint8_t *)buf)[3];
+    ((uint8_t *)value)[3] = ((uint8_t *)buf)[4];
+    ((uint8_t *)value)[2] = ((uint8_t *)buf)[5];
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[6];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[7];
   }
 
-  return POINTER_DRIFT(buf, sizeof(*value));
+  return POINTER_SHIFT(buf, sizeof(*value));
 }
 
-// TODO
-static FORCE_INLINE void *taosEncodeVariant16(void *buf, uint16_t value) {}
-static FORCE_INLINE void *taosEncodeVariant32(void *buf, uint32_t value) {}
-static FORCE_INLINE void *taosEncodeVariant64(void *buf, uint64_t value) {}
-static FORCE_INLINE void *taosDecodeVariant16(void *buf, uint16_t *value) {}
-static FORCE_INLINE void *taosDecodeVariant32(void *buf, uint32_t *value) {}
-static FORCE_INLINE void *taosDecodeVariant64(void *buf, uint64_t *value) {}
+static FORCE_INLINE void *taosEncodeVariant16(void *buf, uint16_t value) {
+  int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 3);
+  }
+
+  ((uint8_t *)buf)[i] = value;
+
+  return POINTER_SHIFT(buf, i+1);
+}
+
+static FORCE_INLINE void *taosEncodeVariant32(void *buf, uint32_t value) {
+  int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 5);
+  }
+
+  ((uint8_t *)buf)[i] = value;
+
+  return POINTER_SHIFT(buf, i + 1);
+}
+
+static FORCE_INLINE void *taosEncodeVariant64(void *buf, uint64_t value) {
+  int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 10);
+  }
+
+  ((uint8_t *)buf)[i] = value;
+
+  return POINTER_SHIFT(buf, i + 1);
+}
+
+static FORCE_INLINE void *taosDecodeVariant16(void *buf, uint16_t *value) {
+  int i = 0;
+  uint16_t tval = 0;
+  *value = 0;
+  while (i < 3) {
+    tval = (uint16_t)(((uint8_t *)buf)[i]);
+    if (tval < ENCODE_LIMIT) {
+      (*value) |= (tval << (7 * i));
+      return POINTER_SHIFT(buf, i + 1);
+    } else {
+      (*value) |= ((tval & (ENCODE_LIMIT - 1)) << (7 * i));
+      i++;
+    }
+  }
+
+  return NULL;  // error happened
+}
+
+static FORCE_INLINE void *taosDecodeVariant32(void *buf, uint32_t *value) {
+  int i = 0;
+  uint32_t tval = 0;
+  *value = 0;
+  while (i < 5) {
+    tval = (uint32_t)(((uint8_t *)buf)[i]);
+    if (tval < ENCODE_LIMIT) {
+      (*value) |= (tval << (7 * i));
+      return POINTER_SHIFT(buf, i + 1);
+    } else {
+      (*value) |= ((tval & (ENCODE_LIMIT - 1)) << (7 * i));
+      i++;
+    }
+  }
+
+  return NULL;  // error happened
+}
+
+static FORCE_INLINE void *taosDecodeVariant64(void *buf, uint64_t *value) {
+  int i = 0;
+  uint64_t tval = 0;
+  *value = 0;
+  while (i < 10) {
+    tval = (uint64_t)(((uint8_t *)buf)[i]);
+    if (tval < ENCODE_LIMIT) {
+      (*value) |= (tval << (7 * i));
+      return POINTER_SHIFT(buf, i + 1);
+    } else {
+      (*value) |= ((tval & (ENCODE_LIMIT - 1)) << (7 * i));
+      i++;
+    }
+  }
+
+  return NULL;  // error happened
+}
 
 #ifdef __cplusplus
 }
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
index 09f396e799..3a0a1920af 100644
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
@@ -45,7 +45,7 @@ extern "C" {
 #define tclose(x) taosCloseSocket(x)
 
 // Pointer p drift right by b bytes
-#define POINTER_DRIFT(p, b) ((void *)((char *)(p) + (b)))
+#define POINTER_SHIFT(p, b) ((void *)((char *)(p) + (b)))
 
 #ifndef NDEBUG
 #define ASSERT(x) assert(x)
diff --git a/src/util/src/tqueue.c b/src/util/src/tqueue.c
index a458cefc9c..8a203ed917 100644
--- a/src/util/src/tqueue.c
+++ b/src/util/src/tqueue.c
@@ -94,8 +94,6 @@ void *taosAllocateQitem(int size) {
 void taosFreeQitem(void *param) {
   if (param == NULL) return;
 
-  uTrace("item:%p is freed", param);
-
   char *temp = (char *)param;
   temp -= sizeof(STaosQnode);
   free(temp);
@@ -144,7 +142,7 @@ int taosReadQitem(taos_queue param, int *type, void **pitem) {
       queue->numOfItems--;
       if (queue->qset) atomic_sub_fetch_32(&queue->qset->numOfItems, 1);
       code = 1;
-      //uTrace("item:%p is read out from queue, items:%d", *pitem, queue->numOfItems);
+      uTrace("item:%p is read out from queue, items:%d", *pitem, queue->numOfItems);
   } 
 
   pthread_mutex_unlock(&queue->mutex);
@@ -309,13 +307,12 @@ int taosReadQitemFromQset(taos_qset param, int *type, void **pitem, void **phand
   pthread_mutex_lock(&qset->mutex);
 
   for(int i=0; i<qset->numOfQueues; ++i) {
-    //pthread_mutex_lock(&qset->mutex);
     if (qset->current == NULL) 
       qset->current = qset->head;   
     STaosQueue *queue = qset->current;
     if (queue) qset->current = queue->next;
-    //pthread_mutex_unlock(&qset->mutex);
     if (queue == NULL) break;
+    if (queue->head == NULL) continue;
 
     pthread_mutex_lock(&queue->mutex);
 
@@ -351,13 +348,12 @@ int taosReadAllQitemsFromQset(taos_qset param, taos_qall p2, void **phandle) {
   pthread_mutex_lock(&qset->mutex);
 
   for(int i=0; i<qset->numOfQueues; ++i) {
-    // pthread_mutex_lock(&qset->mutex);
     if (qset->current == NULL) 
       qset->current = qset->head;   
     queue = qset->current;
     if (queue) qset->current = queue->next;
-    // pthread_mutex_unlock(&qset->mutex);
     if (queue == NULL) break;
+    if (queue->head == NULL) continue;
 
     pthread_mutex_lock(&queue->mutex);
 
diff --git a/src/util/tests/codingTests.cpp b/src/util/tests/codingTests.cpp
new file mode 100644
index 0000000000..a72c7ef291
--- /dev/null
+++ b/src/util/tests/codingTests.cpp
@@ -0,0 +1,116 @@
+#include <gtest/gtest.h>
+#include <stdlib.h>
+#include <time.h>
+#include <random>
+
+#include "tcoding.h"
+
+static bool test_fixed_uint16(uint16_t value) {
+  char     buf[20] = "\0";
+  uint16_t value_check = 0;
+
+  void *ptr1 = taosEncodeFixed16(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixed16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
+static bool test_fixed_uint32(uint32_t value) {
+  char     buf[20] = "\0";
+  uint32_t value_check = 0;
+
+  void *ptr1 = taosEncodeFixed32(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixed32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
+static bool test_fixed_uint64(uint64_t value) {
+  char     buf[20] = "\0";
+  uint64_t value_check = 0;
+
+  void *ptr1 = taosEncodeFixed64(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixed64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
+static bool test_variant_uint16(uint16_t value) {
+  char     buf[20] = "\0";
+  uint16_t value_check = 0;
+
+  void *ptr1 = taosEncodeVariant16(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariant16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
+static bool test_variant_uint32(uint32_t value) {
+  char     buf[20] = "\0";
+  uint32_t value_check = 0;
+
+  void *ptr1 = taosEncodeVariant32(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariant32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
+static bool test_variant_uint64(uint64_t value) {
+  char     buf[20] = "\0";
+  uint64_t value_check = 0;
+
+  void *ptr1 = taosEncodeVariant64(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariant64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
+TEST(codingTest, fixed_encode_decode) {
+  srand(time(0));
+
+  for (uint16_t value = 0; value <= UINT16_MAX; value++) {
+    ASSERT_TRUE(test_fixed_uint16(value));
+    if (value == UINT16_MAX) break;
+  }
+
+  ASSERT_TRUE(test_fixed_uint32(0));
+  ASSERT_TRUE(test_fixed_uint32(UINT32_MAX));
+
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_uint32(rand()));
+  }
+
+  std::mt19937_64 gen (std::random_device{}());
+
+  ASSERT_TRUE(test_fixed_uint64(0));
+  ASSERT_TRUE(test_fixed_uint64(UINT64_MAX));
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_uint64(gen()));
+  }
+}
+
+TEST(codingTest, variant_encode_decode) {
+  srand(time(0));
+
+  for (uint16_t value = 0; value <= UINT16_MAX; value++) {
+    ASSERT_TRUE(test_variant_uint16(value));
+    if (value == UINT16_MAX) break;
+  }
+
+  ASSERT_TRUE(test_variant_uint32(0));
+  ASSERT_TRUE(test_variant_uint32(UINT32_MAX));
+
+  for (int i = 0; i < 5000000; i++) {
+    ASSERT_TRUE(test_variant_uint32(rand()));
+  }
+
+  std::mt19937_64 gen (std::random_device{}());
+
+  ASSERT_TRUE(test_variant_uint64(0));
+  ASSERT_TRUE(test_variant_uint64(UINT64_MAX));
+  for (int i = 0; i < 5000000; i++) {
+    uint64_t value = gen();
+    // printf("%ull\n", value);
+    ASSERT_TRUE(test_variant_uint64(value));
+  }
+}
\ No newline at end of file
diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index 73d99e2b6d..df15c7ebbb 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -20,9 +20,26 @@ run general/table/tinyint.sim
 run general/table/db.table.sim
 
 run general/user/basic1.sim
-#run general/user/pass_alter.sim
+run general/user/pass_alter.sim
 run general/user/pass_len.sim
 run general/user/user_create.sim
 run general/user/user_len.sim
 
+# run general/compute/count.sim 
+# run general/compute/avg.sim 
+# run general/compute/sum.sim 
+# run general/compute/min.sim 
+# run general/compute/max.sim 
+# run general/compute/first.sim 
+# run general/compute/last.sim 
+run general/compute/stddev.sim 
+# run general/compute/leastsquare.sim 
+run general/compute/top.sim 
+run general/compute/bottom.sim 
+run general/compute/percentile.sim 
+run general/compute/diff.sim 
+# run general/compute/interval.sim 
+run general/compute/null.sim 
+# run general/compute/diff2.sim
+
 ################################## 
diff --git a/tests/script/general/agg/stream.sim b/tests/script/general/agg/stream.sim
index 2217c39430..814438ac74 100644
--- a/tests/script/general/agg/stream.sim
+++ b/tests/script/general/agg/stream.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 
 print ========== step1
 system sh/cfg.sh -n dnode1 -c monitor -v 1
diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim
index 52507b1992..d81720a1da 100644
--- a/tests/script/general/alter/cached_schema_after_alter.sim
+++ b/tests/script/general/alter/cached_schema_after_alter.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim
index 1b77f997ac..a6a2a13ef7 100644
--- a/tests/script/general/alter/count.sim
+++ b/tests/script/general/alter/count.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 
diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim
index 7348cc919e..1771d47298 100644
--- a/tests/script/general/alter/import.sim
+++ b/tests/script/general/alter/import.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 
diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim
index 0daa9c6432..7095313a0d 100644
--- a/tests/script/general/alter/insert1.sim
+++ b/tests/script/general/alter/insert1.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim
index 34f935a04b..a248c7cd2b 100644
--- a/tests/script/general/alter/insert2.sim
+++ b/tests/script/general/alter/insert2.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/column/stream.sim b/tests/script/general/column/stream.sim
index 6972e34197..cb94904ff2 100644
--- a/tests/script/general/column/stream.sim
+++ b/tests/script/general/column/stream.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 
 print ========== step1
 system sh/cfg.sh -n dnode1 -c monitor         -v 1
diff --git a/tests/script/general/column/testSuite.sim b/tests/script/general/column/testSuite.sim
index 64eba8cc7e..2a0b9efd45 100644
--- a/tests/script/general/column/testSuite.sim
+++ b/tests/script/general/column/testSuite.sim
@@ -1,4 +1,4 @@
-run lite/column/table.sim
-run lite/column/metrics.sim
-run lite/column/stream.sim
-run lite/column/commit.sim
+run general/column/table.sim
+run general/column/metrics.sim
+run general/column/stream.sim
+run general/column/commit.sim
diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim
index 072eefd10c..e2c3964e1b 100644
--- a/tests/script/general/compress/commitlog.sim
+++ b/tests/script/general/compress/commitlog.sim
@@ -3,7 +3,6 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim
index 54fcc9acde..276fba9f8c 100644
--- a/tests/script/general/compress/compress.sim
+++ b/tests/script/general/compress/compress.sim
@@ -3,7 +3,6 @@ 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/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim
index 76e9e66312..29d14c2c75 100644
--- a/tests/script/general/compress/compress2.sim
+++ b/tests/script/general/compress/compress2.sim
@@ -3,7 +3,6 @@ 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/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 2
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim
index 2ff0144600..a7b8a95d52 100644
--- a/tests/script/general/compress/uncompress.sim
+++ b/tests/script/general/compress/uncompress.sim
@@ -3,7 +3,6 @@ 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/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/db/back_insert.sim b/tests/script/general/db/back_insert.sim
index 43831cca95..642df63ff2 100644
--- a/tests/script/general/db/back_insert.sim
+++ b/tests/script/general/db/back_insert.sim
@@ -1,6 +1,8 @@
 sql connect
 $x = 1
 begin:
+  sql reset query cache
+  sleep 1000 
   sql insert into db.tb values(now, $x ) -x begin  
   #print ===> insert successed $x 
   $x = $x + 1   
diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim
index 9d56e1c5fb..dddc976ab3 100644
--- a/tests/script/general/db/basic.sim
+++ b/tests/script/general/db/basic.sim
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c tables -v 1000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim
index 655dc5e365..8eb38ed1b1 100644
--- a/tests/script/general/db/delete_reuse1.sim
+++ b/tests/script/general/db/delete_reuse1.sim
@@ -1,9 +1,5 @@
 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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print ======== step1 
@@ -78,6 +73,8 @@ sql insert into d1.t1 values(now, 2) -x step2
 step2:
 
 print ========= step3
+sql reset query cache
+sleep 1000
 sql create database d1 replica 1
 sql create table d1.t1 (ts timestamp, i int)
 sql insert into d1.t1 values(now, 2)
@@ -97,6 +94,8 @@ while $x < 20
   step4:
   
   sql create database d1 replica 1
+  sql reset query cache
+  sleep 1000
   sql create table d1.t1 (ts timestamp, i int)
   sql insert into d1.t1 values(now, $x )
   sql select * from d1.t1
diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim
index c424bee9ae..d7483a1b58 100644
--- a/tests/script/general/db/delete_reuse2.sim
+++ b/tests/script/general/db/delete_reuse2.sim
@@ -1,9 +1,5 @@
 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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print ======== step1 
@@ -79,6 +74,8 @@ step2:
 
 print ========= step3
 sql create database db1 replica 1
+sql reset query cache
+sleep 1000  
 sql create table db1.tb1 (ts timestamp, i int)
 sql insert into db1.tb1 values(now, 2)
 sql select * from db1.tb1
@@ -104,6 +101,9 @@ while $x < 20
   $db = db . $x 
   $tb = tb . $x
   
+  sql reset query cache
+  sleep 1000
+  
   sql create database $db replica 1
   sql use $db
   sql create table $tb (ts timestamp, i int)
diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim
index 2204e7434f..1328ae1a9c 100644
--- a/tests/script/general/db/delete_reusevnode.sim
+++ b/tests/script/general/db/delete_reusevnode.sim
@@ -5,19 +5,16 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sql connect
 
 print ======== step1 
 
 $tbPrefix = t
 $i = 0
-while $i < 1000
+while $i < 30
   $db = db . $i
   sql create database $db
   sql use $db
@@ -37,38 +34,32 @@ endw
 
 print ======== step2
 sleep 1000
-sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
 endi 
 
-
 system sh/stop_dnodes.sh
+sleep 3000
 
 system sh/deploy.sh -n dnode1 -i 1
-
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sql connect
 
 print ======== step1
 
 $tbPrefix = t
 $i = 0
-while $i < 1000
+while $i < 10
   $db = db . $i
-  sql create database $db tables 4
+  sql create database $db maxTables 4
   sql use $db
 
-  sql create table st (ts timesetamp, i int) tags(j int);
+  sql create table st (ts timestamp, i int) tags(j int);
   $tb = $tbPrefix . $i
   $tb = $tb . a
 
@@ -114,7 +105,6 @@ endw
 
 print ======== step2
 sleep 1000
-sql drop database $db
 sql show databases
 if $rows != 0 then
   return -1
diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim
index dcf74a287d..b0032e137b 100644
--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
@@ -5,26 +5,19 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-
-sleep 3000
+sql connect
 
 print ======== step1
 
-
-sql create database db tables 4;
+sql create database db maxTables 4;
 sql use db
 
-
 $tbPrefix = t
 $i = 0
-while $i < 1000
-
+while $i < 10
 
   sql create table st (ts timestamp, i int) tags(j int);
   $tb = $tbPrefix . $i
diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim
index 8587925370..134a34bf95 100644
--- a/tests/script/general/db/delete_writing1.sim
+++ b/tests/script/general/db/delete_writing1.sim
@@ -1,9 +1,5 @@
 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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 sql create database db 
@@ -39,7 +34,7 @@ sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
 print ======== start back
-run_back lite/db/back_insert.sim
+run_back general/db/back_insert.sim
 sleep 1000
 
 print ======== step1 
diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim
index 75603dcdd8..819c16751a 100644
--- a/tests/script/general/db/delete_writing2.sim
+++ b/tests/script/general/db/delete_writing2.sim
@@ -1,13 +1,11 @@
 system sh/stop_dnodes.sh
 
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 sql create database db 
@@ -27,7 +25,7 @@ sql create table db4.tb4 (ts timestamp, i int)
 sql insert into db4.tb4 values(now, 1)
 
 print ======== start back
-run_back lite/db/back_insert.sim
+run_back general/db/back_insert.sim
 sleep 1000
 
 print ======== step1 
diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim
index 4ec97c8368..d8c0e9363f 100644
--- a/tests/script/general/db/len.sim
+++ b/tests/script/general/db/len.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
 
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim
index 7afa42f0c4..a69e3fa019 100644
--- a/tests/script/general/db/repeat.sim
+++ b/tests/script/general/db/repeat.sim
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c tables -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim
index 3be2eec729..590c6fc442 100644
--- a/tests/script/general/db/tables.sim
+++ b/tests/script/general/db/tables.sim
@@ -1,17 +1,16 @@
 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/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
 
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
 print =============== step2
-sql create database db tables 2
+sql create database db maxtables 4
 sql show databases
 print $rows $data07
 
@@ -19,7 +18,7 @@ if $rows != 1 then
   return -1
 endi
 
-if $data07 != 2 then
+if $data07 != 4 then
   return -1
 endi
 
@@ -30,9 +29,17 @@ sql create table t2 (ts timestamp, i int)
 sql create table t3 (ts timestamp, i int)
 sql create table t4 (ts timestamp, i int)
 sql create table t11 (ts timestamp, i int)
+sql create table t12 (ts timestamp, i int)
+sql create table t13 (ts timestamp, i int)
+sql create table t14 (ts timestamp, i int)
+sql create table t21 (ts timestamp, i int)
 sql create table t22 (ts timestamp, i int)
+sql create table t23 (ts timestamp, i int)
+sql create table t24 (ts timestamp, i int)
+sql create table t31 (ts timestamp, i int)
+sql create table t32 (ts timestamp, i int)
 sql create table t33 (ts timestamp, i int)
-sql create table t44 (ts timestamp, i int)
+sql create table t34 (ts timestamp, i int)
 
 print =============== step4
 sql insert into t1 values(now, 1)
@@ -42,7 +49,7 @@ sql insert into t4 values(now, 4)
 sql insert into t11 values(now, 1)
 sql insert into t22 values(now, 2)
 sql insert into t33 values(now, 3)
-sql insert into t44 values(now, 4)
+sql insert into t34 values(now, 4)
 
 print =============== step5
 sql select * from t1
@@ -68,10 +75,10 @@ endi
 print =============== step6
 sql drop database db
 sql reset query cache
-sleep 20000
+sleep 4000
 
 print =============== step7
-sql create database db tables 2
+sql create database db maxtables 4
 sql show databases
 print $rows $data07
 
@@ -79,7 +86,7 @@ if $rows != 1 then
   return -1
 endi
 
-if $data07 != 2 then
+if $data07 != 4 then
   return -1
 endi
 
@@ -90,9 +97,17 @@ sql create table t2 (ts timestamp, i int)
 sql create table t3 (ts timestamp, i int)
 sql create table t4 (ts timestamp, i int)
 sql create table t11 (ts timestamp, i int)
+sql create table t12 (ts timestamp, i int)
+sql create table t13 (ts timestamp, i int)
+sql create table t14 (ts timestamp, i int)
+sql create table t21 (ts timestamp, i int)
 sql create table t22 (ts timestamp, i int)
+sql create table t23 (ts timestamp, i int)
+sql create table t24 (ts timestamp, i int)
+sql create table t31 (ts timestamp, i int)
+sql create table t32 (ts timestamp, i int)
 sql create table t33 (ts timestamp, i int)
-sql create table t44 (ts timestamp, i int)
+sql create table t34 (ts timestamp, i int)
 
 print =============== step9
 sql insert into t1 values(now, 1)
@@ -102,7 +117,7 @@ sql insert into t4 values(now, 4)
 sql insert into t11 values(now, 1)
 sql insert into t22 values(now, 2)
 sql insert into t33 values(now, 3)
-sql insert into t44 values(now, 4)
+sql insert into t34 values(now, 4)
 
 print =============== step10
 sql select * from t1
diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim
index 3c63864e6f..893d2040a9 100644
--- a/tests/script/general/db/testSuite.sim
+++ b/tests/script/general/db/testSuite.sim
@@ -1,12 +1,15 @@
+run general//db/basic.sim
 run general/db/basic1.sim
 run general/db/basic2.sim
 run general/db/basic3.sim
 run general/db/basic4.sim
 run general/db/basic5.sim
-#run general//db/tables.sim
-#run general//db/basic.sim
-#run general//db/len.sim
-#run general//db/delete_reuse1.sim
-#run general//db/delete_reuse2.sim
-#run general//db/delete_writing1.sim
-#run general//db/delete_writing2.sim
+run general/db/delete_reuse1.sim
+run general/db/delete_reuse2.sim
+run general/db/delete_reusevnode.sim
+#run general/db/delete_reusevnode2.sim
+run general/db/delete_writing1.sim
+run general/db/delete_writing2.sim
+run general/db/len.sim
+run general/db/repeat.sim
+run general/db/tables.sim
diff --git a/tests/script/general/http/restful.sim b/tests/script/general/http/restful.sim
index c50273107f..894033e8f0 100644
--- a/tests/script/general/http/restful.sim
+++ b/tests/script/general/http/restful.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 sleep 5000
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim
index d125ccb56d..a4c1bd1851 100644
--- a/tests/script/general/http/restful_full.sim
+++ b/tests/script/general/http/restful_full.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 sleep 5000
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim
index 5037014728..0623405c2f 100644
--- a/tests/script/general/import/basic.sim
+++ b/tests/script/general/import/basic.sim
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
 system sh/cfg.sh -n dnode1 -c commitlog -v 0
 system sh/cfg.sh -n dnode2 -c commitlog -v 0
diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim
index 2197c1d39d..ce52b9496f 100644
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/general/import/commit.sim
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
 system sh/cfg.sh -n dnode1 -c commitlog -v 0
 system sh/cfg.sh -n dnode2 -c commitlog -v 0
diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim
index 77a47a1049..6a0bbf28d2 100644
--- a/tests/script/general/import/large.sim
+++ b/tests/script/general/import/large.sim
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
 system sh/cfg.sh -n dnode1 -c commitlog -v 0
 system sh/cfg.sh -n dnode2 -c commitlog -v 0
diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim
index 193082097c..14e27ffa50 100644
--- a/tests/script/general/import/replica1.sim
+++ b/tests/script/general/import/replica1.sim
@@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
 system sh/cfg.sh -n dnode1 -c commitlog -v 0
 system sh/cfg.sh -n dnode2 -c commitlog -v 0
diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim
index e59c1504c4..04f9415e2f 100644
--- a/tests/script/general/insert/insert_drop.sim
+++ b/tests/script/general/insert/insert_drop.sim
@@ -19,7 +19,7 @@ $stb = stb
 
 sql drop database $db -x step1
 step1:
-sql create database $db tables 10 ctime 30
+sql create database $db maxtables 10 ctime 30
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int) tags(t1 int)
diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim
index fb5eedff8e..a23a117ac2 100644
--- a/tests/script/general/metrics/disk.sim
+++ b/tests/script/general/metrics/disk.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -24,7 +24,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/general/metrics/metrics.sim b/tests/script/general/metrics/metrics.sim
index 143e460dff..52448a4002 100644
--- a/tests/script/general/metrics/metrics.sim
+++ b/tests/script/general/metrics/metrics.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/metrics/values.sim b/tests/script/general/metrics/values.sim
index 07a31a686b..efabc67722 100644
--- a/tests/script/general/metrics/values.sim
+++ b/tests/script/general/metrics/values.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim
index ebd1f24225..5d4a9f7f5b 100644
--- a/tests/script/general/metrics/vnode3.sim
+++ b/tests/script/general/metrics/vnode3.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -24,7 +24,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
index 3c8db5ea8f..8fb0ddae54 100644
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
index 8e691e4960..23cad7137e 100644
--- a/tests/script/general/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -22,7 +22,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db rows 200 cache 2048 tables 4
+sql create database $db rows 200 cache 2048 maxTables 4
 print ====== create tables
 sql use $db
 
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index 48b17eed4f..6e11f9d25b 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -163,7 +163,7 @@ sql_error create database $db rows 199
 sql_error create database $db cache 99
 #sql_error create database $db cache 10485761
 
-# ablocks [overwriten by 4*sessionsPerVnode, 409600]
+# ablocks [overwriten by 4*maxtablesPerVnode, 409600]
 sql_error create database $db ablocks -1
 #sql_error create database $db ablocks 409601
 
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index 93b2bffeec..8bede7573a 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db rows 400 cache 4096 tables 4
+sql create database $db rows 400 cache 4096 maxTables 4
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
 
@@ -69,7 +69,7 @@ sql import into $tb (ts) values ( $ts )
 
 print ====== test data created
 
-run lite/parser/first_last_query.sim
+run general/parser/first_last_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -79,5 +79,5 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/first_last_query.sim
+run general/parser/first_last_query.sim
 
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index fb129388a5..5bf41772ed 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -28,7 +28,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index b923f61236..c7c633d422 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -56,7 +56,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/interp_test.sim
+run general/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -64,4 +64,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/interp_test.sim
+run general/parser/interp_test.sim
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index 85ddb29066..6addcb1ac1 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -24,7 +24,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index 91cac9fbdb..86488ea844 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -22,7 +22,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index 83532cc10f..5eb3b144a6 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
 
@@ -57,7 +57,7 @@ endw
 
 print ====== test data created
 
-run lite/parser/lastrow_query.sim
+run general/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -67,4 +67,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/lastrow_query.sim
+run general/parser/lastrow_query.sim
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index a20160363a..8f00912a59 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit_tb.sim
-run lite/parser/limit_stb.sim
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -67,5 +67,5 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/limit_tb.sim
-run lite/parser/limit_stb.sim
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index fa8a938714..040b6303de 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,5 +65,5 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index c6d41cb6a5..a776459640 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,5 +65,5 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index 5b1280d858..cc9334db36 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run lite/parser/limit2_query.sim
+#run general/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit2_query.sim
+run general/parser/limit2_query.sim
diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim
index b69d24f6ca..64f86edd28 100644
--- a/tests/script/general/parser/limit2_tblocks100.sim
+++ b/tests/script/general/parser/limit2_tblocks100.sim
@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run lite/parser/limit2_query.sim
+#run general/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit2_query.sim
+run general/parser/limit2_query.sim
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index 2c8bd0e117..37ba1a8900 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -22,7 +22,7 @@ sql drop database if exists $db
 $paramRows = 200
 $rowNum = $paramRows * 4
 $rowNum = $rowNum / 5
-sql create database $db rows $paramRows tables 4
+sql create database $db rows $paramRows maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index 5381ed7e83..d990a79628 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -22,7 +22,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/repeatAlter.sim b/tests/script/general/parser/repeatAlter.sim
index eec82f62c0..5f6a8e6a2a 100644
--- a/tests/script/general/parser/repeatAlter.sim
+++ b/tests/script/general/parser/repeatAlter.sim
@@ -2,6 +2,6 @@ $i = 1
 $loops = 10
 while $i <= $loops
   print ====== repeat: $i
-  run lite/parser/alter.sim
+  run general/parser/alter.sim
   $i = $i + 1
 endw
diff --git a/tests/script/general/parser/repeatStream.sim b/tests/script/general/parser/repeatStream.sim
index 1301462c31..bd631e36a1 100644
--- a/tests/script/general/parser/repeatStream.sim
+++ b/tests/script/general/parser/repeatStream.sim
@@ -2,6 +2,6 @@ $i = 1
 $repeats = 5
 while $i <= $repeats
   print ====== repeat: $i
-  run lite/parser/stream.sim
+  run general/parser/stream.sim
   $i = $i + 1
 endw
diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim
index 98dd7993ff..883d4d59cd 100644
--- a/tests/script/general/parser/select_across_vnodes.sim
+++ b/tests/script/general/parser/select_across_vnodes.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 5
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
index 84798cdd64..04cc68c310 100644
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
index 350cb7669a..181d7f312a 100644
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -23,7 +23,7 @@ $tstart = 100000
 
 sql drop database if exists $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index 07af4b9b27..5ee65e3b10 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -15,7 +15,7 @@ $db = $dbPrefix
 $stb = $stbPrefix
 
 sql drop database if exists $db
-sql create database $db rows 200 tables 4
+sql create database $db rows 200 maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
@@ -27,7 +27,7 @@ sql create table $tb1 using $stb tags( 1 )
 sql insert into $tb1 values ( $ts0 , 1, 2, 3, 4, true, 'binay10', '涛思nchar10' )
 print ====== tables created
 
-run lite/parser/single_row_in_tb_query.sim
+run general/parser/single_row_in_tb_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -35,4 +35,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/single_row_in_tb_query.sim
+run general/parser/single_row_in_tb_query.sim
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 3581c3a993..7d2d3fc60b 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
@@ -22,7 +22,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024 tblocks 200 tables 4
+sql create database $db rows 200 cache 1024 tblocks 200 maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(15), t2 int, t3 bigint, t4 nchar(10), t5 double, t6 bool)
@@ -94,7 +94,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run lite/parser/slimit_query.sim
+run general/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -104,4 +104,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/slimit_query.sim
+run general/parser/slimit_query.sim
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index ce5b278ca6..7020cc8bb7 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
@@ -53,7 +53,7 @@ endw
 
 print ================== tables and data created
   
-run lite/parser/slimit1_query.sim
+run general/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -63,4 +63,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/slimit1_query.sim
+run general/parser/slimit1_query.sim
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index c507abcf0d..630855260c 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index 59298cc9f5..548560e945 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -64,7 +64,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/tbnameIn_query.sim
+run general/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -72,4 +72,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/tbnameIn_query.sim
+run general/parser/tbnameIn_query.sim
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index 112a1c8377..ce2b62fcc9 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -21,7 +21,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024 tblocks 200 tables 4
+sql create database $db rows 200 cache 1024 tblocks 200 maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 timestamp, c2 int) tags(t1 binary(20))
@@ -54,7 +54,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run lite/parser/timestamp_query.sim
+run general/parser/timestamp_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -64,4 +64,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/timestamp_query.sim
+run general/parser/timestamp_query.sim
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index c6671319b9..c840bcf22e 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -21,7 +21,7 @@ $mt = $mtPrefix . $i
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4
+sql create database if not exists $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
 
diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim
index cf8a6df831..025f4cbdc0 100644
--- a/tests/script/general/stream/metrics_del.sim
+++ b/tests/script/general/stream/metrics_del.sim
@@ -2,9 +2,6 @@ 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/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim
index b4a22b4d6d..13cd18adf3 100644
--- a/tests/script/general/stream/metrics_replica1_vnoden.sim
+++ b/tests/script/general/stream/metrics_replica1_vnoden.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim
index 2a77991569..914ecd8484 100644
--- a/tests/script/general/stream/stream_3.sim
+++ b/tests/script/general/stream/stream_3.sim
@@ -109,9 +109,6 @@ print =============== step7
 system sh/exec.sh -n dnode1 -s stop
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 4000
diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim
index 389a3959b0..16dc8c2bb1 100644
--- a/tests/script/general/stream/table_del.sim
+++ b/tests/script/general/stream/table_del.sim
@@ -2,9 +2,6 @@ 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/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim
index 8195c2c725..44d4008dbd 100644
--- a/tests/script/general/stream/table_replica1_vnoden.sim
+++ b/tests/script/general/stream/table_replica1_vnoden.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim
index bd4a316517..049b3037aa 100644
--- a/tests/script/general/table/delete_writing.sim
+++ b/tests/script/general/table/delete_writing.sim
@@ -40,7 +40,7 @@ sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
 print ======== start back
-run_back lite/table/back_insert.sim
+run_back general/table/back_insert.sim
 sleep 1000
 
 print ======== step1 
diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim
index e22f81271b..97541580a8 100644
--- a/tests/script/general/table/limit.sim
+++ b/tests/script/general/table/limit.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 129
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 129
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -19,7 +19,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =================== step 0
-sql create database $db tables 129
+sql create database $db maxtables 129
 sql use $db
 sql show vgroups
 if $rows != 0 then 
diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim
index 81be2fe40a..7dbab1eabb 100644
--- a/tests/script/general/table/vgroup.sim
+++ b/tests/script/general/table/vgroup.sim
@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =================== step 1
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql show vgroups
 if $rows != 0 then 
diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim
index 987cb84357..3c578ec73c 100644
--- a/tests/script/general/user/monitor.sim
+++ b/tests/script/general/user/monitor.sim
@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 
 print ========== step1
-system sh/cfg.sh -n dnode1 -c clog    -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c monitor -v 1
 system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim
index f7eee1359b..22c0333227 100644
--- a/tests/script/general/user/pass_alter.sim
+++ b/tests/script/general/user/pass_alter.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim
index 583c2e73d3..2a4a007a1a 100644
--- a/tests/script/general/user/pass_len.sim
+++ b/tests/script/general/user/pass_len.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/user/user_create.sim b/tests/script/general/user/user_create.sim
index 4b81313695..cb75c2f5a6 100644
--- a/tests/script/general/user/user_create.sim
+++ b/tests/script/general/user/user_create.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim
index 4d2658cec9..fa1fd5c4ea 100644
--- a/tests/script/general/user/user_len.sim
+++ b/tests/script/general/user/user_len.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 81f6bc55f7..e0590b50ef 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -6,6 +6,49 @@ cd ../../../debug; cmake ..
 #cd ../../../debug; make clean
 cd ../../../debug; make
 
+
+#general
+
+./test.sh -f general//db/basic.sim
+./test.sh -f general/db/basic1.sim
+./test.sh -f general/db/basic2.sim
+./test.sh -f general/db/basic3.sim
+./test.sh -f general/db/basic4.sim
+./test.sh -f general/db/basic5.sim
+./test.sh -f general/db/delete_reuse1.sim
+./test.sh -f general/db/delete_reuse2.sim
+./test.sh -f general/db/delete_reusevnode.sim
+#./test.sh -f general/db/delete_reusevnode2.sim
+./test.sh -f general/db/delete_writing1.sim
+./test.sh -f general/db/delete_writing2.sim
+./test.sh -f general/db/len.sim
+./test.sh -f general/db/repeat.sim
+./test.sh -f general/db/tables.sim
+
+./test.sh -f general/table/autocreate.sim
+./test.sh -f general/table/basic1.sim
+./test.sh -f general/table/basic2.sim
+./test.sh -f general/table/basic3.sim
+./test.sh -f general/table/bigint.sim
+./test.sh -f general/table/bool.sim
+./test.sh -f general/table/column_name.sim
+./test.sh -f general/table/column_num.sim
+./test.sh -f general/table/db.table.sim
+./test.sh -f general/table/double.sim
+./test.sh -f general/table/float.sim
+./test.sh -f general/table/int.sim
+./test.sh -f general/table/smallint.sim
+./test.sh -f general/table/tinyint.sim
+
+./test.sh -f general/user/basic1.sim
+./test.sh -f general/user/pass_alter.sim
+./test.sh -f general/user/pass_len.sim
+./test.sh -f general/user/user_create.sim
+./test.sh -f general/user/user_len.sim
+
+
+# unique
+
 ./test.sh -u -f unique/account/account_create.sim
 ./test.sh -u -f unique/account/account_delete.sim
 ./test.sh -u -f unique/account/account_len.sim
diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim
index b6eb239052..30dd96075c 100644
--- a/tests/script/unique/account/account_create.sim
+++ b/tests/script/unique/account/account_create.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
@@ -76,4 +76,4 @@ if $rows != 1 then
   return -1
 endi
 
-  
+system sh/exec_up.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
index 6d1c148698..71a75a7b35 100644
--- a/tests/script/unique/account/account_delete.sim
+++ b/tests/script/unique/account/account_delete.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
@@ -94,4 +94,6 @@ sql drop account oroot
 sql show accounts
 if $rows != 1 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.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
index 06fb37bb5a..ae2db26d58 100644
--- a/tests/script/unique/account/account_len.sim
+++ b/tests/script/unique/account/account_len.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
@@ -88,3 +88,5 @@ sql show users
 if $rows != 3 then 
   return -1
 endi
+
+system sh/exec_up.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
index 4198f2c333..fe978a5827 100644
--- a/tests/script/unique/account/authority.sim
+++ b/tests/script/unique/account/authority.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec_up.sh -n dnode1 -s start
 
@@ -343,3 +343,5 @@ sql drop database d1
 sql drop database d2
 sql drop database d3
 sql drop database d4
+
+system sh/exec_up.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
index b2d8904cc6..d06f7a15d9 100644
--- a/tests/script/unique/account/basic.sim
+++ b/tests/script/unique/account/basic.sim
@@ -42,4 +42,4 @@ endi
 print $data00 $data01 $data02
 print $data10 $data11 $data22
 
-  
+system sh/exec_up.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
index d1d573d334..b2e540400c 100644
--- a/tests/script/unique/account/paras.sim
+++ b/tests/script/unique/account/paras.sim
@@ -109,3 +109,5 @@ endi
 if $data16 != 0.000/10.000 then 
   return -1
 endi  
+
+system sh/exec_up.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
index 54ab8fbda8..936611833a 100644
--- a/tests/script/unique/account/pass_alter.sim
+++ b/tests/script/unique/account/pass_alter.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
@@ -112,3 +112,5 @@ sql alter user oroot pass 'taosdata'
 sql drop account oroot
 sql drop user read
 sql drop user write
+
+system sh/exec_up.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
index acf4f50c69..f4f9c04964 100644
--- a/tests/script/unique/account/pass_len.sim
+++ b/tests/script/unique/account/pass_len.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
@@ -78,4 +78,4 @@ if $rows != 3 then
   return -1
 endi
 
-
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim
index af904815a0..f022380ac4 100644
--- a/tests/script/unique/account/usage.sim
+++ b/tests/script/unique/account/usage.sim
@@ -54,4 +54,6 @@ if $data05 != 0/10 then
 endi
 
 print =============== check grant
-sql_error create database d6
\ No newline at end of file
+sql_error create database d6
+
+system sh/exec_up.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
index bc4a8f6e8e..075da848d6 100644
--- a/tests/script/unique/account/user_create.sim
+++ b/tests/script/unique/account/user_create.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
@@ -81,7 +81,4 @@ step42:
 
 sql drop user read
 
-  
-
-  
-  
+system sh/exec_up.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
index 0e25f554e0..fcc344d115 100644
--- a/tests/script/unique/account/user_len.sim
+++ b/tests/script/unique/account/user_len.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
@@ -89,3 +89,5 @@ sql show accounts
 if $rows != 1 then 
   return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
index 270c3810a7..3d4d39af53 100644
--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
@@ -1,23 +1,23 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c tables -v 1000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c tables -v 1000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode3 -c tables -v 1000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode4 -c tables -v 1000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode5 -i 5
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode5 -c tables -v 1000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 1000
 
 print =============== prepare data
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index 12affc72c5..738fd0704d 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -1,8 +1,8 @@
 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog           -v 0
-system sh/cfg.sh -n dnode1 -c tables         -v 100
+system sh/cfg.sh -n dnode1 -c walLevel            -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode   -v 100
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v 256
 system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000
 system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000
@@ -39,8 +39,8 @@ endi
 
 
 system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode2 -c clog           -v 0
-system sh/cfg.sh -n dnode2 -c tables         -v 100
+system sh/cfg.sh -n dnode2 -c walLevel            -v 0
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode   -v 100
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes    -v 256
 system sh/cfg.sh -n dnode2 -c maxVnodeConnections -v 100000
 system sh/cfg.sh -n dnode2 -c maxMeterConnections -v 100000
diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim
index a4ca80c75c..7957449617 100644
--- a/tests/script/unique/big/tcp.sim
+++ b/tests/script/unique/big/tcp.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c tables    -v 30000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode    -v 30000
 
 system sh/cfg.sh -n dnode1 -c dDebugFlag      -v 131
 system sh/cfg.sh -n dnode1 -c mDebugFlag      -v 131
diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim
index 50f56688f3..424a80d25a 100644
--- a/tests/script/unique/cluster/balance1.sim
+++ b/tests/script/unique/cluster/balance1.sim
@@ -35,21 +35,21 @@ system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 0
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
-system sh/cfg.sh -n dnode7 -c clog -v 1
-system sh/cfg.sh -n dnode8 -c clog -v 1
+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 dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
 
 print ============== step1
 print ========= start dnode1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
-sql create database c_b1_d1 tables 4
+sql create database c_b1_d1 maxTables 4
 sql use c_b1_d1
 
 sql create table c_b1_t1 (t timestamp, i int)
@@ -59,7 +59,7 @@ sql insert into c_b1_t1 values(1520000022013, 13)
 sql insert into c_b1_t1 values(1520000023012, 12)
 sql insert into c_b1_t1 values(1520000024011, 11)
 
-sql create database c_b1_d2 tables 4
+sql create database c_b1_d2 maxTables 4
 sql use c_b1_d2
 sql create table c_b1_t2 (t timestamp, i int)
 sql insert into c_b1_t2 values(1520000020025, 25)
@@ -116,7 +116,7 @@ print dnode2 ==> $dnode2Role
 
 print ============================== step3
 print ========= add db3
-sql create database c_b1_d3 tables 4
+sql create database c_b1_d3 maxTables 4
 sql use c_b1_d3
 sql create table c_b1_t3 (t timestamp, i int)
 sql insert into c_b1_t3 values(1520000020035, 35)
@@ -289,7 +289,7 @@ if $dnode4Role != slave then
 endi
 
 print ============================== step10
-sql create database c_b1_d4 tables 4
+sql create database c_b1_d4 maxTables 4
 sql use c_b1_d4
 sql create table c_b1_t4 (t timestamp, i int)
 sql insert into c_b1_t4 values(1520000020045, 45)
@@ -327,7 +327,7 @@ sql use c_b1_d2
 sql insert into c_b1_t2 values(1520000025026, 26)
 
 print ============================== step12
-sql create database c_b1_d5 tables 4
+sql create database c_b1_d5 maxTables 4
 sql use c_b1_d5
 sql_error create table c_b1_t5 (t timestamp, i int) -x error3
 
@@ -352,7 +352,7 @@ sql insert into c_b1_t5 values(1520000022053, 53)
 sql insert into c_b1_t5 values(1520000023052, 52)
 sql insert into c_b1_t5 values(1520000024051, 51)
 
-sql create database c_b1_d6 tables 4
+sql create database c_b1_d6 maxTables 4
 sql use c_b1_d6
 sql create table c_b1_t6 (t timestamp, i int)
 sql insert into c_b1_t6 values(1520000020065, 65)
@@ -384,7 +384,7 @@ sql create dnode $hostname6
 system sh/exec_up.sh -n dnode6 -s start
 sleep 15000
 
-sql create database c_b1_d7 tables 4
+sql create database c_b1_d7 maxTables 4
 sql use c_b1_d7
 sql create table c_b1_t7 (t timestamp, i int)
 sql insert into c_b1_t7 values(1520000020075, 75)
@@ -393,7 +393,7 @@ sql insert into c_b1_t7 values(1520000022073, 73)
 sql insert into c_b1_t7 values(1520000023072, 72)
 sql insert into c_b1_t7 values(1520000024071, 71)
 
-sql create database c_b1_d8 tables 4
+sql create database c_b1_d8 maxTables 4
 sql use c_b1_d8
 sql create table c_b1_t8 (t timestamp, i int)
 sql insert into c_b1_t8 values(1520000020085, 85)
@@ -553,11 +553,12 @@ if $data41 != 85 then
   return -1
 endi
 
-print ============================================ over
-system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
-system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
-system sh/exec_up.sh -n dnode4 -s stop -x SIGINT
-system sh/exec_up.sh -n dnode5 -s stop -x SIGINT
-
-
-
+print ============================================ over=
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim
index 04ab5f8fe4..08fdd233e0 100644
--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -26,14 +26,14 @@ system sh/cfg.sh -n dnode6 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode7 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode8 -c numOfMPeers -v 3
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
-system sh/cfg.sh -n dnode7 -c clog -v 1
-system sh/cfg.sh -n dnode8 -c clog -v 1
+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 dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
 
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
@@ -56,7 +56,7 @@ system sh/exec_up.sh -n dnode2 -s start
 system sh/exec_up.sh -n dnode3 -s start
 sleep 4001
 
-sql create database c_b2_d1 replica 2 tables 4
+sql create database c_b2_d1 replica 2 maxTables 4
 sql use c_b2_d1
 sql create table c_b2_t1 (t timestamp, i int)
 sql insert into c_b2_t1 values(1520000020015, 15)
@@ -65,7 +65,7 @@ sql insert into c_b2_t1 values(1520000022013, 13)
 sql insert into c_b2_t1 values(1520000023012, 12)
 sql insert into c_b2_t1 values(1520000024011, 11)
 
-sql create database c_b2_d2 replica 2 tables 4
+sql create database c_b2_d2 replica 2 maxTables 4
 sql use c_b2_d2
 sql create table c_b2_t2 (t timestamp, i int)
 sql insert into c_b2_t2 values(1520000020025, 25)
@@ -74,7 +74,7 @@ sql insert into c_b2_t2 values(1520000022023, 23)
 sql insert into c_b2_t2 values(1520000023022, 22)
 sql insert into c_b2_t2 values(1520000024021, 21)
 
-sql create database c_b2_d3 replica 2 tables 4
+sql create database c_b2_d3 replica 2 maxTables 4
 sql use c_b2_d3
 sql create table c_b2_t3 (t timestamp, i int)
 sql insert into c_b2_t3 values(1520000020035, 35)
@@ -386,21 +386,21 @@ endi
 sql select * from c_b2_d2.c_b2_t2 order by t desc
 print $data01 $data11 $data21 $data31 $data41
 
-#if $data01 != 21 then
-#  return -1
-#endi
-#if $data11 != 22 then
-#  return -1
-#endi
-#if $data21 != 23 then
-#  return -1
-#endi
-#if $data31 != 24 then
-#  return -1
-#endi
-#if $data41 != 25 then
-#  return -1
-#endi
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
 
 sql select * from c_b2_d3.c_b2_t3 order by t desc
 print $data01 $data11 $data21 $data31 $data41
@@ -420,60 +420,6 @@ if $data41 != 35 then
   return -1
 endi
 
-sql select * from c_b2_d4.c_b2_t4 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 41 then
-  return -1
-endi
-if $data11 != 42 then
-  return -1
-endi
-if $data21 != 43 then
-  return -1
-endi
-if $data31 != 44 then
-  return -1
-endi
-if $data41 != 45 then
-  return -1
-endi
-
-sql select * from c_b2_d5.c_b2_t5 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 51 then
-  return -1
-endi
-if $data11 != 52 then
-  return -1
-endi
-if $data21 != 53 then
-  return -1
-endi
-if $data31 != 54 then
-  return -1
-endi
-if $data41 != 55 then
-  return -1
-endi
-
-sql select * from c_b2_d6.c_b2_t6 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 61 then
-  return -1
-endi
-if $data11 != 62 then
-  return -1
-endi
-if $data21 != 63 then
-  return -1
-endi
-if $data31 != 64 then
-  return -1
-endi
-if $data41 != 65 then
-  return -1
-endi
-
 print ============================================ over
 system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim
index 1e66fcf253..407adc7f3b 100644
--- a/tests/script/unique/cluster/balance3.sim
+++ b/tests/script/unique/cluster/balance3.sim
@@ -36,14 +36,14 @@ system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 0
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
-system sh/cfg.sh -n dnode7 -c clog -v 1
-system sh/cfg.sh -n dnode8 -c clog -v 1
+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 dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
 
 print ============== step1
 print ========= start dnode1
@@ -88,7 +88,7 @@ $x = 0
 show1: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show1
@@ -101,13 +101,13 @@ print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
   goto show1
 endi
-if $dnode2Vnodes != 1 then
+if $dnode2Vnodes != 3 then
   goto show1
 endi
-if $dnode3Vnodes != 1 then
+if $dnode3Vnodes != 3 then
   goto show1
 endi
 if $dnode4Vnodes != null then
@@ -124,7 +124,7 @@ $x = 0
 show2: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show2
@@ -150,7 +150,7 @@ $x = 0
 show3: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show3
@@ -163,16 +163,16 @@ print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
   goto show3
 endi
 if $dnode2Vnodes != null then
   goto show3
 endi
-if $dnode3Vnodes != 1 then
+if $dnode3Vnodes != 3 then
   goto show3
 endi
-if $dnode4Vnodes != 1 then
+if $dnode4Vnodes != 3 then
   goto show3
 endi
 
@@ -187,7 +187,7 @@ $x = 0
 show4: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show4
@@ -213,7 +213,7 @@ $x = 0
 show5: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show5
@@ -226,16 +226,16 @@ print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
   goto show5
 endi
-if $dnode5Vnodes != 1 then
+if $dnode5Vnodes != 3 then
   goto show5
 endi
 if $dnode3Vnodes != null then
   goto show5
 endi
-if $dnode4Vnodes != 1 then
+if $dnode4Vnodes != 3 then
   goto show5
 endi
 
@@ -250,7 +250,7 @@ $x = 0
 show6: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show6
@@ -276,7 +276,7 @@ $x = 0
 show7: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show7
@@ -289,13 +289,13 @@ print dnode5 $dnode5Vnodes
 $dnode6Vnodes = $data2_6
 print dnode6 $dnode6Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
   goto show7
 endi
-if $dnode5Vnodes != 1 then
+if $dnode5Vnodes != 3 then
   goto show7
 endi
-if $dnode6Vnodes != 1 then
+if $dnode6Vnodes != 3 then
   goto show7
 endi
 if $dnode4Vnodes != null then
@@ -313,7 +313,7 @@ $x = 0
 show8: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show8
@@ -340,11 +340,26 @@ sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+if $dnode1Role != offline then
+  return -1
+endi
+
+print ============================== step9.1
+system sh/exec_up.sh -n dnode1 -s start
+
 $x = 0
 show9: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql show dnodes -x show9
@@ -355,41 +370,17 @@ print dnode6 $dnode6Vnodes
 $dnode7Vnodes = $data2_7
 print dnode7 $dnode7Vnodes
 
-if $dnode5Vnodes != 1 then
+if $dnode5Vnodes != 3 then
   goto show9
 endi
-if $dnode6Vnodes != 1 then
+if $dnode6Vnodes != 3 then
   goto show9
 endi
-if $dnode7Vnodes != 1 then
+if $dnode7Vnodes != 3 then
   goto show9
 endi
 
-print ============================== step10
-sql create dnode $hostname8
-system sh/exec_up.sh -n dnode8 -s start
-sleep 9000
-
-$x = 0
-show10: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show10
-$dnode5Vnodes = $data2_5
-print dnode5 $dnode5Vnodes
-$dnode6Vnodes = $data2_6
-print dnode6 $dnode6Vnodes
-$dnode7Vnodes = $data2_7
-print dnode7 $dnode7Vnodes
-$dnode8Vnodes = $data2_8
-print dnode8 $dnode8Vnodes
-
-if $dnode8Vnodes != 2 then
- goto show10
-endi
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 
 print ============================== step11
 print ========= add db4
@@ -400,7 +391,7 @@ $x = 0
 create4: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
 sql create table c_b3_t4 (t timestamp, i int) -x create4
@@ -409,37 +400,33 @@ sql insert into c_b3_t4 values(1520000021044, 44)
 sql insert into c_b3_t4 values(1520000022043, 43)
 sql insert into c_b3_t4 values(1520000023042, 42)
 sql insert into c_b3_t4 values(1520000024041, 41)
-sleep 9000
+
+sleep 3000
 
 $x = 0
 show11: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 20 then
 	  return -1
 	endi
-sql show dnodes -x show11
-$dnode1Vnodes = $data2_1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data2_2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data2_3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data2_4
-print dnode4 $dnode4Vnodes
+sql show dnodes -x show11	
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
 
-if $dnode1Vnodes != 1 then
+if $dnode5Vnodes != 4 then
   goto show11
 endi
-if $dnode2Vnodes != 1 then
+if $dnode6Vnodes != 4 then
+  goto show11
+endi
+if $dnode7Vnodes != 4 then
   goto show11
 endi
-#if $dnode3Vnodes != 1 then
-#  goto show11
-#endi
-#if $dnode4Vnodes != 1 then
-#  goto show11
-#endi
 
 system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 
@@ -504,25 +491,6 @@ if $data41 != 35 then
   return -1
 endi
 
-sql select * from c_b3_d4.c_b3_t4 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 41 then
-  return -1
-endi
-if $data11 != 42 then
-  return -1
-endi
-if $data21 != 43 then
-  return -1
-endi
-if $data31 != 44 then
-  return -1
-endi
-if $data41 != 45 then
-  return -1
-endi
-
-
 print ============================================ over
 system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim
index 1b4884cb90..4b08b13e2f 100644
--- a/tests/script/unique/column/replica3.sim
+++ b/tests/script/unique/column/replica3.sim
@@ -3,9 +3,9 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
@@ -29,8 +29,11 @@ while $x < 1010
   $x = $x + 1
 endw 
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
-
-
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
index ed41f1bb90..5100b93dcd 100644
--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -6,18 +6,15 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
@@ -29,7 +26,7 @@ system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 
 print ======== step1 
-sql create database db replica 3 ablocks 2 tblocks 5 tables 10000
+sql create database db replica 3 ablocks 2 tblocks 5 maxtables 10000
 sql create table db.mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
 $tbPrefix = db.t
diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim
index 7e4e1b0b96..3ed4f5d753 100644
--- a/tests/script/unique/db/delete_part.sim
+++ b/tests/script/unique/db/delete_part.sim
@@ -9,10 +9,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -29,10 +29,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c tables -v 4
-system sh/cfg.sh -n dnode2 -c tables -v 4
-system sh/cfg.sh -n dnode3 -c tables -v 4
-system sh/cfg.sh -n dnode4 -c tables -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
 
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim
index 6217a965c0..5d1ec79450 100644
--- a/tests/script/unique/db/replica_add12.sim
+++ b/tests/script/unique/db/replica_add12.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -281,4 +281,13 @@ endi
 sql select * from d4.t4
 if $rows != 4 then
 	return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim
index 193238f5c0..ac7e3f5c5c 100644
--- a/tests/script/unique/db/replica_add13.sim
+++ b/tests/script/unique/db/replica_add13.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -258,4 +258,13 @@ endi
 sql select * from d4.t4
 if $rows != 6 then
 	return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim
index 5cc0347ac7..995cd4116c 100644
--- a/tests/script/unique/db/replica_add23.sim
+++ b/tests/script/unique/db/replica_add23.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -259,4 +259,13 @@ endi
 sql select * from d4.t4
 if $rows != 6 then
 	return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim
index 7fc81fbf5b..f0ffb89015 100644
--- a/tests/script/unique/db/replica_part.sim
+++ b/tests/script/unique/db/replica_part.sim
@@ -4,9 +4,9 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
@@ -145,3 +145,12 @@ sql select * from d1.t1
 sql select * from d2.t2
 sql select * from d3.t3
 sql select * from d4.t4
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim
index eddcaf0e6c..3a324c604a 100644
--- a/tests/script/unique/db/replica_reduce21.sim
+++ b/tests/script/unique/db/replica_reduce21.sim
@@ -4,9 +4,9 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
@@ -144,3 +144,12 @@ sql select * from d4.t4
 if $rows != 3 then
 	return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim
index 658110e83d..fdb5e3c1dc 100644
--- a/tests/script/unique/db/replica_reduce31.sim
+++ b/tests/script/unique/db/replica_reduce31.sim
@@ -4,9 +4,9 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
@@ -182,3 +182,12 @@ sql select * from d1.t1
 sql select * from d2.t2
 sql select * from d3.t3
 sql select * from d4.t4
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim
index 85f35f996c..83b5cb7a5b 100644
--- a/tests/script/unique/db/replica_reduce32.sim
+++ b/tests/script/unique/db/replica_reduce32.sim
@@ -4,9 +4,9 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
@@ -155,3 +155,12 @@ print d3.t3 $rows
 
 sql select * from d4.t4
 print d4.t4 $rows
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim
index 72286aad90..79f22c42ff 100644
--- a/tests/script/unique/dnode/balance1.sim
+++ b/tests/script/unique/dnode/balance1.sim
@@ -15,22 +15,22 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 
-system sh/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int) 
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -68,7 +68,7 @@ if $data2_2 != 1 then
 endi
 
 print ========== step3
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -139,7 +139,7 @@ if $data2_3 != 2 then
 endi
 
 print ========== step6
-sql create database d3 tables 4
+sql create database d3 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
@@ -193,7 +193,7 @@ if $data2_4 != 1 then
 endi
 
 print ========== step8
-sql create database d4 tables 4
+sql create database d4 maxTables 4
 sql create table d4.t4 (t timestamp, i int)
 sql insert into d4.t4 values(now+1s, 45)
 sql insert into d4.t4 values(now+2s, 44)
@@ -327,3 +327,12 @@ endi
 if $data41 != 45 then
   return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim
index decec25683..4518c42622 100644
--- a/tests/script/unique/dnode/balance2.sim
+++ b/tests/script/unique/dnode/balance2.sim
@@ -12,11 +12,11 @@ system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
+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 dnode5 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
@@ -28,7 +28,7 @@ system sh/exec_up.sh -n dnode2 -s start
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 
-sql create database d1 replica 2  tables 4
+sql create database d1 replica 2  maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -36,7 +36,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 replica 2  tables 4
+sql create database d2 replica 2  maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -116,7 +116,7 @@ if $data2_4 != 2 then
 endi
 
 print ========== step4
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
@@ -268,3 +268,12 @@ endi
 if $data41 != 35 then
   return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim
index 53fda28dc4..acb0d033d4 100644
--- a/tests/script/unique/dnode/balance3.sim
+++ b/tests/script/unique/dnode/balance3.sim
@@ -14,12 +14,12 @@ system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
+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 dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
@@ -33,7 +33,7 @@ system sh/exec_up.sh -n dnode3 -s start
 system sh/exec_up.sh -n dnode4 -s start
 sleep 3000
 
-sql create database d1 replica 3  tables 4
+sql create database d1 replica 3  maxTables 4
 sql create table d1.t1 (t timestamp, i int) 
 sql insert into d1.t1 values(now+1s, 15) 
 sql insert into d1.t1 values(now+2s, 14)
@@ -41,7 +41,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 replica 3  tables 4
+sql create database d2 replica 3  maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -136,7 +136,7 @@ if $data2_5 != 2 then
 endi
 
 print ========== step4
-sql create database d3 replica 3 tables 4
+sql create database d3 replica 3 maxTables 4
 sql create table d3.t3 (t timestamp, i int) 
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
@@ -298,3 +298,11 @@ if $data41 != 35 then
   return -1
 endi
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim
index 6c851b5559..d717250a79 100644
--- a/tests/script/unique/dnode/balancex.sim
+++ b/tests/script/unique/dnode/balancex.sim
@@ -10,17 +10,17 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+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
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int)
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -65,7 +65,7 @@ if $data2_2 != 2 then
 endi
 
 print ========== step3
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
@@ -199,3 +199,11 @@ if $data41 != 35 then
   return -1
 endi
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim
index fda7f4ad77..8726caf1db 100644
--- a/tests/script/unique/dnode/monitor_bug.sim
+++ b/tests/script/unique/dnode/monitor_bug.sim
@@ -6,8 +6,8 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
+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 monitor -v 1
 system sh/cfg.sh -n dnode2 -c monitor -v 0
diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim
index c4751bb66b..5e4ab65be3 100644
--- a/tests/script/unique/dnode/offline1.sim
+++ b/tests/script/unique/dnode/offline1.sim
@@ -16,9 +16,9 @@ system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
+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
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
@@ -67,3 +67,11 @@ if $data4_2 != null then
   return -1
 endi
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim
index b9a3464811..2615746e05 100644
--- a/tests/script/unique/dnode/offline2.sim
+++ b/tests/script/unique/dnode/offline2.sim
@@ -16,9 +16,9 @@ system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
+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
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
@@ -27,7 +27,7 @@ sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 3000
 
-sql create database d1 replica 2 tables 4
+sql create database d1 replica 2 maxTables 4
 sql create table d1.t1(ts timestamp, i int)
 sql insert into d1.t1 values(now, 1)
 
@@ -106,3 +106,11 @@ if $rows != 1 then
   return -1
 endi
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim
index c345aa202b..c69c51fa96 100644
--- a/tests/script/unique/dnode/remove1.sim
+++ b/tests/script/unique/dnode/remove1.sim
@@ -10,17 +10,17 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+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
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int)
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -47,7 +47,7 @@ sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 9000
 
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim
index 909f82e61c..c9e48d9283 100644
--- a/tests/script/unique/dnode/remove2.sim
+++ b/tests/script/unique/dnode/remove2.sim
@@ -10,17 +10,17 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+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
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -47,7 +47,7 @@ sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 9000
 
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim
index 3693868497..6b3c8ebeb2 100644
--- a/tests/script/unique/dnode/vnode_clean.sim
+++ b/tests/script/unique/dnode/vnode_clean.sim
@@ -10,16 +10,16 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+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
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -55,7 +55,7 @@ if $data2_2 != 3 then
 endi
 
 print ========== step3
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
@@ -107,7 +107,7 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c clog -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
 system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
@@ -128,7 +128,7 @@ if $data2_2 != 2 then
 endi
 
 print ========== step6
-sql create database d3 tables 4
+sql create database d3 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim
index 2b1c7e08c9..51307af00e 100644
--- a/tests/script/unique/http/admin.sim
+++ b/tests/script/unique/http/admin.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c http -v 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+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_up.sh -n dnode1 -s start
@@ -177,4 +177,13 @@ print ===============  step8 - monitor dbs
 #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
\ No newline at end of file
+#	endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.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
index 3c59a73454..d1b193173e 100644
--- a/tests/script/unique/http/opentsdb.sim
+++ b/tests/script/unique/http/opentsdb.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim
index 52afbd93cb..bab04bd211 100644
--- a/tests/script/unique/import/replica2.sim
+++ b/tests/script/unique/import/replica2.sim
@@ -15,10 +15,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
 system sh/cfg.sh -n dnode1 -c commitlog -v 0
 system sh/cfg.sh -n dnode2 -c commitlog -v 0
diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim
index 8b8602df66..c10f2da2f1 100644
--- a/tests/script/unique/import/replica3.sim
+++ b/tests/script/unique/import/replica3.sim
@@ -15,10 +15,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
 system sh/cfg.sh -n dnode1 -c commitlog -v 0
 system sh/cfg.sh -n dnode2 -c commitlog -v 0
diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim
index cab3c1a807..eb50276260 100644
--- a/tests/script/unique/metrics/balance_replica1.sim
+++ b/tests/script/unique/metrics/balance_replica1.sim
@@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
 
 $dbPrefix = br1_db
 $tbPrefix = br1_tb
@@ -34,7 +34,7 @@ $db = $dbPrefix
 $mt = $mtPrefix
 $st = $stPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim
index 2156dc40d8..03a881ea49 100644
--- a/tests/script/unique/metrics/dnode2.sim
+++ b/tests/script/unique/metrics/dnode2.sim
@@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+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
@@ -43,7 +43,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim
index be6ec735a1..58a46f9be9 100644
--- a/tests/script/unique/metrics/dnode2_stop.sim
+++ b/tests/script/unique/metrics/dnode2_stop.sim
@@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+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
@@ -48,7 +48,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim
index 3fd54adfba..503ce6c47a 100644
--- a/tests/script/unique/metrics/dnode3.sim
+++ b/tests/script/unique/metrics/dnode3.sim
@@ -12,9 +12,9 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -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/exec.sh -n dnode1 -s start
 
 sql connect
@@ -54,7 +54,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim
index c5096ca03c..7672b19ad9 100644
--- a/tests/script/unique/metrics/replica2_dnode4.sim
+++ b/tests/script/unique/metrics/replica2_dnode4.sim
@@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -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/exec.sh -n dnode1 -s start
 
 sql connect
@@ -63,7 +63,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 2 tables 4
+sql create database $db replica 2 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim
index 937c78cb8b..e7163e826d 100644
--- a/tests/script/unique/metrics/replica2_vnode3.sim
+++ b/tests/script/unique/metrics/replica2_vnode3.sim
@@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+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
@@ -42,7 +42,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 2 tables 4
+sql create database $db replica 2 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim
index c3592a88f2..ef70bf5cc3 100644
--- a/tests/script/unique/metrics/replica3_dnode6.sim
+++ b/tests/script/unique/metrics/replica3_dnode6.sim
@@ -28,12 +28,12 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode5 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode6 -c sessionsPerVnode -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 dnode5 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode6 -c maxtablesPerVnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
 sql connect
@@ -93,7 +93,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 3 tables 4
+sql create database $db replica 3 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim
index 4da34fc92a..50ad6d7584 100644
--- a/tests/script/unique/metrics/replica3_vnode3.sim
+++ b/tests/script/unique/metrics/replica3_vnode3.sim
@@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -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/exec.sh -n dnode1 -s start
 
 sql connect
@@ -62,7 +62,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 3 tables 4
+sql create database $db replica 3 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim
index 05e636d0de..3275a233ad 100644
--- a/tests/script/unique/mnode/mgmt22.sim
+++ b/tests/script/unique/mnode/mgmt22.sim
@@ -104,6 +104,11 @@ if $data3_3 != null then
 	goto show7
 endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.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
index 07f8894769..8c144dd0c4 100644
--- a/tests/script/unique/mnode/mgmt23.sim
+++ b/tests/script/unique/mnode/mgmt23.sim
@@ -122,6 +122,11 @@ sql_error show mnodes
 print ============== step7
 sql_error drop dnode $hostname1
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -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
index 3598534504..4c61cbd7ae 100644
--- a/tests/script/unique/mnode/mgmt24.sim
+++ b/tests/script/unique/mnode/mgmt24.sim
@@ -73,6 +73,11 @@ if $data2_2 != slave then
 	goto step5
 endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.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
index cedfad4bd0..8c8eeba466 100644
--- a/tests/script/unique/mnode/mgmt25.sim
+++ b/tests/script/unique/mnode/mgmt25.sim
@@ -85,6 +85,11 @@ if $dnode3Role != slave then
   return -1
 endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.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
index 105e753634..373a0abaed 100644
--- a/tests/script/unique/mnode/mgmt26.sim
+++ b/tests/script/unique/mnode/mgmt26.sim
@@ -113,6 +113,11 @@ if $dnode3Role != slave then
   return -1
 endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -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
index ef9b0bbcc7..e3a62a2d22 100644
--- a/tests/script/unique/mnode/mgmt33.sim
+++ b/tests/script/unique/mnode/mgmt33.sim
@@ -166,6 +166,11 @@ endi
 #  return -1
 #endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.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
index af4353b563..4409c825c8 100644
--- a/tests/script/unique/mnode/mgmt34.sim
+++ b/tests/script/unique/mnode/mgmt34.sim
@@ -220,7 +220,11 @@ endi
 #  return -1
 #endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
-system sh/exec_up.sh -n dnode4 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim
index e6f05198f4..ff6ca9d1f0 100644
--- a/tests/script/unique/stream/metrics_balance.sim
+++ b/tests/script/unique/stream/metrics_balance.sim
@@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -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 dnode1 -c tableMetaKeepTimer -v 5
 system sh/cfg.sh -n dnode2 -c tableMetaKeepTimer -v 5
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
@@ -34,7 +34,7 @@ sql connect
 
 print ============== step1
 $db = $dbPrefix
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 
 $i = 0
diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim
index 45fb7d269d..78b9165681 100644
--- a/tests/script/unique/stream/metrics_replica1_dnode2.sim
+++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim
@@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+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
diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
index 1c89d18917..47454501c6 100644
--- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
@@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+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
diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim
index d0ef994f29..a8c986cce9 100644
--- a/tests/script/unique/stream/metrics_replica2_dnode3.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim
@@ -12,9 +12,9 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -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/exec.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim
index e2b2c3d6cc..8ff7a3738e 100644
--- a/tests/script/unique/stream/metrics_replica3_dnode4.sim
+++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim
@@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -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/exec.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim
index 6d2e7de57a..015f9f1f17 100644
--- a/tests/script/unique/stream/table_balance.sim
+++ b/tests/script/unique/stream/table_balance.sim
@@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -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 dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 
@@ -38,7 +38,7 @@ $db = $dbPrefix
 $mt = $mtPrefix
 $st = $stPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim
index 3096bcc9f9..6589ed941e 100644
--- a/tests/script/unique/stream/table_move.sim
+++ b/tests/script/unique/stream/table_move.sim
@@ -25,20 +25,20 @@ 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 clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+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 mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -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 numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
@@ -75,7 +75,7 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 $st = $stPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim
index a36d9ec99d..3d88493f40 100644
--- a/tests/script/unique/stream/table_replica1_dnode2.sim
+++ b/tests/script/unique/stream/table_replica1_dnode2.sim
@@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+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
diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
index c84d73933f..809627432b 100644
--- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
@@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode2 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
+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
diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim
index 5e9ef14c01..abee70d048 100644
--- a/tests/script/unique/stream/table_replica2_dnode3.sim
+++ b/tests/script/unique/stream/table_replica2_dnode3.sim
@@ -12,9 +12,9 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -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/exec.sh -n dnode1 -s start
 
 
diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim
index 7547f77963..effdd38c2e 100644
--- a/tests/script/unique/stream/table_replica3_dnode4.sim
+++ b/tests/script/unique/stream/table_replica3_dnode4.sim
@@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 8
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -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/exec.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/table/delete_part.sim b/tests/script/unique/table/delete_part.sim
index 826df7f04c..f4a7b6fce4 100644
--- a/tests/script/unique/table/delete_part.sim
+++ b/tests/script/unique/table/delete_part.sim
@@ -29,10 +29,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c sessionsPerVnode -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
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim
index 7383934aac..dae6571667 100644
--- a/tests/script/unique/vnode/commit.sim
+++ b/tests/script/unique/vnode/commit.sim
@@ -2,8 +2,8 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim
index 57e0d10b7e..544f7d5b55 100644
--- a/tests/script/unique/vnode/many.sim
+++ b/tests/script/unique/vnode/many.sim
@@ -4,10 +4,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim
index c71692fa9f..8e18c3b9e7 100644
--- a/tests/script/unique/vnode/replica2_basic.sim
+++ b/tests/script/unique/vnode/replica2_basic.sim
@@ -2,8 +2,8 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim
index 7a387d165e..a86071faaf 100644
--- a/tests/script/unique/vnode/replica2_basic2.sim
+++ b/tests/script/unique/vnode/replica2_basic2.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -202,4 +202,13 @@ endi
 sql select * from d4.t4
 if $rows != 3 then
 	return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim
index 46fe90cfde..cc1feecb07 100644
--- a/tests/script/unique/vnode/replica2_repeat.sim
+++ b/tests/script/unique/vnode/replica2_repeat.sim
@@ -4,10 +4,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim
index 4da26a9349..62910b947a 100644
--- a/tests/script/unique/vnode/replica3_basic.sim
+++ b/tests/script/unique/vnode/replica3_basic.sim
@@ -3,9 +3,9 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
@@ -149,8 +149,11 @@ if $rows != $expect then
   return -1
 endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
-
-
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim
index 67ac673bfc..0ed16e0729 100644
--- a/tests/script/unique/vnode/replica3_repeat.sim
+++ b/tests/script/unique/vnode/replica3_repeat.sim
@@ -4,10 +4,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim
index 46003a14fa..2763ed7c67 100644
--- a/tests/script/unique/vnode/replica3_vgroup.sim
+++ b/tests/script/unique/vnode/replica3_vgroup.sim
@@ -3,9 +3,9 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
@@ -26,7 +26,7 @@ sleep 3000
 
 print =================== step 1 
 
-sql create database $db replica 3 tables 100
+sql create database $db replica 3 maxtables 100
 sql use $db
 sql create table st (ts timestamp, speed int) tags (t1 int)
 sleep 3001