[td-225]

2020-05-11 11:31:40 +08:00 · 2020-05-11 11:31:40 +08:00 · d3ce12908c
parent 49b331d879 efe4e3fe1c
commit d3ce12908c
99 changed files with 1119 additions and 534 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -59,12 +59,12 @@ matrix:
          GREEN_UNDERLINE='\033[4;32m'
          NC='\033[0m'

-          grep 'ERROR SUMMARY' mem-error-out.txt | uniq | tee uniq-mem-error-out.txt
+          grep 'ERROR SUMMARY' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-mem-error-out.txt

          for memError in `cat uniq-mem-error-out.txt | awk '{print $4}'` 
          do
            if [ -n "$memError" ]; then
-              if [ "$memError" -gt 16 ]; then
+              if [ "$memError" -gt 5 ]; then
                echo -e "${RED} ## Memory errors number valgrind reports is $memError.\
                         More than our threshold! ## ${NC}"
                travis_terminate $memError
@ -72,11 +72,11 @@ matrix:
            fi
          done

-          grep 'definitely lost' mem-error-out.txt | uniq | tee uniq-definitely-lost-out.txt
+          grep 'definitely lost:' mem-error-out.txt|grep -v 'grep'|uniq|tee uniq-definitely-lost-out.txt
          for defiMemError in `cat uniq-definitely-lost-out.txt | awk '{print $7}'`
          do
            if [ -n "$defiMemError" ]; then
-              if [ "$defiMemError" -gt 16 ]; then
+              if [ "$defiMemError" -gt 3 ]; then
                echo -e "${RED} ## Memory errors number valgrind reports \
                         Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
                travis_terminate $defiMemError
--- a/src/client/inc/tscLog.h
+++ b/src/client/inc/tscLog.h
@ -22,25 +22,25 @@ extern "C" {

 #include "tlog.h"

-extern int32_t cdebugFlag;
+extern int32_t cDebugFlag;

 #define tscError(...)                        \
-  if (cdebugFlag & DEBUG_ERROR) {            \
+  if (cDebugFlag & DEBUG_ERROR) {            \
    taosPrintLog("ERROR TSC ", 255, __VA_ARGS__); \
  }
 #define tscWarn(...)                                \
-  if (cdebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  TSC ", cdebugFlag, __VA_ARGS__); \
+  if (cDebugFlag & DEBUG_WARN) {                    \
+    taosPrintLog("WARN  TSC ", cDebugFlag, __VA_ARGS__); \
  }
 #define tscTrace(...)                         \
-  if (cdebugFlag & DEBUG_TRACE) {             \
-    taosPrintLog("TSC ", cdebugFlag, __VA_ARGS__); \
+  if (cDebugFlag & DEBUG_TRACE) {             \
+    taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); \
  }
 #define tscPrint(...) \
  { taosPrintLog("TSC ", 255, __VA_ARGS__); }
 #define tscDump(...)                                      \
-  if (cdebugFlag & DEBUG_TRACE) {                         \
-    taosPrintLongString("TSC ", cdebugFlag, __VA_ARGS__); \
+  if (cDebugFlag & DEBUG_TRACE) {                         \
+    taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); \
  }

 #ifdef __cplusplus
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@ -23,16 +23,16 @@
 #include "ttime.h"

 #define jniError(...)                                 \
-  if (jnidebugFlag & DEBUG_ERROR) {                   \
-    taosPrintLog("ERROR JNI ", jnidebugFlag, __VA_ARGS__); \
+  if (jniDebugFlag & DEBUG_ERROR) {                   \
+    taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); \
  }
 #define jniWarn(...)                                  \
-  if (jnidebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  JNI ", jnidebugFlag, __VA_ARGS__); \
+  if (jniDebugFlag & DEBUG_WARN) {                    \
+    taosPrintLog("WARN  JNI ", jniDebugFlag, __VA_ARGS__); \
  }
 #define jniTrace(...)                           \
-  if (jnidebugFlag & DEBUG_TRACE) {             \
-    taosPrintLog("JNI ", jnidebugFlag, __VA_ARGS__); \
+  if (jniDebugFlag & DEBUG_TRACE) {             \
+    taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); \
  }
 #define jniPrint(...) \
  { taosPrintLog("JNI ", 255, __VA_ARGS__); }
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@ -156,7 +156,8 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 3);
    if (i >= tscGetNumOfColumns(pMeta) && tscGetNumOfTags(pMeta) != 0) {
      char* output = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 3) * totalNumOfRows + pField->bytes * i;
-      STR_WITH_SIZE_TO_VARSTR(output, "TAG", 3);
+      const char *src = "TAG";
+      STR_WITH_SIZE_TO_VARSTR(output, src, strlen(src));
    }
  }

@ -191,7 +192,8 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
    // tag value
    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 3);
    char *target = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 3) * totalNumOfRows + pField->bytes * i;
-    STR_WITH_SIZE_TO_VARSTR(target, "TAG", 3);
+    const char *src = "TAG";
+    STR_WITH_SIZE_TO_VARSTR(target, src, strlen(src));

    pTagValue += pSchema[i].bytes;
  }
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@ -370,10 +370,11 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
      }

-      char* pMsg = pCmd->payload + tsRpcHeadSize;
-      pMsg += sizeof(SMgmtHead);
+      char* pMsg = pCmd->payload;

      SCMCfgDnodeMsg* pCfg = (SCMCfgDnodeMsg*)pMsg;
+      pDCL->a[0].n = strdequote(pDCL->a[0].z);
+      
      strncpy(pCfg->ep, pDCL->a[0].z, pDCL->a[0].n);

      strncpy(pCfg->config, pDCL->a[1].z, pDCL->a[1].n);
@ -2254,14 +2255,14 @@ int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
  char* portStr = strtok(NULL, &delim);

  if (!validateIpAddress(ipStr, strlen(ipStr))) {
-    memset(pCmd->payload, 0, tListLen(pCmd->payload));
+    memset(pCmd->payload, 0, strlen(pCmd->payload));

    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
  }

  uint16_t port = (uint16_t)strtol(portStr, NULL, 10);
  if (port <= 0 || port > 65535) {
-    memset(pCmd->payload, 0, tListLen(pCmd->payload));
+    memset(pCmd->payload, 0, strlen(pCmd->payload));
    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
  }

--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@ -1005,13 +1005,7 @@ int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 int32_t tscBuildCfgDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
  SSqlCmd *pCmd = &pSql->cmd;
  pCmd->payloadLen = sizeof(SCMCfgDnodeMsg);
-
-  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
-    tscError("%p failed to malloc for query msg", pSql);
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
-  }
-
-  pCmd->msgType = TSDB_MSG_TYPE_MD_CONFIG_DNODE;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_CONFIG_DNODE;
  return TSDB_CODE_SUCCESS;
 }

@ -1189,7 +1183,7 @@ int32_t tscBuildKillMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 int tscEstimateCreateTableMsgLength(SSqlObj *pSql, SSqlInfo *pInfo) {
  SSqlCmd *pCmd = &(pSql->cmd);

-  int32_t size = minMsgSize() + sizeof(SMgmtHead) + sizeof(SCMCreateTableMsg);
+  int32_t size = minMsgSize() + sizeof(SCMCreateTableMsg);

  SCreateTableSQL *pCreateTableInfo = pInfo->pCreateTableInfo;
  if (pCreateTableInfo->type == TSQL_CREATE_TABLE_FROM_STABLE) {
@ -1277,7 +1271,7 @@ int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {

 int tscEstimateAlterTableMsgLength(SSqlCmd *pCmd) {
  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  return minMsgSize() + sizeof(SMgmtHead) + sizeof(SCMAlterTableMsg) + sizeof(SSchema) * tscNumOfFields(pQueryInfo) +
+  return minMsgSize() + sizeof(SCMAlterTableMsg) + sizeof(SSchema) * tscNumOfFields(pQueryInfo) +
         TSDB_EXTRA_PAYLOAD_SIZE;
 }

@ -1534,6 +1528,7 @@ int tscBuildTableMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 *      no used         4B
 **/
 int tscBuildMultiMeterMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
+#if 0
  SSqlCmd *pCmd = &pSql->cmd;

  // copy payload content to temp buff
@ -1566,6 +1561,8 @@ int tscBuildMultiMeterMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
           pCmd->payloadLen);

  return pCmd->payloadLen;
+#endif
+  return 0;  
 }

 //static UNUSED_FUNC int32_t tscEstimateMetricMetaMsgSize(SSqlCmd *pCmd) {
@ -1765,7 +1762,7 @@ int tscEstimateHeartBeatMsgLength(SSqlObj *pSql) {
  int      size = 0;
  STscObj *pObj = pSql->pTscObj;

-  size += tsRpcHeadSize + sizeof(SMgmtHead);
+  size += tsRpcHeadSize;
  size += sizeof(SQqueryList);

  SSqlObj *tpSql = pObj->sqlList;
@ -1801,13 +1798,9 @@ int tscBuildHeartBeatMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
    return -1;
  }

-  pMsg = pCmd->payload + tsRpcHeadSize;
+  pMsg = pCmd->payload;
  pStart = pMsg;

-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  strcpy(pMgmt->db, pObj->db);
-  pMsg += sizeof(SMgmtHead);
-
  pMsg = tscBuildQueryStreamDesc(pMsg, pObj);
  pthread_mutex_unlock(&pObj->mutex);

--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@ -172,7 +172,7 @@ static void syncConnCallback(void *param, TAOS_RES *tres, int code) {
 }

 TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) {
-  tscTrace("try to create a connection to %s", ip);
+  tscTrace("try to create a connection to %s:%u, user:%s db:%s", ip, port, user, db);

  STscObj *pObj = taosConnectImpl(ip, user, pass, db, port, NULL, NULL, NULL);
  if (pObj != NULL) {
@ -191,7 +191,7 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
      return NULL;
    }
    
-    tscTrace("%p DB connection is opening", pObj);
+    tscTrace("%p DB connection is opening, dnodeConn:%p", pObj, pObj->pDnodeConn);
    
    // version compare only requires the first 3 segments of the version string
    int code = taosCheckVersion(version, taos_get_server_info(pObj), 3);
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@ -69,6 +69,8 @@ int32_t tscInitRpc(const char *user, const char *secret, void** pDnodeConn) {
    if (*pDnodeConn == NULL) {
      tscError("failed to init connection to TDengine");
      return -1;
+    } else {
+      tscTrace("dnodeConn:%p is created, user:%s", *pDnodeConn, user);
    }
  }

--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@ -766,7 +766,7 @@ void tscCloseTscObj(STscObj* pObj) {
    rpcClose(pObj->pDnodeConn);
  }
  
-  tscTrace("%p DB connection is closed", pObj);
+  tscTrace("%p DB connection is closed, dnodeConn:%p", pObj, pObj->pDnodeConn);
  tfree(pObj);
 }

--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@ -141,9 +141,9 @@ extern int32_t tsAsyncLog;
 extern int32_t tsNumOfLogLines;
 extern int32_t dDebugFlag;
 extern int32_t vDebugFlag;
-extern int32_t mdebugFlag;
-extern int32_t cdebugFlag;
-extern int32_t jnidebugFlag;
+extern int32_t mDebugFlag;
+extern int32_t cDebugFlag;
+extern int32_t jniDebugFlag;
 extern int32_t tmrDebugFlag;
 extern int32_t sdbDebugFlag;
 extern int32_t httpDebugFlag;
@ -151,8 +151,8 @@ extern int32_t monitorDebugFlag;
 extern int32_t uDebugFlag;
 extern int32_t rpcDebugFlag;
 extern int32_t debugFlag;
-extern int32_t odbcdebugFlag;
-extern int32_t qdebugFlag;
+extern int32_t odbcDebugFlag;
+extern int32_t qDebugFlag;

 extern uint32_t taosMaxTmrCtrl;

--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@ -127,16 +127,16 @@ int32_t tsRestRowLimit = 10240;
 int32_t tsMaxSQLStringLen = TSDB_MAX_SQL_LEN;

 int32_t tsNumOfLogLines = 10000000;
-int32_t mdebugFlag = 135;
+int32_t mDebugFlag = 135;
 int32_t sdbDebugFlag = 135;
 int32_t dDebugFlag = 135;
 int32_t vDebugFlag = 135;
-int32_t cdebugFlag = 135;
-int32_t jnidebugFlag = 131;
-int32_t odbcdebugFlag = 131;
+int32_t cDebugFlag = 135;
+int32_t jniDebugFlag = 131;
+int32_t odbcDebugFlag = 131;
 int32_t httpDebugFlag = 131;
 int32_t monitorDebugFlag = 131;
-int32_t qdebugFlag = 131;
+int32_t qDebugFlag = 131;
 int32_t rpcDebugFlag = 135;
 int32_t uDebugFlag = 131;
 int32_t debugFlag = 131;
@ -204,10 +204,19 @@ static pthread_once_t tsInitGlobalCfgOnce = PTHREAD_ONCE_INIT;

 void taosSetAllDebugFlag() {
  for (int32_t i = 0; i < tsGlobalConfigNum; ++i) {
-    SGlobalCfg *cfg = &tsGlobalConfig[i];
-    if ((cfg->cfgType & TSDB_CFG_CTYPE_B_LOG) && cfg->cfgType == TAOS_CFG_VTYPE_INT32) {
-      *((int32_t*)cfg->ptr) = debugFlag;
-    }
+    mDebugFlag = debugFlag;
+    sdbDebugFlag = debugFlag;
+    dDebugFlag = debugFlag;
+    vDebugFlag = debugFlag;
+    cDebugFlag = debugFlag;
+    jniDebugFlag = debugFlag;
+    odbcDebugFlag = debugFlag;
+    httpDebugFlag = debugFlag;
+    monitorDebugFlag = debugFlag;
+    rpcDebugFlag = debugFlag;
+    uDebugFlag = debugFlag;
+    sDebugFlag = debugFlag;
+    //qDebugFlag = debugFlag;    
  }
  uPrint("all debug flag are set to %d", debugFlag);
 }
@ -993,7 +1002,7 @@ static void doInitGlobalConfig() {
  taosInitConfigOption(cfg);

  cfg.option = "mDebugFlag";
-  cfg.ptr = &mdebugFlag;
+  cfg.ptr = &mDebugFlag;
  cfg.valType = TAOS_CFG_VTYPE_INT32;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
  cfg.minValue = 0;
@ -1053,7 +1062,7 @@ static void doInitGlobalConfig() {
  taosInitConfigOption(cfg);

  cfg.option = "cDebugFlag";
-  cfg.ptr = &cdebugFlag;
+  cfg.ptr = &cDebugFlag;
  cfg.valType = TAOS_CFG_VTYPE_INT32;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
  cfg.minValue = 0;
@ -1063,7 +1072,7 @@ static void doInitGlobalConfig() {
  taosInitConfigOption(cfg);

  cfg.option = "jniDebugFlag";
-  cfg.ptr = &jnidebugFlag;
+  cfg.ptr = &jniDebugFlag;
  cfg.valType = TAOS_CFG_VTYPE_INT32;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
  cfg.minValue = 0;
@ -1073,7 +1082,7 @@ static void doInitGlobalConfig() {
  taosInitConfigOption(cfg);

  cfg.option = "odbcDebugFlag";
-  cfg.ptr = &odbcdebugFlag;
+  cfg.ptr = &odbcDebugFlag;
  cfg.valType = TAOS_CFG_VTYPE_INT32;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
  cfg.minValue = 0;
@ -1113,7 +1122,7 @@ static void doInitGlobalConfig() {
  taosInitConfigOption(cfg);

  cfg.option = "qDebugFlag";
-  cfg.ptr = &qdebugFlag;
+  cfg.ptr = &qDebugFlag;
  cfg.valType = TAOS_CFG_VTYPE_INT32;
  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
  cfg.minValue = 0;
@ -1189,6 +1198,10 @@ void taosInitGlobalCfg() {
 }

 bool taosCheckGlobalCfg() {
+  if (debugFlag == 135 || debugFlag == 199) {
+    taosSetAllDebugFlag();
+  }
+  
  taosGetFqdn(tsLocalEp);
  sprintf(tsLocalEp + strlen(tsLocalEp), ":%d", tsServerPort);
  uPrint("localEp is %s", tsLocalEp);
--- a/src/connector/python/linux/python2/taos/cinterface.py
+++ b/src/connector/python/linux/python2/taos/cinterface.py
@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
    for i in range(abs(num_of_rows)):
        try:
            if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
            else:
                res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
        except ValueError:
@ -146,6 +147,7 @@ class CTaosInterface(object):
    libtaos.taos_errstr.restype = ctypes.c_char_p
    libtaos.taos_subscribe.restype = ctypes.c_void_p
    libtaos.taos_consume.restype = ctypes.c_void_p
+    libtaos.taos_fetch_lengths.restype = ctypes.c_void_p

    def __init__(self, config=None):
        '''
@ -314,6 +316,8 @@ class CTaosInterface(object):

        isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
        blocks = [None] * len(fields)
+        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
        for i in range(len(fields)):
            data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
            if data == None:
@ -323,7 +327,7 @@ class CTaosInterface(object):
            if fields[i]['type'] not in _CONVERT_FUNC:
                raise DatabaseError("Invalid data type returned from database")
            
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fields[i]['bytes'], isMicro)
+            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)

        return blocks, abs(num_of_rows)

--- a/src/connector/python/linux/python3/taos/cinterface.py
+++ b/src/connector/python/linux/python3/taos/cinterface.py
@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
    for i in range(abs(num_of_rows)):
        try:
            if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
            else:
                res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
        except ValueError:
--- a/src/connector/python/windows/python2/taos/cinterface.py
+++ b/src/connector/python/windows/python2/taos/cinterface.py
@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
    for i in range(abs(num_of_rows)):
        try:
            if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
            else:
                res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
        except ValueError:
@ -146,6 +147,7 @@ class CTaosInterface(object):
    libtaos.taos_errstr.restype = ctypes.c_char_p
    libtaos.taos_subscribe.restype = ctypes.c_void_p
    libtaos.taos_consume.restype = ctypes.c_void_p
+    libtaos.taos_fetch_lengths.restype = ctypes.c_void_p

    def __init__(self, config=None):
        '''
@ -314,6 +316,8 @@ class CTaosInterface(object):

        isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
        blocks = [None] * len(fields)
+        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
        for i in range(len(fields)):
            data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
            if data == None:
@ -323,7 +327,7 @@ class CTaosInterface(object):
            if fields[i]['type'] not in _CONVERT_FUNC:
                raise DatabaseError("Invalid data type returned from database")
            
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fields[i]['bytes'], isMicro)
+            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)

        return blocks, abs(num_of_rows)

--- a/src/connector/python/windows/python3/taos/cinterface.py
+++ b/src/connector/python/windows/python3/taos/cinterface.py
@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
    for i in range(abs(num_of_rows)):
        try:
            if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
            else:
                res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
        except ValueError:
@ -146,6 +147,7 @@ class CTaosInterface(object):
    libtaos.taos_errstr.restype = ctypes.c_char_p
    libtaos.taos_subscribe.restype = ctypes.c_void_p
    libtaos.taos_consume.restype = ctypes.c_void_p
+    libtaos.taos_fetch_lengths.restype = ctypes.c_void_p

    def __init__(self, config=None):
        '''
@ -314,6 +316,8 @@ class CTaosInterface(object):

        isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
        blocks = [None] * len(fields)
+        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
        for i in range(len(fields)):
            data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
            if data == None:
@ -323,7 +327,7 @@ class CTaosInterface(object):
            if fields[i]['type'] not in _CONVERT_FUNC:
                raise DatabaseError("Invalid data type returned from database")
            
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fields[i]['bytes'], isMicro)
+            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)

        return blocks, abs(num_of_rows)

--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@ -167,9 +167,9 @@ static int32_t dnodeInitSystem() {
  if (dnodeInitRead() != 0) return -1;
  if (dnodeInitWrite() != 0) return -1;
  if (dnodeInitClient() != 0) return -1;
-  if (dnodeInitModules() != 0) return -1;
  if (dnodeInitServer() != 0) return -1;
  if (dnodeInitMgmt() != 0) return -1;
+  if (dnodeInitModules() != 0) return -1;
  if (dnodeInitShell() != 0) return -1;

  dnodeStartModules();
@ -184,14 +184,14 @@ static void dnodeCleanUpSystem() {
  if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_STOPPED) {
    dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_STOPPED);
    dnodeCleanupShell();
-    dnodeCleanupServer();
+    dnodeCleanUpModules();
    dnodeCleanupMgmt();
+    dnodeCleanupServer();
    dnodeCleanupClient();
    dnodeCleanupWrite();
    dnodeCleanupRead();
-    dnodeCleanUpModules();
-    taos_cleanup();
    dnodeCleanupStorage();
+    taos_cleanup();
    taosCloseLog();
  }
 }
--- a/src/dnode/src/dnodePeer.c
+++ b/src/dnode/src/dnodePeer.c
@ -61,7 +61,7 @@ int32_t dnodeInitServer() {
  rpcInit.cfp          = dnodeProcessReqMsgFromDnode;
  rpcInit.sessions     = 100;
  rpcInit.connType     = TAOS_CONN_SERVER;
-  rpcInit.idleTime     = tsShellActivityTimer * 2000;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;

  tsDnodeServerRpc = rpcOpen(&rpcInit);
  if (tsDnodeServerRpc == NULL) {
@ -122,7 +122,7 @@ int32_t dnodeInitClient() {
  rpcInit.ufp          = dnodeUpdateIpSet;
  rpcInit.sessions     = 100;
  rpcInit.connType     = TAOS_CONN_CLIENT;
-  rpcInit.idleTime     = tsShellActivityTimer * 2000;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;
  rpcInit.user         = "t";
  rpcInit.ckey         = "key";
  rpcInit.secret       = "secret";
--- a/src/dnode/src/dnodeShell.c
+++ b/src/dnode/src/dnodeShell.c
@ -86,7 +86,7 @@ int32_t dnodeInitShell() {
  rpcInit.cfp          = dnodeProcessMsgFromShell;
  rpcInit.sessions     = TSDB_SESSIONS_PER_DNODE;
  rpcInit.connType     = TAOS_CONN_SERVER;
-  rpcInit.idleTime     = tsShellActivityTimer * 1500;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;
  rpcInit.afp          = dnodeRetrieveUserAuthInfo;

  tsDnodeShellRpc = rpcOpen(&rpcInit);
@ -137,7 +137,6 @@ void dnodeProcessMsgFromShell(SRpcMsg *pMsg) {
  }
 }

-
 static int dnodeRetrieveUserAuthInfo(char *user, char *spi, char *encrypt, char *secret, char *ckey) {
  return TSDB_CODE_SUCCESS;
 }
--- a/src/dnode/src/dnodeVRead.c
+++ b/src/dnode/src/dnodeVRead.c
@ -81,6 +81,8 @@ void dnodeCleanupRead() {
  }

  taosCloseQset(readQset);
+  free(readPool.readWorker);
+
  dPrint("dnode read is closed");
 }

--- a/src/dnode/src/dnodeVWrite.c
+++ b/src/dnode/src/dnodeVWrite.c
@ -85,7 +85,7 @@ void dnodeCleanupWrite() {
 void dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg) {
  char *pCont = (char *)pMsg->pCont;

-  if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT || pMsg->msgType == TSDB_MSG_TYPE_MD_DROP_STABLE) {
+  if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT) {
    SMsgDesc *pDesc = (SMsgDesc *)pCont;
    pDesc->numOfVnodes = htonl(pDesc->numOfVnodes);
    pCont += sizeof(SMsgDesc);
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@ -317,10 +317,6 @@ typedef struct {
  int8_t flag;
 } SCMCreateUserMsg, SCMAlterUserMsg;

-typedef struct {
-  char db[TSDB_TABLE_ID_LEN + 1];
-} SMgmtHead;
-
 typedef struct {
  int32_t  contLen;
  int32_t  vgId;
@ -330,6 +326,7 @@ typedef struct {
 } SMDDropTableMsg;

 typedef struct {
+  int32_t contLen;
  int32_t vgId;
  int64_t uid;
  char    tableId[TSDB_TABLE_ID_LEN + 1];
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@ -634,7 +634,7 @@ void *readMetric(void *sarg) {
  fprintf(fp, "Querying On %d records:\n", totalData);

  for (int j = 0; j < n; j++) {
-    char condition[BUFFER_SIZE] = "\0";
+    char condition[BUFFER_SIZE - 30] = "\0";
    char tempS[BUFFER_SIZE] = "\0";

    int m = 10 < num_of_tables ? 10 : num_of_tables;
--- a/src/mnode/inc/mgmtInt.h
+++ b/src/mnode/inc/mgmtInt.h
@ -23,43 +23,23 @@ extern "C" {
 #include "tlog.h"
 #include "monitor.h"

-extern int32_t mdebugFlag;
+extern int32_t mDebugFlag;
 extern int32_t sdbDebugFlag;

 // mnode log function
-#define mError(...)                          \
-  if (mdebugFlag & DEBUG_ERROR) {            \
-    taosPrintLog("ERROR MND ", 255, __VA_ARGS__); \
-  }
-#define mWarn(...)                                  \
-  if (mdebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  MND ", mdebugFlag, __VA_ARGS__); \
-  }
-#define mTrace(...)                           \
-  if (mdebugFlag & DEBUG_TRACE) {             \
-    taosPrintLog("MND ", mdebugFlag, __VA_ARGS__); \
-  }
-#define mPrint(...) \
-  { taosPrintLog("MND ", 255, __VA_ARGS__); }
+#define mError(...) if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND ", 255, __VA_ARGS__); }
+#define mWarn(...)  if (mDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  MND ", mDebugFlag, __VA_ARGS__); }
+#define mTrace(...) if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }
+#define mPrint(...)                               { taosPrintLog("MND ", 255, __VA_ARGS__); }

 #define mLError(...) monitorSaveLog(2, __VA_ARGS__); mError(__VA_ARGS__)
 #define mLWarn(...)  monitorSaveLog(1, __VA_ARGS__); mWarn(__VA_ARGS__)
 #define mLPrint(...) monitorSaveLog(0, __VA_ARGS__); mPrint(__VA_ARGS__)

-#define sdbError(...)                            \
-  if (sdbDebugFlag & DEBUG_ERROR) {              \
-    taosPrintLog("ERROR MND-SDB ", 255, __VA_ARGS__); \
-  }
-#define sdbWarn(...)                                      \
-  if (sdbDebugFlag & DEBUG_WARN) {                        \
-    taosPrintLog("WARN  MND-SDB ", sdbDebugFlag, __VA_ARGS__); \
-  }
-#define sdbTrace(...)                               \
-  if (sdbDebugFlag & DEBUG_TRACE) {                 \
-    taosPrintLog("MND-SDB ", sdbDebugFlag, __VA_ARGS__); \
-  }
-#define sdbPrint(...) \
-  { taosPrintLog("MND-SDB ", 255, __VA_ARGS__); }
+#define sdbError(...) if (sdbDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR MND-SDB ", 255, __VA_ARGS__); }
+#define sdbWarn(...)  if (sdbDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN  MND-SDB ", sdbDebugFlag, __VA_ARGS__); }
+#define sdbTrace(...) if (sdbDebugFlag & DEBUG_TRACE) { taosPrintLog("MND-SDB ", sdbDebugFlag, __VA_ARGS__);}
+#define sdbPrint(...)                                 { taosPrintLog("MND-SDB ", 255, __VA_ARGS__); }

 #define sdbLError(...) monitorSaveLog(2, __VA_ARGS__); sdbError(__VA_ARGS__)
 #define sdbLWarn(...)  monitorSaveLog(1, __VA_ARGS__); sdbWarn(__VA_ARGS__)
--- a/src/mnode/src/mgmtAcct.c
+++ b/src/mnode/src/mgmtAcct.c
@ -20,7 +20,7 @@
 #include "tutil.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtAcct.h"
 #include "mgmtDb.h"
 #include "mgmtSdb.h"
--- a/src/mnode/src/mgmtBalance.c
+++ b/src/mnode/src/mgmtBalance.c
@ -19,7 +19,7 @@
 #include "tbalance.h"
 #include "tglobal.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtMnode.h"
 #include "mgmtDnode.h"
 #include "mgmtVgroup.h"
--- a/src/mnode/src/mgmtDb.c
+++ b/src/mnode/src/mgmtDb.c
@ -25,7 +25,7 @@
 #include "tbalance.h"
 #include "tdataformat.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtAcct.h"
 #include "mgmtDb.h"
 #include "mgmtDnode.h"
@ -677,9 +677,11 @@ static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *

    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
    if (pDb->status == TSDB_DB_STATUS_READY) {
-      STR_WITH_SIZE_TO_VARSTR(pWrite, "ready", 5);
+      const char *src = "ready";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
    } else {
-      STR_WITH_SIZE_TO_VARSTR(pWrite, "dropping", 8);
+      const char *src = "dropping";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
    }
    cols++;

--- a/src/mnode/src/mgmtDnode.c
+++ b/src/mnode/src/mgmtDnode.c
@ -27,7 +27,7 @@
 #include "tdataformat.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtDnode.h"
 #include "mgmtMnode.h"
 #include "mgmtSdb.h"
@ -223,7 +223,7 @@ void mgmtProcessCfgDnodeMsg(SQueuedMsg *pMsg) {
  if (pCmCfgDnode->ep[0] == 0) {
    strcpy(pCmCfgDnode->ep, tsLocalEp);
  } else {
-    strcpy(pCmCfgDnode->ep, pCmCfgDnode->ep);
+    // TODO temporary disabled for compiling: strcpy(pCmCfgDnode->ep, pCmCfgDnode->ep); 
  }

  if (strcmp(pMsg->pUser->user, "root") != 0) {
@ -252,7 +252,7 @@ void mgmtProcessCfgDnodeMsg(SQueuedMsg *pMsg) {
 }

 static void mgmtProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) {
-  mPrint("cfg vnode rsp is received, result:%s", tstrerror(rpcMsg->code));
+  mPrint("cfg dnode rsp is received");
 }

 void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
--- a/src/mnode/src/mgmtGrant.c
+++ b/src/mnode/src/mgmtGrant.c
@ -18,7 +18,7 @@
 #include "os.h"
 #include "taoserror.h"
 #include "tgrant.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"

 int32_t grantInit() { return TSDB_CODE_SUCCESS; }
 void    grantCleanUp() {}
--- a/src/mnode/src/mgmtMain.c
+++ b/src/mnode/src/mgmtMain.c
@ -23,7 +23,7 @@
 #include "tglobal.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtServer.h"
 #include "mgmtAcct.h"
 #include "mgmtDnode.h"
@ -55,11 +55,6 @@ int32_t mgmtStartSystem() {
    return -1;
  }

-  if (grantInit() < 0) {
-    mError("failed to init grant");
-    return -1;
-  }
-
  if (mgmtInitUsers() < 0) {
    mError("failed to init users");
    return -1;
@ -99,6 +94,11 @@ int32_t mgmtStartSystem() {
    mError("failed to init balance")
  }

+  if (grantInit() < 0) {
+    mError("failed to init grant");
+    return -1;
+  }
+
  if (mgmtInitServer() < 0) {
    return -1;
  }
@ -132,20 +132,19 @@ int32_t mgmtInitSystem() {

 void mgmtCleanUpSystem() {
  mPrint("starting to clean up mgmt");
-  grantCleanUp();
-  mgmtCleanupMnodes();
-  balanceCleanUp();
+  tsMgmtIsRunning = false;
  mgmtCleanUpShell();
  mgmtCleanupServer();
-  mgmtCleanUpAccts();
+  grantCleanUp();
+  balanceCleanUp();
+  sdbCleanUp();
+  mgmtCleanupMnodes();
  mgmtCleanUpTables();
  mgmtCleanUpVgroups();
  mgmtCleanUpDbs();
  mgmtCleanupDnodes();
  mgmtCleanUpUsers();
-  sdbCleanUp();
-  taosTmrCleanUp(tsMgmtTmr);
-  tsMgmtIsRunning = false;
+  mgmtCleanUpAccts();
  mPrint("mgmt is cleaned up");
 }

--- a/src/mnode/src/mgmtMnode.c
+++ b/src/mnode/src/mgmtMnode.c
@ -24,7 +24,7 @@
 #include "tsocket.h"
 #include "tdataformat.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtMnode.h"
 #include "mgmtDnode.h"
 #include "mgmtSdb.h"
--- a/src/mnode/src/mgmtProfile.c
+++ b/src/mnode/src/mgmtProfile.c
@ -19,7 +19,7 @@
 #include "taoserror.h"
 #include "tutil.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtAcct.h"
 #include "mgmtDnode.h"
 #include "mgmtDb.h"
--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
@ -27,7 +27,7 @@
 #include "hashstr.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtMnode.h"
 #include "mgmtSdb.h"

@ -278,7 +278,7 @@ void sdbUpdateSync() {
    sdbPrint("mnode:%d, %s:%d", syncCfg.nodeInfo[i].nodeId, syncCfg.nodeInfo[i].nodeFqdn, syncCfg.nodeInfo[i].nodePort);
  }

-  SSyncInfo syncInfo;
+  SSyncInfo syncInfo = {0};
  syncInfo.vgId = 1;
  syncInfo.version = sdbGetVersion();
  syncInfo.syncCfg = syncCfg;
@ -323,11 +323,19 @@ void sdbCleanUp() {
  if (tsSdbObj.status != SDB_STATUS_SERVING) return;

  tsSdbObj.status = SDB_STATUS_CLOSING;
+  
+  if (tsSdbObj.sync) {
    syncStop(tsSdbObj.sync);
+    tsSdbObj.sync = NULL;
+  }
+
+  if (tsSdbObj.wal) {
    walClose(tsSdbObj.wal);
+    tsSdbObj.wal = NULL;
+  }
+  
  sem_destroy(&tsSdbObj.sem);
  pthread_mutex_destroy(&tsSdbObj.mutex);
-  memset(&tsSdbObj, 0, sizeof(tsSdbObj));
 }

 void sdbIncRef(void *handle, void *pRow) {
--- a/src/mnode/src/mgmtServer.c
+++ b/src/mnode/src/mgmtServer.c
@ -25,7 +25,7 @@
 #include "tglobal.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtDb.h"
 #include "mgmtMnode.h"
 #include "mgmtProfile.h"
@ -88,10 +88,12 @@ void mgmtProcessReqMsgFromDnode(SRpcMsg *rpcMsg) {
    
    SRpcIpSet ipSet = {0};
    dnodeGetMnodeDnodeIpSet(&ipSet);
+    for (int i = 0; i < ipSet.numOfIps; ++i) 
+      ipSet.port[i] = htons(ipSet.port[i]);
    
    mTrace("conn from dnode ip:%s user:%s redirect msg, inUse:%d", taosIpStr(connInfo.clientIp), connInfo.user, ipSet.inUse);
    for (int32_t i = 0; i < ipSet.numOfIps; ++i) {
-      mTrace("index:%d %s:%d", i, ipSet.fqdn[i], ipSet.port[i]);
+      mTrace("mnode index:%d %s:%d", i, ipSet.fqdn[i], htons(ipSet.port[i]));
    }
    rpcSendRedirectRsp(rpcMsg->handle, &ipSet);
    return;
--- a/src/mnode/src/mgmtShell.c
+++ b/src/mnode/src/mgmtShell.c
@ -26,7 +26,7 @@
 #include "tcache.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtAcct.h"
 #include "mgmtDb.h"
 #include "mgmtDnode.h"
@ -66,21 +66,26 @@ int32_t mgmtInitShell() {
  
  tsMgmtTmr = taosTmrInit((tsMaxShellConns) * 3, 200, 3600000, "MND");
  tsMgmtTranQhandle = taosInitScheduler(tsMaxShellConns, 1, "mnodeT");
-  tsQhandleCache = taosCacheInit(tsMgmtTmr, 2);
+  tsQhandleCache = taosCacheInit(tsMgmtTmr, 10);

  return 0;
 }

 void mgmtCleanUpShell() {
-  if (tsMgmtTranQhandle) {
-    taosCleanUpScheduler(tsMgmtTranQhandle);
-    tsMgmtTranQhandle = NULL;
+  if (tsMgmtTmr != NULL){
+    taosTmrCleanUp(tsMgmtTmr);
+    tsMgmtTmr = NULL;
  }

-  if (tsQhandleCache) {
+  if (tsQhandleCache != NULL) {
    taosCacheCleanup(tsQhandleCache);
    tsQhandleCache = NULL;
  }
+  
+  if (tsMgmtTranQhandle != NULL) {
+    taosCleanUpScheduler(tsMgmtTranQhandle);
+    tsMgmtTranQhandle = NULL;
+  }
 }

 void mgmtAddShellMsgHandle(uint8_t showType, void (*fp)(SQueuedMsg *queuedMsg)) {
@ -132,7 +137,7 @@ void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg) {
    mgmtGetMnodeIpSet(&ipSet);
    mTrace("conn from shell ip:%s user:%s redirect msg, inUse:%d", taosIpStr(connInfo.clientIp), connInfo.user, ipSet.inUse);
    for (int32_t i = 0; i < ipSet.numOfIps; ++i) {
-      mTrace("index:%d ip:%s:%d", i, ipSet.fqdn[i], ipSet.port[i]);
+      mTrace("mnode index:%d ip:%s:%d", i, ipSet.fqdn[i], htons(ipSet.port[i]));
    }

    rpcSendRedirectRsp(rpcMsg->handle, &ipSet);
--- a/src/mnode/src/mgmtTable.c
+++ b/src/mnode/src/mgmtTable.c
@ -26,7 +26,7 @@
 #include "tglobal.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtAcct.h"
 #include "mgmtDb.h"
 #include "mgmtDnode.h"
@ -701,10 +701,10 @@ static void mgmtProcessDropTableMsg(SQueuedMsg *pMsg) {
  }

  if (pMsg->pTable->type == TSDB_SUPER_TABLE) {
-    mTrace("table:%s, start to drop stable", pDrop->tableId);
+    mPrint("table:%s, start to drop stable", pDrop->tableId);
    mgmtProcessDropSuperTableMsg(pMsg);
  } else {
-    mTrace("table:%s, start to drop ctable", pDrop->tableId);
+    mPrint("table:%s, start to drop ctable", pDrop->tableId);
    mgmtProcessDropChildTableMsg(pMsg);
  }
 }
@ -802,36 +802,39 @@ static void mgmtProcessDropSuperTableMsg(SQueuedMsg *pMsg) {
      int32_t vgId = pStable->vgList[vg];
      if (vgId == 0) break;

+      SVgObj *pVgroup = mgmtGetVgroup(vgId);
+      if (pVgroup == NULL) break;
+      
      SMDDropSTableMsg *pDrop = rpcMallocCont(sizeof(SMDDropSTableMsg));
+      pDrop->contLen = htonl(sizeof(SMDDropSTableMsg));
      pDrop->vgId = htonl(vgId);
      pDrop->uid = htobe64(pStable->uid);
      mgmtExtractTableName(pStable->info.tableId, pDrop->tableId);
        
-      SVgObj *pVgroup = mgmtGetVgroup(vgId);
-      if (pVgroup != NULL) {
+      mPrint("stable:%s, send drop stable msg to vgId:%d", pStable->info.tableId, vgId);
      SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pVgroup);
      SRpcMsg rpcMsg = {.pCont = pDrop, .contLen = sizeof(SMDDropSTableMsg), .msgType = TSDB_MSG_TYPE_MD_DROP_STABLE};
      dnodeSendMsgToDnode(&ipSet, &rpcMsg);
      mgmtDecVgroupRef(pVgroup);
    }
  } 
-  } else {
+  
  SSdbOper oper = {
    .type = SDB_OPER_GLOBAL,
    .table = tsSuperTableSdb,
    .pObj = pStable
  };
+  
  int32_t code = sdbDeleteRow(&oper);
  mLPrint("stable:%s, is dropped from sdb, result:%s", pStable->info.tableId, tstrerror(code));
  mgmtSendSimpleResp(pMsg->thandle, code);
 }
-}

 static int32_t mgmtFindSuperTableTagIndex(SSuperTableObj *pStable, const char *tagName) {
-  for (int32_t i = 0; i < pStable->numOfTags; i++) {
-    SSchema *schema = (SSchema *)(pStable->schema + (pStable->numOfColumns + i) * sizeof(SSchema));
-    if (strcasecmp(tagName, schema->name) == 0) {
-      return i;
+  SSchema *schema = (SSchema *) pStable->schema;
+  for (int32_t tag = 0; tag < pStable->numOfTags; tag++) {
+    if (strcasecmp(schema[pStable->numOfColumns + tag].name, tagName) == 0) {
+      return tag;
    }
  }

@ -1303,7 +1306,7 @@ static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) {
 }

 static void mgmtProcessDropSuperTableRsp(SRpcMsg *rpcMsg) {
- mTrace("drop stable rsp received, handle:%p code:%s", rpcMsg->handle, tstrerror(rpcMsg->code));
+  mPrint("drop stable rsp received, result:%s", tstrerror(rpcMsg->code));
 }

 static void *mgmtBuildCreateChildTableMsg(SCMCreateTableMsg *pMsg, SChildTableObj *pTable) {
@ -1540,7 +1543,7 @@ static void mgmtProcessDropChildTableMsg(SQueuedMsg *pMsg) {

  SRpcIpSet ipSet = mgmtGetIpSetFromVgroup(pMsg->pVgroup);

-  mTrace("table:%s, send drop ctable msg", pDrop->tableId);
+  mPrint("table:%s, send drop ctable msg", pDrop->tableId);
  SQueuedMsg *newMsg = mgmtCloneQueuedMsg(pMsg);
  newMsg->ahandle = pMsg->pTable;
  SRpcMsg rpcMsg = {
@ -1867,7 +1870,7 @@ static void mgmtProcessDropChildTableRsp(SRpcMsg *rpcMsg) {
  queueMsg->received++;

  SChildTableObj *pTable = queueMsg->ahandle;
-  mTrace("table:%s, drop table rsp received, thandle:%p result:%s", pTable->info.tableId, queueMsg->thandle, tstrerror(rpcMsg->code));
+  mPrint("table:%s, drop table rsp received, thandle:%p result:%s", pTable->info.tableId, queueMsg->thandle, tstrerror(rpcMsg->code));

  if (rpcMsg->code != TSDB_CODE_SUCCESS) {
    mError("table:%s, failed to drop in dnode, reason:%s", pTable->info.tableId, tstrerror(rpcMsg->code));
--- a/src/mnode/src/mgmtUser.c
+++ b/src/mnode/src/mgmtUser.c
@ -23,7 +23,7 @@
 #include "tdataformat.h"
 #include "dnode.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtAcct.h"
 #include "mgmtMnode.h"
 #include "mgmtSdb.h"
@ -309,11 +309,14 @@ static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void

    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
    if (pUser->superAuth) {
-      STR_WITH_SIZE_TO_VARSTR(pWrite, "super", 5);
+      const char *src = "super";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
    } else if (pUser->writeAuth) {
-      STR_WITH_SIZE_TO_VARSTR(pWrite, "writable", 8);
+      const char *src = "writable";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
    } else {
-      STR_WITH_SIZE_TO_VARSTR(pWrite, "readable", 8);
+      const char *src = "readable";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
    }
    cols++;

--- a/src/mnode/src/mgmtVgroup.c
+++ b/src/mnode/src/mgmtVgroup.c
@ -26,7 +26,7 @@
 #include "dnode.h"
 #include "tdataformat.h"
 #include "mgmtDef.h"
-#include "mgmtLog.h"
+#include "mgmtInt.h"
 #include "mgmtDb.h"
 #include "mgmtDnode.h"
 #include "mgmtMnode.h"
@ -494,11 +494,12 @@ int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pCo
        cols++;
      } else {
        pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-        STR_WITH_SIZE_TO_VARSTR(pWrite, "NULL", 4);
+        const char *src = "NULL";
+        STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
        cols++;
        
        pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-        STR_WITH_SIZE_TO_VARSTR(pWrite, "NULL", 4);
+        STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
        cols++;
      }
    }
--- a/src/os/linux/CMakeLists.txt
+++ b/src/os/linux/CMakeLists.txt
@ -12,3 +12,5 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  ADD_LIBRARY(os ${SRC})
  TARGET_LINK_LIBRARIES(os m rt)
 ENDIF ()
+
+SET_SOURCE_FILES_PROPERTIES(src/linuxSysPara.c PROPERTIES COMPILE_FLAGS -w)
--- a/src/os/linux/inc/os.h
+++ b/src/os/linux/inc/os.h
@ -23,13 +23,6 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>

-#ifndef _ALPINE
-  #include <error.h>
-  #include <sys/sysctl.h>
-#else
-  #include <linux/sysctl.h>  
-#endif
-
 #include <argp.h>
 #include <arpa/inet.h>
 #include <assert.h>
@ -82,6 +75,7 @@ extern "C" {
 #include <fcntl.h>
 #include <sys/utsname.h>
 #include <sys/resource.h>
+#include <error.h>

 #define taosCloseSocket(x) \
  {                        \
--- a/src/os/linux/inc/tsysctl.h
+++ b/src/os/linux/inc/tsysctl.h
@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_TSYSCTL_H
+#define TDENGINE_TSYSCTL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ALPINE
+  #include <error.h>
+  #include <sys/sysctl.h>
+#else
+  #include <linux/sysctl.h>  
+#endif
+
+#endif
--- a/src/os/linux/src/linuxSysPara.c
+++ b/src/os/linux/src/linuxSysPara.c
@ -15,6 +15,7 @@

 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "tsysctl.h"
 #include "tconfig.h"
 #include "tglobal.h"
 #include "tulog.h"
@ -356,10 +357,15 @@ static bool taosGetCardName(char *ip, char *name) {
      break;
    }

-    if (strcmp(host, ip) == 0) {
+    if (strcmp(host, "127.0.0.1") == 0) {
+      continue;
+    }
+
+    // TODO: the ip not config
+    // if (strcmp(host, ip) == 0) {
    strcpy(name, ifa->ifa_name);
    ret = true;
-    }
+    // }
  }

  freeifaddrs(ifaddr);
--- a/src/plugins/http/src/gcJson.c
+++ b/src/plugins/http/src/gcJson.c
@ -121,10 +121,11 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,

  for (int k = 0; k < numOfRows; ++k) {
    TAOS_ROW row = taos_fetch_row(result);
+    int32_t* length = taos_fetch_lengths(result);

    // for group by
    if (groupFields != -1) {
-      char target[HTTP_GC_TARGET_SIZE];
+      char target[HTTP_GC_TARGET_SIZE] = {0};
      int len;
      len = snprintf(target,HTTP_GC_TARGET_SIZE,"%s{",aliasBuffer);
      for (int i = dataFields + 1; i<num_fields; i++){
@ -150,7 +151,11 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
            break;
          case TSDB_DATA_TYPE_BINARY:
          case TSDB_DATA_TYPE_NCHAR:
-            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%s", fields[i].name, (char *)row[i]);
+            if (row[i]!= NULL){            
+              len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:", fields[i].name);
+              memcpy(target + len, (char *) row[i], length[i]);
+              len = strlen(target);
+            }
            break;
          default:
            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%s", fields[i].name, "-");
--- a/src/plugins/http/src/restJson.c
+++ b/src/plugins/http/src/restJson.c
@ -94,6 +94,7 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,

  for (int k = 0; k < numOfRows; ++k) {
    TAOS_ROW row = taos_fetch_row(result);
+    int32_t* length = taos_fetch_lengths(result);

    // data row array begin
    httpJsonItemToken(jsonBuf);
@ -129,7 +130,7 @@ bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
          break;
        case TSDB_DATA_TYPE_BINARY:
        case TSDB_DATA_TYPE_NCHAR:
-          httpJsonStringForTransMean(jsonBuf, row[i], fields[i].bytes);
+          httpJsonStringForTransMean(jsonBuf, row[i], length[i]);
          break;
        case TSDB_DATA_TYPE_TIMESTAMP:
          if (timestampFormat == REST_TIMESTAMP_FMT_LOCAL_STRING) {
--- a/src/plugins/monitor/src/monitorMain.c
+++ b/src/plugins/monitor/src/monitorMain.c
@ -43,7 +43,7 @@
  { taosPrintLog("MON ", 255, __VA_ARGS__); }

 #define SQL_LENGTH     1024
-#define LOG_LEN_STR    80
+#define LOG_LEN_STR    100
 #define IP_LEN_STR     18
 #define CHECK_INTERVAL 1000

@ -148,8 +148,8 @@ static void dnodeBuildMonitorSql(char *sql, int32_t cmd) {

  if (cmd == MONITOR_CMD_CREATE_DB) {
    snprintf(sql, SQL_LENGTH,
-             "create database if not exists %s replica 1 days 10 keep 30 cache 2 "
-             "blocks 2 maxtables 32 precision 'us'",
+             "create database if not exists %s replica 1 days 10 keep 30 cache 1 "
+             "blocks 2 maxtables 16 precision 'us'",
             tsMonitorDbName);
  } else if (cmd == MONITOR_CMD_CREATE_MT_DN) {
    snprintf(sql, SQL_LENGTH,
@ -160,11 +160,11 @@ static void dnodeBuildMonitorSql(char *sql, int32_t cmd) {
             ", band_speed float"
             ", io_read float, io_write float"
             ", req_http int, req_select int, req_insert int"
-             ") tags (ipaddr binary(%d))",
+             ") tags (dnodeid int, fqdn binary(%d))",
             tsMonitorDbName, TSDB_FQDN_LEN + 1);
  } else if (cmd == MONITOR_CMD_CREATE_TB_DN) {
-    snprintf(sql, SQL_LENGTH, "create table if not exists %s.dn_%s using %s.dn tags('%s')", tsMonitorDbName,
-             tsMonitorConn.ep, tsMonitorDbName, tsLocalEp);
+    snprintf(sql, SQL_LENGTH, "create table if not exists %s.dn%d using %s.dn tags(%d, '%s')", tsMonitorDbName,
+             dnodeGetDnodeId(), tsMonitorDbName, dnodeGetDnodeId(), tsLocalEp);
  } else if (cmd == MONITOR_CMD_CREATE_MT_ACCT) {
    snprintf(sql, SQL_LENGTH,
             "create table if not exists %s.acct(ts timestamp "
@ -347,7 +347,7 @@ static void monitorSaveSystemInfo() {

  int64_t ts = taosGetTimestampUs();
  char *  sql = tsMonitorConn.sql;
-  int32_t pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn_%s values(%" PRId64, tsMonitorDbName, tsMonitorConn.ep, ts);
+  int32_t pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn%d values(%" PRId64, tsMonitorDbName, dnodeGetDnodeId(), ts);

  pos += monitorBuildCpuSql(sql + pos);
  pos += monitorBuildMemorySql(sql + pos);
@ -407,7 +407,7 @@ void monitorSaveLog(int32_t level, const char *const format, ...) {

  if (tsMonitorConn.state != MONITOR_STATE_INITIALIZED) return;

-  int32_t len = snprintf(sql, (size_t)max_length, "import into %s.log values(%" PRId64 ", %d,'", tsMonitorDbName,
+  int32_t len = snprintf(sql, (size_t)max_length, "insert into %s.log values(%" PRId64 ", %d,'", tsMonitorDbName,
                         taosGetTimestampUs(), level);

  va_start(argpointer, format);
--- a/src/query/inc/queryLog.h
+++ b/src/query/inc/queryLog.h
@ -22,20 +22,20 @@ extern "C" {

 #include "tlog.h"

-extern int32_t qdebugFlag;
+extern int32_t qDebugFlag;

 #define qTrace(...)                               \
-  if (qdebugFlag & DEBUG_TRACE) {                 \
-    taosPrintLog("DND QRY ", qdebugFlag, __VA_ARGS__); \
+  if (qDebugFlag & DEBUG_TRACE) {                 \
+    taosPrintLog("DND QRY ", qDebugFlag, __VA_ARGS__); \
  }

 #define qError(...)                                   \
-  if (qdebugFlag & DEBUG_ERROR) {                   \
-    taosPrintLog("ERROR QRY ", qdebugFlag, __VA_ARGS__); \
+  if (qDebugFlag & DEBUG_ERROR) {                   \
+    taosPrintLog("ERROR QRY ", qDebugFlag, __VA_ARGS__); \
  }
 #define qWarn(...)                                    \
-  if (qdebugFlag & DEBUG_WARN) {                    \
-    taosPrintLog("WARN  QRY ", qdebugFlag, __VA_ARGS__); \
+  if (qDebugFlag & DEBUG_WARN) {                    \
+    taosPrintLog("WARN  QRY ", qDebugFlag, __VA_ARGS__); \
  }  

 #ifdef __cplusplus
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@ -226,17 +226,6 @@ void *rpcOpen(const SRpcInit *pInit) {
  pRpc->cfp = pInit->cfp;
  pRpc->afp = pInit->afp;

-  pRpc->tcphandle = (*taosInitConn[pRpc->connType|RPC_CONN_TCP])(0, pRpc->localPort, pRpc->label, 
-                                                  pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc);
-  pRpc->udphandle = (*taosInitConn[pRpc->connType])(0, pRpc->localPort, pRpc->label, 
-                                                  pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc);
-
-  if (pRpc->tcphandle == NULL || pRpc->udphandle == NULL) {
-    tError("%s failed to init network, port:%d", pRpc->label, pRpc->localPort);
-    rpcClose(pRpc);
-    return NULL;
-  }
-
  size_t size = sizeof(SRpcConn) * pRpc->sessions;
  pRpc->connList = (SRpcConn *)calloc(1, size);
  if (pRpc->connList == NULL) {
@ -277,6 +266,17 @@ void *rpcOpen(const SRpcInit *pInit) {

  pthread_mutex_init(&pRpc->mutex, NULL);

+  pRpc->tcphandle = (*taosInitConn[pRpc->connType|RPC_CONN_TCP])(0, pRpc->localPort, pRpc->label, 
+                                                  pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc);
+  pRpc->udphandle = (*taosInitConn[pRpc->connType])(0, pRpc->localPort, pRpc->label, 
+                                                  pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc);
+
+  if (pRpc->tcphandle == NULL || pRpc->udphandle == NULL) {
+    tError("%s failed to init network, port:%d", pRpc->label, pRpc->localPort);
+    rpcClose(pRpc);
+    return NULL;
+  }
+
  tTrace("%s RPC is openned, numOfThreads:%d", pRpc->label, pRpc->numOfThreads);

  return pRpc;
@ -793,7 +793,7 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {

  pConn->chandle = pRecv->chandle;
  pConn->peerIp = pRecv->ip; 
-  if (pConn->peerPort == 0) pConn->peerPort = pRecv->port;
+  pConn->peerPort = pRecv->port;
  if (pHead->port) pConn->peerPort = htons(pHead->port); 

  terrno = rpcCheckAuthentication(pConn, (char *)pHead, pRecv->msgLen);
@ -869,9 +869,9 @@ static void *rpcProcessMsgFromPeer(SRecvInfo *pRecv) {
  pConn = rpcProcessMsgHead(pRpc, pRecv);

  if (pHead->msgType < TSDB_MSG_TYPE_CM_HEARTBEAT || (rpcDebugFlag & 16)) {
-    tTrace("%s %p, %s received from 0x%x:%hu, parse code:0x%x len:%d sig:0x%08x:0x%08x:%d",
+    tTrace("%s %p, %s received from 0x%x:%hu, parse code:0x%x len:%d sig:0x%08x:0x%08x:%d code:0x%x",
        pRpc->label, pConn, taosMsg[pHead->msgType], pRecv->ip, pRecv->port, terrno, 
-        pRecv->msgLen, pHead->sourceId, pHead->destId, pHead->tranId, pHead->port);
+        pRecv->msgLen, pHead->sourceId, pHead->destId, pHead->tranId, pHead->code);
  }

  int32_t code = terrno;
@ -935,10 +935,19 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) {
    rpcAddConnIntoCache(pRpc->pCache, pConn, pConn->peerFqdn, pContext->ipSet.port[pContext->ipSet.inUse], pConn->connType);    

    if (pHead->code == TSDB_CODE_REDIRECT) { 
-      pContext->redirect = 1;
+      pContext->redirect++;
+      if (pContext->redirect > TSDB_MAX_REPLICA) {
+        pHead->code = TSDB_CODE_NETWORK_UNAVAIL; 
+        tWarn("%s %p, too many redirects, quit", pRpc->label, pConn);
+      }
+    }
+
+    if (pHead->code == TSDB_CODE_REDIRECT) {
      pContext->numOfTry = 0;
      memcpy(&pContext->ipSet, pHead->content, sizeof(pContext->ipSet));
      tTrace("%s %p, redirect is received, numOfIps:%d", pRpc->label, pConn, pContext->ipSet.numOfIps);
+      for (int i=0; i<pContext->ipSet.numOfIps; ++i) 
+        pContext->ipSet.port[i] = htons(pContext->ipSet.port[i]);
      rpcSendReqToServer(pRpc, pContext);
    } else if (pHead->code == TSDB_CODE_NOT_READY) {
      pContext->code = pHead->code;
@ -1085,8 +1094,8 @@ static void rpcSendMsgToPeer(SRpcConn *pConn, void *msg, int msgLen) {
  } 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, 
+      tTrace( "%s %p, %s is sent to 0x%x:%hu, code:0x%x len:%d sig:0x%08x:0x%08x:%d",
+          pRpc->label, pConn, taosMsg[pHead->msgType], pConn->peerIp, pConn->peerPort, 
          htonl(pHead->code), msgLen, pHead->sourceId, pHead->destId, pHead->tranId);
  }

--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@ -94,6 +94,7 @@ typedef struct STable {
  void *         streamHandler;  // TODO
  TSKEY          lastKey;        // lastkey inserted in this table, initialized as 0, TODO: make a structure
  struct STable *next;           // TODO: remove the next
+  struct STable *prev;
  tstr *         name;           // NOTE: there a flexible string here
 } STable;

--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@ -90,6 +90,7 @@ void tsdbFreeCfg(STsdbCfg *pCfg) {
 int32_t tsdbCreateRepo(char *rootDir, STsdbCfg *pCfg, void *limiter /* TODO */) {

  if (mkdir(rootDir, 0755) != 0) {
+    tsdbError("id %d: failed to create rootDir! rootDir %s, reason %s", pCfg->tsdbId, rootDir, strerror(errno));
    if (errno == EACCES) {
      return TSDB_CODE_NO_DISK_PERMISSIONS;
    } else if (errno == ENOSPC) {
@ -611,14 +612,20 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) {
  if (pCfg->precision == -1) {
    pCfg->precision = TSDB_DEFAULT_PRECISION;
  } else {
-    if (!IS_VALID_PRECISION(pCfg->precision)) return -1;
+    if (!IS_VALID_PRECISION(pCfg->precision)) {
+      tsdbError("id %d: invalid precision configuration! precision %d", pCfg->tsdbId, pCfg->precision);
+      return -1;
+    }
  }

  // Check compression
  if (pCfg->compression == -1) {
    pCfg->compression = TSDB_DEFAULT_COMPRESSION;
  } else {
-    if (!IS_VALID_COMPRESSION(pCfg->compression)) return -1;
+    if (!IS_VALID_COMPRESSION(pCfg->compression)) {
+      tsdbError("id %d: invalid compression configuration! compression %d", pCfg->tsdbId, pCfg->precision);
+      return -1;
+    }
  }

  // Check tsdbId
@ -628,30 +635,50 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) {
  if (pCfg->maxTables == -1) {
    pCfg->maxTables = TSDB_DEFAULT_TABLES;
  } else {
-    if (pCfg->maxTables < TSDB_MIN_TABLES || pCfg->maxTables > TSDB_MAX_TABLES) return -1;
+    if (pCfg->maxTables < TSDB_MIN_TABLES || pCfg->maxTables > TSDB_MAX_TABLES) {
+      tsdbError("id %d: invalid maxTables configuration! maxTables %d TSDB_MIN_TABLES %d TSDB_MAX_TABLES %d",
+                pCfg->tsdbId, pCfg->maxTables, TSDB_MIN_TABLES, TSDB_MAX_TABLES);
+      return -1;
+    }
  }

  // Check daysPerFile
  if (pCfg->daysPerFile == -1) {
    pCfg->daysPerFile = TSDB_DEFAULT_DAYS_PER_FILE;
  } else {
-    if (pCfg->daysPerFile < TSDB_MIN_DAYS_PER_FILE || pCfg->daysPerFile > TSDB_MAX_DAYS_PER_FILE) return -1;
+    if (pCfg->daysPerFile < TSDB_MIN_DAYS_PER_FILE || pCfg->daysPerFile > TSDB_MAX_DAYS_PER_FILE) {
+      tsdbError(
+          "id %d: invalid daysPerFile configuration! daysPerFile %d TSDB_MIN_DAYS_PER_FILE %d TSDB_MAX_DAYS_PER_FILE "
+          "%d",
+          pCfg->tsdbId, pCfg->daysPerFile, TSDB_MIN_DAYS_PER_FILE, TSDB_MAX_DAYS_PER_FILE);
+      return -1;
+    }
  }

  // Check minRowsPerFileBlock and maxRowsPerFileBlock
  if (pCfg->minRowsPerFileBlock == -1) {
    pCfg->minRowsPerFileBlock = TSDB_DEFAULT_MIN_ROW_FBLOCK;
  } else {
-    if (pCfg->minRowsPerFileBlock < TSDB_MIN_MIN_ROW_FBLOCK || pCfg->minRowsPerFileBlock > TSDB_MAX_MIN_ROW_FBLOCK)
+    if (pCfg->minRowsPerFileBlock < TSDB_MIN_MIN_ROW_FBLOCK || pCfg->minRowsPerFileBlock > TSDB_MAX_MIN_ROW_FBLOCK) {
+      tsdbError(
+          "id %d: invalid minRowsPerFileBlock configuration! minRowsPerFileBlock %d TSDB_MIN_MIN_ROW_FBLOCK %d "
+          "TSDB_MAX_MIN_ROW_FBLOCK %d",
+          pCfg->tsdbId, pCfg->minRowsPerFileBlock, TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK);
      return -1;
    }
+  }

  if (pCfg->maxRowsPerFileBlock == -1) {
    pCfg->maxRowsPerFileBlock = TSDB_DEFAULT_MAX_ROW_FBLOCK;
  } else {
-    if (pCfg->maxRowsPerFileBlock < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->maxRowsPerFileBlock > TSDB_MAX_MAX_ROW_FBLOCK)
+    if (pCfg->maxRowsPerFileBlock < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->maxRowsPerFileBlock > TSDB_MAX_MAX_ROW_FBLOCK) {
+      tsdbError(
+          "id %d: invalid maxRowsPerFileBlock configuration! maxRowsPerFileBlock %d TSDB_MIN_MAX_ROW_FBLOCK %d "
+          "TSDB_MAX_MAX_ROW_FBLOCK %d",
+          pCfg->tsdbId, pCfg->maxRowsPerFileBlock, TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK);
      return -1;
    }
+  }

  if (pCfg->minRowsPerFileBlock > pCfg->maxRowsPerFileBlock) return -1;

@ -659,7 +686,13 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) {
  if (pCfg->keep == -1) {
    pCfg->keep = TSDB_DEFAULT_KEEP;
  } else {
-    if (pCfg->keep < TSDB_MIN_KEEP || pCfg->keep > TSDB_MAX_KEEP) return -1;
+    if (pCfg->keep < TSDB_MIN_KEEP || pCfg->keep > TSDB_MAX_KEEP) {
+      tsdbError(
+          "id %d: invalid keep configuration! keep %d TSDB_MIN_KEEP %d "
+          "TSDB_MAX_KEEP %d",
+          pCfg->tsdbId, pCfg->keep, TSDB_MIN_KEEP, TSDB_MAX_KEEP);
+      return -1;
+    }
  }

  return 0;
@ -716,15 +749,22 @@ static int32_t tsdbGetDataDirName(STsdbRepo *pRepo, char *fname) {
 }

 static int32_t tsdbSetRepoEnv(STsdbRepo *pRepo) {
+  STsdbCfg *pCfg = &pRepo->config;
  if (tsdbSaveConfig(pRepo) < 0) return -1;

  char dirName[128] = "\0";
  if (tsdbGetDataDirName(pRepo, dirName) < 0) return -1;

  if (mkdir(dirName, 0755) < 0) {
+    tsdbError("id %d: failed to create repository directory! reason %s", pRepo->config.tsdbId, strerror(errno));
    return -1;
  }

+  tsdbError(
+      "id %d: set up tsdb environment succeed! cacheBlockSize %d, totalBlocks %d, maxTables %d, daysPerFile %d, keep "
+      "%d, minRowsPerFileBlock %d, maxRowsPerFileBlock %d, precision %d, compression%d",
+      pRepo->config.tsdbId, pCfg->cacheBlockSize, pCfg->totalBlocks, pCfg->maxTables, pCfg->daysPerFile, pCfg->keep,
+      pCfg->minRowsPerFileBlock, pCfg->maxRowsPerFileBlock, pCfg->precision, pCfg->compression);
  return 0;
 }

@ -811,7 +851,8 @@ static int32_t tsdbInsertDataToTable(TsdbRepoT *repo, SSubmitBlk *pBlock, TSKEY
  STableId tableId = {.uid = pBlock->uid, .tid = pBlock->tid};
  STable *pTable = tsdbIsValidTableToInsert(pRepo->tsdbMeta, tableId);
  if (pTable == NULL) {
-    tsdbError("failed to get table for insert, uid:%" PRIu64 ", tid:%d", tableId.uid, tableId.tid);
+    tsdbError("id %d: failed to get table for insert, uid:%" PRIu64 ", tid:%d", pRepo->config.tsdbId, pBlock->uid,
+              pBlock->tid);
    return TSDB_CODE_INVALID_TABLE_ID;
  }

--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@ -13,10 +13,10 @@ const int32_t DEFAULT_TAG_INDEX_COLUMN = 0;
 static int     tsdbFreeTable(STable *pTable);
 static int32_t tsdbCheckTableCfg(STableCfg *pCfg);
 static int     tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx);
-static int     tsdbAddTableIntoMap(STsdbMeta *pMeta, STable *pTable);
 static int     tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable);
 static int     tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable);
 static int     tsdbEstimateTableEncodeSize(STable *pTable);
+static int     tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable);

 /**
 * Encode a TSDB table object as a binary content
@ -391,21 +391,9 @@ int32_t tsdbDropTableImpl(STsdbMeta *pMeta, STableId tableId) {
  STable *pTable = tsdbGetTableByUid(pMeta, tableId.uid);
  if (pTable == NULL) return -1;

-  if (pTable->type == TSDB_SUPER_TABLE) {
-    // TODO: implement drop super table
-    return -1;
-  } else {
-    pMeta->tables[pTable->tableId.tid] = NULL;
-    pMeta->nTables--;
-    assert(pMeta->nTables >= 0);
-    if (pTable->type == TSDB_CHILD_TABLE) {
-      tsdbRemoveTableFromIndex(pMeta, pTable);
-    }
-
-    tsdbFreeTable(pTable);
-  }
-
+  if (tsdbRemoveTableFromMeta(pMeta, pTable) < 0) return -1;
  return 0;
+
 }

 // int32_t tsdbInsertRowToTableImpl(SSkipListNode *pNode, STable *pTable) {
@ -461,10 +449,12 @@ static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx) {
    if (pMeta->superList == NULL) {
      pMeta->superList = pTable;
      pTable->next = NULL;
+      pTable->prev = NULL;
    } else {
-      STable *pTemp = pMeta->superList;
+      pTable->next = pMeta->superList;
+      pTable->prev = NULL;
+      pTable->next->prev = pTable;
      pMeta->superList = pTable;
-      pTable->next = pTemp;
    }
  } else {
    // add non-super table to the array
@ -483,23 +473,50 @@ static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx) {
    if (bytes > pMeta->maxRowBytes) pMeta->maxRowBytes = bytes;
  }

-  return tsdbAddTableIntoMap(pMeta, pTable);
-}
-
-// static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable) {
-//   // TODO
-//   return 0;
-// }
-
-static int tsdbAddTableIntoMap(STsdbMeta *pMeta, STable *pTable) {
-  // TODO: add the table to the map
-  int64_t uid = pTable->tableId.uid;
-  if (taosHashPut(pMeta->map, (char *)(&uid), sizeof(uid), (void *)(&pTable), sizeof(pTable)) < 0) {
+  if (taosHashPut(pMeta->map, (char *)(&pTable->tableId.uid), sizeof(pTable->tableId.uid), (void *)(&pTable), sizeof(pTable)) < 0) {
    return -1;
  }
  return 0;
 }

+static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable) {
+  if (pTable->type == TSDB_SUPER_TABLE) {
+    SSkipListIterator  *pIter = tSkipListCreateIter(pTable->pIndex);
+    while (tSkipListIterNext(pIter)) {
+      STable *tTable = *(STable **)SL_GET_NODE_DATA(tSkipListIterGet(pIter));
+      ASSERT(tTable != NULL && tTable->type == TSDB_CHILD_TABLE);
+
+      pMeta->tables[tTable->tableId.tid] = NULL;
+      taosHashRemove(pMeta->map, (char *)(&(pTable->tableId.uid)), sizeof(pTable->tableId.uid));
+      pMeta->nTables--;
+      tsdbFreeTable(tTable);
+    }
+
+    tSkipListDestroyIter(pIter);
+
+    // TODO: Remove the table from the list
+    if (pTable->prev != NULL) {
+      pTable->prev->next = pTable->next;
+      if (pTable->next != NULL) {
+        pTable->next->prev = pTable->prev;
+      }
+    } else {
+      pMeta->superList = pTable->next;
+    }
+  } else {
+    pMeta->tables[pTable->tableId.tid] = NULL;
+    if (pTable->type == TSDB_CHILD_TABLE) {
+      tsdbRemoveTableFromIndex(pMeta, pTable);
+    }
+
+    pMeta->nTables--;
+  }
+
+  tsdbFreeTable(pTable);
+  taosHashRemove(pMeta->map, (char *)(&(pTable->tableId.uid)), sizeof(pTable->tableId.uid));
+  return 0;
+}
+
 static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable) {
  assert(pTable->type == TSDB_CHILD_TABLE && pTable != NULL);
  STable* pSTable = tsdbGetTableByUid(pMeta, pTable->superUid);
--- a/src/util/src/tconfig.c
+++ b/src/util/src/tconfig.c
@ -236,7 +236,7 @@ void taosReadGlobalLogCfg() {
  int    olen, vlen;
  char   fileName[PATH_MAX] = {0};

-  mdebugFlag = 135;
+  mDebugFlag = 135;
  sdbDebugFlag = 135;

  wordexp_t full_path;
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@ -267,7 +267,7 @@ void vnodeRelease(void *pVnodeRaw) {
  assert(refCount >= 0);

  if (refCount > 0) {
-    vTrace("vgId:%d, release vnode, refCount:%d", pVnode, vgId, refCount);
+    vTrace("vgId:%d, release vnode, refCount:%d", vgId, refCount);
    return;
  }

@ -301,7 +301,7 @@ void *vnodeGetVnode(int32_t vgId) {
  SVnodeObj **ppVnode = (SVnodeObj **)taosGetIntHashData(tsDnodeVnodesHash, vgId);
  if (ppVnode == NULL || *ppVnode == NULL) {
    terrno = TSDB_CODE_INVALID_VGROUP_ID;
-    vPrint("vgId:%d not exist", vgId);
+    vPrint("vgId:%d, not exist", vgId);
    return NULL;
  }

@ -693,8 +693,9 @@ static bool vnodeReadVersion(SVnodeObj *pVnode) {
  sprintf(versionFile, "%s/vnode%d/version.json", tsVnodeDir, pVnode->vgId);
  FILE *fp = fopen(versionFile, "r");
  if (!fp) {
-    vTrace("vgId:%d, failed to open version file:%s error:%s", pVnode->vgId,
-           versionFile, strerror(errno));
+    if (errno != ENOENT) {
+      vError("vgId:%d, failed to open version file:%s error:%s", pVnode->vgId, versionFile, strerror(errno));
+    }
    return false;
  }

--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@ -231,13 +231,15 @@ static int32_t vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
  int32_t code = 0;

  vTrace("vgId:%d, stable:%s, start to drop", pVnode->vgId, pTable->tableId);
-  // TODO: drop stable in vvnode
-  //int64_t uid = htobe64(pTable->uid);
-  //void *pTsdb = dnodeGetVnodeTsdb(pMsg->pVnode);
-  //rpcRsp.code = tsdbDropTable(pTsdb, pTable->uid);
  
-  code = TSDB_CODE_SUCCESS;
-  vTrace("vgId:%d, stable:%s, drop stable result:%x", pVnode, pTable->tableId, code);
+  STableId stableId = {
+    .uid = htobe64(pTable->uid),
+    .tid = -1
+  };
+
+  code = tsdbDropTable(pVnode->tsdb, stableId);
+  
+  vTrace("vgId:%d, stable:%s, drop stable result:%s", pVnode->vgId, pTable->tableId, tstrerror(code));
 
  return code;
 }
--- a/tests/examples/JDBC/springbootdemo/readme.md
+++ b/tests/examples/JDBC/springbootdemo/readme.md
@ -14,7 +14,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 spring.datasource.druid.max-wait=60000

-spring.datasource.druid.validation-query=describe log.dn
+spring.datasource.druid.validation-query=select server_status();
 spring.datasource.druid.validation-query-timeout=5000
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
--- a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
@ -10,7 +10,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 spring.datasource.druid.max-wait=60000

-spring.datasource.druid.validation-query=describe log.dn
+spring.datasource.druid.validation-query=select server_status();
 spring.datasource.druid.validation-query-timeout=5000
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
--- a/tests/pytest/account/init.py
+++ b/tests/pytest/account/init.py
--- a/tests/pytest/account/account_create.py
+++ b/tests/pytest/account/account_create.py
@ -0,0 +1,41 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        try:
+            tdSql.execute("create account a&cc PASS 'pass123'")
+        except Exception as e:
+            print("create account a&cc PASS 'pass123'")
+            return
+
+        tdLog.exit("drop built-in user is error.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
--- a/tests/pytest/account/account_del.py
+++ b/tests/pytest/account/account_del.py
@ -0,0 +1,52 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        print("==========step1")
+        print("drop built-in account")
+        try:
+            tdSql.execute("drop account root")
+        except Exception as e:
+            if len(e.args) > 0 and 'no rights' != e.args[0]:
+                tdLog.exit(e)
+
+        print("==========step2")
+        print("drop built-in user")
+        try:
+            tdSql.execute("drop user root")
+        except Exception as e:
+            if len(e.args) > 0 and 'no rights' != e.args[0]:
+                tdLog.exit(e)
+            return
+
+        tdLog.exit("drop built-in user is error.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@ -9,6 +9,7 @@ python3 ./test.py $1 -f insert/smallint.py
 python3 ./test.py $1 -f insert/tinyint.py
 python3 ./test.py $1 -f insert/date.py
 python3 ./test.py $1 -f insert/binary.py
+python3 ./test.py $1 -f insert/nchar.py

 python3 ./test.py $1 -f table/column_name.py
 python3 ./test.py $1 -f table/column_num.py
@ -80,3 +81,7 @@ python3 ./test.py $1 -f import_merge/importToCommit.py
 python3 ./test.py $1 -f import_merge/importTORestart.py
 python3 ./test.py $1 -f import_merge/importTPORestart.py
 python3 ./test.py $1 -f import_merge/importTRestart.py
+
+# user
+python3 ./test.py $1 -f user/user_create.py
+python3 ./test.py $1 -f user/pass_len.py
--- a/tests/pytest/insert/binary.py
+++ b/tests/pytest/insert/binary.py
@ -14,7 +14,6 @@ class TDTestCase:
    def run(self):
        tdSql.prepare()

-
        tdLog.info('=============== step1')
        tdLog.info('create table tb (ts timestamp, speed binary(5))')
        tdSql.execute('create table tb (ts timestamp, speed binary(5))')
--- a/tests/pytest/insert/nchar.py
+++ b/tests/pytest/insert/nchar.py
@ -0,0 +1,44 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('create table tb (ts timestamp, col nchar(10))')
+        tdSql.execute("insert into tb values (now, 'taosdata')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 'taosdata')
+        tdSql.execute("insert into tb values (now, '涛思数据')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 1, '涛思数据')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
--- a/tests/pytest/smoketest.sh
+++ b/tests/pytest/smoketest.sh
@ -1,66 +1,116 @@
 #!/bin/bash
 python3 ./test.py $1 -f insert/basic.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/int.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/float.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/bigint.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/bool.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/double.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/smallint.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/tinyint.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/binary.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/date.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/nchar.py
+python3 ./test.py $1 -s && sleep 1

 python3 ./test.py $1 -f table/column_name.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f table/column_num.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f table/db_table.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1

 python3 ./test.py $1 -f import_merge/importDataLastTO.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importDataLastT.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importDataTO.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importDataT.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importHeadOverlap.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importHeadPartOverlap.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importHORestart.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importHPORestart.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importHRestart.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importLastSub.py
-python3 ./test.py -s $1
-sleep 1
+python3 ./test.py $1 -s && sleep 1
+
+python3 ./test.py $1 -f import_merge/importBlock1HO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1HPO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1H.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1S.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1Sub.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1TO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1TPO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock1T.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2HO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2HPO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2H.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2S.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2Sub.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2TO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2TPO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlock2T.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importBlockbetween.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importCacheFileSub.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importCacheFileTO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importCacheFileT.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importDataLastSub.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importHead.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importLastTO.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importLastT.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importSpan.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importSRestart.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importSubRestart.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importTailOverlap.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importTail.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importTORestart.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importTPORestart.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importTRestart.py
+python3 ./test.py $1 -s && sleep 1
--- a/tests/pytest/test.py
+++ b/tests/pytest/test.py
@ -96,16 +96,16 @@ if __name__ == "__main__":
    else:
        host = masterIp

-    tdLog.notice("Procedures for tdengine deployed in %s" % (host))
+    tdLog.info("Procedures for tdengine deployed in %s" % (host))

    if testCluster:
-        tdLog.notice("Procedures for testing cluster")
+        tdLog.info("Procedures for testing cluster")
        if fileName == "all":
            tdCases.runAllCluster()
        else:
            tdCases.runOneCluster(fileName)
    else:
-        tdLog.notice("Procedures for testing self-deployment")
+        tdLog.info("Procedures for testing self-deployment")
        conn = taos.connect(
            host,
            config=tdDnodes.getSimCfgPath())
--- a/tests/pytest/user/init.py
+++ b/tests/pytest/user/init.py
--- a/tests/pytest/user/pass_len.py
+++ b/tests/pytest/user/pass_len.py
@ -0,0 +1,63 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        print("==============step1")
+        try:
+            tdSql.execute("create user abc pass '123456'")
+        except Exception as e:
+            tdLog.exit(e)
+        print("create user abc pass '123456'")
+
+        print("==============step2")
+        try:
+            tdSql.execute("alter user abc pass 'taosdata'")
+        except Exception as e:
+            tdLog.exit(e)
+        print("alter user abc pass 'taosdata'")
+
+        print("==============step3")
+        try:
+            tdSql.execute("alter user abc pass ''")
+        except Exception as e:
+            print("alter user abc pass ''")
+        else:
+            tdLog.exit("Error: alert user abc pass''")
+
+        print("==============step4")
+        try:
+            tdSql.execute("alter user abc pass null")
+        except Exception as e:
+            print("alter user abc pass null")
+        else:
+            tdLog.exit("Error: alter user abc pass null")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
--- a/tests/pytest/user/user_create.py
+++ b/tests/pytest/user/user_create.py
@ -0,0 +1,54 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        print("==============step1")
+        try:
+            tdSql.execute("create user &abc PASS 'pass123'")
+        except Exception as e:
+            print(e)
+
+        print("==============step2")
+        try:
+            tdSql.execute("create user a&bc PASS 'pass123'")
+        except Exception as e:
+            print(e)
+
+        print("==============step3")
+        try:
+            tdSql.execute("create user '涛思' PASS 'pass123'")
+        except Exception as e:
+            print(e)
+            return
+
+        tdLog.exit("create user with special character.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@ -69,7 +69,7 @@ class TDSimClient:
        self.cfg("numOfLogLines", "100000000")
        self.cfg("numOfThreadsPerCore", "2.0")
        self.cfg("locale", "en_US.UTF-8")
-        self.cfg("charset", "GBK")
+        self.cfg("charset", "UTF-8")
        self.cfg("asyncLog", "0")
        self.cfg("anyIp", "0")
        self.cfg("sdbDebugFlag", "135")
@ -205,24 +205,47 @@ class TDDnode:
        time.sleep(2)

    def stop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
        if self.running != 0:
-            cmd = "ps -ef|grep -w taosd | grep '%s' | grep -v grep | awk '{print $2}' && pkill -sigint taosd" % (
-                self.cfgDir)
-            if os.system(cmd) != 0:
-                tdLog.exit(cmd)
-            tdLog.debug("dnode:%d is stopped by kill -SIGINT" % (self.index))
+            killCmd = "ps -ef|grep -w %s| grep '%s' | grep -v grep | awk '{print $2}' | xargs kill -INT" % (
+                toBeKilled, self.cfgDir)
+
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(psCmd, shell=True)
+
+            while(processID):
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(psCmd, shell=True)
+
+            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
            tdLog.debug(
                "wait 2 seconds for the dnode:%d to stop." %
                (self.index))
            time.sleep(2)

    def forcestop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
        if self.running != 0:
-            cmd = "ps -ef|grep -w taosd | grep '%s' | grep -v grep | awk '{print $2}' && pkill -sigkill taosd" % (
-                self.cfgDir)
-            if os.system(cmd) != 0:
-                tdLog.exit(cmd)
-            tdLog.debug("dnode:%d is stopped by kill -9" % (self.index))
+            killCmd = "ps -ef|grep -w %s| grep '%s' | grep -v grep | awk '{print $2}' | xargs kill -KILL" % (
+                toBeKilled, self.cfgDir)
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(psCmd, shell=True)
+
+            while(processID):
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(psCmd, shell=True)
+
+            tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
            tdLog.debug(
                "wait 2 seconds for the dnode:%d to stop." %
                (self.index))
@ -268,8 +291,21 @@ class TDDnodes:
        self.dnodes.append(TDDnode(10))

    def init(self, path):
-        cmd = "ps -ef|grep -w taosd | grep 'taosd' | grep -v grep | awk '{print $2}' && pkill -sigkill taosd"
-        os.system(cmd)
+        killCmd = "ps -ef|grep -w taosd | grep -v grep | awk '{print $2}' | xargs kill -KILL"
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True)
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
+        killCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}' | xargs kill -KILL"
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True)
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)

        binPath = os.path.dirname(os.path.realpath(__file__))
        binPath = binPath + "/../../../debug/"
@ -361,8 +397,22 @@ class TDDnodes:
            os.system(cmd)
        # if os.system(cmd) != 0 :
        # tdLog.exit(cmd)
-        cmd = "ps -ef | grep -w taosd | grep 'dnode' | grep -v grep | awk '{print $2}' && pkill -sigkill taosd"
-        os.system(cmd)
+        killCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}' | xargs kill -KILL"
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True)
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
+        killCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}' | xargs kill -KILL"
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True)
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
        # if os.system(cmd) != 0 :
        # tdLog.exit(cmd)

--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@ -1,45 +1,26 @@
 ################################# 
-run general/db/basic1.sim
-run general/db/basic2.sim
-run general/db/basic3.sim
+run general/cache/new_metrics.sim
+run general/compress/compress.sim
+run general/compute/avg.sim
+run general/compute/bottom.sim
+run general/compute/count.sim
+run general/db/len.sim
 run general/db/basic4.sim
-run general/db/basic5.sim
-
-run general/table/basic1.sim
-run general/table/basic2.sim
+run general/http/restful_insert.sim
+run general/import/basic.sim
+run general/import/commit.sim
+run general/insert/basic.sim
+run general/insert/query_file_memory.sim
+run general/parser/binary_escapeCharacter.sim
+run general/parser/columnValue_bigint.sim
+run general/parser/select_from_cache_disk.sim
+run general/table/autocreate.sim
 run general/table/basic3.sim
-run general/table/column_num.sim
 run general/table/column_name.sim
-run general/table/bigint.sim
-run general/table/bool.sim
-run general/table/double.sim
-run general/table/float.sim
 run general/table/int.sim
-run general/table/smallint.sim
-run general/table/tinyint.sim
-run general/table/db.table.sim
-
+run general/table/vgroup.sim
 run general/user/basic1.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
-
+run general/vector/single.sim
 ################################## 
--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
 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
@ -36,7 +34,7 @@ while $i < 10
    sql create table $tb1 using st tags(1)
    sql insert into  $tb1 values(now, 1);

-    $tb1 = $tb . 5
+    $tb1 = $tb . 4
    sql create table $tb1 using st tags(1)
    sql insert into  $tb1 values(now, 1);

@ -58,7 +56,7 @@ while $i < 10

  sql drop table st

-  sleep 1000
+  sleep 2000
  print times $i
  $i = $i + 1

--- a/tests/script/general/field/testSuite.sim
+++ b/tests/script/general/field/testSuite.sim
@ -1,11 +1,14 @@
-run general/field/2.sim
-run general/field/3.sim
-run general/field/4.sim
-run general/field/5.sim
-run general/field/6.sim
-run general/field/bigint.sim
-run general/field/binary.sim
+# run general/field/single.sim
 run general/field/bool.sim
-run general/field/single.sim
 run general/field/smallint.sim
 run general/field/tinyint.sim
+run general/field/int.sim
+run general/field/bigint.sim
+run general/field/float.sim
+run general/field/double.sim
+# run general/field/binary.sim
+# run general/field/2.sim
+# run general/field/3.sim
+# run general/field/4.sim
+# run general/field/5.sim
+# run general/field/6.sim
--- a/tests/script/general/http/grafana_bug.sim
+++ b/tests/script/general/http/grafana_bug.sim
@ -35,7 +35,7 @@ print ===============  step1 - one query, 1 column, with timestamp

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"A","target":"A","datapoints":[["-",1577980800000],["-",1578067200000]]}]@ then
+if $system_content != @[{"refId":"A","target":"A","datapoints":[[null,1577980800000],[null,1578067200000]]}]@ then
  return -1
 endi

@ -51,32 +51,32 @@ print ===============  step3 - one query, 3 column, with timestamp

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val,val1 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step3.1-> $system_content
-if $system_content != @[{"refId":"A","target":"13","datapoints":[[2,1577980800000]]},{"refId":"A","target":"14","datapoints":[[2,1578067200000]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
  return -1
 endi

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val,val1 from db.tb "} ]' 127.0.0.1:6020/grafana/query
 print step3.2-> $system_content
-if $system_content != @[{"refId":"A","target":"11","datapoints":[[1,1577808000000]]},{"refId":"A","target":"12","datapoints":[[1,1577894400000]]},{"refId":"A","target":"13","datapoints":[[2,1577980800000]]},{"refId":"A","target":"14","datapoints":[[2,1578067200000]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val1:11,}","datapoints":[[1,1577808000000]]},{"refId":"A","target":"{val1:12,}","datapoints":[[1,1577894400000]]},{"refId":"A","target":"{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
  return -1
 endi

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val1,val from db.tb "} ]' 127.0.0.1:6020/grafana/query
 print step3.3-> $system_content
-if $system_content != @[{"refId":"A","target":"1","datapoints":[[11,1577808000000],[12,1577894400000]]},{"refId":"A","target":"2","datapoints":[[13,1577980800000],[14,1578067200000]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val:1,}","datapoints":[[11,1577808000000],[12,1577894400000]]},{"refId":"A","target":"{val:2,}","datapoints":[[13,1577980800000],[14,1578067200000]]}]@ then
  return -1
 endi

 print ===============  step4 - one query, 4 column, with timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val2,val1,val from db.tb "} ]' 127.0.0.1:6020/grafana/query
 print step4.1-> $system_content
-if $system_content != @[{"refId":"A","target":"1","datapoints":[[21,1577808000000],[22,1577894400000]]},{"refId":"A","target":"2","datapoints":[[23,1577980800000],[24,1578067200000]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val1:11,, val:1,}","datapoints":[[21,1577808000000]]},{"refId":"A","target":"{val1:12,, val:1,}","datapoints":[[22,1577894400000]]},{"refId":"A","target":"{val1:13,, val:2,}","datapoints":[[23,1577980800000]]},{"refId":"A","target":"{val1:14,, val:2,}","datapoints":[[24,1578067200000]]}]@ then
  return -1
 endi

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val,val1,val2 from db.tb "} ]' 127.0.0.1:6020/grafana/query
 print step4.2-> $system_content
-if $system_content != @[{"refId":"A","target":"21","datapoints":[[1,1577808000000]]},{"refId":"A","target":"22","datapoints":[[1,1577894400000]]},{"refId":"A","target":"23","datapoints":[[2,1577980800000]]},{"refId":"A","target":"24","datapoints":[[2,1578067200000]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val1:11,, val2:21,}","datapoints":[[1,1577808000000]]},{"refId":"A","target":"{val1:12,, val2:22,}","datapoints":[[1,1577894400000]]},{"refId":"A","target":"{val1:13,, val2:23,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,, val2:24,}","datapoints":[[2,1578067200000]]}]@ then
  return -1
 endi

@ -90,20 +90,20 @@ endi
 print ===============  step6 - one query, 2 column, no timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val1,val2 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"A","target":"23","datapoints":[[13,"-"]]},{"refId":"A","target":"24","datapoints":[[14,"-"]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val2:23,}","datapoints":[[13,"-"]]},{"refId":"A","target":"{val2:24,}","datapoints":[[14,"-"]]}]@ then
  return -1
 endi

 print ===============  step7 - one query, 3 column, no timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val1,val2,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"A","target":"2","datapoints":[[13,"-"],[14,"-"]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val2:23,, val:2,}","datapoints":[[13,"-"]]},{"refId":"A","target":"{val2:24,, val:2,}","datapoints":[[14,"-"]]}]@ then
  return -1
 endi

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val1,val2,val from db.tb"} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"A","target":"1","datapoints":[[11,"-"],[12,"-"]]},{"refId":"A","target":"2","datapoints":[[13,"-"],[14,"-"]]}]@ then
+if $system_content != @[{"refId":"A","target":"{val2:21,, val:1,}","datapoints":[[11,"-"]]},{"refId":"A","target":"{val2:22,, val:1,}","datapoints":[[12,"-"]]},{"refId":"A","target":"{val2:23,, val:2,}","datapoints":[[13,"-"]]},{"refId":"A","target":"{val2:24,, val:2,}","datapoints":[[14,"-"]]}]@ then
  return -1
 endi

@ -132,7 +132,7 @@ print ===============  step11 - two query, 1 column, with timestamp, 1 column, w

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"","sql":"select ts from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB","datapoints":[["-",1577980800000],["-",1578067200000]]},{"refId":"A","target":"A","datapoints":[["-",1577980800000],["-",1578067200000]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[null,1577980800000],[null,1578067200000]]},{"refId":"A","target":"A","datapoints":[[null,1577980800000],[null,1578067200000]]}]@ then
  return -1
 endi

@ -140,14 +140,14 @@ print ===============  step12 - two query, 1 column, with timestamp, 2 column, w

 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"","sql":"select ts,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB","datapoints":[["-",1577980800000],["-",1578067200000]]},{"refId":"A","target":"A","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[null,1577980800000],[null,1578067200000]]},{"refId":"A","target":"A","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
  return -1
 endi

 print ===============  step13 - two query, 1 column, with timestamp, 3 column, with timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"","sql":"select ts,val,val1 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB","datapoints":[["-",1577980800000],["-",1578067200000]]},{"refId":"A","target":"13","datapoints":[[2,1577980800000]]},{"refId":"A","target":"14","datapoints":[[2,1578067200000]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[null,1577980800000],[null,1578067200000]]},{"refId":"A","target":"{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
  return -1
 endi

@ -161,14 +161,14 @@ endi
 print ===============  step15 - two query, 2 column, with timestamp, 3 column, with timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val2, val1 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB213","datapoints":[[223,1577980800000]]},{"refId":"B","target":"BB214","datapoints":[[224,1578067200000]]},{"refId":"A","target":"AA","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB{val1:213,}","datapoints":[[223,1577980800000]]},{"refId":"B","target":"BB{val1:214,}","datapoints":[[224,1578067200000]]},{"refId":"A","target":"AA","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
  return -1
 endi

 print ===============  step16 - two query, 3 column, with timestamp, 4 column, with timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val, val1, val2, val1 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val,val1 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB213","datapoints":[[22,1577980800000]]},{"refId":"B","target":"BB214","datapoints":[[22,1578067200000]]},{"refId":"A","target":"AA13","datapoints":[[2,1577980800000]]},{"refId":"A","target":"AA14","datapoints":[[2,1578067200000]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB{val1:213,, val2:223,, val1:213,}","datapoints":[[22,1577980800000]]},{"refId":"B","target":"BB{val1:214,, val2:224,, val1:214,}","datapoints":[[22,1578067200000]]},{"refId":"A","target":"AA{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"AA{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
  return -1
 endi

@ -196,7 +196,7 @@ endi
 print ===============  step20 - two query, 1 column, no timestamp, 1 column, with timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,"-"],[22,"-"]]},{"refId":"A","target":"AA","datapoints":[["-",1577980800000],["-",1578067200000]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,"-"],[22,"-"]]},{"refId":"A","target":"AA","datapoints":[[null,1577980800000],[null,1578067200000]]}]@ then
  return -1
 endi

@ -210,28 +210,28 @@ endi
 print ===============  step22 - two query, 1 column, no timestamp, 3 column, with timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val1, val2 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,"-"],[22,"-"]]},{"refId":"A","target":"AA223","datapoints":[[213,1577980800000]]},{"refId":"A","target":"AA224","datapoints":[[214,1578067200000]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,"-"],[22,"-"]]},{"refId":"A","target":"AA{val2:223,}","datapoints":[[213,1577980800000]]},{"refId":"A","target":"AA{val2:224,}","datapoints":[[214,1578067200000]]}]@ then
  return -1
 endi

 print ===============  step23 - two query, 2 column, no timestamp, 1 column, no timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val1,val2 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select val1 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB223","datapoints":[[213,"-"]]},{"refId":"B","target":"BB224","datapoints":[[214,"-"]]},{"refId":"A","target":"AA","datapoints":[[213,"-"],[214,"-"]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB{val2:223,}","datapoints":[[213,"-"]]},{"refId":"B","target":"BB{val2:224,}","datapoints":[[214,"-"]]},{"refId":"A","target":"AA","datapoints":[[213,"-"],[214,"-"]]}]@ then
  return -1
 endi

 print ===============  step24 - two query, 2 column, no timestamp, 2 column, no timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val1,val2 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select val,val1 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB223","datapoints":[[213,"-"]]},{"refId":"B","target":"BB224","datapoints":[[214,"-"]]},{"refId":"A","target":"AA213","datapoints":[[22,"-"]]},{"refId":"A","target":"AA214","datapoints":[[22,"-"]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB{val2:223,}","datapoints":[[213,"-"]]},{"refId":"B","target":"BB{val2:224,}","datapoints":[[214,"-"]]},{"refId":"A","target":"AA{val1:213,}","datapoints":[[22,"-"]]},{"refId":"A","target":"AA{val1:214,}","datapoints":[[22,"-"]]}]@ then
  return -1
 endi

 print ===============  step25 - two query, 2 column, no timestamp, 3 column, no timestamp
 system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val1,val2 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select val,val1,val2 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:6020/grafana/query
 print step1-> $system_content
-if $system_content != @[{"refId":"B","target":"BB223","datapoints":[[213,"-"]]},{"refId":"B","target":"BB224","datapoints":[[214,"-"]]},{"refId":"A","target":"AA223","datapoints":[[22,"-"]]},{"refId":"A","target":"AA224","datapoints":[[22,"-"]]}]@ then
+if $system_content != @[{"refId":"B","target":"BB{val2:223,}","datapoints":[[213,"-"]]},{"refId":"B","target":"BB{val2:224,}","datapoints":[[214,"-"]]},{"refId":"A","target":"AA{val1:213,, val2:223,}","datapoints":[[22,"-"]]},{"refId":"A","target":"AA{val1:214,, val2:224,}","datapoints":[[22,"-"]]}]@ then
  return -1
 endi

--- a/tests/script/general/http/telegraf.sim
+++ b/tests/script/general/http/telegraf.sim
@ -16,14 +16,14 @@ print ===============  step1 - parse
 system_content curl -u root:taosdata -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/
 print $system_content

-if $system_content != @{"status":"error","code":1022,"desc":"database name can not be NULL"}@ then
+if $system_content != @{"status":"error","code":1022,"desc":"database name can not be null"}@ then
  return -1
 endi

 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/
 print $system_content

-if $system_content != @{"status":"error","code":1022,"desc":"database name can not be NULL"}@ then
+if $system_content != @{"status":"error","code":1022,"desc":"database name can not be null"}@ then
  return -1
 endi

@ -170,7 +170,7 @@ endi
 system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"":"windows"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1
 print $system_content

-if $system_content != @{"status":"error","code":1038,"desc":"tag name is NULL"}@ then
+if $system_content != @{"status":"error","code":1038,"desc":"tag name is null"}@ then
  return -1
 endi

@ -191,14 +191,14 @@ endi
 system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":""},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1
 print $system_content

-if $system_content != @{"status":"error","code":1041,"desc":"tag value is NULL"}@ then
+if $system_content != @{"status":"error","code":1041,"desc":"tag value is null"}@ then
  return -1
 endi

 system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"1022":"111"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1
 print $system_content

-if $system_content != @{"status":"error","code":1042,"desc":"table is NULL"}@ then
+if $system_content != @{"status":"error","code":1042,"desc":"table is null"}@ then
  return -1
 endi

@ -219,14 +219,14 @@ endi
 system_content curl -u root:taosdata -d  '{"fields":{"":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1
 print $system_content

-if $system_content != @{"status":"error","code":1048,"desc":"field name is NULL"}@ then
+if $system_content != @{"status":"error","code":1048,"desc":"field name is null"}@ then
  return -1
 endi

 system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":"","Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:6020/telegraf/db/root/taosdata1
 print $system_content

-if $system_content != @{"status":"error","code":1051,"desc":"field value is NULL"}@ then
+if $system_content != @{"status":"error","code":1051,"desc":"field value is null"}@ then
  return -1
 endi

--- a/tests/script/general/insert/insert_drop.sim
+++ b/tests/script/general/insert/insert_drop.sim
@ -46,8 +46,9 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
-sql connect
-sleep 3000
+
+sql reset query cache
+sleep 1000

 sql use $db
 sql drop table tb5
@ -71,13 +72,15 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
-sql connect
-sleep 3000
+
+sql reset query cache
+sleep 1000

 sql use $db

 sql create table tb5 using $stb tags(5)
 sql select * from tb5
+print $rows should be 0
 if $rows != 0 then
  return -1
 endi
--- a/tests/script/general/metrics/testSuite.sim
+++ b/tests/script/general/metrics/testSuite.sim
@ -1,4 +0,0 @@
-run general/metrics/disk.sim
-run general/metrics/metrics.sim
-run general/metrics/values.sim
-run general/metrics/vnode3.sim
--- 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 maxTables 4
+sql create database $db maxrows 200 cache 2048 maxTables 4
 print ====== create tables
 sql use $db

--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@ -108,10 +108,10 @@ $cache = 4096 # 4 kb
 $ablocks = 100 
 $tblocks = 32 # max=512, automatically trimmed when exceeding
 $ctime = 36000 # 10 hours
-$clog = 0 # max=32, automatically trimmed when exceeding
+$wal = 0 # valid value is 0, 1, 2
 $comp = 1 # max=32, automatically trimmed when exceeding

-sql create database $db replica $replica days $days keep $keep rows $rows_db cache $cache ablocks $ablocks tblocks $tblocks ctime $ctime clog $clog comp $comp
+sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache ablocks $ablocks tblocks $tblocks ctime $ctime wal $wal comp $comp
 sql show databases
 if $rows != 1 then
  return -1
@ -156,8 +156,8 @@ sql_error create database $db keep 0
 #sql_error create database $db keep 3651

 # rows [200, 10000]
-sql_error create database $db rows 199
-#sql_error create database $db rows 10001
+sql_error create database $db maxrows 199
+#sql_error create database $db maxrows 10001

 # cache [100, 10485760]
 sql_error create database $db cache 99
@ -175,9 +175,9 @@ sql_error create database $db ablocks -1
 sql_error create database $db ctime 29
 sql_error create database $db ctime 40961

-# clog {0, 1}
-sql_error create database $db clog -1
-#sql_error create database $db clog 2
+# wal {0, 1}
+sql_error create database $db wal -1
+#sql_error create database $db wal 2

 # comp {0, 1, 2}
 sql_error create database $db comp -1
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@ -21,7 +21,9 @@ $stb = $stbPrefix . $i

 sql drop database $db -x step1
 step1:
+
 sql create database $db maxrows 400 cache 1 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)

--- 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 maxTables 4
+sql create database $db maxrows $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)
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@ -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 maxTables 4
+sql create database $db maxrows 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)
@ -64,7 +64,7 @@ print ====== $db tables created

 $db = $dbPrefix . 1
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024
+sql create database $db maxrows 200 cache 1024
 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)

--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@ -18,7 +18,7 @@ $delta = 600000
 $db = $dbPrefix

 sql drop database if exists $db
-sql create database $db rows 200
+sql create database $db maxrows 200
 sql use $db

 sql create table stb (ts timestamp, c1 int, c2 bigint, c3 double) tags(t1 int, t2 int)
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@ -18,7 +18,7 @@ $delta = 600000
 $db = $dbPrefix

 sql drop database if exists $db
-sql create database $db rows 200
+sql create database $db maxrows 200
 sql use $db

 sql create table stb (ts timestamp, c1 int, c2 bigint, c3 double) tags(t1 int, t2 int)
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@ -87,8 +87,11 @@ sleep 2000
 #run general/parser/repeatStream.sim
 sleep 2000
 run general/parser/join.sim
+sleep 2000
 run general/parser/join_multivnode.sim
+sleep 2000
 run general/parser/projection_limit_offset.sim
 sleep 2000
 run general/parser/select_with_tags.sim
+sleep 2000
 run general/parser/groupby.sim
--- 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 maxTables 4
+sql create database $db maxrows 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))
--- a/tests/script/general/metrics/disk.sim
+++ b/tests/script/general/metrics/disk.sim
--- a/tests/script/general/metrics/metrics.sim
+++ b/tests/script/general/metrics/metrics.sim
--- a/tests/script/general/stable/testSuite.sim
+++ b/tests/script/general/stable/testSuite.sim
@ -0,0 +1,4 @@
+run general/stable/disk.sim
+run general/stable/metrics.sim
+run general/stable/values.sim
+run general/stable/vnode3.sim
--- a/tests/script/general/metrics/values.sim
+++ b/tests/script/general/metrics/values.sim
--- a/tests/script/general/metrics/vnode3.sim
+++ b/tests/script/general/metrics/vnode3.sim
--- a/tests/script/general/table/basic3.sim
+++ b/tests/script/general/table/basic3.sim
@ -70,4 +70,11 @@ if $data21 != 3 then
  return -1
 endi

+print =============== drop stable
+sql drop table db.st
+sql show db.stables
+if $rows != 0 then 
+  return -1
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/general/user/pass_alter.sim
+++ b/tests/script/general/user/pass_alter.sim
@ -19,28 +19,47 @@ endi

 print ============= step2
 sql close
+sleep 2500
+print user read login
 sql connect read
-sleep 2000
 sql alter user read pass 'taosdata'
 sql alter user write pass 'taosdata1' -x step2
  return -1
 step2:

+sql_error create user read pass 'taosdata1'
+sql_error create user write pass 'taosdata1'
+
+sql show users
+if $rows != 5 then 
+  return -1
+endi

 print ============= step3
 sql close
+sleep 2500
+print user write login
 sql connect write
-sleep 2000
+
+sql_error create user read pass 'taosdata1'
+sql_error create user write pass 'taosdata1'
 sql alter user write pass 'taosdata'
 sql alter user read pass 'taosdata' -x step3
  return -1
 step3:

+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
 print ============= step4
 sql close 
+sleep 2500
+print root write login
 sql connect
-sleep 2000
 sql create user oroot pass 'taosdata'
+
 sql show users
 if $rows != 6 then 
  return -1
--- a/tests/script/general/user/user_create.sim
+++ b/tests/script/general/user/user_create.sim
@ -34,10 +34,10 @@ print =============== step3
 sql drop user read -x step31
  return -1
 step31:
-sql drop user sys -x step32
+sql drop user _root -x step32
  return -1
 step32:
-sql drop user stream -x step33
+sql drop user monitor -x step33
  return -1
 step33:

@ -71,11 +71,11 @@ sql alter user read privilege 1 -x step43
  return -1
 step43:

-sql drop user sys -x step41
+sql drop user _root -x step41
  return -1
 step41:

-sql drop user stream -x step42
+sql drop user monitor -x step42
  return -1
 step42:

--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@ -27,21 +27,21 @@ cd ../../../debug; make
 ./test.sh -f general/compress/compress2.sim
 ./test.sh -f general/compress/uncompress.sim

-#./test.sh -f general/compute/avg.sim
+./test.sh -f general/compute/avg.sim
 ./test.sh -f general/compute/bottom.sim
-#./test.sh -f general/compute/count.sim
+./test.sh -f general/compute/count.sim
 ./test.sh -f general/compute/diff.sim
 #./test.sh -f general/compute/diff2.sim
-#./test.sh -f general/compute/first.sim
+./test.sh -f general/compute/first.sim
 #./test.sh -f general/compute/interval.sim
 #./test.sh -f general/compute/last.sim
 #./test.sh -f general/compute/leastsquare.sim
-#./test.sh -f general/compute/max.sim
-#./test.sh -f general/compute/min.sim
+./test.sh -f general/compute/max.sim
+./test.sh -f general/compute/min.sim
 ./test.sh -f general/compute/null.sim
 ./test.sh -f general/compute/percentile.sim
 ./test.sh -f general/compute/stddev.sim
-#./test.sh -f general/compute/sum.sim
+./test.sh -f general/compute/sum.sim
 ./test.sh -f general/compute/top.sim

 ./test.sh -f general/db/basic.sim
@ -65,20 +65,20 @@ cd ../../../debug; make
 #./test.sh -f general/field/4.sim
 #./test.sh -f general/field/5.sim
 #./test.sh -f general/field/6.sim
-./test.sh -f general/field/bigint.sim
+##./test.sh -f general/field/bigint.sim
 #./test.sh -f general/field/binary.sim
-./test.sh -f general/field/bool.sim
+##./test.sh -f general/field/bool.sim
 #./test.sh -f general/field/single.sim
-./test.sh -f general/field/smallint.sim
-./test.sh -f general/field/tinyint.sim
+##./test.sh -f general/field/smallint.sim
+##./test.sh -f general/field/tinyint.sim

-./test.sh -f general/http/restful.sim
+##./test.sh -f general/http/restful.sim
 ./test.sh -f general/http/restful_insert.sim
 ./test.sh -f general/http/restful_limit.sim
-./test.sh -f general/http/restful_full.sim
+##./test.sh -f general/http/restful_full.sim
 ./test.sh -f general/http/prepare.sim
 ./test.sh -f general/http/telegraf.sim
-#./test.sh -f general/http/grafana_bug.sim
+./test.sh -f general/http/grafana_bug.sim
 #./test.sh -f general/http/grafana.sim

 ./test.sh -f general/import/basic.sim
@ -96,12 +96,72 @@ cd ../../../debug; make
 ./test.sh -f general/insert/query_multi_file.sim
 ./test.sh -f general/insert/tcp.sim

-#./test.sh -f general/metrics/disk.sim
-#./test.sh -f general/metrics/metrics.sim
-#./test.sh -f general/metrics/values.sim
-#./test.sh -f general/metrics/vnode3.sim
-
 #parser
+
+# ./test.sh -f general/parser/alter.sim
+# ./test.sh -f general/parser/alter1.sim
+# ./test.sh -f general/parser/alter_stable.sim
+# ./test.sh -f general/parser/auto_create_tb.sim
+# ./test.sh -f general/parser/auto_create_tb_drop_tb.sim
+./test.sh -f general/parser/binary_escapeCharacter.sim
+#./test.sh -f general/parser/bug.sim
+./test.sh -f general/parser/col_arithmetic_operation.sim
+./test.sh -f general/parser/columnValue_bigint.sim
+./test.sh -f general/parser/columnValue_bool.sim
+./test.sh -f general/parser/columnValue_double.sim
+./test.sh -f general/parser/columnValue_float.sim
+./test.sh -f general/parser/columnValue_int.sim
+# ./test.sh -f general/parser/col_arithmetic_operation.sim
+# ./test.sh -f general/parser/columnValue.sim
+# ./test.sh -f general/parser/commit.sim
+# ./test.sh -f general/parser/create_db.sim
+# ./test.sh -f general/parser/create_mt.sim
+# ./test.sh -f general/parser/create_tb.sim
+# ./test.sh -f general/parser/dbtbnameValidate.sim
+# ./test.sh -f general/parser/fill.sim
+# ./test.sh -f general/parser/fill_stb.sim
+# ./test.sh -f general/parser/first_last.sim
+# ./test.sh -f general/parser/import_commit1.sim
+# ./test.sh -f general/parser/import_commit2.sim
+# ./test.sh -f general/parser/import_commit3.sim
+# ./test.sh -f general/parser/import_file.sim
+# ./test.sh -f general/parser/insert_tb.sim
+# ./test.sh -f general/parser/tags_dynamically_specifiy.sim
+# ./test.sh -f general/parser/interp.sim
+# ./test.sh -f general/parser/lastrow.sim
+# ./test.sh -f general/parser/limit.sim
+# ./test.sh -f general/parser/limit1.sim
+# ./test.sh -f general/parser/limit1_tblocks100.sim
+# ./test.sh -f general/parser/limit2.sim
+# ./test.sh -f general/parser/mixed_blocks.sim
+# ./test.sh -f general/parser/nchar.sim
+# ./test.sh -f general/parser/null_char.sim
+# ./test.sh -f general/parser/selectResNum.sim
+# ./test.sh -f general/parser/select_across_vnodes.sim
+./test.sh -f general/parser/select_from_cache_disk.sim
+# ./test.sh -f general/parser/set_tag_vals.sim
+# ./test.sh -f general/parser/single_row_in_tb.sim
+# ./test.sh -f general/parser/slimit.sim
+./test.sh -f general/parser/slimit1.sim
+./test.sh -f general/parser/slimit1_query.sim
+# ./test.sh -f general/parser/slimit_alter_tags.sim
+# ./test.sh -f general/parser/stream_on_sys.sim
+# ./test.sh -f general/parser/stream.sim
+# ./test.sh -f general/parser/tbnameIn.sim
+# ./test.sh -f general/parser/where.sim
+# #./test.sh -f general/parser/repeatAlter.sim
+# #./test.sh -f general/parser/repeatStream.sim
+# ./test.sh -f general/parser/join.sim
+# ./test.sh -f general/parser/join_multivnode.sim
+# ./test.sh -f general/parser/projection_limit_offset.sim
+# ./test.sh -f general/parser/select_with_tags.sim
+# ./test.sh -f general/parser/groupby.sim
+
+#./test.sh -f general/stable/disk.sim
+#./test.sh -f general/stable/metrics.sim
+#./test.sh -f general/stable/values.sim
+#./test.sh -f general/stable/vnode3.sim
+
 #stream

 ./test.sh -f general/table/autocreate.sim
@ -195,9 +255,9 @@ cd ../../../debug; make
 #./test.sh -u -f unique/big/maxvnodes.sim
 #./test.sh -u -f unique/big/tcp.sim

-./test.sh -u -f unique/cluster/balance1.sim
-./test.sh -u -f unique/cluster/balance2.sim
-./test.sh -u -f unique/cluster/balance3.sim
+##./test.sh -u -f unique/cluster/balance1.sim
+##./test.sh -u -f unique/cluster/balance2.sim
+##./test.sh -u -f unique/cluster/balance3.sim
 #./test.sh -u -f unique/cluster/cache.sim

 ./test.sh -u -f unique/column/replica3.sim
@ -205,26 +265,26 @@ cd ../../../debug; make
 #./test.sh -u -f unique/db/commit.sim
 #./test.sh -u -f unique/db/delete.sim
 #./test.sh -u -f unique/db/delete_part.sim
-./test.sh -u -f unique/db/replica_add12.sim
-./test.sh -u -f unique/db/replica_add13.sim
-./test.sh -u -f unique/db/replica_add23.sim
-./test.sh -u -f unique/db/replica_reduce21.sim
-./test.sh -u -f unique/db/replica_reduce32.sim
-./test.sh -u -f unique/db/replica_reduce31.sim
-./test.sh -u -f unique/db/replica_part.sim
+##./test.sh -u -f unique/db/replica_add12.sim
+##./test.sh -u -f unique/db/replica_add13.sim
+##./test.sh -u -f unique/db/replica_add23.sim
+##./test.sh -u -f unique/db/replica_reduce21.sim
+##./test.sh -u -f unique/db/replica_reduce32.sim
+##./test.sh -u -f unique/db/replica_reduce31.sim
+##./test.sh -u -f unique/db/replica_part.sim

-./test.sh -u -f unique/dnode/balance1.sim
-./test.sh -u -f unique/dnode/balance2.sim
-./test.sh -u -f unique/dnode/balance3.sim
-./test.sh -u -f unique/dnode/balancex.sim
-./test.sh -u -f unique/dnode/offline1.sim
-./test.sh -u -f unique/dnode/offline2.sim
+##./test.sh -u -f unique/dnode/balance1.sim
+##./test.sh -u -f unique/dnode/balance2.sim
+##./test.sh -u -f unique/dnode/balance3.sim
+##./test.sh -u -f unique/dnode/balancex.sim
+##./test.sh -u -f unique/dnode/offline1.sim
+##./test.sh -u -f unique/dnode/offline2.sim
 #./test.sh -u -f unique/dnode/remove1.sim
 #./test.sh -u -f unique/dnode/remove2.sim
 #./test.sh -u -f unique/dnode/vnode_clean.sim

-./test.sh -u -f unique/http/admin.sim
-./test.sh -u -f unique/http/opentsdb.sim
+##./test.sh -u -f unique/http/admin.sim
+##./test.sh -u -f unique/http/opentsdb.sim

 #./test.sh -u -f unique/import/replica2.sim
 #./test.sh -u -f unique/import/replica3.sim
@ -238,28 +298,28 @@ cd ../../../debug; make
 #./test.sh -u -f unique/metrics/replica3_dnode6.sim
 #./test.sh -u -f unique/metrics/replica3_vnode3.sim

-./test.sh -u -f unique/mnode/mgmt22.sim
-./test.sh -u -f unique/mnode/mgmt23.sim
-./test.sh -u -f unique/mnode/mgmt24.sim
-./test.sh -u -f unique/mnode/mgmt25.sim
-./test.sh -u -f unique/mnode/mgmt26.sim
-./test.sh -u -f unique/mnode/mgmt33.sim
-./test.sh -u -f unique/mnode/mgmt34.sim
+##./test.sh -u -f unique/mnode/mgmt22.sim
+##./test.sh -u -f unique/mnode/mgmt23.sim
+##./test.sh -u -f unique/mnode/mgmt24.sim
+##./test.sh -u -f unique/mnode/mgmt25.sim
+##./test.sh -u -f unique/mnode/mgmt26.sim
+##./test.sh -u -f unique/mnode/mgmt33.sim
+##./test.sh -u -f unique/mnode/mgmt34.sim
 #./test.sh -u -f unique/mnode/mgmtr2.sim
 #./test.sh -u -f unique/mnode/secondIp.sim

 #stream

-./test.sh -u -f unique/table/delete_part.sim
+##./test.sh -u -f unique/table/delete_part.sim

-./test.sh -u -f unique/vnode/replica2_basic2.sim
-./test.sh -u -f unique/vnode/replica3_basic.sim
+##./test.sh -u -f unique/vnode/replica2_basic2.sim
+##./test.sh -u -f unique/vnode/replica3_basic.sim

 #./test.sh -u -f unique/vnode/commit.sim
 #./test.sh -u -f unique/vnode/many.sim
 #./test.sh -u -f unique/vnode/replica2_basic.sim
-./test.sh -u -f unique/vnode/replica2_basic2.sim
+##./test.sh -u -f unique/vnode/replica2_basic2.sim
 #./test.sh -u -f unique/vnode/replica2_repeat.sim
-./test.sh -u -f unique/vnode/replica3_basic.sim
+##./test.sh -u -f unique/vnode/replica3_basic.sim
 #./test.sh -u -f unique/vnode/replica3_repeat.sim
 #./test.sh -u -f unique/vnode/replica3_vgroup.sim
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@ -108,6 +108,7 @@ echo "udebugFlag          131"            >> $TAOS_CFG
 echo "jnidebugFlag        131"            >> $TAOS_CFG
 echo "sdebugFlag          135"            >> $TAOS_CFG
 echo "monitor             0"              >> $TAOS_CFG
+echo "monitorInterval     1"              >> $TAOS_CFG
 echo "http                0"              >> $TAOS_CFG
 echo "numOfThreadsPerCore 2.0"            >> $TAOS_CFG
 echo "defaultPass         taosdata"       >> $TAOS_CFG
--- a/tests/script/sh/stop_dnodes.sh
+++ b/tests/script/sh/stop_dnodes.sh
@ -2,14 +2,14 @@

 PID=`ps -ef|grep /usr/bin/taosd | grep -v grep | awk '{print $2}'`
 if [ -n "$PID" ]; then 
-	echo sudo systemctl stop taosd 
-	sudo systemctl stop taosd
+	echo systemctl stop taosd 
+	systemctl stop taosd
 fi
  
 PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
 while [ -n "$PID" ]; do
-	echo sudo kill -9 $PID 
-	sudo pkill -9 taosd
-  sudo fuser -k -n tcp 6030
+	echo kill -9 $PID 
+	pkill -9 taosd
+  fuser -k -n tcp 6030
  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
 done
--- a/tests/script/unique/account/user_create.sim
+++ b/tests/script/unique/account/user_create.sim
@ -35,10 +35,10 @@ print =============== step3
 sql drop user read -x step31
  return -1
 step31:
-sql drop user sys -x step32
+sql drop user _root -x step32
  return -1
 step32:
-sql drop user stream -x step33
+sql drop user monitor -x step33
  return -1
 step33:

@ -71,11 +71,11 @@ sql alter user read privilege 1 -x step43
  return -1
 step43:

-sql drop user sys -x step41
+sql drop user _root -x step41
  return -1
 step41:

-sql drop user stream -x step42
+sql drop user monitor -x step42
  return -1
 step42:

--- a/tests/script/unique/db/replica_add12.sim
+++ b/tests/script/unique/db/replica_add12.sim
@ -73,9 +73,9 @@ endi
 sleep 2000

 sql show dnodes
-print dnode1 ==> openVnodes: $data3_1
-print dnode2 ==> openVnodes: $data3_2
-print dnode3 ==> openVnodes: $data3_3
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3

 if $data2_1 != 0 then
   return -1
@ -99,9 +99,9 @@ sleep 10000
 print ======== step3
 	
 sql show dnodes
-print dnode1 ==> openVnodes: $data3_1
-print dnode2 ==> openVnodes: $data3_2
-print dnode3 ==> openVnodes: $data3_3
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3

 if $data2_1 != 0 then
   return -1
--- a/tests/script/unique/mnode/mgmt22.sim
+++ b/tests/script/unique/mnode/mgmt22.sim
@ -9,6 +9,7 @@ system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2

 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect

 sql show mnodes
@ -45,7 +46,7 @@ sql_error drop dnode $hostname1 -x error1
 print should not drop master

 print ============== step4
-system sh/exec_up.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sql_error show mnodes
 print error of no master

@ -100,7 +101,7 @@ endi
 if $data2_2 != slave then
 	goto show7
 endi
-if $data3_3 != NULL then
+if $data3_3 != null then
 	goto show7
 endi

--- a/tests/script/unique/vnode/replica2_basic2.sim
+++ b/tests/script/unique/vnode/replica2_basic2.sim
@ -27,6 +27,7 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4

 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect
 sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
@ -89,6 +90,19 @@ if $data2_3 != 4 then
  return -1
 endi

+if $data4_1 != ready then
+  print dnode1 status should ready but is $data4_1
+  return -1
+endi
+
+if $data4_2 != ready then
+  return -1
+endi
+
+if $data4_3 != ready then
+  return -1
+endi
+
 print ========= step2
 sql insert into d1.t1 values(now, 2)
 sql insert into d2.t2 values(now, 2)
--- a/tests/script/windows/account/user_create.sim
+++ b/tests/script/windows/account/user_create.sim
@ -30,10 +30,10 @@ print =============== step3
 sql drop user read -x step31
  return -1
 step31:
-sql drop user sys -x step32
+sql drop user _root -x step32
  return -1
 step32:
-sql drop user stream -x step33
+sql drop user monitor -x step33
  return -1
 step33:

@ -64,11 +64,11 @@ sql alter user read privilege 1 -x step43
  return -1
 step43:

-sql drop user sys -x step41
+sql drop user _root -x step41
  return -1
 step41:

-sql drop user stream -x step42
+sql drop user monitor -x step42
  return -1
 step42:

--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@ -119,7 +119,7 @@ char *simGetVariable(SScript *script, char *varName, int varLen) {
 int simExecuteExpression(SScript *script, char *exp) {
  char *op1, *op2, *var1, *var2, *var3, *rest;
  int op1Len, op2Len, var1Len, var2Len, var3Len, val0, val1;
-  char t0[512], t1[512], t2[512], t3[512];
+  char t0[512], t1[512], t2[512], t3[1024];
  int result;

  rest = paGetToken(exp, &var1, &var1Len);
@ -310,14 +310,15 @@ void simStoreSystemContentResult(SScript *script, char *filename) {

 bool simExecuteSystemContentCmd(SScript *script, char *option) {
  char buf[4096] = {0};
+  char buf1[4096 + 512] = {0};
  char filename[400] = {0};
  sprintf(filename, "%s/%s.tmp", tsScriptDir, script->fileName);

  sprintf(buf, "cd %s; ", tsScriptDir);
  simVisuallizeOption(script, option, buf + strlen(buf));
-  sprintf(buf, "%s > %s 2>/dev/null", buf, filename);
+  sprintf(buf1, "%s > %s 2>/dev/null", buf, filename);

-  sprintf(script->system_exit_code, "%d", system(buf));
+  sprintf(script->system_exit_code, "%d", system(buf1));
  simStoreSystemContentResult(script, filename);

  script->linePos++;
@ -414,7 +415,7 @@ void simCloseNativeConnect(SScript *script) {

  simTrace("script:%s, taos:%p closed", script->fileName, script->taos);
  taos_close(script->taos);
-  taosMsleep(1000);
+  taosMsleep(1200);

  script->taos = NULL;
 }