Merge remote-tracking branch 'origin/develop' into feature/crash_gen

.travis.yml

@@ -49,7 +49,7 @@ matrix:
           pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/
 
           cd ${TRAVIS_BUILD_DIR}/tests
-          ./test-all.sh $TRAVIS_EVENT_TYPE || travis_terminate $?
+          ./test-all.sh smoke || travis_terminate $?
 
           cd ${TRAVIS_BUILD_DIR}/tests/pytest
           ./valgrind-test.sh 2>&1 > mem-error-out.log
@@ -169,7 +169,7 @@ matrix:
 
           cd ${TRAVIS_BUILD_DIR}/tests
 
-          ./test-all.sh $TRAVIS_EVENT_TYPE COVER
+          ./test-all.sh smoke COVER
 
           TEST_RESULT=$?
 
@@ -178,7 +178,7 @@ matrix:
 
           cd ${TRAVIS_BUILD_DIR}
           lcov -d . --capture --rc lcov_branch_coverage=1 -o coverage.info
-          lcov --remove coverage.info '*/tests/*' '*/test/*' '*/deps/*' -o coverage.info
+          lcov --remove coverage.info '*/tests/*' '*/test/*' '*/deps/*' '*/plugins/*' -o coverage.info
           lcov -l --rc lcov_branch_coverage=1 coverage.info || travis_terminate $?
 
           gem install coveralls-lcov

src/client/src/tscAsync.c

@@ -449,11 +449,14 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
       tscTrace("%p update table meta in local cache, continue to process sql and send corresponding subquery", pSql);
 
       STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-      if (pTableMetaInfo->pTableMeta == NULL){
       code = tscGetTableMeta(pSql, pTableMetaInfo);
+      if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+        return;
+      } else {
         assert(code == TSDB_CODE_SUCCESS);      
       }
      
+      
       assert((tscGetNumOfTags(pTableMetaInfo->pTableMeta) != 0) && pTableMetaInfo->vgroupIndex >= 0 && pSql->param != NULL);
 
       SRetrieveSupport *trs = (SRetrieveSupport *)pSql->param;
@@ -473,7 +476,11 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
 
         STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
         code = tscGetTableMeta(pSql, pTableMetaInfo);
+        if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+          return;
+        } else {
           assert(code == TSDB_CODE_SUCCESS);      
+        }
 
         // if failed to process sql, go to error handler
         if ((code = tscProcessSql(pSql)) == TSDB_CODE_SUCCESS) {
@@ -483,7 +490,6 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
 //          // 1. table uid, 2. ip address
 //          code = tscSendMsgToServer(pSql);
 //          if (code == TSDB_CODE_SUCCESS) return;
-//        }
       } else {
         tscTrace("%p continue parse sql after get table meta", pSql);
 
@@ -491,8 +497,11 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
         if (TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_STMT_INSERT)) {
           STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
           code = tscGetTableMeta(pSql, pTableMetaInfo);
-          assert(code == TSDB_CODE_SUCCESS && pTableMetaInfo->pTableMeta != NULL);
+          if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
-
+            return;
+          } else {
+            assert(code == TSDB_CODE_SUCCESS);      
+          }
           (*pSql->fp)(pSql->param, pSql, code);
           return;
         }

src/client/src/tscFunctionImpl.c

@@ -151,7 +151,6 @@ typedef struct SRateInfo {
   double  sum;        // for sum/avg
 } SRateInfo;
 
-
 int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, int16_t *type,
                           int16_t *bytes, int32_t *interBytes, int16_t extLength, bool isSuperTable) {
   if (!isValidDataType(dataType, dataBytes)) {

src/client/src/tscLocal.c

@@ -279,7 +279,7 @@ static void tscProcessCurrentUser(SSqlObj *pSql) {
   pExpr->resType = TSDB_DATA_TYPE_BINARY;
   
   char* vx = calloc(1, pExpr->resBytes);
-  STR_WITH_MAXSIZE_TO_VARSTR(vx, pSql->pTscObj->user, TSDB_USER_LEN);
+  STR_WITH_MAXSIZE_TO_VARSTR(vx, pSql->pTscObj->user, sizeof(pSql->pTscObj->user));
   
   tscSetLocalQueryResult(pSql, vx, pExpr->aliasName, pExpr->resType, pExpr->resBytes);
   free(vx);

src/client/src/tscSQLParser.c

@@ -169,7 +169,7 @@ static int32_t handlePassword(SSqlCmd* pCmd, SSQLToken* pPwd) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (pPwd->n > TSDB_PASSWORD_LEN) {
+  if (pPwd->n >= TSDB_PASSWORD_LEN) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
@@ -232,7 +232,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         pzName->n = strdequote(pzName->z);
         strncpy(pTableMetaInfo->name, pzName->z, pzName->n);
       } else {  // drop user
-        if (pzName->n > TSDB_USER_LEN) {
+        if (pzName->n >= TSDB_USER_LEN) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
         }
 
@@ -317,7 +317,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return TSDB_CODE_TSC_INVALID_SQL;
       }
 
-      if (pName->n > TSDB_USER_LEN) {
+      if (pName->n >= TSDB_USER_LEN) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
 
@@ -348,7 +348,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      if (pToken->n >= TSDB_TABLE_NAME_LEN) {
+      if (!tscValidateTableNameLength(pToken->n)) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
@@ -401,7 +401,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       SSQLToken* pName = &pUser->user;
       SSQLToken* pPwd = &pUser->passwd;
 
-      if (pName->n > TSDB_USER_LEN) {
+      if (pName->n >= TSDB_USER_LEN) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
 
@@ -543,7 +543,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), "not support sql expression");
   }
 
-  pSql->cmd.parseFinished = true;
+  pSql->cmd.parseFinished = 1;
   return tscBuildMsg[pCmd->command](pSql, pInfo);
 }
 
@@ -1056,12 +1056,12 @@ int32_t setObjFullName(char* fullName, const char* account, SSQLToken* pDB, SSQL
       totalLen += 1;
 
       /* here we only check the table name length limitation */
-      if (tableName->n > TSDB_TABLE_NAME_LEN) {
+      if (!tscValidateTableNameLength(tableName->n)) {
         return TSDB_CODE_TSC_INVALID_SQL;
       }
     } else {  // pDB == NULL, the db prefix name is specified in tableName
       /* the length limitation includes tablename + dbname + sep */
-      if (tableName->n > (TSDB_TABLE_NAME_LEN - 1) + (TSDB_DB_NAME_LEN - 1) + sizeof(TS_PATH_DELIMITER)) {
+      if (tableName->n >= TSDB_TABLE_NAME_LEN + TSDB_DB_NAME_LEN) {
         return TSDB_CODE_TSC_INVALID_SQL;
       }
     }
@@ -1078,7 +1078,7 @@ int32_t setObjFullName(char* fullName, const char* account, SSQLToken* pDB, SSQL
     fullName[totalLen] = 0;
   }
 
-  return (totalLen <= TSDB_TABLE_ID_LEN) ? TSDB_CODE_SUCCESS : TSDB_CODE_TSC_INVALID_SQL;
+  return (totalLen < TSDB_TABLE_ID_LEN) ? TSDB_CODE_SUCCESS : TSDB_CODE_TSC_INVALID_SQL;
 }
 
 static void extractColumnNameFromString(tSQLExprItem* pItem) {
@@ -1402,9 +1402,7 @@ int32_t addProjectionExprAndResultField(SQueryInfo* pQueryInfo, tSQLExprItem* pI
     }
 
     if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
-      SSchema colSchema = {.type = TSDB_DATA_TYPE_BINARY, .bytes = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE};
+      SSchema colSchema = tGetTableNameColumnSchema();
-      strcpy(colSchema.name, TSQL_TBNAME_L);
-
       tscAddSpecialColumnForSelect(pQueryInfo, startPos, TSDB_FUNC_TAGPRJ, &index, &colSchema, true);
     } else {
       STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
@@ -1914,9 +1912,7 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIndex, tSQLExpr
       
       SSchema s = {0};
       if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
-        s.bytes = TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE;
+        s = tGetTableNameColumnSchema();
-        s.type  = TSDB_DATA_TYPE_BINARY;
-        s.colId = TSDB_TBNAME_COLUMN_INDEX;
       } else {
         s = pTagSchema[index.columnIndex];
       }
@@ -2052,7 +2048,7 @@ int32_t getTableIndexImpl(SSQLToken* pTableToken, SQueryInfo* pQueryInfo, SColum
   }
 
   pIndex->tableIndex = COLUMN_INDEX_INITIAL_VAL;
-  char tableName[TSDB_TABLE_ID_LEN + 1] = {0};
+  char tableName[TSDB_TABLE_ID_LEN] = {0};
 
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
     STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
@@ -2230,7 +2226,7 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
-      if (pCmd->payloadLen >= TSDB_TABLE_NAME_LEN) {
+      if (!tscValidateTableNameLength(pCmd->payloadLen)) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
     }
@@ -2241,7 +2237,7 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     // show vnodes may be ip addr of dnode in payload
     SSQLToken* pDnodeIp = &pShowInfo->prefix;
-    if (pDnodeIp->n > TSDB_IPv4ADDR_LEN) {  // ip addr is too long
+    if (pDnodeIp->n >= TSDB_IPv4ADDR_LEN) {  // ip addr is too long
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
 
@@ -2861,7 +2857,7 @@ static int32_t tablenameListToString(tSQLExpr* pExpr, SStringBuilder* sb) {
       taosStringBuilderAppendString(sb, TBNAME_LIST_SEP);
     }
 
-    if (pSub->val.nLen <= 0 || pSub->val.nLen > TSDB_TABLE_NAME_LEN) {
+    if (pSub->val.nLen <= 0 || !tscValidateTableNameLength(pSub->val.nLen)) {
       return TSDB_CODE_TSC_INVALID_SQL;
     }
   }
@@ -3616,7 +3612,7 @@ static int32_t setTableCondForSTableQuery(SQueryInfo* pQueryInfo, const char* ac
       taosStringBuilderAppendStringLen(&sb1, TBNAME_LIST_SEP, 1);
     }
 
-    char      idBuf[TSDB_TABLE_ID_LEN + 1] = {0};
+    char      idBuf[TSDB_TABLE_ID_LEN] = {0};
     int32_t   xlen = strlen(segments[i]);
     SSQLToken t = {.z = segments[i], .n = xlen, .type = TK_STRING};
 
@@ -4380,9 +4376,10 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    if (index.columnIndex < tscGetNumOfColumns(pTableMeta)) {
+    int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
+    if (index.columnIndex < numOfCols) {
       return invalidSqlErrMsg(pQueryInfo->msg, msg10);
-    } else if (index.columnIndex == 0) {
+    } else if (index.columnIndex == numOfCols) {
       return invalidSqlErrMsg(pQueryInfo->msg, msg11);
     }
 
@@ -5232,9 +5229,10 @@ static int32_t doAddGroupbyColumnsOnDemand(SQueryInfo* pQueryInfo) {
   
     int16_t colIndex = pColIndex->colIndex;
     if (colIndex == TSDB_TBNAME_COLUMN_INDEX) {
-      type = TSDB_DATA_TYPE_BINARY;
+      SSchema s = tGetTableNameColumnSchema();
-      bytes = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE; // todo extract method
+      type  = s.type;
-      name = TSQL_TBNAME_L;
+      bytes = s.bytes;
+      name  = s.name;
     } else {
       if (TSDB_COL_IS_TAG(pColIndex->flag)) {
         SSchema* tagSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
@@ -5602,7 +5600,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   }
 
   // get meter meta from mnode
-  strncpy(pCreateTable->usingInfo.tagdata.name, pStableMeterMetaInfo->name, TSDB_TABLE_ID_LEN);
+  tstrncpy(pCreateTable->usingInfo.tagdata.name, pStableMeterMetaInfo->name, sizeof(pCreateTable->usingInfo.tagdata.name));
   tVariantList* pList = pInfo->pCreateTableInfo->usingInfo.pTagVals;
 
   int32_t code = tscGetTableMeta(pSql, pStableMeterMetaInfo);

src/client/src/tscSchemaUtil.c

@@ -50,14 +50,6 @@ int32_t tscGetNumOfColumns(const STableMeta* pTableMeta) {
 
 SSchema *tscGetTableSchema(const STableMeta *pTableMeta) {
   assert(pTableMeta != NULL);
-  
-//  if (pTableMeta->tableType == TSDB_CHILD_TABLE) {
-//    STableMeta* pSTableMeta = pTableMeta->pSTable;
-//    assert (pSTableMeta != NULL);
-//
-//    return pSTableMeta->schema;
-//  }
-  
   return (SSchema*) pTableMeta->schema;
 }
 

src/client/src/tscServer.c

@@ -1289,6 +1289,9 @@ int tscBuildUpdateTagMsg(SSqlObj* pSql, SSqlInfo *pInfo) {
   
   SUpdateTableTagValMsg* pUpdateMsg = (SUpdateTableTagValMsg*) (pCmd->payload + tsRpcHeadSize);
   pCmd->payloadLen = htonl(pUpdateMsg->head.contLen);
+  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  tscSetDnodeIpList(pSql, &pTableMetaInfo->pTableMeta->vgroupInfo);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -1705,8 +1708,8 @@ int tscBuildSTableVgroupMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   
   for(int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
     STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, i);
-    strncpy(pMsg, pTableMetaInfo->name, TSDB_TABLE_ID_LEN);
+    tstrncpy(pMsg, pTableMetaInfo->name, sizeof(pTableMetaInfo->name));
-    pMsg += TSDB_TABLE_ID_LEN;
+    pMsg += sizeof(pTableMetaInfo->name);
   }
 
   pCmd->msgType = TSDB_MSG_TYPE_CM_STABLE_VGROUP;
@@ -2220,9 +2223,7 @@ int tscProcessAlterTableMsgRsp(SSqlObj *pSql) {
 
   if (pTableMetaInfo->pTableMeta) {
     bool isSuperTable = UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
-
     taosCacheRelease(tscCacheHandle, (void **)&(pTableMetaInfo->pTableMeta), true);
-//    taosCacheRelease(tscCacheHandle, (void **)&(pTableMetaInfo->pMetricMeta), true);
 
     if (isSuperTable) {  // if it is a super table, reset whole query cache
       tscTrace("%p reset query cache since table:%s is stable", pSql, pTableMetaInfo->name);

src/client/src/tscSql.c

@@ -45,11 +45,11 @@ static bool validImpl(const char* str, size_t maxsize) {
 }
 
 static bool validUserName(const char* user) {
-  return validImpl(user, TSDB_USER_LEN);
+  return validImpl(user, TSDB_USER_LEN - 1);
 }
 
 static bool validPassword(const char* passwd) {
-  return validImpl(passwd, TSDB_PASSWORD_LEN);
+  return validImpl(passwd, TSDB_PASSWORD_LEN - 1);
 }
 
 SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pass, const char *db, uint16_t port,
@@ -475,6 +475,33 @@ int taos_select_db(TAOS *taos, const char *db) {
   return code;
 }
 
+// send free message to vnode to free qhandle and corresponding resources in vnode
+static void tscFreeQhandleInVnode(SSqlObj* pSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+  if (pRes->code == TSDB_CODE_SUCCESS && pRes->completed == false && !tscIsTwoStageSTableQuery(pQueryInfo, 0) &&
+      (pCmd->command == TSDB_SQL_SELECT ||
+          pCmd->command == TSDB_SQL_SHOW ||
+          pCmd->command == TSDB_SQL_RETRIEVE ||
+          pCmd->command == TSDB_SQL_FETCH) &&
+      (pCmd->command == TSDB_SQL_SELECT && pSql->pStream == NULL && pTableMetaInfo->pTableMeta != NULL)) {
+
+    pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
+    tscTrace("%p start to send msg to free qhandle in dnode, command:%s", pSql, sqlCmd[pCmd->command]);
+    pSql->freed = 1;
+    tscProcessSql(pSql);
+
+    // in case of sync model query, waits for response and then goes on
+    if (pSql->fp == waitForQueryRsp || pSql->fp == waitForRetrieveRsp) {
+      sem_wait(&pSql->rspSem);
+    }
+  }
+}
+
 void taos_free_result(TAOS_RES *res) {
   SSqlObj *pSql = (SSqlObj *)res;
   tscTrace("%p start to free result", res);
@@ -484,10 +511,8 @@ void taos_free_result(TAOS_RES *res) {
     return;
   }
   
-  SSqlRes *pRes = &pSql->res;
-  SSqlCmd *pCmd = &pSql->cmd;
-
   // The semaphore can not be changed while freeing async sub query objects.
+  SSqlRes *pRes = &pSql->res;
   if (pRes == NULL || pRes->qhandle == 0) {
     tscTrace("%p SqlObj is freed by app, qhandle is null", pSql);
     tscFreeSqlObj(pSql);
@@ -502,30 +527,9 @@ void taos_free_result(TAOS_RES *res) {
   }
 
   pQueryInfo->type = TSDB_QUERY_TYPE_FREE_RESOURCE;
-  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  tscFreeQhandleInVnode(pSql);
-
-  /*
-   * If the query process is cancelled by user in stable query, tscProcessSql should not be called
-   * for each subquery. Because the failure of execution tsProcessSql may trigger the callback function
-   * be executed, and the retry efforts may result in double free the resources, e.g.,SRetrieveSupport
-   */
-  if (pRes->code == TSDB_CODE_SUCCESS && pRes->completed == false &&
-      (pCmd->command == TSDB_SQL_SELECT || pCmd->command == TSDB_SQL_SHOW ||
-       pCmd->command == TSDB_SQL_RETRIEVE || pCmd->command == TSDB_SQL_FETCH) &&
-       (pCmd->command == TSDB_SQL_SELECT && pSql->pStream == NULL && pTableMetaInfo->pTableMeta != NULL)) {
-    pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
-
-    tscTrace("%p start to send msg to free qhandle in dnode, command:%s", pSql, sqlCmd[pCmd->command]);
-    pSql->freed = 1;
-    tscProcessSql(pSql);
-
-    // in case of sync model query, waits for response and then goes on
-    if (pSql->fp == waitForQueryRsp || pSql->fp == waitForRetrieveRsp) {
-      sem_wait(&pSql->rspSem);
-    }
-  }
-
   tscFreeSqlObj(pSql);
+
   tscTrace("%p sql result is freed by app", pSql);
 }
 

src/client/src/tscSubquery.c

@@ -1662,12 +1662,13 @@ void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) {
    */
   if (code != TSDB_CODE_SUCCESS) {
     if (trsupport->numOfRetry++ >= MAX_NUM_OF_SUBQUERY_RETRY) {
-      tscTrace("%p sub:%p reach the max retry times, set global code:%d", pParentSql, pSql, code);
+      tscTrace("%p sub:%p reach the max retry times, set global code:%s", pParentSql, pSql, tstrerror(code));
       atomic_val_compare_exchange_32(&pState->code, 0, code);
     } else {  // does not reach the maximum retry time, go on
       tscTrace("%p sub:%p failed code:%s, retry:%d", pParentSql, pSql, tstrerror(code), trsupport->numOfRetry);
       
       SSqlObj *pNew = tscCreateSqlObjForSubquery(pParentSql, trsupport, pSql);
+
       if (pNew == NULL) {
         tscError("%p sub:%p failed to create new subquery due to out of memory, abort retry, vgId:%d, orderOfSub:%d",
                  trsupport->pParentSqlObj, pSql, pVgroup->vgId, trsupport->subqueryIndex);
@@ -1678,6 +1679,7 @@ void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) {
         SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
         assert(pNewQueryInfo->pTableMetaInfo[0]->pTableMeta != NULL);
 
+        taos_free_result(pSql);
         tscProcessSql(pNew);
         return;
       }

src/common/inc/tdataformat.h

@@ -69,8 +69,8 @@ typedef struct {
   int      version;    // version
   int      numOfCols;  // Number of columns appended
   int      tlen;       // maximum length of a SDataRow without the header part
-  int16_t  flen;       // First part length in a SDataRow after the header part
+  uint16_t  flen;       // First part length in a SDataRow after the header part
-  int16_t  vlen;       // pure value part length, excluded the overhead
+  uint16_t  vlen;       // pure value part length, excluded the overhead
   STColumn columns[];
 } STSchema;
 
@@ -107,8 +107,8 @@ typedef struct {
   int       tCols;
   int       nCols;
   int       tlen;
-  int16_t   flen;
+  uint16_t   flen;
-  int16_t   vlen;
+  uint16_t   vlen;
   int       version;
   STColumn *columns;
 } STSchemaBuilder;
@@ -125,16 +125,16 @@ STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
  * |<--------------------+--------------------------- len ---------------------------------->|
  * |<--     Head      -->|<---------   flen -------------->|                                 |
  * +---------------------+---------------------------------+---------------------------------+
- * | int16_t  |  int16_t |                                 |                                 |
+ * | uint16_t |  int16_t |                                 |                                 |
  * +----------+----------+---------------------------------+---------------------------------+
  * |   len    | sversion |           First part            |             Second part         |
  * +----------+----------+---------------------------------+---------------------------------+
  */
 typedef void *SDataRow;
 
-#define TD_DATA_ROW_HEAD_SIZE sizeof(int16_t)*2
+#define TD_DATA_ROW_HEAD_SIZE (sizeof(uint16_t) + sizeof(int16_t))
 
-#define dataRowLen(r) (*(int16_t *)(r))
+#define dataRowLen(r) (*(uint16_t *)(r))
 #define dataRowVersion(r) *(int16_t *)POINTER_SHIFT(r, sizeof(int16_t))
 #define dataRowTuple(r) POINTER_SHIFT(r, TD_DATA_ROW_HEAD_SIZE)
 #define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r)))

src/common/inc/tname.h

@@ -23,5 +23,8 @@ void extractTableName(const char *tableId, char *name);
 
 char* extractDBName(const char *tableId, char *name);
 
+SSchema tGetTableNameColumnSchema();
+
+bool tscValidateTableNameLength(size_t len);
 
 #endif  // TDENGINE_NAME_H

src/common/src/tdataformat.c

@@ -201,10 +201,10 @@ void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints)
 
   pDataCol->len = 0;
   if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
-    pDataCol->spaceSize = (sizeof(VarDataLenT) + pDataCol->bytes) * maxPoints;
     pDataCol->dataOff = (VarDataOffsetT *)(*pBuf);
-    pDataCol->pData = POINTER_SHIFT(*pBuf, TYPE_BYTES[pDataCol->type] * maxPoints);
+    pDataCol->pData = POINTER_SHIFT(*pBuf, sizeof(VarDataOffsetT) * maxPoints);
-    *pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize + TYPE_BYTES[pDataCol->type] * maxPoints);
+    pDataCol->spaceSize = pDataCol->bytes * maxPoints;
+    *pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize + sizeof(VarDataOffsetT) * maxPoints);
   } else {
     pDataCol->spaceSize = pDataCol->bytes * maxPoints;
     pDataCol->dataOff = NULL;

src/common/src/tglobal.c

@@ -718,7 +718,7 @@ static void doInitGlobalConfig() {
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
-  cfg.ptrLength = TSDB_USER_LEN;
+  cfg.ptrLength = TSDB_USER_LEN - 1;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
@@ -728,7 +728,7 @@ static void doInitGlobalConfig() {
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_NOT_PRINT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
-  cfg.ptrLength = TSDB_PASSWORD_LEN;
+  cfg.ptrLength = TSDB_PASSWORD_LEN - 1;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 

src/common/src/tname.c

@@ -37,3 +37,16 @@ char* extractDBName(const char* tableId, char* name) {
   
   return strncpy(name, &tableId[offset1 + 1], len);
 }
+
+SSchema tGetTableNameColumnSchema() {
+  SSchema s = {0};
+  s.bytes = TSDB_TABLE_NAME_LEN - 1 + VARSTR_HEADER_SIZE;
+  s.type  = TSDB_DATA_TYPE_BINARY;
+  s.colId = TSDB_TBNAME_COLUMN_INDEX;
+  strncpy(s.name, TSQL_TBNAME_L, TSDB_COL_NAME_LEN);
+  return s;
+}
+
+bool tscValidateTableNameLength(size_t len) {
+  return len < TSDB_TABLE_NAME_LEN;
+}

src/connector/python/linux/python2/taos/cinterface.py

@@ -130,9 +130,9 @@ _CONVERT_FUNC = {
 
 # Corresponding TAOS_FIELD structure in C
 class TaosField(ctypes.Structure):
-    _fields_ = [('name', ctypes.c_char * 64),
+    _fields_ = [('name', ctypes.c_char * 65),
-                ('bytes', ctypes.c_short),
+                ('type', ctypes.c_char),
-                ('type', ctypes.c_char)]
+                ('bytes', ctypes.c_short)]
 
 # C interface class
 class CTaosInterface(object):

src/connector/python/linux/python3/taos/cinterface.py

@@ -226,8 +226,8 @@ class CTaosInterface(object):
         if connection.value == None:
             print('connect to TDengine failed')
             # sys.exit(1)
-        else:
+        #else:
-            print('connect to TDengine success')
+        #    print('connect to TDengine success')
 
         return connection
 
@@ -236,7 +236,7 @@ class CTaosInterface(object):
         '''Close the TDengine handle
         '''
         CTaosInterface.libtaos.taos_close(connection)
-        print('connection is closed')
+        #print('connection is closed')
 
     @staticmethod
     def query(connection, sql):

src/connector/python/windows/python2/taos/cinterface.py

@@ -130,9 +130,9 @@ _CONVERT_FUNC = {
 
 # Corresponding TAOS_FIELD structure in C
 class TaosField(ctypes.Structure):
-    _fields_ = [('name', ctypes.c_char * 64),
+    _fields_ = [('name', ctypes.c_char * 65),
-                ('bytes', ctypes.c_short),
+                ('type', ctypes.c_char),
-                ('type', ctypes.c_char)]
+                ('bytes', ctypes.c_short)]
 
 # C interface class
 class CTaosInterface(object):

src/connector/python/windows/python3/taos/cinterface.py

@@ -130,9 +130,9 @@ _CONVERT_FUNC = {
 
 # Corresponding TAOS_FIELD structure in C
 class TaosField(ctypes.Structure):
-    _fields_ = [('name', ctypes.c_char * 64),
+    _fields_ = [('name', ctypes.c_char * 65),
-                ('bytes', ctypes.c_short),
+                ('type', ctypes.c_char),
-                ('type', ctypes.c_char)]
+                ('bytes', ctypes.c_short)]
 
 # C interface class
 class CTaosInterface(object):

src/dnode/src/dnodeMgmt.c

@@ -414,15 +414,35 @@ static void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
   
   dnodeProcessModuleStatus(pCfg->moduleStatus);
   dnodeUpdateDnodeCfg(pCfg);
+
   dnodeUpdateMnodeInfos(pMnodes);
   taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
 }
 
+static bool dnodeCheckMnodeInfos(SDMMnodeInfos *pMnodes) {
+  if (pMnodes->nodeNum <= 0 || pMnodes->nodeNum > 3) {
+    dError("invalid mnode infos, num:%d", pMnodes->nodeNum);
+    return false;
+  }
+
+  for (int32_t i = 0; i < pMnodes->nodeNum; ++i) {
+    SDMMnodeInfo *pMnodeInfo = &pMnodes->nodeInfos[i];
+    if (pMnodeInfo->nodeId <= 0 || strlen(pMnodeInfo->nodeEp) <= 5) {
+      dError("invalid mnode info:%d, nodeId:%d nodeEp:%s", i, pMnodeInfo->nodeId, pMnodeInfo->nodeEp);
+      return false;
+    }
+  }
+
+  return true;
+}
+
 static void dnodeUpdateMnodeInfos(SDMMnodeInfos *pMnodes) {
   bool mnodesChanged = (memcmp(&tsDMnodeInfos, pMnodes, sizeof(SDMMnodeInfos)) != 0);
   bool mnodesNotInit = (tsDMnodeInfos.nodeNum == 0);
   if (!(mnodesChanged || mnodesNotInit)) return;
 
+  if (!dnodeCheckMnodeInfos(pMnodes)) return;
+
   memcpy(&tsDMnodeInfos, pMnodes, sizeof(SDMMnodeInfos));
   dPrint("mnode infos is changed, nodeNum:%d inUse:%d", tsDMnodeInfos.nodeNum, tsDMnodeInfos.inUse);
   for (int32_t i = 0; i < tsDMnodeInfos.nodeNum; i++) {
@@ -552,6 +572,7 @@ static void dnodeSaveMnodeInfos() {
   len += snprintf(content + len, maxLen - len, "}\n"); 
 
   fwrite(content, 1, len, fp);
+  fflush(fp);
   fclose(fp);
   free(content);
   
@@ -674,6 +695,7 @@ static void dnodeSaveDnodeCfg() {
   len += snprintf(content + len, maxLen - len, "}\n"); 
 
   fwrite(content, 1, len, fp);
+  fflush(fp);
   fclose(fp);
   free(content);
   

src/dnode/src/dnodePeer.c

@@ -89,6 +89,8 @@ static void dnodeProcessReqMsgFromDnode(SRpcMsg *pMsg, SRpcIpSet *pIpSet) {
     .contLen = 0
   };
   
+  if (pMsg->pCont == NULL) return;
+
   if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_RUNING) {
     rspMsg.code = TSDB_CODE_RPC_NOT_READY;
     rpcSendResponse(&rspMsg);

src/dnode/src/dnodeShell.c

@@ -115,6 +115,8 @@ void dnodeProcessMsgFromShell(SRpcMsg *pMsg, SRpcIpSet *pIpSet) {
     .contLen = 0
   };
 
+  if (pMsg->pCont == NULL) return;
+
   if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_RUNING) {
     dError("RPC %p, shell msg:%s is ignored since dnode not running", pMsg->handle, taosMsg[pMsg->msgType]);
     rpcMsg.code = TSDB_CODE_RPC_NOT_READY;
@@ -145,7 +147,7 @@ static int dnodeRetrieveUserAuthInfo(char *user, char *spi, char *encrypt, char
   if (code != TSDB_CODE_RPC_NOT_READY) return code;
 
   SDMAuthMsg *pMsg = rpcMallocCont(sizeof(SDMAuthMsg));
-  tstrncpy(pMsg->user, user, TSDB_USER_LEN);
+  tstrncpy(pMsg->user, user, sizeof(pMsg->user));
 
   SRpcMsg rpcMsg = {0};
   rpcMsg.pCont = pMsg;

src/dnode/src/dnodeSystem.c

@@ -29,7 +29,7 @@ int32_t main(int32_t argc, char *argv[]) {
   for (int32_t i = 1; i < argc; ++i) {
     if (strcmp(argv[i], "-c") == 0) {
       if (i < argc - 1) {        
-        if (strlen(argv[++i]) > TSDB_FILENAME_LEN - 1) {
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
           printf("config file path overflow");
           exit(EXIT_FAILURE);
         }

src/dnode/src/dnodeVRead.c

@@ -26,13 +26,6 @@
 #include "dnodeVRead.h"
 #include "vnode.h"
 
-typedef struct {
-  SRspRet  rspRet;
-  void    *pCont;
-  int32_t  contLen;
-  SRpcMsg  rpcMsg;
-} SReadMsg;
-
 typedef struct {
   pthread_t  thread;    // thread
   int32_t    workerId;  // worker ID
@@ -218,7 +211,7 @@ static void *dnodeProcessReadQueue(void *param) {
     }
 
     dTrace("%p, msg:%s will be processed in vread queue", pReadMsg->rpcMsg.ahandle, taosMsg[pReadMsg->rpcMsg.msgType]);
-    int32_t code = vnodeProcessRead(pVnode, pReadMsg->rpcMsg.msgType, pReadMsg->pCont, pReadMsg->contLen, &pReadMsg->rspRet);
+    int32_t code = vnodeProcessRead(pVnode, pReadMsg);
     dnodeSendRpcReadRsp(pVnode, pReadMsg, code);
     taosFreeQitem(pReadMsg);
   }

src/inc/query.h

@@ -77,6 +77,12 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp** pRsp, int32_t* co
  */
 bool qHasMoreResultsToRetrieve(qinfo_t qinfo);
 
+/**
+ * kill current ongoing query and free query handle automatically
+ * @param qinfo
+ */
+int32_t qKillQuery(qinfo_t qinfo);
+
 #ifdef __cplusplus
 }
 #endif

src/inc/taosdef.h

@@ -186,30 +186,31 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_BINARY_OP_MULTIPLY   14
 #define TSDB_BINARY_OP_DIVIDE     15
 #define TSDB_BINARY_OP_REMAINDER  16
-#define TSDB_USERID_LEN           9
 #define TS_PATH_DELIMITER_LEN     1
 
-#define TSDB_METER_ID_LEN_MARGIN  8
-#define TSDB_TABLE_ID_LEN         (TSDB_DB_NAME_LEN+TSDB_TABLE_NAME_LEN+2*TS_PATH_DELIMITER_LEN+TSDB_USERID_LEN+TSDB_METER_ID_LEN_MARGIN) //TSDB_DB_NAME_LEN+TSDB_TABLE_NAME_LEN+2*strlen(TS_PATH_DELIMITER)+strlen(USERID)
 #define TSDB_UNI_LEN              24
 #define TSDB_USER_LEN             TSDB_UNI_LEN
-#define TSDB_ACCT_LEN             TSDB_UNI_LEN
+// ACCOUNT is a 32 bit positive integer
+// this is the length of its string representation
+// including the terminator zero
+#define TSDB_ACCT_LEN             11
 #define TSDB_PASSWORD_LEN         TSDB_UNI_LEN
 
 #define TSDB_MAX_COLUMNS          1024
 #define TSDB_MIN_COLUMNS          2       //PRIMARY COLUMN(timestamp) + other columns
 
 #define TSDB_NODE_NAME_LEN        64
-#define TSDB_TABLE_NAME_LEN       193
+#define TSDB_TABLE_NAME_LEN       193     // it is a null-terminated string
 #define TSDB_DB_NAME_LEN          33
+#define TSDB_TABLE_ID_LEN         (TSDB_ACCT_LEN + TSDB_DB_NAME_LEN + TSDB_TABLE_NAME_LEN)
 #define TSDB_COL_NAME_LEN         65
 #define TSDB_MAX_SAVED_SQL_LEN    TSDB_MAX_COLUMNS * 64
 #define TSDB_MAX_SQL_LEN          TSDB_PAYLOAD_SIZE
 #define TSDB_MAX_SQL_SHOW_LEN     256
 #define TSDB_MAX_ALLOWED_SQL_LEN  (8*1024*1024U)          // sql length should be less than 8mb
 
-#define TSDB_MAX_BYTES_PER_ROW    TSDB_MAX_COLUMNS * 64
+#define TSDB_MAX_BYTES_PER_ROW    65535
-#define TSDB_MAX_TAGS_LEN         65536
+#define TSDB_MAX_TAGS_LEN         65535
 #define TSDB_MAX_TAGS             128
 
 #define TSDB_AUTH_LEN             16

src/inc/taoserror.h

@@ -71,6 +71,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_COM_OPS_NOT_SUPPORT,          0, 0x0100, "operations
 TAOS_DEFINE_ERROR(TSDB_CODE_COM_MEMORY_CORRUPTED,         0, 0x0101, "memory corrupted")
 TAOS_DEFINE_ERROR(TSDB_CODE_COM_OUT_OF_MEMORY,            0, 0x0102, "out of memory")
 TAOS_DEFINE_ERROR(TSDB_CODE_COM_INVALID_CFG_MSG,          0, 0x0103, "invalid config message")
+TAOS_DEFINE_ERROR(TSDB_CODE_COM_FILE_CORRUPTED,           0, 0x0104, "file is corrupted")
 
 //client
 TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_SQL,              0, 0x0200, "invalid sql")

src/inc/taosmsg.h

@@ -243,13 +243,13 @@ typedef struct {
   uint64_t uid;
   uint64_t superTableUid;
   uint64_t createdTime;
-  char     tableId[TSDB_TABLE_ID_LEN + 1];
+  char     tableId[TSDB_TABLE_ID_LEN];
-  char     superTableId[TSDB_TABLE_ID_LEN + 1];
+  char     superTableId[TSDB_TABLE_ID_LEN];
   char     data[];
 } SMDCreateTableMsg;
 
 typedef struct {
-  char    tableId[TSDB_TABLE_ID_LEN + 1];
+  char    tableId[TSDB_TABLE_ID_LEN];
   char    db[TSDB_DB_NAME_LEN];
   int8_t  igExists;
   int8_t  getMeta;
@@ -262,12 +262,12 @@ typedef struct {
 } SCMCreateTableMsg;
 
 typedef struct {
-  char   tableId[TSDB_TABLE_ID_LEN + 1];
+  char   tableId[TSDB_TABLE_ID_LEN];
   int8_t igNotExists;
 } SCMDropTableMsg;
 
 typedef struct {
-  char    tableId[TSDB_TABLE_ID_LEN + 1];
+  char    tableId[TSDB_TABLE_ID_LEN];
   char    db[TSDB_DB_NAME_LEN];
   int16_t type; /* operation type   */
   int16_t numOfCols; /* number of schema */
@@ -292,7 +292,7 @@ typedef struct {
 typedef struct {
   char clientVersion[TSDB_VERSION_LEN];
   char msgVersion[TSDB_VERSION_LEN];
-  char db[TSDB_TABLE_ID_LEN + 1];
+  char db[TSDB_TABLE_ID_LEN];
 } SCMConnectMsg;
 
 typedef struct {
@@ -321,18 +321,18 @@ typedef struct {
 } SAcctCfg;
 
 typedef struct {
-  char     user[TSDB_USER_LEN + 1];
+  char     user[TSDB_USER_LEN];
-  char     pass[TSDB_KEY_LEN + 1];
+  char     pass[TSDB_KEY_LEN];
   SAcctCfg cfg;
 } SCMCreateAcctMsg, SCMAlterAcctMsg;
 
 typedef struct {
-  char user[TSDB_USER_LEN + 1];
+  char user[TSDB_USER_LEN];
 } SCMDropUserMsg, SCMDropAcctMsg;
 
 typedef struct {
-  char   user[TSDB_USER_LEN + 1];
+  char   user[TSDB_USER_LEN];
-  char   pass[TSDB_KEY_LEN + 1];
+  char   pass[TSDB_KEY_LEN];
   int8_t privilege;
   int8_t flag;
 } SCMCreateUserMsg, SCMAlterUserMsg;
@@ -342,14 +342,14 @@ typedef struct {
   int32_t  vgId;
   int32_t  sid;
   uint64_t uid;
-  char     tableId[TSDB_TABLE_ID_LEN + 1];
+  char     tableId[TSDB_TABLE_ID_LEN];
 } SMDDropTableMsg;
 
 typedef struct {
   int32_t  contLen;
   int32_t  vgId;
   uint64_t uid;
-  char    tableId[TSDB_TABLE_ID_LEN + 1];
+  char    tableId[TSDB_TABLE_ID_LEN];
 } SMDDropSTableMsg;
 
 typedef struct {
@@ -501,8 +501,7 @@ typedef struct {
 } SVnodeLoad;
 
 typedef struct {
-  char     acct[TSDB_USER_LEN + 1];
+  char     db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
-  char     db[TSDB_DB_NAME_LEN];
   int32_t  cacheBlockSize; //MB
   int32_t  totalBlocks;
   int32_t  maxTables;
@@ -521,7 +520,7 @@ typedef struct {
 } SCMCreateDbMsg, SCMAlterDbMsg;
 
 typedef struct {
-  char    db[TSDB_TABLE_ID_LEN + 1];
+  char    db[TSDB_TABLE_ID_LEN];
   uint8_t ignoreNotExists;
 } SCMDropDbMsg, SCMUseDbMsg;
 
@@ -612,7 +611,7 @@ typedef struct {
 } SMDCreateVnodeMsg;
 
 typedef struct {
-  char    tableId[TSDB_TABLE_ID_LEN + 1];
+  char    tableId[TSDB_TABLE_ID_LEN];
   int16_t createFlag;
   char    tags[];
 } SCMTableInfoMsg;
@@ -639,7 +638,7 @@ typedef struct {
 
 typedef struct STableMetaMsg {
   int32_t       contLen;
-  char          tableId[TSDB_TABLE_ID_LEN + 1];   // table id
+  char          tableId[TSDB_TABLE_ID_LEN];   // table id
   uint8_t       numOfTags;
   uint8_t       precision;
   uint8_t       tableType;
@@ -660,7 +659,7 @@ typedef struct SMultiTableMeta {
 
 typedef struct {
   int32_t dataLen;
-  char name[TSDB_TABLE_ID_LEN + 1];
+  char name[TSDB_TABLE_ID_LEN];
   char data[TSDB_MAX_TAGS_LEN];
 } STagData;
 
@@ -746,15 +745,15 @@ typedef struct {
   uint64_t uid;
   uint64_t stime;  // stream starting time
   int32_t  status;
-  char     tableId[TSDB_TABLE_ID_LEN + 1];
+  char     tableId[TSDB_TABLE_ID_LEN];
 } SMDAlterStreamMsg;
 
 typedef struct {
-  char user[TSDB_USER_LEN + 1];
+  char user[TSDB_USER_LEN];
   char spi;
   char encrypt;
-  char secret[TSDB_KEY_LEN + 1];
+  char secret[TSDB_KEY_LEN];
-  char ckey[TSDB_KEY_LEN + 1];
+  char ckey[TSDB_KEY_LEN];
 } SDMAuthMsg, SDMAuthRsp;
 
 #pragma pack(pop)

src/inc/trpc.h

@@ -83,6 +83,7 @@ void  rpcSendResponse(const SRpcMsg *pMsg);
 void  rpcSendRedirectRsp(void *pConn, const SRpcIpSet *pIpSet); 
 int   rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo);
 void  rpcSendRecv(void *shandle, SRpcIpSet *pIpSet, const SRpcMsg *pReq, SRpcMsg *pRsp);
+void  rpcReportProgress(void *pConn, char *pCont, int contLen);
 
 #ifdef __cplusplus
 }

src/inc/vnode.h

@@ -34,6 +34,13 @@ typedef struct {
   void *qhandle; //used by query and retrieve msg
 } SRspRet;
 
+typedef struct {
+  SRspRet  rspRet;
+  void    *pCont;
+  int32_t  contLen;
+  SRpcMsg  rpcMsg;
+} SReadMsg;
+
 int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg);
 int32_t vnodeDrop(int32_t vgId);
 int32_t vnodeOpen(int32_t vgId, char *rootDir);
@@ -52,7 +59,7 @@ void*   vnodeGetWal(void *pVnode);
 int32_t vnodeProcessWrite(void *pVnode, int qtype, void *pHead, void *item);
 void    vnodeBuildStatusMsg(void * param);
 
-int32_t vnodeProcessRead(void *pVnode, int msgType, void *pCont, int32_t contLen, SRspRet *ret);
+int32_t vnodeProcessRead(void *pVnode, SReadMsg *pReadMsg);
 
 #ifdef __cplusplus
 }

src/kit/shell/src/shellDarwin.c

@@ -97,7 +97,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
       }
     } else if (strcmp(argv[i], "-c") == 0) {
       if (i < argc - 1) { 
-        if (strlen(argv[++i]) > TSDB_FILENAME_LEN - 1) {
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
           exit(EXIT_FAILURE);
         }

src/kit/shell/src/shellLinux.c

@@ -81,7 +81,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
         fprintf(stderr, "Invalid path %s\n", arg);
         return -1;
       }       
-      if (strlen(full_path.we_wordv[0]) > TSDB_FILENAME_LEN - 1) {
+      if (strlen(full_path.we_wordv[0]) >= TSDB_FILENAME_LEN) {
         fprintf(stderr, "config file path: %s overflow max len %d\n", full_path.we_wordv[0], TSDB_FILENAME_LEN - 1);
         wordfree(&full_path);
         return -1;

src/kit/shell/src/shellWindows.c

@@ -77,7 +77,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
       }
     } else if (strcmp(argv[i], "-c") == 0) {
       if (i < argc - 1) {   
-        if (strlen(argv[++i]) > TSDB_FILENAME_LEN - 1) {
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
           exit(EXIT_FAILURE);
         }

src/kit/taosdump/taosdump.c

@@ -177,8 +177,8 @@ typedef struct SDumpArguments {
   char *password;
   uint16_t port;
   // output file
-  char output[TSDB_FILENAME_LEN + 1];
+  char output[TSDB_FILENAME_LEN];
-  char input[TSDB_FILENAME_LEN + 1];
+  char input[TSDB_FILENAME_LEN];
   char *encode;
   // dump unit option
   bool all_databases;

src/mnode/inc/mnodeDef.h

@@ -154,8 +154,8 @@ typedef struct {
 } SDbCfg;
 
 typedef struct SDbObj {
-  char    name[TSDB_DB_NAME_LEN];
+  char    name[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
-  char    acct[TSDB_USER_LEN + 1];
+  char    acct[TSDB_USER_LEN];
   int64_t createdTime;
   int32_t cfgVersion;
   SDbCfg  cfg;
@@ -172,9 +172,9 @@ typedef struct SDbObj {
 } SDbObj;
 
 typedef struct SUserObj {
-  char              user[TSDB_USER_LEN + 1];
+  char              user[TSDB_USER_LEN];
-  char              pass[TSDB_KEY_LEN + 1];
+  char              pass[TSDB_KEY_LEN];
-  char              acct[TSDB_USER_LEN + 1];
+  char              acct[TSDB_USER_LEN];
   int64_t           createdTime;
   int8_t            superAuth;
   int8_t            writeAuth;
@@ -203,8 +203,8 @@ typedef struct {
 } SAcctInfo;
 
 typedef struct SAcctObj {
-  char      user[TSDB_USER_LEN + 1];
+  char      user[TSDB_USER_LEN];
-  char      pass[TSDB_KEY_LEN + 1];
+  char      pass[TSDB_KEY_LEN];
   SAcctCfg  cfg;
   int32_t   acctId;
   int64_t   createdTime;

src/mnode/inc/mnodeProfile.h

@@ -22,7 +22,7 @@ extern "C" {
 #include "mnodeDef.h"
 
 typedef struct {
-  char     user[TSDB_USER_LEN + 1];
+  char     user[TSDB_USER_LEN];
   int8_t   killed;
   uint16_t port;
   uint32_t ip;

src/mnode/src/mnodeProfile.c

@@ -97,7 +97,7 @@ SConnObj *mnodeCreateConn(char *user, uint32_t ip, uint16_t port) {
     .connId = connId,
     .stime  = taosGetTimestampMs()
   };
-  tstrncpy(connObj.user, user, TSDB_USER_LEN);
+  tstrncpy(connObj.user, user, sizeof(connObj.user));
   
   char key[10];
   sprintf(key, "%u", connId);  
@@ -222,7 +222,7 @@ static int32_t mnodeRetrieveConns(SShowObj *pShow, char *data, int32_t rows, voi
   SConnObj *pConnObj = NULL;
   int32_t   cols = 0;
   char *    pWrite;
-  char      ipStr[TSDB_IPv4ADDR_LEN + 7];
+  char      ipStr[TSDB_IPv4ADDR_LEN + 6];
 
   while (numOfRows < rows) {
     pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
@@ -235,12 +235,12 @@ static int32_t mnodeRetrieveConns(SShowObj *pShow, char *data, int32_t rows, voi
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, TSDB_USER_LEN);
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, sizeof(pConnObj->user));
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    snprintf(ipStr, TSDB_IPv4ADDR_LEN + 6, "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
+    snprintf(ipStr, sizeof(ipStr), "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
-    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, TSDB_IPv4ADDR_LEN + 6);
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, sizeof(ipStr));
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
@@ -342,7 +342,7 @@ static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, v
   SConnObj *pConnObj = NULL;
   int32_t   cols = 0;
   char *    pWrite;
-  char      ipStr[TSDB_IPv4ADDR_LEN + 7];
+  char      ipStr[TSDB_IPv4ADDR_LEN + 6];
 
   while (numOfRows < rows) {
     pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
@@ -358,12 +358,12 @@ static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, v
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, TSDB_USER_LEN);
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, sizeof(pConnObj->user));
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      snprintf(ipStr, TSDB_IPv4ADDR_LEN + 6, "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
+      snprintf(ipStr, sizeof(ipStr), "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
-      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, TSDB_IPv4ADDR_LEN + 6);
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, sizeof(ipStr));
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
@@ -463,7 +463,7 @@ static int32_t mnodeRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, v
   SConnObj *pConnObj = NULL;
   int32_t   cols = 0;
   char *    pWrite;
-  char      ipStr[TSDB_IPv4ADDR_LEN + 7];
+  char      ipStr[TSDB_IPv4ADDR_LEN + 6];
 
   while (numOfRows < rows) {
     pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
@@ -479,12 +479,12 @@ static int32_t mnodeRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, v
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, TSDB_USER_LEN);
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, sizeof(pConnObj->user));
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      snprintf(ipStr, TSDB_IPv4ADDR_LEN + 6, "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
+      snprintf(ipStr, sizeof(ipStr), "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
-      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, TSDB_IPv4ADDR_LEN + 6);
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, sizeof(ipStr));
       cols++;
 
       pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;

src/mnode/src/mnodeShow.c

@@ -138,15 +138,16 @@ static int32_t mnodeProcessShowMsg(SMnodeMsg *pMsg) {
   }
   pShowRsp->qhandle = htobe64((uint64_t) pShow);
 
-  mTrace("%p, show type:%s, start to get meta", pShow, mnodeGetShowType(pShowMsg->type));
   int32_t code = (*tsMnodeShowMetaFp[pShowMsg->type])(&pShowRsp->tableMeta, pShow, pMsg->rpcMsg.handle);
-  if (code == 0) {
+  mTrace("%p, show type:%s index:%d, get meta finished, rows:%d cols:%d result:%s", pShow,
+         mnodeGetShowType(pShowMsg->type), pShow->index, pShow->numOfRows, pShow->numOfColumns, tstrerror(code));
+
+  if (code == TSDB_CODE_SUCCESS) {
     pMsg->rpcRsp.rsp = pShowRsp;
     pMsg->rpcRsp.len = sizeof(SCMShowRsp) + sizeof(SSchema) * pShow->numOfColumns;
     mnodeReleaseShowObj(pShow, false);
     return TSDB_CODE_SUCCESS;
   } else {
-    mError("%p, show type:%s, failed to get meta, reason:%s", pShow, mnodeGetShowType(pShowMsg->type), tstrerror(code));
     rpcFreeCont(pShowRsp);
     mnodeReleaseShowObj(pShow, true);
     return code;
@@ -161,7 +162,6 @@ static int32_t mnodeProcessRetrieveMsg(SMnodeMsg *pMsg) {
   pRetrieve->qhandle = htobe64(pRetrieve->qhandle);
 
   SShowObj *pShow = (SShowObj *)pRetrieve->qhandle;
-  mTrace("%p, show type:%s, retrieve data", pShow, mnodeGetShowType(pShow->type));
   
   /*
    * in case of server restart, apps may hold qhandle created by server before
@@ -172,6 +172,9 @@ static int32_t mnodeProcessRetrieveMsg(SMnodeMsg *pMsg) {
     return TSDB_CODE_MND_INVALID_SHOWOBJ;
   }
 
+  mTrace("%p, show type:%s index:%d, start retrieve data, numOfReads:%d numOfRows:%d", pShow,
+         mnodeGetShowType(pShow->type), pShow->index, pShow->numOfReads, pShow->numOfRows);
+
   if (mnodeCheckShowFinished(pShow)) {
     mTrace("%p, show is already read finished, numOfReads:%d numOfRows:%d", pShow, pShow->numOfReads, pShow->numOfRows);
     pShow->numOfReads = pShow->numOfRows;
@@ -198,6 +201,9 @@ static int32_t mnodeProcessRetrieveMsg(SMnodeMsg *pMsg) {
   if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE)
     rowsRead = (*tsMnodeShowRetrieveFp[pShow->type])(pShow, pRsp->data, rowsToRead, pMsg->rpcMsg.handle);
 
+  mTrace("%p, show type:%s index:%d, stop retrieve data, rowsRead:%d rowsToRead:%d", pShow,
+         mnodeGetShowType(pShow->type), pShow->index, rowsRead, rowsToRead);
+
   if (rowsRead < 0) {
     rpcFreeCont(pRsp);
     mnodeReleaseShowObj(pShow, false);
@@ -211,7 +217,7 @@ static int32_t mnodeProcessRetrieveMsg(SMnodeMsg *pMsg) {
   pMsg->rpcRsp.rsp = pRsp;
   pMsg->rpcRsp.len = size;
 
-  if (rowsToRead == 0 || (rowsRead == rowsToRead && pShow->numOfRows - pShow->numOfReads == rowsToRead)) {
+  if (rowsToRead == 0 || (rowsRead == rowsToRead && pShow->numOfRows == pShow->numOfReads)) {
     pRsp->completed = 1;
     mnodeReleaseShowObj(pShow, true);
   } else {

src/mnode/src/mnodeTable.c

@@ -201,7 +201,7 @@ static int32_t mnodeChildTableActionEncode(SSdbOper *pOper) {
   assert(pTable != NULL && pOper->rowData != NULL);
 
   int32_t len = strlen(pTable->info.tableId);
-  if (len > TSDB_TABLE_ID_LEN) return TSDB_CODE_MND_INVALID_TABLE_ID;
+  if (len >= TSDB_TABLE_ID_LEN) return TSDB_CODE_MND_INVALID_TABLE_ID;
 
   memcpy(pOper->rowData, pTable->info.tableId, len);
   memset(pOper->rowData + len, 0, 1);
@@ -232,7 +232,7 @@ static int32_t mnodeChildTableActionDecode(SSdbOper *pOper) {
   if (pTable == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
 
   int32_t len = strlen(pOper->rowData);
-  if (len > TSDB_TABLE_ID_LEN) {
+  if (len >= TSDB_TABLE_ID_LEN) {
     free(pTable);
     return TSDB_CODE_MND_INVALID_TABLE_ID;
   }
@@ -453,7 +453,7 @@ static int32_t mnodeSuperTableActionEncode(SSdbOper *pOper) {
   assert(pOper->pObj != NULL && pOper->rowData != NULL);
 
   int32_t len = strlen(pStable->info.tableId);
-  if (len > TSDB_TABLE_ID_LEN) len = TSDB_CODE_MND_INVALID_TABLE_ID;
+  if (len >= TSDB_TABLE_ID_LEN) len = TSDB_CODE_MND_INVALID_TABLE_ID;
 
   memcpy(pOper->rowData, pStable->info.tableId, len);
   memset(pOper->rowData + len, 0, 1);
@@ -477,7 +477,7 @@ static int32_t mnodeSuperTableActionDecode(SSdbOper *pOper) {
   if (pStable == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
 
   int32_t len = strlen(pOper->rowData);
-  if (len > TSDB_TABLE_ID_LEN){
+  if (len >= TSDB_TABLE_ID_LEN){
     free(pStable);
     return TSDB_CODE_MND_INVALID_TABLE_ID;
   }
@@ -1078,8 +1078,9 @@ static int32_t mnodeGetShowSuperTableMeta(STableMetaMsg *pMeta, SShowObj *pShow,
   int32_t cols = 0;
   SSchema *pSchema = pMeta->schema;
 
-  pShow->bytes[cols] = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+  SSchema tbnameSchema = tGetTableNameColumnSchema();
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  pShow->bytes[cols] = tbnameSchema.bytes;
+  pSchema[cols].type = tbnameSchema.type;
   strcpy(pSchema[cols].name, "name");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
@@ -1249,12 +1250,12 @@ static int32_t mnodeGetSuperTableMeta(SMnodeMsg *pMsg) {
   pMeta->numOfColumns = htons((int16_t)pTable->numOfColumns);
   pMeta->tableType    = pTable->info.type;
   pMeta->contLen      = sizeof(STableMetaMsg) + mnodeSetSchemaFromSuperTable(pMeta->schema, pTable);
-  strncpy(pMeta->tableId, pTable->info.tableId, TSDB_TABLE_ID_LEN);
+  tstrncpy(pMeta->tableId, pTable->info.tableId, sizeof(pMeta->tableId));
 
+  pMsg->rpcRsp.len = pMeta->contLen;
   pMeta->contLen = htons(pMeta->contLen);
 
   pMsg->rpcRsp.rsp = pMeta;
-  pMsg->rpcRsp.len = pMeta->contLen;
   
   mTrace("stable:%s, uid:%" PRIu64 " table meta is retrieved", pTable->info.tableId, pTable->uid);
   return TSDB_CODE_SUCCESS;
@@ -2032,7 +2033,7 @@ static int32_t mnodeProcessMultiTableMetaMsg(SMnodeMsg *pMsg) {
   pMultiMeta->numOfTables = 0;
 
   for (int32_t t = 0; t < pInfo->numOfTables; ++t) {
-    char * tableId = (char *)(pInfo->tableIds + t * TSDB_TABLE_ID_LEN + 1);
+    char * tableId = (char *)(pInfo->tableIds + t * TSDB_TABLE_ID_LEN);
     SChildTableObj *pTable = mnodeGetChildTable(tableId);
     if (pTable == NULL) continue;
 
@@ -2079,8 +2080,9 @@ static int32_t mnodeGetShowTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void
   int32_t cols = 0;
   SSchema *pSchema = pMeta->schema;
 
-  pShow->bytes[cols] = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+  SSchema s = tGetTableNameColumnSchema();
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  pShow->bytes[cols] = s.bytes;
+  pSchema[cols].type = s.type;
   strcpy(pSchema[cols].name, "table_name");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
@@ -2097,8 +2099,9 @@ static int32_t mnodeGetShowTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
-  pShow->bytes[cols] = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+  SSchema tbCol = tGetTableNameColumnSchema();
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  pShow->bytes[cols] = tbCol.bytes;
+  pSchema[cols].type = tbCol.type;
   strcpy(pSchema[cols].name, "stable_name");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
@@ -2268,8 +2271,9 @@ static int32_t mnodeGetStreamTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, vo
   int32_t cols = 0;
   SSchema *pSchema = pMeta->schema;
 
-  pShow->bytes[cols] = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+  SSchema tbnameColSchema = tGetTableNameColumnSchema();
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  pShow->bytes[cols] = tbnameColSchema.bytes;
+  pSchema[cols].type = tbnameColSchema.type;
   strcpy(pSchema[cols].name, "table_name");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;

src/mnode/src/mnodeUser.c

@@ -315,7 +315,7 @@ static int32_t mnodeRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, voi
     cols = 0;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pUser->user, TSDB_USER_LEN);
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pUser->user, sizeof(pUser->user));
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
@@ -336,7 +336,7 @@ static int32_t mnodeRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, voi
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pUser->acct, TSDB_USER_LEN);
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pUser->acct, sizeof(pUser->user));
     cols++;
 
     numOfRows++;

src/os/linux/src/linuxSysPara.c

@@ -332,33 +332,42 @@ bool taosGetDisk() {
 }
 
 static bool taosGetCardInfo(int64_t *bytes) {
+  *bytes = 0;
   FILE *fp = fopen(tsSysNetFile, "r");
   if (fp == NULL) {
     uError("open file:%s failed", tsSysNetFile);
     return false;
   }
 
-  int64_t rbytes, rpackts, tbytes, tpackets;
-  int64_t nouse1, nouse2, nouse3, nouse4, nouse5, nouse6;
-  char    nouse0[200] = {0};
 
-  size_t len;
+  size_t len = 2048;
-  char * line = NULL;
+  char * line = calloc(1, len);
-  *bytes = 0;
 
   while (!feof(fp)) {
-    tfree(line);
+    memset(line, 0, len);
-    len = 0;
+    
+    int64_t rbytes = 0;
+    int64_t rpackts = 0;
+    int64_t tbytes = 0;
+    int64_t tpackets = 0;
+    int64_t nouse1 = 0;
+    int64_t nouse2 = 0;
+    int64_t nouse3 = 0;
+    int64_t nouse4 = 0;
+    int64_t nouse5 = 0;
+    int64_t nouse6 = 0;
+    char    nouse0[200] = {0};
+
     getline(&line, &len, fp);
-    if (line == NULL) {
+    line[len - 1] = 0;
-      break;
+
-    }
     if (strstr(line, "lo:") != NULL) {
       continue;
     }
 
     sscanf(line,
-           "%s %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64,
+           "%s %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64
+           " %" PRId64,
            nouse0, &rbytes, &rpackts, &nouse1, &nouse2, &nouse3, &nouse4, &nouse5, &nouse6, &tbytes, &tpackets);
     *bytes += (rbytes + tbytes);
   }

src/plugins/http/inc/httpHandle.h

@@ -67,7 +67,7 @@
 #define HTTP_COMPRESS_IDENTITY      0
 #define HTTP_COMPRESS_GZIP          2
 
-#define HTTP_SESSION_ID_LEN         (TSDB_USER_LEN * 2 + 1)
+#define HTTP_SESSION_ID_LEN         (TSDB_USER_LEN + TSDB_PASSWORD_LEN)
 
 typedef enum {
     HTTP_CONTEXT_STATE_READY,
@@ -84,7 +84,7 @@ typedef struct {
   int   expire;
   int   access;
   void *taos;
-  char  id[HTTP_SESSION_ID_LEN + 1];
+  char  id[HTTP_SESSION_ID_LEN];
 } HttpSession;
 
 typedef enum {

src/plugins/http/src/gcHandle.c

@@ -48,7 +48,7 @@ void gcInitHandle(HttpServer* pServer) { httpAddMethod(pServer, &gcDecodeMethod)
 
 bool gcGetUserFromUrl(HttpContext* pContext) {
   HttpParser* pParser = &pContext->parser;
-  if (pParser->path[GC_USER_URL_POS].len > TSDB_USER_LEN - 1 || pParser->path[GC_USER_URL_POS].len <= 0) {
+  if (pParser->path[GC_USER_URL_POS].len >= TSDB_USER_LEN || pParser->path[GC_USER_URL_POS].len <= 0) {
     return false;
   }
 
@@ -58,7 +58,7 @@ bool gcGetUserFromUrl(HttpContext* pContext) {
 
 bool gcGetPassFromUrl(HttpContext* pContext) {
   HttpParser* pParser = &pContext->parser;
-  if (pParser->path[GC_PASS_URL_POS].len > TSDB_PASSWORD_LEN - 1 || pParser->path[GC_PASS_URL_POS].len <= 0) {
+  if (pParser->path[GC_PASS_URL_POS].len >= TSDB_PASSWORD_LEN || pParser->path[GC_PASS_URL_POS].len <= 0) {
     return false;
   }
 

src/plugins/http/src/httpAuth.c

@@ -89,7 +89,7 @@ bool httpParseTaosdAuthToken(HttpContext *pContext, char *token, int len) {
     return false;
   } else {
     tstrncpy(pContext->user, descrypt, sizeof(pContext->user));
-    tstrncpy(pContext->pass, descrypt + TSDB_USER_LEN, TSDB_PASSWORD_LEN);
+    tstrncpy(pContext->pass, descrypt + TSDB_USER_LEN, sizeof(pContext->pass));
 
     httpTrace("context:%p, fd:%d, ip:%s, taosd token:%s parsed success, user:%s", pContext, pContext->fd,
               pContext->ipstr, token, pContext->user);
@@ -100,14 +100,15 @@ bool httpParseTaosdAuthToken(HttpContext *pContext, char *token, int len) {
 }
 
 bool httpGenTaosdAuthToken(HttpContext *pContext, char *token, int maxLen) {
-  char buffer[TSDB_USER_LEN + TSDB_PASSWORD_LEN] = {0};
+  char buffer[sizeof(pContext->user) + sizeof(pContext->pass)] = {0};
-  strncpy(buffer, pContext->user, TSDB_USER_LEN);
+  tstrncpy(buffer, pContext->user, sizeof(pContext->user));
-  strncpy(buffer + TSDB_USER_LEN, pContext->pass, TSDB_PASSWORD_LEN);
+  tstrncpy(buffer + sizeof(pContext->user), pContext->pass, sizeof(pContext->pass));
 
   char *encrypt = taosDesEncode(KEY_DES_4, buffer, TSDB_USER_LEN + TSDB_PASSWORD_LEN);
   char *base64 = base64_encode((const unsigned char *)encrypt, TSDB_USER_LEN + TSDB_PASSWORD_LEN);
 
-  strncpy(token, base64, (size_t)strlen(base64));
+  size_t len = strlen(base64);
+  tstrncpy(token, base64, len + 1);
   free(encrypt);
   free(base64);
 

src/plugins/http/src/httpSql.c

@@ -87,7 +87,7 @@ void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int code) {
   }
 
   if (code < 0) {
-    if (encode->checkFinishedFp != NULL && !encode->checkFinishedFp(pContext, singleCmd, -code)) {
+    if (encode->checkFinishedFp != NULL && !encode->checkFinishedFp(pContext, singleCmd, code)) {
       singleCmd->code = code;
       httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos jump to:%d, last code:%s, last sql:%s",
                 pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos + 1, tstrerror(code), sql);

src/plugins/http/src/restHandle.c

@@ -61,7 +61,7 @@ void restInitHandle(HttpServer* pServer) {
 
 bool restGetUserFromUrl(HttpContext* pContext) {
   HttpParser* pParser = &pContext->parser;
-  if (pParser->path[REST_USER_URL_POS].len > TSDB_USER_LEN - 1 || pParser->path[REST_USER_URL_POS].len <= 0) {
+  if (pParser->path[REST_USER_URL_POS].len >= TSDB_USER_LEN || pParser->path[REST_USER_URL_POS].len <= 0) {
     return false;
   }
 
@@ -71,7 +71,7 @@ bool restGetUserFromUrl(HttpContext* pContext) {
 
 bool restGetPassFromUrl(HttpContext* pContext) {
   HttpParser* pParser = &pContext->parser;
-  if (pParser->path[REST_PASS_URL_POS].len > TSDB_PASSWORD_LEN - 1 || pParser->path[REST_PASS_URL_POS].len <= 0) {
+  if (pParser->path[REST_PASS_URL_POS].len >= TSDB_PASSWORD_LEN || pParser->path[REST_PASS_URL_POS].len <= 0) {
     return false;
   }
 

src/plugins/http/src/tgHandle.c

@@ -306,21 +306,21 @@ void tgCleanupHandle() {
 
 bool tgGetUserFromUrl(HttpContext *pContext) {
   HttpParser *pParser = &pContext->parser;
-  if (pParser->path[TG_USER_URL_POS].len > TSDB_USER_LEN - 1 || pParser->path[TG_USER_URL_POS].len <= 0) {
+  if (pParser->path[TG_USER_URL_POS].len >= TSDB_USER_LEN || pParser->path[TG_USER_URL_POS].len <= 0) {
     return false;
   }
 
-  tstrncpy(pContext->user, pParser->path[TG_USER_URL_POS].pos, TSDB_USER_LEN);
+  tstrncpy(pContext->user, pParser->path[TG_USER_URL_POS].pos, sizeof(pContext->user));
   return true;
 }
 
 bool tgGetPassFromUrl(HttpContext *pContext) {
   HttpParser *pParser = &pContext->parser;
-  if (pParser->path[TG_PASS_URL_POS].len > TSDB_PASSWORD_LEN - 1 || pParser->path[TG_PASS_URL_POS].len <= 0) {
+  if (pParser->path[TG_PASS_URL_POS].len >= TSDB_PASSWORD_LEN || pParser->path[TG_PASS_URL_POS].len <= 0) {
     return false;
   }
 
-  tstrncpy(pContext->pass, pParser->path[TG_PASS_URL_POS].pos, TSDB_PASSWORD_LEN);
+  tstrncpy(pContext->pass, pParser->path[TG_PASS_URL_POS].pos, sizeof(pContext->pass));
   return true;
 }
 

src/plugins/monitor/src/monitorMain.c

@@ -175,7 +175,7 @@ static void dnodeBuildMonitorSql(char *sql, int32_t cmd) {
              ", totalConns smallint, maxConns smallint"
              ", accessState smallint"
              ") tags (acctId binary(%d))",
-             tsMonitorDbName, TSDB_USER_LEN + 1);
+             tsMonitorDbName, TSDB_USER_LEN);
   } else if (cmd == MONITOR_CMD_CREATE_TB_ACCT_ROOT) {
     snprintf(sql, SQL_LENGTH, "create table if not exists %s.acct_%s using %s.acct tags('%s')", tsMonitorDbName, "root",
              tsMonitorDbName, "root");
@@ -183,7 +183,7 @@ static void dnodeBuildMonitorSql(char *sql, int32_t cmd) {
     snprintf(sql, SQL_LENGTH,
              "create table if not exists %s.slowquery(ts timestamp, username "
              "binary(%d), created_time timestamp, time bigint, sql binary(%d))",
-             tsMonitorDbName, TSDB_TABLE_ID_LEN, TSDB_SLOW_QUERY_SQL_LEN);
+             tsMonitorDbName, TSDB_TABLE_ID_LEN - 1, TSDB_SLOW_QUERY_SQL_LEN);
   } else if (cmd == MONITOR_CMD_CREATE_TB_LOG) {
     snprintf(sql, SQL_LENGTH,
              "create table if not exists %s.log(ts timestamp, level tinyint, "

src/query/src/qExecutor.c

@@ -12,8 +12,8 @@
  * 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/>.
  */
-#include "qfill.h"
 #include "os.h"
+#include "qfill.h"
 
 #include "hash.h"
 #include "hashfunc.h"
@@ -1368,8 +1368,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int16_t order
     int32_t index = pSqlFuncMsg->colInfo.colIndex;
     if (TSDB_COL_IS_TAG(pIndex->flag)) {
       if (pIndex->colId == TSDB_TBNAME_COLUMN_INDEX) {  // todo refactor
-        pCtx->inputBytes = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+        SSchema s = tGetTableNameColumnSchema();
-        pCtx->inputType = TSDB_DATA_TYPE_BINARY;
+
+        pCtx->inputBytes = s.bytes;
+        pCtx->inputType = s.type;
       } else {
         pCtx->inputBytes = pQuery->tagColList[index].bytes;
         pCtx->inputType = pQuery->tagColList[index].type;
@@ -5143,8 +5145,9 @@ static int32_t createQFunctionExprFromMsg(SQueryTableMsg *pQueryMsg, SExprInfo *
       type  = TSDB_DATA_TYPE_DOUBLE;
       bytes = tDataTypeDesc[type].nSize;
     } else if (pExprs[i].base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX && pExprs[i].base.functionId == TSDB_FUNC_TAGPRJ) {  // parse the normal column
-      type  = TSDB_DATA_TYPE_BINARY;
+      SSchema s = tGetTableNameColumnSchema();
-      bytes = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+      type  = s.type;
+      bytes = s.bytes;
     } else{
       int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].base, pTagCols);
       assert(j < pQueryMsg->numOfCols || j < pQueryMsg->numOfTags || j == TSDB_TBNAME_COLUMN_INDEX);
@@ -5154,10 +5157,11 @@ static int32_t createQFunctionExprFromMsg(SQueryTableMsg *pQueryMsg, SExprInfo *
         type = pCol->type;
         bytes = pCol->bytes;
       } else {
-        type  = TSDB_DATA_TYPE_BINARY;
+        SSchema s = tGetTableNameColumnSchema();
-        bytes = TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE;
-      }
 
+        type  = s.type;
+        bytes = s.bytes;
+      }
     }
 
     int32_t param = pExprs[i].base.arg[0].argValue.i64;
@@ -5822,20 +5826,36 @@ _over:
   //pQInfo already freed in initQInfo, but *pQInfo may not pointer to null;
   if (code != TSDB_CODE_SUCCESS) {
     *pQInfo = NULL;
+  } else {
+    SQInfo* pq = (SQInfo*) (*pQInfo);
+
+    T_REF_INC(pq);
+    T_REF_INC(pq);
   }
 
   // if failed to add ref for all meters in this query, abort current query
   return code;
 }
 
-void qDestroyQueryInfo(qinfo_t pQInfo) {
+static void doDestoryQueryInfo(SQInfo* pQInfo) {
+  assert(pQInfo != NULL);
   qTrace("QInfo:%p query completed", pQInfo);
-  
+  queryCostStatis(pQInfo);   // print the query cost summary
-  // print the query cost summary
-  queryCostStatis(pQInfo);
   freeQInfo(pQInfo);
 }
 
+void qDestroyQueryInfo(qinfo_t qHandle) {
+  SQInfo* pQInfo = (SQInfo*) qHandle;
+  if (!isValidQInfo(pQInfo)) {
+    return;
+  }
+
+  int16_t ref = T_REF_DEC(pQInfo);
+  if (ref == 0) {
+    doDestoryQueryInfo(pQInfo);
+  }
+}
+
 void qTableQuery(qinfo_t qinfo) {
   SQInfo *pQInfo = (SQInfo *)qinfo;
 
@@ -5846,6 +5866,7 @@ void qTableQuery(qinfo_t qinfo) {
 
   if (isQueryKilled(pQInfo)) {
     qTrace("QInfo:%p it is already killed, abort", pQInfo);
+    qDestroyQueryInfo(pQInfo);
     return;
   }
 
@@ -5861,7 +5882,7 @@ void qTableQuery(qinfo_t qinfo) {
   }
 
   sem_post(&pQInfo->dataReady);
-  //  vnodeDecRefCount(pQInfo);
+  qDestroyQueryInfo(pQInfo);
 }
 
 int32_t qRetrieveQueryResultInfo(qinfo_t qinfo) {
@@ -5887,20 +5908,29 @@ int32_t qRetrieveQueryResultInfo(qinfo_t qinfo) {
 bool qHasMoreResultsToRetrieve(qinfo_t qinfo) {
   SQInfo *pQInfo = (SQInfo *)qinfo;
 
-  if (pQInfo == NULL || pQInfo->signature != pQInfo || pQInfo->code != TSDB_CODE_SUCCESS) {
+  if (!isValidQInfo(pQInfo) || pQInfo->code != TSDB_CODE_SUCCESS) {
+    qTrace("QInfo:%p invalid qhandle or error occurs, abort query, code:%x", pQInfo, pQInfo->code);
     return false;
   }
 
   SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+  bool ret = false;
   if (Q_STATUS_EQUAL(pQuery->status, QUERY_OVER)) {
-    return false;
+    ret = false;
   } else if (Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL)) {
-    return true;
+    ret = true;
   } else if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
-    return true;
+    ret = true;
   } else {
     assert(0);
   }
+
+  if (ret) {
+    T_REF_INC(pQInfo);
+    qTrace("QInfo:%p has more results waits for client retrieve", pQInfo);
+  }
+
+  return ret;
 }
 
 int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *contLen) {
@@ -5945,6 +5975,19 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
   return code;
 }
 
+int32_t qKillQuery(qinfo_t qinfo) {
+  SQInfo *pQInfo = (SQInfo *)qinfo;
+
+  if (pQInfo == NULL || !isValidQInfo(pQInfo)) {
+    return TSDB_CODE_QRY_INVALID_QHANDLE;
+  }
+
+  setQueryKilled(pQInfo);
+  qDestroyQueryInfo(pQInfo);
+
+  return TSDB_CODE_SUCCESS;
+}
+
 static void buildTagQueryResult(SQInfo* pQInfo) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery *          pQuery = pRuntimeEnv->pQuery;
@@ -6025,6 +6068,7 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
     qTrace("QInfo:%p create count(tbname) query, res:%d rows:1", pQInfo, count);
   } else {  // return only the tags|table name etc.
     count = 0;
+    SSchema tbnameSchema = tGetTableNameColumnSchema();
     while(pQInfo->tableIndex < num && count < pQuery->rec.capacity) {
       int32_t i = pQInfo->tableIndex++;
       
@@ -6034,7 +6078,7 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
       for(int32_t j = 0; j < pQuery->numOfOutput; ++j) {
         if (pExprInfo[j].base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
           char* data = tsdbGetTableName(pQInfo->tsdb, &item->id);
-          char* dst = pQuery->sdata[j]->data + count * ((TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE);
+          char* dst = pQuery->sdata[j]->data + count * tbnameSchema.bytes;
           memcpy(dst, data, varDataTLen(data));
         } else {// todo refactor
           int16_t type = pExprInfo[j].type;

src/rpc/src/rpcMain.c

@@ -426,6 +426,10 @@ void rpcSendResponse(const SRpcMsg *pRsp) {
   rpcSendMsgToPeer(pConn, msg, msgLen);
   pConn->secured = 1; // connection shall be secured
 
+  if (pConn->pReqMsg) rpcFreeCont(pConn->pReqMsg);
+  pConn->pReqMsg = NULL;
+  pConn->reqMsgLen = 0;
+
   rpcUnlockConn(pConn);
   rpcDecRef(pRpc);    // decrease the referene count
 
@@ -482,6 +486,15 @@ void rpcSendRecv(void *shandle, SRpcIpSet *pIpSet, const SRpcMsg *pMsg, SRpcMsg
   return;
 }
 
+// this API is used by server app to keep an APP context in case connection is broken
+void rpcReportProgress(void *handle, char *pCont, int contLen) {
+  SRpcConn *pConn = (SRpcConn *)handle;
+
+  // pReqMsg and reqMsgLen is re-used to store the context from app server
+  pConn->pReqMsg = pCont;     
+  pConn->reqMsgLen = contLen;
+}
+
 static void rpcFreeMsg(void *msg) {
   if ( msg ) {
     char *temp = (char *)msg - sizeof(SRpcReqContext);
@@ -493,7 +506,7 @@ static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerFqdn, uint16_t peerPort,
   SRpcConn *pConn;
 
   uint32_t peerIp = taosGetIpFromFqdn(peerFqdn);
-  if (peerIp == -1) {
+  if (peerIp == 0xFFFFFFFF) {
     tError("%s, failed to resolve FQDN:%s", pRpc->label, peerFqdn); 
     terrno = TSDB_CODE_RPC_APP_ERROR; 
     return NULL;
@@ -542,7 +555,7 @@ static void rpcCloseConn(void *thandle) {
 
   if ( pRpc->connType == TAOS_CONN_SERVER) {
     char hashstr[40] = {0};
-    size_t size = sprintf(hashstr, "%x:%x:%x:%d", pConn->peerIp, pConn->linkUid, pConn->peerId, pConn->connType);
+    size_t size = snprintf(hashstr, sizeof(hashstr), "%x:%x:%x:%d", pConn->peerIp, pConn->linkUid, pConn->peerId, pConn->connType);
     taosHashRemove(pRpc->hash, hashstr, size);
   
     rpcFreeMsg(pConn->pRspMsg); // it may have a response msg saved, but not request msg
@@ -592,7 +605,7 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
   char      hashstr[40] = {0};
   SRpcHead *pHead = (SRpcHead *)pRecv->msg;
 
-  size_t size = sprintf(hashstr, "%x:%x:%x:%d", pRecv->ip, pHead->linkUid, pHead->sourceId, pRecv->connType);
+  size_t size = snprintf(hashstr, sizeof(hashstr), "%x:%x:%x:%d", pRecv->ip, pHead->linkUid, pHead->sourceId, pRecv->connType);
  
   // check if it is already allocated
   SRpcConn **ppConn = (SRpcConn **)(taosHashGet(pRpc->hash, hashstr, size));
@@ -682,7 +695,7 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) {
   if (pConn) {
     pConn->tretry = 0;
     pConn->ahandle = pContext->ahandle;
-    sprintf(pConn->info, "%s %p %p", pRpc->label, pConn, pConn->ahandle);
+    snprintf(pConn->info, sizeof(pConn->info), "%s %p %p", pRpc->label, pConn, pConn->ahandle);
     pConn->tretry = 0;
   } else {
     tError("%s %p, failed to set up connection(%s)", pRpc->label, pContext->ahandle, tstrerror(terrno));
@@ -811,7 +824,7 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
 
   if (rpcIsReq(pHead->msgType)) {
     pConn->ahandle = (void *)pHead->ahandle;
-    sprintf(pConn->info, "%s %p %p", pRpc->label, pConn, pConn->ahandle);
+    snprintf(pConn->info, sizeof(pConn->info), "%s %p %p", pRpc->label, pConn, pConn->ahandle);
   }
 
   sid = pConn->sid;
@@ -846,6 +859,21 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
   return pConn;
 }
 
+static void rpcReportBrokenLinkToServer(SRpcConn *pConn) {
+  SRpcInfo *pRpc = pConn->pRpc;
+
+  // if there are pending request, notify the app
+  tTrace("%s, notify the server app, connection is gone", pConn->info);
+
+  SRpcMsg rpcMsg;
+  rpcMsg.pCont = pConn->pReqMsg;     // pReqMsg is re-used to store the APP context from server
+  rpcMsg.contLen = pConn->reqMsgLen; // reqMsgLen is re-used to store the APP context length
+  rpcMsg.handle = pConn;
+  rpcMsg.msgType = pConn->inType;
+  rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL; 
+  if (pRpc->cfp) (*(pRpc->cfp))(&rpcMsg, NULL);
+}
+
 static void rpcProcessBrokenLink(SRpcConn *pConn) {
   if (pConn == NULL) return;
   SRpcInfo *pRpc = pConn->pRpc;
@@ -859,19 +887,7 @@ static void rpcProcessBrokenLink(SRpcConn *pConn) {
     taosTmrStart(rpcProcessConnError, 0, pContext, pRpc->tmrCtrl);
   }
 
-  if (pConn->inType) {
+  if (pConn->inType) rpcReportBrokenLinkToServer(pConn); 
-    // if there are pending request, notify the app
-    tTrace("%s, connection is gone, notify the app", pConn->info);
-/*
-    SRpcMsg rpcMsg;
-    rpcMsg.pCont = NULL;
-    rpcMsg.contLen = 0;
-    rpcMsg.handle = pConn;
-    rpcMsg.msgType = pConn->inType;
-    rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
-    (*(pRpc->cfp))(&rpcMsg);
-*/
-  }
 
   rpcUnlockConn(pConn);
   rpcCloseConn(pConn);
@@ -1210,23 +1226,10 @@ static void rpcProcessRetryTimer(void *param, void *tmrId) {
 
 static void rpcProcessIdleTimer(void *param, void *tmrId) {
   SRpcConn *pConn = (SRpcConn *)param;
-  SRpcInfo *pRpc = pConn->pRpc;
 
   if (pConn->user[0]) {
     tTrace("%s, close the connection since no activity", pConn->info);
-    if (pConn->inType && pRpc->cfp) {
+    if (pConn->inType) rpcReportBrokenLinkToServer(pConn); 
-      // if there are pending request, notify the app
-      tTrace("%s, notify the app, connection is gone", pConn->info);
-/*
-      SRpcMsg rpcMsg;
-      rpcMsg.pCont = NULL;
-      rpcMsg.contLen = 0;
-      rpcMsg.handle = pConn;
-      rpcMsg.msgType = pConn->inType;
-      rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL; 
-      (*(pRpc->cfp))(&rpcMsg);
-*/
-    }
     rpcCloseConn(pConn);
   } else {
     tTrace("%s, idle timer:%p not processed", pConn->info, tmrId);

src/tsdb/inc/tsdbMain.h

@@ -161,7 +161,7 @@ typedef struct {
   int64_t index;
   int     numOfCacheBlocks;
   SList * memPool;
-} STsdbCachePool;
+} STsdbBufferPool;
 
 typedef struct {
   TSKEY   keyFirst;
@@ -173,7 +173,7 @@ typedef struct {
 typedef struct {
   int              cacheBlockSize;
   int              totalCacheBlocks;
-  STsdbCachePool   pool;
+  STsdbBufferPool   pool;
   STsdbCacheBlock *curBlock;
   SCacheMem *      mem;
   SCacheMem *      imem;

src/tsdb/src/tsdbCache.c

@@ -35,7 +35,7 @@ STsdbCache *tsdbInitCache(int cacheBlockSize, int totalBlocks, TsdbRepoT *pRepo)
   pCache->totalCacheBlocks = totalBlocks;
   pCache->pRepo = pRepo;
 
-  STsdbCachePool *pPool = &(pCache->pool);
+  STsdbBufferPool *pPool = &(pCache->pool);
   pPool->index = 0;
   pPool->memPool = tdListNew(sizeof(STsdbCacheBlock *));
   if (pPool->memPool == NULL) goto _err;
@@ -106,7 +106,7 @@ static void tsdbFreeCacheMem(SCacheMem *mem) {
 }
 
 static int tsdbAllocBlockFromPool(STsdbCache *pCache) {
-  STsdbCachePool *pPool = &(pCache->pool);
+  STsdbBufferPool *pPool = &(pCache->pool);
   
   tsdbLockRepo(pCache->pRepo);
   if (listNEles(pPool->memPool) == 0) {
@@ -170,7 +170,7 @@ int tsdbAlterCacheTotalBlocks(STsdbRepo *pRepo, int totalBlocks) {
 }
 
 static int tsdbAddCacheBlockToPool(STsdbCache *pCache) {
-  STsdbCachePool *pPool = &pCache->pool;
+  STsdbBufferPool *pPool = &pCache->pool;
 
   STsdbCacheBlock *pBlock = malloc(sizeof(STsdbCacheBlock) + pCache->cacheBlockSize);
   if (pBlock == NULL) return -1;
@@ -184,7 +184,7 @@ static int tsdbAddCacheBlockToPool(STsdbCache *pCache) {
 }
 
 static int tsdbRemoveCacheBlockFromPool(STsdbCache *pCache) {
-  STsdbCachePool *pPool = &pCache->pool;
+  STsdbBufferPool *pPool = &pCache->pool;
   STsdbCacheBlock *pBlock = NULL;
 
   ASSERT(pCache->totalCacheBlocks >= 0);

src/tsdb/src/tsdbMetaFile.c

@@ -105,7 +105,7 @@ int32_t tsdbInsertMetaRecord(SMetaFile *mfh, uint64_t uid, void *cont, int32_t c
     return -1;
   }
 
-  fsync(mfh->fd);
+  // fsync(mfh->fd);
 
   mfh->tombSize++;
 
@@ -132,7 +132,7 @@ int32_t tsdbDeleteMetaRecord(SMetaFile *mfh, uint64_t uid) {
     return -1;
   }
 
-  fsync(mfh->fd);
+  // fsync(mfh->fd);
 
   mfh->nDel++;
 
@@ -167,7 +167,7 @@ int32_t tsdbUpdateMetaRecord(SMetaFile *mfh, uint64_t uid, void *cont, int32_t c
     return -1;
   }
 
-  fsync(mfh->fd);
+  // fsync(mfh->fd);
 
   return 0;
 }

src/tsdb/src/tsdbRead.c

@@ -1942,7 +1942,7 @@ int32_t tableGroupComparFn(const void *p1, const void *p2, const void *param) {
       f1 = (char*) pTable1->name;
       f2 = (char*) pTable2->name;
       type = TSDB_DATA_TYPE_BINARY;
-      bytes = (TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+      bytes = tGetTableNameColumnSchema().bytes;
     } else {
       STColumn* pCol = schemaColAt(pTableGroupSupp->pTagSchema, colIndex);
       bytes = pCol->bytes;

src/util/inc/tkvstore.h

@@ -46,11 +46,12 @@ typedef struct {
 } SKVStore;
 
 int       tdCreateKVStore(char *fname);
-int       tdDestroyKVStore();
+int       tdDestroyKVStore(char *fname);
 SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH);
 void      tdCloseKVStore(SKVStore *pStore);
 int       tdKVStoreStartCommit(SKVStore *pStore);
-int       tdUpdateRecordInKVStore(SKVStore *pStore, uint64_t uid, void *cont, int contLen);
+int       tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLen);
+int       tdDropKVStoreRecord(SKVStore *pStore, uint64_t uid);
 int       tdKVStoreEndCommit(SKVStore *pStore);
 
 #ifdef __cplusplus

src/util/src/tconfig.c

@@ -242,7 +242,7 @@ void taosReadGlobalLogCfg() {
   wordexp_t full_path;
   wordexp(configDir, &full_path, 0);
   if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {    
-    if (strlen(full_path.we_wordv[0]) > TSDB_FILENAME_LEN - 1) {
+    if (strlen(full_path.we_wordv[0]) >= TSDB_FILENAME_LEN) {
       printf("\nconfig file: %s path overflow max len %d, all variables are set to default\n", full_path.we_wordv[0], TSDB_FILENAME_LEN - 1);
       wordfree(&full_path);
       return;

src/util/src/tkvstore.c

@@ -34,42 +34,67 @@
 #define TD_KVSTORE_SNAP_SUFFIX ".snap"
 #define TD_KVSTORE_NEW_SUFFIX ".new"
 
+typedef struct {
+  uint64_t uid;
+  int64_t  offset;
+  int64_t  size;
+} SKVRecord;
+
 static int       tdInitKVStoreHeader(int fd, char *fname);
 static void *    tdEncodeStoreInfo(void *buf, SStoreInfo *pInfo);
-// static void *    tdDecodeStoreInfo(void *buf, SStoreInfo *pInfo);
+static void *    tdDecodeStoreInfo(void *buf, SStoreInfo *pInfo);
 static SKVStore *tdNewKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH);
 static char *    tdGetKVStoreSnapshotFname(char *fdata);
 static char *    tdGetKVStoreNewFname(char *fdata);
 static void      tdFreeKVStore(SKVStore *pStore);
 static int       tdUpdateKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo);
+static int       tdLoadKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo);
+static void *    tdEncodeKVRecord(void *buf, SKVRecord *pRecord);
+static void *    tdDecodeKVRecord(void *buf, SKVRecord *pRecord);
+static int       tdRestoreKVStore(SKVStore *pStore);
 
 int tdCreateKVStore(char *fname) {
-  char *tname = strdup(fname);
-  if (tname == NULL) return TSDB_CODE_COM_OUT_OF_MEMORY;
-
   int fd = open(fname, O_RDWR | O_CREAT, 0755);
   if (fd < 0) {
     uError("failed to open file %s since %s", fname, strerror(errno));
-    return TAOS_SYSTEM_ERROR(errno);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
   }
 
-  int code = tdInitKVStoreHeader(fd, fname);
+  if (tdInitKVStoreHeader(fd, fname) < 0) {
-  if (code != TSDB_CODE_SUCCESS) return code;
+    close(fd);
+    return -1;
+  }
 
   if (fsync(fd) < 0) {
     uError("failed to fsync file %s since %s", fname, strerror(errno));
-    return TAOS_SYSTEM_ERROR(errno);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    close(fd);
+    return -1;
   }
 
   if (close(fd) < 0) {
     uError("failed to close file %s since %s", fname, strerror(errno));
-    return TAOS_SYSTEM_ERROR(errno);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
   }
 
-  return TSDB_CODE_SUCCESS;
+  return 0;
+}
+
+int tdDestroyKVStore(char *fname) {
+  if (remove(fname) < 0) {
+    uError("failed to remove file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  return 0;
 }
 
 SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH) {
+  SStoreInfo info = {0};
+
   SKVStore *pStore = tdNewKVStore(fname, iFunc, aFunc, appH);
   if (pStore == NULL) return NULL;
 
@@ -89,14 +114,44 @@ SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH
       goto _err;
     }
 
-    // TODO: rewind the file
+    if (tdLoadKVStoreHeader(pStore->sfd, pStore->fsnap, &info) < 0) goto _err;
+
+    if (ftruncate(pStore->fd, info.size) < 0) {
+      uError("failed to truncate %s to " PRId64 " size since %s", pStore->fname, info.size, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+
+    if (tdUpdateKVStoreHeader(pStore->fd, pStore->fname, &info) < 0) goto _err;
 
     close(pStore->sfd);
     pStore->sfd = -1;
     remove(pStore->fsnap);
   }
 
-  // TODO: Recover from the file
+  if (tdLoadKVStoreHeader(pStore->fd, pStore->fname, &info) < 0) goto _err;
+
+  struct stat tfstat;
+  if (fstat(pStore->fd, &tfstat) < 0) {
+    uError("failed to fstat file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  ASSERT(info.size == tfstat.st_size);
+
+  if (lseek(pStore->fd, TD_KVSTORE_HEADER_SIZE, SEEK_SET) < 0) {
+    uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  pStore->info.size += TD_KVSTORE_HEADER_SIZE;
+
+  if (tdRestoreKVStore(pStore) < 0) goto _err;
+
+  close(pStore->fd);
+  pStore->fd = -1;
 
   return pStore;
 
@@ -113,7 +168,11 @@ _err:
   return NULL;
 }
 
+void tdCloseKVStore(SKVStore *pStore) { tdFreeKVStore(pStore); }
+
 int tdKVStoreStartCommit(SKVStore *pStore) {
+  ASSERT(pStore->fd < 0);
+
   pStore->fd = open(pStore->fname, O_RDWR);
   if (pStore->fd < 0) {
     uError("failed to open file %s since %s", pStore->fname, strerror(errno));
@@ -147,6 +206,14 @@ int tdKVStoreStartCommit(SKVStore *pStore) {
   }
   pStore->sfd = -1;
 
+  if (lseek(pStore->fd, 0, SEEK_END) < 0) {
+    uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  ASSERT(pStore->info.size == lseek(pStore->fd, 0, SEEK_CUR));
+
   return 0;
 
 _err:
@@ -162,11 +229,50 @@ _err:
   return -1;
 }
 
+int tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLen) {
+  SKVRecord *pRecord = taosHashGet(pStore->map, (void *)&uid, sizeof(uid));
+  if (pRecord != NULL) {
+    pStore->info.tombSize += (pRecord->size + sizeof(SKVRecord));
+  }
+
+  // TODO
+  return 0;
+}
+
+int tdDropKVStoreRecord(SKVStore *pStore, uint64_t uid) {
+  SKVRecord rInfo = {0};
+  char      buf[128] = "\0";
+
+  SKVRecord *pRecord = taosHashGet(pStore->map, &uid, sizeof(uid));
+  if (pRecord == NULL) {
+    uError("failed to drop KV store record with key " PRIu64 " since not find", uid);
+    return -1;
+  }
+
+  rInfo.offset = -pRecord->offset;
+  rInfo.uid = pRecord->uid;
+  rInfo.size = pRecord->size;
+
+  void *pBuf = tdEncodeKVRecord(buf, &rInfo);
+
+  if (twrite(pStore->fd, buf, POINTER_DISTANCE(pBuf, buf)) < POINTER_DISTANCE(pBuf, buf)) {
+    uError("failed to write %d bytes to file %s since %s", POINTER_DISTANCE(pBuf, buf), pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  pStore->info.size += POINTER_DISTANCE(pBuf, buf);
+  pStore->info.nDels++;
+  pStore->info.nRecords--;
+  pStore->info.tombSize += (rInfo.size + sizeof(SKVRecord) * 2);
+
+  return 0;
+}
+
 int tdKVStoreEndCommit(SKVStore *pStore) {
   ASSERT(pStore->fd > 0);
 
-  terrno = tdUpdateKVStoreHeader(pStore->fd, pStore->fname, &(pStore->info));
+  if (tdUpdateKVStoreHeader(pStore->fd, pStore->fname, &(pStore->info)) < 0) return -1;
-  if (terrno != TSDB_CODE_SUCCESS) return -1;
 
   if (fsync(pStore->fd) < 0) {
     uError("failed to fsync file %s since %s", pStore->fname, strerror(errno));
@@ -179,27 +285,56 @@ int tdKVStoreEndCommit(SKVStore *pStore) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
   }
+  pStore->fd = -1;
 
   remove(pStore->fsnap);
   return 0;
 }
 
+static int tdLoadKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo) {
+  char buf[TD_KVSTORE_HEADER_SIZE] = "\0";
+
+  if (lseek(fd, 0, SEEK_SET) < 0) {
+    uError("failed to lseek file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (tread(fd, buf, TD_KVSTORE_HEADER_SIZE) < TD_KVSTORE_HEADER_SIZE) {
+    uError("failed to read %d bytes from file %s since %s", TD_KVSTORE_HEADER_SIZE, fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (!taosCheckChecksumWhole((uint8_t *)buf, TD_KVSTORE_HEADER_SIZE)) {
+    uError("file %s is broken", fname);
+    terrno = TSDB_CODE_COM_FILE_CORRUPTED;
+    return -1;
+  }
+
+  tdDecodeStoreInfo(buf, pInfo);
+
+  return 0;
+}
+
 static int tdUpdateKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo) {
   char buf[TD_KVSTORE_HEADER_SIZE] = "\0";
 
   if (lseek(fd, 0, SEEK_SET) < 0) {
     uError("failed to lseek file %s since %s", fname, strerror(errno));
-    return TAOS_SYSTEM_ERROR(errno);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
   }
 
   tdEncodeStoreInfo(buf, pInfo);
   taosCalcChecksumAppend(0, (uint8_t *)buf, TD_KVSTORE_HEADER_SIZE);
   if (twrite(fd, buf, TD_KVSTORE_HEADER_SIZE) < TD_KVSTORE_HEADER_SIZE) {
-    uError("failed to write file %s %d bytes since %s", fname, TD_KVSTORE_HEADER_SIZE, strerror(errno));
+    uError("failed to write %d bytes to file %s since %s", TD_KVSTORE_HEADER_SIZE, fname, strerror(errno));
-    return TAOS_SYSTEM_ERROR(errno);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
   }
 
-  return TSDB_CODE_SUCCESS;
+  return 0;
 }
 
 static int tdInitKVStoreHeader(int fd, char *fname) {
@@ -217,21 +352,24 @@ static void *tdEncodeStoreInfo(void *buf, SStoreInfo *pInfo) {
   return buf;
 }
 
-// static void *tdDecodeStoreInfo(void *buf, SStoreInfo *pInfo) {
+static void *tdDecodeStoreInfo(void *buf, SStoreInfo *pInfo) {
-//   buf = taosDecodeVariantI64(buf, &(pInfo->size));
+  buf = taosDecodeVariantI64(buf, &(pInfo->size));
-//   buf = taosDecodeVariantI64(buf, &(pInfo->tombSize));
+  buf = taosDecodeVariantI64(buf, &(pInfo->tombSize));
-//   buf = taosDecodeVariantI64(buf, &(pInfo->nRecords));
+  buf = taosDecodeVariantI64(buf, &(pInfo->nRecords));
-//   buf = taosDecodeVariantI64(buf, &(pInfo->nDels));
+  buf = taosDecodeVariantI64(buf, &(pInfo->nDels));
 
-//   return buf;
+  return buf;
-// }
+}
 
 static SKVStore *tdNewKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH) {
   SKVStore *pStore = (SKVStore *)malloc(sizeof(SKVStore));
   if (pStore == NULL) goto _err;
 
   pStore->fname = strdup(fname);
-  if (pStore->map == NULL) goto _err;
+  if (pStore->map == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    goto _err;
+  }
 
   pStore->fsnap = tdGetKVStoreSnapshotFname(fname);
   if (pStore->fsnap == NULL) goto _err;
@@ -254,7 +392,6 @@ static SKVStore *tdNewKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void
   return pStore;
 
 _err:
-  terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
   tdFreeKVStore(pStore);
   return NULL;
 }
@@ -290,3 +427,115 @@ static char *tdGetKVStoreNewFname(char *fdata) {
   sprintf(fname, "%s%s", fdata, TD_KVSTORE_NEW_SUFFIX);
   return fname;
 }
+
+static void *tdEncodeKVRecord(void *buf, SKVRecord *pRecord) {
+  buf = taosEncodeFixedU64(buf, pRecord->uid);
+  buf = taosEncodeFixedI64(buf, pRecord->offset);
+  buf = taosEncodeFixedI64(buf, pRecord->size);
+
+  return buf;
+}
+
+static void *tdDecodeKVRecord(void *buf, SKVRecord *pRecord) {
+  buf = taosDecodeFixedU64(buf, &(pRecord->uid));
+  buf = taosDecodeFixedI64(buf, &(pRecord->offset));
+  buf = taosDecodeFixedI64(buf, &(pRecord->size));
+
+  return buf;
+}
+
+static int tdRestoreKVStore(SKVStore *pStore) {
+  char      tbuf[128] = "\0";
+  void *    buf = NULL;
+  int       maxBufSize = 0;
+  SKVRecord rInfo = {0};
+
+  ASSERT(TD_KVSTORE_HEADER_SIZE == lseek(pStore->fd, 0, SEEK_CUR));
+
+  while (true) {
+    ssize_t tsize = tread(pStore->fd, tbuf, sizeof(SKVRecord));
+    if (tsize == 0) break;
+    if (tsize < sizeof(SKVRecord)) {
+      uError("failed to read %d bytes from file %s since %s", sizeof(SKVRecord), pStore->fname, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+
+    char *pBuf = tdDecodeKVRecord(tbuf, &rInfo);
+    ASSERT(POINTER_DISTANCE(pBuf, tbuf) == sizeof(SKVRecord));
+    ASSERT(rInfo.offset > 0 ? pStore->info.size == rInfo.offset : true);
+
+    if (rInfo.offset < 0) {
+      taosHashRemove(pStore->map, (void *)(&rInfo.uid), sizeof(rInfo.uid));
+      pStore->info.size += sizeof(SKVRecord);
+      pStore->info.nRecords--;
+      pStore->info.nDels++;
+      pStore->info.tombSize += (rInfo.size + sizeof(SKVRecord) + sizeof(SKVRecord));
+    } else {
+      // TODO: add statistics
+      ASSERT(rInfo.offset > 0 && rInfo.size > 0);
+      if (taosHashPut(pStore->map, (void *)(&rInfo.uid), sizeof(rInfo.uid), &rInfo, sizeof(rInfo)) < 0) {
+        uError("failed to put record in KV store %s", pStore->fname);
+        terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+        goto _err;
+      }
+
+      maxBufSize = MAX(maxBufSize, rInfo.size);
+
+      if (lseek(pStore->fd, rInfo.size, SEEK_CUR) < 0) {
+        uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        goto _err;
+      }
+    }
+  }
+
+  buf = malloc(maxBufSize);
+  if (buf == NULL) {
+    uError("failed to allocate %d bytes in KV store %s", maxBufSize, pStore->fname);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  SHashMutableIterator *pIter = taosHashCreateIter(pStore->map);
+  if (pIter == NULL) {
+    uError("failed to create hash iter while opening KV store %s", pStore->fname);
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  while (taosHashIterNext(pIter)) {
+    SKVRecord *pRecord = taosHashIterGet(pIter);
+
+    if (lseek(pStore->fd, pRecord->offset, SEEK_SET) < 0) {
+      uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+
+    if (tread(pStore->fd, buf, pRecord->size) < pRecord->size) {
+      uError("failed to read %d bytes from file %s since %s", pRecord->size, pStore->fname, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+
+    if (!taosCheckChecksumWhole((uint8_t *)buf, pRecord->size)) {
+      uError("file %s has checksum error, offset " PRId64 " size %d", pStore->fname, pRecord->offset, pRecord->size);
+      terrno = TSDB_CODE_COM_FILE_CORRUPTED;
+      goto _err;
+    }
+
+    if (pStore->iFunc) (*pStore->iFunc)(pStore->appH, buf, pRecord->size);
+  }
+
+  taosHashDestroyIter(pIter);
+
+  if (pStore->aFunc) (*pStore->aFunc)(pStore->appH);
+
+  tfree(buf);
+  return 0;
+
+_err:
+  tfree(buf);
+  return -1;
+}

src/util/src/tsocket.c

@@ -29,11 +29,12 @@ int taosGetFqdn(char *fqdn) {
 
   hints.ai_flags = AI_CANONNAME;
 
-  getaddrinfo(hostname, NULL, &hints, &result);
+  int32_t ret = getaddrinfo(hostname, NULL, &hints, &result);
   if (result) {
     strcpy(fqdn, result->ai_canonname);
     freeaddrinfo(result);
   } else {
+    uError("failed to get fqdn, code:%d, reason:%s", ret, gai_strerror(ret));
     code = -1;
   }
 
@@ -42,9 +43,12 @@ int taosGetFqdn(char *fqdn) {
 
 uint32_t taosGetIpFromFqdn(const char *fqdn) {
   struct addrinfo hints = {0};
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+
   struct addrinfo *result = NULL;
 
-  getaddrinfo(fqdn, NULL, &hints, &result);
+  int32_t ret = getaddrinfo(fqdn, NULL, &hints, &result);
   if (result) {
     struct sockaddr *sa = result->ai_addr;
     struct sockaddr_in *si = (struct sockaddr_in*)sa;
@@ -53,7 +57,8 @@ uint32_t taosGetIpFromFqdn(const char *fqdn) {
     freeaddrinfo(result);
     return ip;
   } else {
-    return -1;
+    uError("failed get the ip address, fqdn:%s, code:%d, reason:%s", fqdn, ret, gai_strerror(ret));
+    return 0xFFFFFFFF;
   }
 }
 

src/vnode/src/vnodeMain.c

@@ -553,6 +553,7 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) {
   len += snprintf(content + len, maxLen - len, "}\n");
 
   fwrite(content, 1, len, fp);
+  fflush(fp);
   fclose(fp);
   free(content);
 

src/vnode/src/vnodeRead.c

@@ -27,17 +27,18 @@
 #include "vnodeLog.h"
 #include "query.h"
 
-static int32_t (*vnodeProcessReadMsgFp[TSDB_MSG_TYPE_MAX])(SVnodeObj *, void *pCont, int32_t contLen, SRspRet *pRet);
+static int32_t (*vnodeProcessReadMsgFp[TSDB_MSG_TYPE_MAX])(SVnodeObj *pVnode, SReadMsg *pReadMsg);
-static int32_t  vnodeProcessQueryMsg(SVnodeObj *pVnode, void *pCont, int32_t contLen, SRspRet *pRet);
+static int32_t  vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg);
-static int32_t  vnodeProcessFetchMsg(SVnodeObj *pVnode, void *pCont, int32_t contLen, SRspRet *pRet);
+static int32_t  vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg);
 
 void vnodeInitReadFp(void) {
   vnodeProcessReadMsgFp[TSDB_MSG_TYPE_QUERY] = vnodeProcessQueryMsg;
   vnodeProcessReadMsgFp[TSDB_MSG_TYPE_FETCH] = vnodeProcessFetchMsg;
 }
 
-int32_t vnodeProcessRead(void *param, int msgType, void *pCont, int32_t contLen, SRspRet *ret) {
+int32_t vnodeProcessRead(void *param, SReadMsg *pReadMsg) {
   SVnodeObj *pVnode = (SVnodeObj *)param;
+  int msgType = pReadMsg->rpcMsg.msgType;
 
   if (vnodeProcessReadMsgFp[msgType] == NULL) {
     vTrace("vgId:%d, msgType:%s not processed, no handle", pVnode->vgId, taosMsg[msgType]);
@@ -55,16 +56,44 @@ int32_t vnodeProcessRead(void *param, int msgType, void *pCont, int32_t contLen,
     return TSDB_CODE_RPC_NOT_READY;
   }
 
-  return (*vnodeProcessReadMsgFp[msgType])(pVnode, pCont, contLen, ret);
+  return (*vnodeProcessReadMsgFp[msgType])(pVnode, pReadMsg);
 }
 
-static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, void *pCont, int32_t contLen, SRspRet *pRet) {
+// notify connection(handle) that current qhandle is created, if current connection from
+// client is broken, the query needs to be killed immediately.
+static void vnodeNotifyCurrentQhandle(void* handle, void* qhandle, int32_t vgId) {
+  SRetrieveTableMsg* killQueryMsg = rpcMallocCont(sizeof(SRetrieveTableMsg));
+  killQueryMsg->qhandle = htobe64((uint64_t) qhandle);
+  killQueryMsg->free = htons(1);
+  killQueryMsg->header.vgId = htonl(vgId);
+  killQueryMsg->header.contLen = htonl(sizeof(SRetrieveTableMsg));
+
+  rpcReportProgress(handle, (char*) killQueryMsg, sizeof(SRetrieveTableMsg));
+}
+
+static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
+  void *   pCont = pReadMsg->pCont;
+  int32_t  contLen = pReadMsg->contLen;
+  SRspRet *pRet = &pReadMsg->rspRet;
+
   SQueryTableMsg* pQueryTableMsg = (SQueryTableMsg*) pCont;
   memset(pRet, 0, sizeof(SRspRet));
 
-  int32_t code = TSDB_CODE_SUCCESS;
+  // qHandle needs to be freed correctly
+  if (pReadMsg->rpcMsg.code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
+    SRetrieveTableMsg* killQueryMsg = (SRetrieveTableMsg*) pReadMsg->pCont;
+    killQueryMsg->free = htons(killQueryMsg->free);
+    killQueryMsg->qhandle = htobe64(killQueryMsg->qhandle);
 
+    assert(pReadMsg->rpcMsg.contLen > 0 && killQueryMsg->free == 1);
+    qDestroyQueryInfo((qinfo_t) killQueryMsg->qhandle);
+
+    return TSDB_CODE_SUCCESS;
+  }
+
+  int32_t code = TSDB_CODE_SUCCESS;
   qinfo_t pQInfo = NULL;
+
   if (contLen != 0) {
     code = qCreateQueryInfo(pVnode->tsdb, pVnode->vgId, pQueryTableMsg, &pQInfo);
 
@@ -75,6 +104,8 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
     pRet->len = sizeof(SQueryTableRsp);
     pRet->rsp = pRsp;
 
+    vnodeNotifyCurrentQhandle(pReadMsg->rpcMsg.handle, pQInfo, pVnode->vgId);
+
     vTrace("vgId:%d, QInfo:%p, dnode query msg disposed", pVnode->vgId, pQInfo);
   } else {
     assert(pCont != NULL);
@@ -91,11 +122,32 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
   return code;
 }
 
-static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, void *pCont, int32_t contLen, SRspRet *pRet) {
+static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
+  void *   pCont = pReadMsg->pCont;
+  SRspRet *pRet = &pReadMsg->rspRet;
+
   SRetrieveTableMsg *pRetrieve = pCont;
   void *pQInfo = (void*) htobe64(pRetrieve->qhandle);
+  pRetrieve->free = htons(pRetrieve->free);
+
   memset(pRet, 0, sizeof(SRspRet));
 
+  if (pRetrieve->free == 1) {
+    vTrace("vgId:%d, QInfo:%p, retrieve msg received to kill query and free qhandle", pVnode->vgId, pQInfo);
+    int32_t ret = qKillQuery(pQInfo);
+
+    pRet->rsp = (SRetrieveTableRsp *)rpcMallocCont(sizeof(SRetrieveTableRsp));
+    pRet->len = sizeof(SRetrieveTableRsp);
+
+    memset(pRet->rsp, 0, sizeof(SRetrieveTableRsp));
+    SRetrieveTableRsp* pRsp = pRet->rsp;
+    pRsp->numOfRows = 0;
+    pRsp->completed = true;
+    pRsp->useconds  = 0;
+
+    return ret;
+  }
+
   vTrace("vgId:%d, QInfo:%p, retrieve msg is received", pVnode->vgId, pQInfo);
 
   int32_t code = qRetrieveQueryResultInfo(pQInfo);
@@ -110,8 +162,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
     if (qHasMoreResultsToRetrieve(pQInfo)) {
       pRet->qhandle = pQInfo;
       code = TSDB_CODE_VND_ACTION_NEED_REPROCESSED;
-    } else {
+    } else { // no further execution invoked, release the ref to vnode
-      // no further execution invoked, release the ref to vnode
       qDestroyQueryInfo(pQInfo);
       vnodeRelease(pVnode);
     }

src/wal/src/walMain.c

@@ -44,7 +44,7 @@ typedef struct {
   uint32_t id;   // increase continuously
   int      num;  // number of wal files
   char     path[TSDB_FILENAME_LEN];
-  char     name[TSDB_FILENAME_LEN];
+  char     name[TSDB_FILENAME_LEN+16];
   pthread_mutex_t mutex;
 } SWal;
 
@@ -108,7 +108,7 @@ void walClose(void *handle) {
   if (pWal->keep == 0) {
     // remove all files in the directory
     for (int i=0; i<pWal->num; ++i) {
-      sprintf(pWal->name, "%s/%s%d", pWal->path, walPrefix, pWal->id-i);
+      snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", pWal->path, walPrefix, pWal->id-i);
       if (remove(pWal->name) <0) {
         wError("wal:%s, failed to remove", pWal->name);
       } else {
@@ -140,7 +140,7 @@ int walRenew(void *handle) {
 
   pWal->num++;
 
-  sprintf(pWal->name, "%s/%s%d", pWal->path, walPrefix, pWal->id);
+  snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", pWal->path, walPrefix, pWal->id);
   pWal->fd = open(pWal->name, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
 
   if (pWal->fd < 0) {
@@ -152,7 +152,7 @@ int walRenew(void *handle) {
     if (pWal->num > pWal->max) {
       // remove the oldest wal file
       char name[TSDB_FILENAME_LEN * 3];
-      sprintf(name, "%s/%s%d", pWal->path, walPrefix, pWal->id - pWal->max);
+      snprintf(name, sizeof(name), "%s/%s%d", pWal->path, walPrefix, pWal->id - pWal->max);
       if (remove(name) <0) {
         wError("wal:%s, failed to remove(%s)", name, strerror(errno));
       } else {
@@ -214,7 +214,7 @@ int walRestore(void *handle, void *pVnode, int (*writeFp)(void *, void *, int))
   int   plen = strlen(walPrefix);
   char  opath[TSDB_FILENAME_LEN+5];
    
-  int slen = sprintf(opath, "%s", pWal->path);
+  int slen = snprintf(opath, sizeof(opath), "%s", pWal->path);
   if ( pWal->keep == 0) 
     strcpy(opath+slen, "/old");
 
@@ -245,7 +245,7 @@ int walRestore(void *handle, void *pVnode, int (*writeFp)(void *, void *, int))
     wTrace("wal:%s, %d files will be restored", opath, count);
 
     for (index = minId; index<=maxId; ++index) {
-      sprintf(pWal->name, "%s/%s%d", opath, walPrefix, index);
+      snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", opath, walPrefix, index);
       terrno = walRestoreWalFile(pWal, pVnode, writeFp);
       if (terrno < 0) break;
     }
@@ -264,7 +264,7 @@ int walRestore(void *handle, void *pVnode, int (*writeFp)(void *, void *, int))
       // open the existing WAL file in append mode
       pWal->num = count;
       pWal->id = maxId;
-      sprintf(pWal->name, "%s/%s%d", opath, walPrefix, maxId);
+      snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", opath, walPrefix, maxId);
       pWal->fd = open(pWal->name, O_WRONLY | O_CREAT | O_APPEND, S_IRWXU | S_IRWXG | S_IRWXO);
       if (pWal->fd < 0) {
         wError("wal:%s, failed to open file(%s)", pWal->name, strerror(errno));
@@ -361,7 +361,7 @@ int walHandleExistingFiles(const char *path) {
   char   nname[TSDB_FILENAME_LEN * 3];
   char   opath[TSDB_FILENAME_LEN];
 
-  sprintf(opath, "%s/old", path);
+  snprintf(opath, sizeof(opath), "%s/old", path);
 
   struct dirent *ent;
   DIR   *dir = opendir(path);
@@ -377,8 +377,8 @@ int walHandleExistingFiles(const char *path) {
     int count = 0;
     while ((ent = readdir(dir))!= NULL) {  
       if ( strncmp(ent->d_name, walPrefix, plen) == 0) {
-        sprintf(oname, "%s/%s", path, ent->d_name);
+        snprintf(oname, sizeof(oname), "%s/%s", path, ent->d_name);
-        sprintf(nname, "%s/old/%s", path, ent->d_name);
+        snprintf(nname, sizeof(nname), "%s/old/%s", path, ent->d_name);
         if (access(opath, F_OK) != 0) {
           if (mkdir(opath, 0755) != 0) {
             wError("wal:%s, failed to create directory:%s(%s)", oname, opath, strerror(errno));
@@ -416,7 +416,7 @@ static int walRemoveWalFiles(const char *path) {
 
   while ((ent = readdir(dir))!= NULL) {
     if ( strncmp(ent->d_name, walPrefix, plen) == 0) {
-      sprintf(name, "%s/%s", path, ent->d_name);
+      snprintf(name, sizeof(name), "%s/%s", path, ent->d_name);
       if (remove(name) <0) {
         wError("wal:%s, failed to remove(%s)", name, strerror(errno));
         terrno = TAOS_SYSTEM_ERROR(errno);

tests/examples/c/demo.c

@@ -30,7 +30,7 @@ static int32_t doQuery(TAOS* taos, const char* sql) {
   
   TAOS_RES* res = taos_query(taos, sql);
   if (taos_errno(res) != 0) {
-    printf("failed to execute query, reason:%s\n", taos_errstr(res));
+    printf("failed to execute query, reason:%s\n", taos_errstr(taos));
     return -1;
   }
   
@@ -77,7 +77,7 @@ static __attribute__((unused)) void multiThreadTest(int32_t numOfThreads, void*
   pthread_attr_init(&thattr);
   pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
   
-  pthread_t* threadId = malloc(sizeof(pthread_t)*numOfThreads);
+  pthread_t* threadId = (pthread_t*)malloc(sizeof(pthread_t)*(uint32_t)numOfThreads);
   
   for (int i = 0; i < numOfThreads; ++i) {
     pthread_create(&threadId[i], NULL, oneLoader, conn);
@@ -115,15 +115,15 @@ int main(int argc, char *argv[]) {
   
   printf("success to connect to server\n");
 //  doQuery(taos, "select c1,count(*) from group_db0.group_mt0 where c1<8 group by c1");
-  doQuery(taos, "select * from test.m1");
+//  doQuery(taos, "select * from test.m1");
 
 //  multiThreadTest(1, taos);
 //  doQuery(taos, "select tbname from test.m1");
 //   doQuery(taos, "select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from lm2_db0.lm2_stb0 where ts >= 1537146000000 and ts <= 1543145400000 and tbname in ('lm2_tb0') interval(1s) group by t1");
 //   doQuery(taos, "select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from lm2_db0.lm2_stb0 where ts >= 1537146000000 and ts <= 1543145400000 and tbname in ('lm2_tb0', 'lm2_tb1', 'lm2_tb2') interval(1s)");
-//  for(int32_t i = 0; i < 100000; ++i) {
+  for(int32_t i = 0; i < 200; ++i) {
-//    doQuery(taos, "insert into t1 values(now, 2)");
+    doQuery(taos, "select * from lm2_db0.lm2_stb0");
-//  }
+  }
 //  doQuery(taos, "create table t1(ts timestamp, k binary(12), f nchar(2))");
   
   taos_close(taos);

tests/pytest/random-test/random-test-multi-threading-3.py

@@ -127,6 +127,8 @@ class Test (Thread):
     def drop_stable(self):
         tdLog.info("drop_stable")
         global last_stb
+        global last_tb
+        global written
 
         if (last_stb == ""):
             tdLog.info("no super table")
@@ -135,6 +137,8 @@ class Test (Thread):
             tdLog.info("will drop last super table")
             tdSql.execute('drop table %s' % last_stb)
             last_stb = ""
+            last_tb = ""
+            written = 0
 
     def restart_database(self):
         tdLog.info("restart_database")

tests/pytest/random-test/random-test-multi-threading.py

@@ -105,12 +105,18 @@ class Test (threading.Thread):
             return
         else:
             tdLog.info("will create stable %s" % current_stb)
+            tdLog.info(
+                'create table %s(ts timestamp, c1 int, c2 nchar(10)) tags (t1 int, t2 nchar(10))' %
+                current_stb)
             tdSql.execute(
                 'create table %s(ts timestamp, c1 int, c2 nchar(10)) tags (t1 int, t2 nchar(10))' %
                 current_stb)
             last_stb = current_stb
 
             current_tb = "tb%d" % int(round(time.time() * 1000))
+            tdLog.info(
+                "create table %s using %s tags (1, '表1')" %
+                (current_tb, last_stb))
             tdSql.execute(
                 "create table %s using %s tags (1, '表1')" %
                 (current_tb, last_stb))
@@ -128,6 +134,8 @@ class Test (threading.Thread):
     def drop_stable(self):
         tdLog.info("drop_stable")
         global last_stb
+        global last_tb
+        global written
 
         if (last_stb == ""):
             tdLog.info("no super table")
@@ -136,6 +144,8 @@ class Test (threading.Thread):
             tdLog.info("will drop last super table")
             tdSql.execute('drop table %s' % last_stb)
             last_stb = ""
+            last_tb = ""
+            written = 0
 
     def restart_database(self):
         tdLog.info("restart_database")

tests/pytest/random-test/random-test.py

@@ -111,6 +111,8 @@ class Test:
             tdLog.info("will drop last super table")
             tdSql.execute('drop table %s' % self.last_stb)
             self.last_stb = ""
+            self.last_tb = ""
+            self.written = 0
 
     def query_data_from_stable(self):
         tdLog.info("query_data_from_stable")

tests/pytest/regressiontest.sh

@@ -36,7 +36,7 @@ python3 ./test.py -f tag_lite/binary.py
 python3 ./test.py -f tag_lite/bool_binary.py
 python3 ./test.py -f tag_lite/bool_int.py
 python3 ./test.py -f tag_lite/bool.py
-python3 ./test.py -f tag_lite/change.py
+# python3 ./test.py -f tag_lite/change.py
 python3 ./test.py -f tag_lite/column.py
 # python3 ./test.py -f tag_lite/commit.py
 python3 ./test.py -f tag_lite/create.py
@@ -127,7 +127,7 @@ python3 ./test.py -f user/user_create.py
 python3 ./test.py -f user/pass_len.py
 
 # table
-#python3 ./test.py -f table/del_stable.py
+# python3 ./test.py -f table/del_stable.py
 
 #query
 python3 ./test.py -f query/filter.py

tests/pytest/table/boundary.py

@@ -141,7 +141,7 @@ class TDTestCase:
         tdSql.prepare()
 
         # 8 bytes for timestamp
-        maxRowSize = 65536 - 8
+        maxRowSize = 65535 - 8
         maxCols = self.getLimitFromSourceCode('TSDB_MAX_COLUMNS') - 1
 
         # for binary cols, 2 bytes are used for length

tests/pytest/tag_lite/change.py

@@ -50,18 +50,18 @@ class TDTestCase:
         # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
         # bool, tgcol2 int)
         tdLog.info(
-            "create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)")
+            "create table ta_ch_mt2 (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)")
         tdSql.execute(
-            'create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)')
+            'create table ta_ch_mt2 (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)')
         # TSIM: sql create table $tb using $mt tags( 1, 2 )
-        tdLog.info("create table tb2 using $mt tags( 1, 2 )")
+        tdLog.info("create table tb2 using ta_ch_mt2 tags( 1, 2 )")
-        tdSql.execute('create table tb2 using $mt tags( 1, 2 )')
+        tdSql.execute('create table tb2 using ta_ch_mt2 tags( 1, 2 )')
         # TSIM: sql insert into $tb values(now, 1)
         tdLog.info("insert into tb2 values(now, 1)")
         tdSql.execute("insert into tb2 values(now, 1)")
         # TSIM: sql select * from $mt where tgcol1 = 1
-        tdLog.info('select * from $mt where tgcol1 = 1')
+        tdLog.info('select * from ta_ch_mt2 where tgcol1 = 1')
-        tdSql.query('select * from $mt where tgcol1 = 1')
+        tdSql.query('select * from ta_ch_mt2 where tgcol1 = 1')
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
@@ -107,18 +107,18 @@ class TDTestCase:
         # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
         # smallint, tgcol2 tinyint)
         tdLog.info(
-            "create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)")
+            "create table ta_ch_mt3 (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)")
         tdSql.execute(
-            'create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)')
+            'create table ta_ch_mt3 (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)')
         # TSIM: sql create table $tb using $mt tags( 1, 2 )
-        tdLog.info("create table tb3 using $mt tags( 1, 2 )")
+        tdLog.info("create table tb3 using ta_ch_mt3 tags( 1, 2 )")
-        tdSql.execute('create table tb3 using $mt tags( 1, 2 )')
+        tdSql.execute('create table tb3 using ta_ch_mt3 tags( 1, 2 )')
         # TSIM: sql insert into $tb values(now, 1)
         tdLog.info("insert into tb3 values(now, 1)")
         tdSql.execute("insert into tb3 values(now, 1)")
         # TSIM: sql select * from $mt where tgcol1 = 1
-        tdLog.info('select * from $mt where tgcol1 = 1')
+        tdLog.info('select * from ta_ch_mt3 where tgcol1 = 1')
-        tdSql.query('select * from $mt where tgcol1 = 1')
+        tdSql.query('select * from ta_ch_mt3 where tgcol1 = 1')
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
@@ -151,18 +151,18 @@ class TDTestCase:
         # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
         # bigint, tgcol2 float)
         tdLog.info(
-            "create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)")
+            "create table ta_ch_mt4 (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)")
         tdSql.execute(
-            'create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)')
+            'create table ta_ch_mt4 (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)')
         # TSIM: sql create table $tb using $mt tags( 1, 2 )
-        tdLog.info("create table tb4 using $mt tags( 1, 2 )")
+        tdLog.info("create table tb4 using ta_ch_mt4 tags( 1, 2 )")
-        tdSql.execute('create table tb4 using $mt tags( 1, 2 )')
+        tdSql.execute('create table tb4 using ta_ch_mt4 tags( 1, 2 )')
         # TSIM: sql insert into $tb values(now, 1)
         tdLog.info("insert into tb4 values(now, 1)")
         tdSql.execute("insert into tb4 values(now, 1)")
         # TSIM: sql select * from $mt where tgcol1 = 1
-        tdLog.info('select * from $mt where tgcol1 = 1')
+        tdLog.info('select * from ta_ch_mt4 where tgcol1 = 1')
-        tdSql.query('select * from $mt where tgcol1 = 1')
+        tdSql.query('select * from ta_ch_mt4 where tgcol1 = 1')
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
@@ -195,18 +195,18 @@ class TDTestCase:
         # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
         # double, tgcol2 binary(10))
         tdLog.info(
-            "create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))")
+            "create table ta_ch_mt5 (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))")
         tdSql.execute(
-            'create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))')
+            'create table ta_ch_mt5 (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))')
         # TSIM: sql create table $tb using $mt tags( 1, '2' )
-        tdLog.info("create table tb5 using $mt tags( 1, '2' )")
+        tdLog.info("create table tb5 using ta_ch_mt5 tags( 1, '2' )")
-        tdSql.execute('create table tb5 using $mt tags( 1, '2' )')
+        tdSql.execute("create table tb5 using ta_ch_mt5 tags( 1, '2' )")
         # TSIM: sql insert into $tb values(now, 1)
         tdLog.info("insert into tb5 values(now, 1)")
         tdSql.execute("insert into tb5 values(now, 1)")
         # TSIM: sql select * from $mt where tgcol2 = '2'
-        tdLog.info('select * from $mt where tgcol2 = '2'')
+        tdLog.info("select * from ta_ch_mt5 where tgcol2 = '2'")
-        tdSql.query('select * from $mt where tgcol2 = '2'')
+        tdSql.query("select * from ta_ch_mt5 where tgcol2 = '2'")
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
@@ -239,18 +239,18 @@ class TDTestCase:
         # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
         # binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5
         # double, tgcol6 binary(20))
-        tdLog.info("create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))")
+        tdLog.info("create table ta_ch_mt6 (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))")
         tdSql.execute(
-            'create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))')
+            'create table ta_ch_mt6 (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))')
         # TSIM: sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-        tdLog.info("create table tb6 using $mt tags( '1', 2, 3, '4', 5, '6' )")
+        tdLog.info("create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
-        tdSql.execute('create table tb6 using $mt tags( '1', 2, 3, '4', 5, '6' )')
+        tdSql.execute("create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
         # TSIM: sql insert into $tb values(now, 1)
         tdLog.info("insert into tb6 values(now, 1)")
         tdSql.execute("insert into tb6 values(now, 1)")
         # TSIM: sql select * from $mt where tgcol1 = '1'
-        tdLog.info('select * from $mt where tgcol1 = '1'')
+        tdLog.info("select * from ta_ch_mt6 where tgcol1 = '1'")
-        tdSql.query('select * from $mt where tgcol1 = '1'')
+        tdSql.query("select * from ta_ch_mt6 where tgcol1 = '1'")
         # TSIM: if $rows != 1 then
         tdLog.info('tdSql.checkRow(1)')
         tdSql.checkRows(1)
@@ -312,19 +312,19 @@ class TDTestCase:
         # TSIM: $tb = $tbPrefix . $i
         # TSIM:
         # TSIM: sql select * from $mt where tgcol1 = 1 -x step24
-        tdLog.info('select * from $mt where tgcol1 = 1 -x step24')
+        tdLog.info('select * from ta_ch_mt2 where tgcol1 = 1 -x step24')
-        tdSql.error('select * from $mt where tgcol1 = 14')
+        tdSql.error('select * from ta_ch_mt2 where tgcol1 = 14')
         # TSIM: return -1
         # TSIM: step24:
         # TSIM: sql select * from $mt where tgcol2 = 1 -x step25
-        tdLog.info('select * from $mt where tgcol2 = 1 -x step25')
+        tdLog.info('select * from ta_ch_mt2 where tgcol2 = 1 -x step25')
-        tdSql.error('select * from $mt where tgcol2 = 15')
+        tdSql.error('select * from ta_ch_mt2 where tgcol2 = 15')
         # TSIM: return -1
         # TSIM: step25:
         # TSIM:
         # TSIM: sql select * from $mt where tgcol3 = 1
-        tdLog.info('select * from $mt where tgcol3 = 1')
+        tdLog.info('select * from ta_ch_mt2 where tgcol3 = 1')
-        tdSql.query('select * from $mt where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt2 where tgcol3 = 1')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -349,8 +349,8 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select * from $mt where tgcol4 = 2
-        tdLog.info('select * from $mt where tgcol4 = 2')
+        tdLog.info('select * from ta_ch_mt2 where tgcol4 = 2')
-        tdSql.query('select * from $mt where tgcol4 = 2')
+        tdSql.query('select * from ta_ch_mt2 where tgcol4 = 2')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -381,19 +381,19 @@ class TDTestCase:
         # TSIM: $tb = $tbPrefix . $i
         # TSIM:
         # TSIM: sql select * from $mt where tgcol1 = 1 -x step31
-        tdLog.info('select * from $mt where tgcol1 = 1 -x step31')
+        tdLog.info('select * from ta_ch_mt3 where tgcol1 = 1 -x step31')
-        tdSql.error('select * from $mt where tgcol1 = 11')
+        tdSql.error('select * from ta_ch_mt3 where tgcol1 = 11')
         # TSIM: return -1
         # TSIM: step31:
         # TSIM: sql select * from $mt where tgcol2 = 1 -x step32
-        tdLog.info('select * from $mt where tgcol2 = 1 -x step32')
+        tdLog.info('select * from ta_ch_mt3 where tgcol2 = 1 -x step32')
-        tdSql.error('select * from $mt where tgcol2 = 12')
+        tdSql.error('select * from ta_ch_mt3 where tgcol2 = 12')
         # TSIM: return -1
         # TSIM: step32:
         # TSIM:
         # TSIM: sql select * from $mt where tgcol3 = 1
-        tdLog.info('select * from $mt where tgcol3 = 1')
+        tdLog.info('select * from ta_ch_mt3 where tgcol3 = 1')
-        tdSql.query('select * from $mt where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt3 where tgcol3 = 1')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -450,19 +450,19 @@ class TDTestCase:
         # TSIM: $tb = $tbPrefix . $i
         # TSIM:
         # TSIM: sql select * from $mt where tgcol1 = 1 -x step41
-        tdLog.info('select * from $mt where tgcol1 = 1 -x step41')
+        tdLog.info('select * from ta_ch_mt4 where tgcol1 = 1 -x step41')
-        tdSql.error('select * from $mt where tgcol1 = 11')
+        tdSql.error('select * from ta_ch_mt4 where tgcol1 = 11')
         # TSIM: return -1
         # TSIM: step41:
         # TSIM: sql select * from $mt where tgcol2 = 1 -x step42
-        tdLog.info('select * from $mt where tgcol2 = 1 -x step42')
+        tdLog.info('select * from ta_ch_mt4 where tgcol2 = 1 -x step42')
-        tdSql.error('select * from $mt where tgcol2 = 12')
+        tdSql.error('select * from ta_ch_mt4 where tgcol2 = 12')
         # TSIM: return -1
         # TSIM: step42:
         # TSIM:
         # TSIM: sql select * from $mt where tgcol3 = 1
-        tdLog.info('select * from $mt where tgcol3 = 1')
+        tdLog.info('select * from ta_ch_mt4 where tgcol3 = 1')
-        tdSql.query('select * from $mt where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt4 where tgcol3 = 1')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -487,8 +487,8 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select * from $mt where tgcol4 = 2
-        tdLog.info('select * from $mt where tgcol4 = 2')
+        tdLog.info('select * from ta_ch_mt4 where tgcol4 = 2')
-        tdSql.query('select * from $mt where tgcol4 = 2')
+        tdSql.query('select * from ta_ch_mt4 where tgcol4 = 2')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -519,19 +519,19 @@ class TDTestCase:
         # TSIM: $tb = $tbPrefix . $i
         # TSIM:
         # TSIM: sql select * from $mt where tgcol1 = 1 -x step51
-        tdLog.info('select * from $mt where tgcol1 = 1 -x step51')
+        tdLog.info('select * from ta_ch_mt5 where tgcol1 = 1 -x step51')
-        tdSql.error('select * from $mt where tgcol1 = 11')
+        tdSql.error('select * from ta_ch_mt5 where tgcol1 = 11')
         # TSIM: return -1
         # TSIM: step51:
         # TSIM: sql select * from $mt where tgcol2 = 1 -x step52
-        tdLog.info('select * from $mt where tgcol2 = 1 -x step52')
+        tdLog.info('select * from ta_ch_mt5 where tgcol2 = 1 -x step52')
-        tdSql.error('select * from $mt where tgcol2 = 12')
+        tdSql.error('select * from ta_ch_mt5 where tgcol2 = 12')
         # TSIM: return -1
         # TSIM: step52:
         # TSIM:
         # TSIM: sql select * from $mt where tgcol3 = 1
-        tdLog.info('select * from $mt where tgcol3 = 1')
+        tdLog.info('select * from ta_ch_mt5 where tgcol3 = 1')
-        tdSql.query('select * from $mt where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt5 where tgcol3 = 1')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -556,8 +556,8 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select * from $mt where tgcol4 = '2'
-        tdLog.info('select * from $mt where tgcol4 = '2'')
+        tdLog.info("select * from ta_ch_mt5 where tgcol4 = '2'")
-        tdSql.query('select * from $mt where tgcol4 = '2'')
+        tdSql.query("select * from ta_ch_mt5 where tgcol4 = '2'")
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -588,39 +588,39 @@ class TDTestCase:
         # TSIM: $tb = $tbPrefix . $i
         # TSIM:
         # TSIM: sql select * from $mt where tgcol1 = 1 -x step61
-        tdLog.info('select * from $mt where tgcol1 = 1 -x step61')
+        tdLog.info('select * from ta_ch_mt6 where tgcol1 = 1 -x step61')
-        tdSql.error('select * from $mt where tgcol1 = 11')
+        tdSql.error('select * from ta_ch_mt6 where tgcol1 = 11')
         # TSIM: return -1
         # TSIM: step61:
         # TSIM: sql select * from $mt where tgcol2 = 1 -x step62
-        tdLog.info('select * from $mt where tgcol2 = 1 -x step62')
+        tdLog.info('select * from ta_ch_mt6 where tgcol2 = 1 -x step62')
-        tdSql.error('select * from $mt where tgcol2 = 12')
+        tdSql.error('select * from ta_ch_mt6 where tgcol2 = 12')
         # TSIM: return -1
         # TSIM: step62:
         # TSIM: sql select * from $mt where tgcol3 = 1 -x step63
-        tdLog.info('select * from $mt where tgcol3 = 1 -x step63')
+        tdLog.info('select * from ta_ch_mt6 where tgcol3 = 1 -x step63')
-        tdSql.error('select * from $mt where tgcol3 = 13')
+        tdSql.error('select * from ta_ch_mt6 where tgcol3 = 13')
         # TSIM: return -1
         # TSIM: step63:
         # TSIM: sql select * from $mt where tgcol4 = 1 -x step64
-        tdLog.info('select * from $mt where tgcol4 = 1 -x step64')
+        tdLog.info('select * from ta_ch_mt6 where tgcol4 = 1 -x step64')
-        tdSql.error('select * from $mt where tgcol4 = 14')
+        tdSql.error('select * from ta_ch_mt6 where tgcol4 = 14')
         # TSIM: return -1
         # TSIM: step64:
         # TSIM: sql select * from $mt where tgcol5 = 1 -x step65
-        tdLog.info('select * from $mt where tgcol5 = 1 -x step65')
+        tdLog.info('select * from ta_ch_mt6 where tgcol5 = 1 -x step65')
-        tdSql.error('select * from $mt where tgcol5 = 15')
+        tdSql.error('select * from ta_ch_mt6 where tgcol5 = 15')
         # TSIM: return -1
         # TSIM: step65:
         # TSIM: sql select * from $mt where tgcol6 = 1 -x step66
-        tdLog.info('select * from $mt where tgcol6 = 1 -x step66')
+        tdLog.info('select * from ta_ch_mt6 where tgcol6 = 1 -x step66')
-        tdSql.error('select * from $mt where tgcol6 = 16')
+        tdSql.error('select * from ta_ch_mt6 where tgcol6 = 16')
         # TSIM: return -1
         # TSIM: step66:
         # TSIM:
         # TSIM: sql select * from $mt where tgcol7 = '1'
-        tdLog.info('select * from $mt where tgcol7 = '1'')
+        tdLog.info("select * from ta_ch_mt6 where tgcol7 = '1'")
-        tdSql.query('select * from $mt where tgcol7 = '1'')
+        tdSql.query("select * from ta_ch_mt6 where tgcol7 = '1'")
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -665,8 +665,8 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select * from $mt where tgcol8 = 2
-        tdLog.info('select * from $mt where tgcol8 = 2')
+        tdLog.info('select * from ta_ch_mt6 where tgcol8 = 2')
-        tdSql.query('select * from $mt where tgcol8 = 2')
+        tdSql.query('select * from ta_ch_mt6 where tgcol8 = 2')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -711,8 +711,8 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select * from $mt where tgcol9 = '4'
-        tdLog.info('select * from $mt where tgcol9 = '4'')
+        tdLog.info("select * from ta_ch_mt6 where tgcol9 = '4'")
-        tdSql.query('select * from $mt where tgcol9 = '4'')
+        tdSql.query("select * from ta_ch_mt6 where tgcol9 = '4'")
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -757,8 +757,8 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select * from $mt where tgcol10 = 5
-        tdLog.info('select * from $mt where tgcol10 = 5')
+        tdLog.info('select * from ta_ch_mt6 where tgcol10 = 5')
-        tdSql.query('select * from $mt where tgcol10 = 5')
+        tdSql.query('select * from ta_ch_mt6 where tgcol10 = 5')
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then
@@ -803,8 +803,8 @@ class TDTestCase:
         # TSIM: endi
         # TSIM:
         # TSIM: sql select * from $mt where tgcol11 = '6'
-        tdLog.info('select * from $mt where tgcol11 = '6'')
+        tdLog.info("select * from ta_ch_mt6 where tgcol11 = '6'")
-        tdSql.query('select * from $mt where tgcol11 = '6'')
+        tdSql.query("select * from ta_ch_mt6 where tgcol11 = '6'")
         # TSIM: print $data01 $data02 $data03
         tdLog.info('$data01 $data02 $data03')
         # TSIM: if $rows != 1 then

tests/script/general/cache/restart_metrics.sim

@@ -50,6 +50,7 @@ endi
 
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
+sleep 5000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 10

tests/script/general/cache/restart_table.sim

@@ -34,6 +34,7 @@ endi
 
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
+sleep 5000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 10

tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim

@@ -0,0 +1,105 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table to max tables
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 16
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step3: create one table, should return error for not more vnode
+sql_error create table tbm using $stb tags( 10000 )
+
+
+
+
+
+
+
+

tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim

@@ -0,0 +1,105 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table to max tables
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 16
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step3: drop dnode4, should return error for not more dnode
+sql_error drop dnode $hostname4
+
+
+
+
+
+
+
+

tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim

@@ -0,0 +1,309 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3 maxTables $totalTableNum
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: drop the middle table 5
+sql drop table tb5
+$totalRows = $totalRows - 10
+sleep 6000
+
+print ============== step4: insert data into other tables
+$tsStart = 1420041610000
+$i = 0
+$tblNum = 5
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+$i = 6
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step5: create the middle table 5 and insert data
+sql create table tb5 using $stb tags( 5 )
+sleep 3000
+
+$tsStart = 1420041620000
+$i = 5
+$tblNum = 6
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql select count(*) from tb5
+print data00 $data00
+if $data00 != 10 then
+	return -1
+endi
+
+print ============== step6: drop the first table 0
+sql drop table tb0
+$totalRows = $totalRows - 20
+sleep 6000
+
+print ============== step7: insert data into other tables
+$tsStart = 1420041630000
+$i = 1
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+sql select count(*) from tb5
+print data00 $data00
+if $data00 != 20 then
+	return -1
+endi
+
+print ============== step8: create the first table 0 and insert data
+sql create table tb0 using $stb tags( 0 )
+sleep 3000
+
+$tsStart = 1420041640000
+$i = 0
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql select count(*) from tb0
+print data00 $data00
+if $data00 != 10 then
+	return -1
+endi
+
+print ============== step9: drop the last table 9
+sql drop table tb9
+$totalRows = $totalRows - 40
+sleep 6000
+
+print ============== step10: insert data into other tables
+$tsStart = 1420041650000
+$i = 0
+$tblNum = 9
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step11: create the last table 9 and insert data
+sql create table tb9 using $stb tags( 9 )
+sleep 3000
+
+$tsStart = 1420041660000
+$i = 0
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql select count(*) from tb9
+print data00 $data00
+if $data00 != 10 then
+	return -1
+endi

tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim

@@ -0,0 +1,168 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1 
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode5 -c offlineThreshold -v 10
+
+system sh/cfg.sh -n dnode1 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode2 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode3 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode5 -c enableCoreFile -v 1
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster, then create database, create table , and insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$rowNum = 10
+$tblNum = 16
+$totalRows = 0
+$tsStart = 1420041600000
+
+$db = db
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+print       info: select count(*) from $stb
+sleep 1000
+sql reset query cache
+sleep 1000
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  return -1
+endi
+
+print ============== step3: stop dnode4, after timerout dnode4 will be auto-dropped. 
+### The script using down port to stop the network is invalid, so temp it stops the service instead
+system sh/exec.sh -n dnode4 -s stop
+#system sh/port.sh -p 7400 -s down
+sleep 12000
+
+wait_dnode4_dropped:
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode4, but there no dnode4 in cluster 
+system sh/exec.sh -n dnode4 -s start
+sql show dnodes
+if $rows != 3 then
+  return -1
+endi
+

tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim

@@ -55,7 +55,7 @@ sql create dnode $hostname3
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 10000
+$totalTableNum = 1000
 $sleepTimer = 10000
 
 $db = db
@@ -133,5 +133,3 @@ if $data00 != $totalRows then
 	return -1
 endi
 
-print      drop dnode $hostname3, return error: not drop dnode for repica is 2, need 2 dnodes.
-sql_error drop dnode $hostname3

tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim

@@ -0,0 +1,224 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1 
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode5 -c offlineThreshold -v 10
+
+system sh/cfg.sh -n dnode1 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode2 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode3 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode5 -c enableCoreFile -v 1
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster, then create database, create table , and insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$rowNum = 10
+$tblNum = 16
+$totalRows = 0
+$tsStart = 1420041600000
+
+$db = db
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+print       info: select count(*) from $stb
+sleep 1000
+sql reset query cache
+sleep 1000
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  return -1
+endi
+
+print ============== step3: stop dnode4, after timerout dnode4 will be auto-dropped. 
+system sh/exec.sh -n dnode4 -s stop
+sleep 12000
+
+wait_dnode4_dropped:
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode4, but there are not dnode4 in cluster 
+system sh/exec.sh -n dnode4 -s start
+sleep 3000
+sql show dnodes
+if $rows != 3 then
+  return -1
+endi
+
+print ============== step5: recreate dnode4 into cluster, result should fail
+sql create dnode $hostname4
+sleep 12000
+sql show dnodes
+if $rows != 3 then
+  return -1
+endi
+
+print ============== step5: remove dnode4 director, then recreate dnode4 into cluster, result should success
+system sh/exec.sh -n dnode4 -s stop
+system rm -rf ../../../sim/dnode4
+
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1
+
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname4
+sleep 6000
+
+wait_dnode4_ready:
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_6 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi

tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim

@@ -59,7 +59,7 @@ $totalTableNum = 100
 $sleepTimer = 3000
 
 $db = db
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 2 maxTables $totalTableNum
 sql use $db
 
 # create table , insert data
@@ -168,7 +168,7 @@ $dnode4Status = $data4_4
 
 if $dnode3Status != ready then
   sleep 2000
-  goto wait_dnode4_reready
+  goto wait_dnode3_reready
 endi
 
 sql select count(*) from $stb
@@ -213,8 +213,8 @@ print show vgroups:
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
-$dnode2Vtatus = $data4_2
+$dnode2Vtatus = $data7_2
-$dnode3Vtatus = $data7_2
+$dnode3Vtatus = $data4_2
 
 if $dnode2Vtatus != offline then
   sleep 2000

tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim

@@ -59,7 +59,7 @@ $totalTableNum = 100
 $sleepTimer = 3000
 
 $db = db
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 2 maxTables $totalTableNum
 sql use $db
 
 # create table , insert data
@@ -141,8 +141,8 @@ print show vgroups:
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
 print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
-$dnode2Vtatus = $data4_2
+$dnode2Vtatus = $data7_2
-$dnode3Vtatus = $data7_2
+$dnode3Vtatus = $data4_2
 
 if $dnode2Vtatus != offline then
   sleep 2000

tests/script/unique/arbitrator/dn3_mn2_killDnode.sim

@@ -0,0 +1,126 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+#system sh/cfg.sh -n dnode1 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 3, and create table to max tables
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+#system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sleep 3000
+sql create dnode $hostname3
+#sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 4
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00:$data00  totalRows:$totalRows
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step3: stop dnode2
+system sh/exec.sh -n dnode2 -s stop
+sleep 3000
+
+sql show mnodes
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$mnode1Status = $data2_1  
+$mnode2Status = $data2_2
+$mnode3Status = $data2_3  
+#$mnode4Status = $data2_4 
+
+if $mnode1Status != master then
+	return -1
+endi
+
+if $mnode2Status != offline then
+	return -1
+endi
+
+sql reset query cache
+sql select count(*) from $stb
+print data00:$data00  totalRows:$totalRows
+if $data00 != $totalRows then
+	return -1
+endi
+
+

tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim

@@ -47,7 +47,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
 system sh/exec.sh -n dnode2 -s start
 #system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
@@ -60,13 +60,13 @@ $totalTableNum = 100
 $sleepTimer = 3000
 
 $db = db
-print create database $db replica 3 maxTables $totalTableNum
+print create database $db replica 2 maxTables $totalTableNum
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 2 maxTables $totalTableNum
 sql use $db
 
 # create table , insert data
 $stb = stb
-sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int)
 $rowNum = 500
 $tblNum = $totalTableNum
 $totalRows = 0
@@ -81,8 +81,8 @@ while $i < $tblNum
   $x = 0
   while $x < $rowNum
     $ts = $tsStart + $x
-    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
-    $x = $x + 60
+    $x = $x + 20
   endw 
   $totalRows = $totalRows + $x
   print       info: inserted $x rows into $tb and totalRows: $totalRows
@@ -113,8 +113,8 @@ print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != offline then
@@ -151,7 +151,7 @@ sql alter table $stb add column f1 double
 $i = 0
 while $i < $tblNum
   $tb = tb . $i
-  sql inset into $tb values (now, 10001) (now + 1s, 10002) (now + 2s, 10003) (now + 3s, 10004)
+  sql insert into $tb values (now, 10001, 1.0001) (now + 1s, 10002, 1.0002) (now + 2s, 10003, 1.0003) (now + 3s, 10004, 1.0004)
   $i = $i + 1
 endw 
 $addRows = 4 * $tblNum
@@ -174,8 +174,8 @@ print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 #$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != ready then

tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim

@@ -0,0 +1,232 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+#system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+#system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+$maxTables = $totalTableNum * 2
+
+$db = db
+print create database $db replica 2 maxTables $maxTables
+sql create database $db replica 2 maxTables $maxTables
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+wait_dnode4_offline_0:
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+wait_dnode4_vgroup_offline:
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data4_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: alter table and tag, then drop all sub tables, recreate som subtable and insert more data rows
+sql alter table $stb drop column c1
+sql alter table $stb add column f1 double
+
+sql alter table $stb add tag t2 int
+sql alter table $stb add tag t3 int
+sql alter table $stb drop tag t1
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql drop table $tb
+  $i = $i + 1
+endw 
+
+$totalRows = 0
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+wait_dnode4_ready:
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00 totalRows: $totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+

tests/script/unique/arbitrator/offline_replica2_createTable_online.sim

@@ -47,7 +47,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
 system sh/exec.sh -n dnode2 -s start
 #system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
@@ -59,9 +59,11 @@ sleep 3000
 $totalTableNum = 100
 $sleepTimer = 3000
 
+$maxTables = $totalTableNum * 2
+
 $db = db
-print create database $db replica 3 maxTables $totalTableNum
+print create database $db replica 2 maxTables $maxTables
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 2 maxTables $maxTables
 sql use $db
 
 # create table , insert data
@@ -113,8 +115,8 @@ print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != offline then
@@ -186,8 +188,8 @@ print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 #$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != ready then

tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim

@@ -113,8 +113,8 @@ print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != offline then

tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim

@@ -47,7 +47,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
 system sh/exec.sh -n dnode2 -s start
 #system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
@@ -60,8 +60,8 @@ $totalTableNum = 100
 $sleepTimer = 3000
 
 $db = db
-print create database $db replica 3 maxTables $totalTableNum
+print create database $db replica 2 maxTables $totalTableNum
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 2 maxTables $totalTableNum
 sql use $db
 
 # create table , insert data
@@ -113,8 +113,8 @@ print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != offline then
@@ -172,8 +172,8 @@ print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 #$dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != ready then

tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim

@@ -66,7 +66,7 @@ sql use $db
 
 # create table , insert data
 $stb = stb
-sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int)
 $rowNum = 500
 $tblNum = $totalTableNum
 $totalRows = 0
@@ -81,8 +81,8 @@ while $i < $tblNum
   $x = 0
   while $x < $rowNum
     $ts = $tsStart + $x
-    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
-    $x = $x + 60
+    $x = $x + 20
   endw 
   $totalRows = $totalRows + $x
   print       info: inserted $x rows into $tb and totalRows: $totalRows
@@ -151,7 +151,7 @@ sql alter table $stb add column f1 double
 $i = 0
 while $i < $tblNum
   $tb = tb . $i
-  sql inset into $tb values (now, 10001) (now + 1s, 10002) (now + 2s, 10003) (now + 3s, 10004)
+  sql insert into $tb values (now, 10001, 1.0001) (now + 1s, 10002, 1.0002) (now + 2s, 10003, 1.0003) (now + 3s, 10004, 1.0004)
   $i = $i + 1
 endw 
 $addRows = 4 * $tblNum

tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim

@@ -0,0 +1,232 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+#system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+#system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+$maxTables = $totalTableNum * 2
+
+$db = db
+print create database $db replica 3 maxTables $maxTables
+sql create database $db replica 3 maxTables $maxTables
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+wait_dnode4_offline_0:
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+wait_dnode4_vgroup_offline:
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data4_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: alter table and tag, then drop all sub tables, recreate som subtable and insert more data rows
+sql alter table $stb drop column c1
+sql alter table $stb add column f1 double
+
+sql alter table $stb add tag t2 int
+sql alter table $stb add tag t3 int
+sql alter table $stb drop tag t1
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql drop table $tb
+  $i = $i + 1
+endw 
+
+$totalRows = 0
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+wait_dnode4_ready:
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00 totalRows: $totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+

tests/script/unique/arbitrator/offline_replica3_createTable_online.sim

@@ -58,10 +58,11 @@ sleep 3000
 
 $totalTableNum = 100
 $sleepTimer = 3000
+$maxTables = $totalTableNum * 2
 
 $db = db
-print create database $db replica 3 maxTables $totalTableNum
+print create database $db replica 3 maxTables $maxTables
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 3 maxTables $maxTables
 sql use $db
 
 # create table , insert data

tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim

@@ -47,7 +47,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
 system sh/exec.sh -n dnode2 -s start
 #system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
@@ -56,12 +56,12 @@ sql create dnode $hostname2
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
-print create database $db replica 3 maxTables $totalTableNum
+print create database $db replica 2 maxTables $totalTableNum
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 2 maxTables $totalTableNum
 sql use $db
 
 # create table , insert data
@@ -113,8 +113,8 @@ print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != offline then
@@ -162,7 +162,7 @@ while $i < $tblNum
 endw 
 
 sql select count(*) from $stb
-print data00 $data00
+print data00:$data00   totalRows:$totalRows 
 if $data00 != $totalRows then
 	return -1
 endi
@@ -172,8 +172,8 @@ system sh/exec.sh -n dnode4 -s start
 run_back unique/arbitrator/sync_replica_alterTable_background_add.sim
 
 print ============== step6: check result
-#in background.sim, add one column and insert 200 rows
+#in background.sim, add one column and insert 36 rows
-$totalRows = $totalRows + 200
+$totalRows = $totalRows + 36
 
 $cnt = 0
 wait_table_altered:
@@ -183,7 +183,7 @@ if $cnt == 20 then
 endi
 sql select count(*) from $stb
 if $data00 != $totalRows then
-  print data00: $data00
+  print data00:$data00   totalRows:$totalRows 
 	sleep 2000
 	goto wait_table_altered
 endi

tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim

@@ -47,7 +47,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
 system sh/exec.sh -n dnode2 -s start
 #system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
@@ -56,12 +56,12 @@ sql create dnode $hostname2
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
-print create database $db replica 3 maxTables $totalTableNum
+print create database $db replica 2 maxTables $totalTableNum
-sql create database $db replica 3 maxTables $totalTableNum
+sql create database $db replica 2 maxTables $totalTableNum
 sql use $db
 
 # create table , insert data
@@ -113,8 +113,8 @@ print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != offline then
@@ -173,7 +173,7 @@ run_back unique/arbitrator/sync_replica_alterTable_background_drop.sim
 
 print ============== step6: check result
 #in background.sim, drop one column and add one new column, then insert 200 rows
-$totalRows = $totalRows + 200
+$totalRows = $totalRows + 36
 
 $cnt = 0
 wait_table_altered:

tests/script/unique/arbitrator/sync_replica2_dropDb.sim

@@ -56,7 +56,7 @@ sql create dnode $hostname2
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
@@ -113,8 +113,8 @@ print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
 #print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
-$dnode3Status = $data4_3  
+#$dnode3Status = $data4_3  
-$dnode4Status = $data4_4 
+$dnode4Status = $data4_3 
 #$dnode5Status = $data4_5
 
 if $dnode4Status != offline then

tests/script/unique/arbitrator/sync_replica2_dropTable.sim

@@ -56,7 +56,7 @@ sql create dnode $hostname2
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
@@ -162,18 +162,18 @@ while $i < $tblNum
 endw 
 
 sql select count(*) from $stb
-print data00 $data00
+print data00:$data00  totalRows:$totalRows
 if $data00 != $totalRows then
 	return -1
 endi
 
-print ============== step5: restart dnode4, while drop database in other thead when dnode4 is syncing
+print ============== step5: restart dnode4, while drop some tables in other thread when dnode4 is syncing
 system sh/exec.sh -n dnode4 -s start
 run_back unique/arbitrator/sync_replica_dropTable_background.sim
 
 print ============== step6: check result
-#in background.sim, drop 10 tables
+#in background.sim, drop 5 tables
-$totalRows = $totalRows - 10800
+$totalRows = $totalRows - 5400
 
 $cnt = 0
 wait_table_dropped:
@@ -183,15 +183,15 @@ if $cnt == 20 then
 endi
 sql select count(*) from $stb
 if $data00 != $totalRows then
-  print data00: $data00
+  print data00:$data00  totalRows:$totalRows
 	sleep 2000
 	goto wait_table_dropped
 endi
 
-$tblNum = $tblNum - 10
+$tblNum = $tblNum - 5
 sql select count(tbname) from $stb
 if $data00 != $tblNum then
-  print data00: $data00
+  print data00: $data00   tblNum: $tblNum
 	sleep 2000
 	goto wait_table_dropped
 endi

tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim

@@ -56,7 +56,7 @@ sql create dnode $hostname3
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
@@ -173,7 +173,7 @@ run_back unique/arbitrator/sync_replica_alterTable_background_add.sim
 
 print ============== step6: check result
 #in background.sim, add one column and insert 200 rows
-$totalRows = $totalRows + 200
+$totalRows = $totalRows + 36
 
 $cnt = 0
 wait_table_altered:

tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim

@@ -56,7 +56,7 @@ sql create dnode $hostname3
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
@@ -172,8 +172,8 @@ system sh/exec.sh -n dnode4 -s start
 run_back unique/arbitrator/sync_replica_alterTable_background_drop.sim
 
 print ============== step6: check result
-#in background.sim, drop one column and add one new column, then insert 200 rows
+#in background.sim, drop one column and add one new column, then insert 36 rows
-$totalRows = $totalRows + 200
+$totalRows = $totalRows + 36
 
 $cnt = 0
 wait_table_altered:

tests/script/unique/arbitrator/sync_replica3_dropDb.sim

@@ -56,7 +56,7 @@ sql create dnode $hostname3
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db

tests/script/unique/arbitrator/sync_replica3_dropTable.sim

@@ -56,7 +56,7 @@ sql create dnode $hostname3
 sql create dnode $hostname4
 sleep 3000
 
-$totalTableNum = 100
+$totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
@@ -143,7 +143,7 @@ if $dnode3Vtatus != master then
   sleep 2000
   goto wait_dnode4_vgroup_offline
 endi
-
+sleep 2000
 print ============== step4: insert more data rows
 $tsStart = $tsEnd + 1000
 $i = 0
@@ -173,7 +173,7 @@ run_back unique/arbitrator/sync_replica_dropTable_background.sim
 
 print ============== step6: check result
 #in background.sim, drop 10 tables
-$totalRows = $totalRows - 10800
+$totalRows = $totalRows - 5400
 
 $cnt = 0
 wait_table_dropped:
@@ -188,7 +188,7 @@ if $data00 != $totalRows then
 	goto wait_table_dropped
 endi
 
-$tblNum = $tblNum - 10
+$tblNum = $tblNum - 5
 sql select count(tbname) from $stb
 if $data00 != $tblNum then
   print data00: $data00

tests/script/unique/arbitrator/sync_replica_alterTable_background_add.sim

@@ -3,7 +3,7 @@ sql connect
 $db = db
 $stb = stb
 print =============== sync_replica_alterTable_background_add.sim step0: alter table and insert data
-$totalTableNum = 100
+$totalTableNum = 10
 
 sql use $db
 
@@ -12,7 +12,7 @@ print alter table $stb add column f1 float
 sql alter table $stb add column f1 float
 
 $tblNum = $totalTableNum
-$alterTblNum = 51
+$alterTblNum = 10
 
 $i = 1
 while $i < $alterTblNum

tests/script/unique/arbitrator/sync_replica_alterTable_background_drop.sim

@@ -8,11 +8,11 @@ $totalTableNum = 100
 sql use $db
 
 #sql create table $stb (ts timestamp, c1 int) tags(t1 int)
-sql alter table $stb drop column c1
 sql alter table $stb add column f1 double
+sql alter table $stb drop column c1
 
 $tblNum = $totalTableNum
-$alterTblNum = 51
+$alterTblNum = 10
 
 $i = 1
 while $i < $alterTblNum

tests/script/unique/arbitrator/sync_replica_dropTable_background.sim

@@ -3,12 +3,12 @@ sql connect
 $db = db
 $stb = stb
 print =============== sync_replica_dropTable_background.sim step0: drop table
-$totalTableNum = 100
+$totalTableNum = 6
 
 sql use $db
 
 $tblNum = $totalTableNum
-$dropTblNum = 11
+$dropTblNum = 6
 
 $i = 1
 while $i < $dropTblNum

tests/script/unique/arbitrator/testSuite.sim

@@ -0,0 +1,36 @@
+run unique/arbitrator/dn2_mn1_cache_file_sync.sim
+run unique/arbitrator/dn2_mn1_cache_file_sync_second.sim
+run unique/arbitrator/dn3_mn1_full_createTableFail.sim
+run unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
+run unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
+run unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
+run unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
+run unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
+run unique/arbitrator/dn3_mn1_replica_change.sim
+run unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
+run unique/arbitrator/dn3_mn1_vnode_change.sim
+run unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
+run unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+####run unique/arbitrator/dn3_mn1_vnode_delDir.sim
+run unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+run unique/arbitrator/dn3_mn2_killDnode.sim
+run unique/arbitrator/insert_duplicationTs.sim
+run unique/arbitrator/offline_replica2_alterTable_online.sim
+run unique/arbitrator/offline_replica2_alterTag_online.sim
+run unique/arbitrator/offline_replica2_createTable_online.sim
+run unique/arbitrator/offline_replica2_dropDb_online.sim
+run unique/arbitrator/offline_replica2_dropTable_online.sim
+run unique/arbitrator/offline_replica3_alterTable_online.sim
+run unique/arbitrator/offline_replica3_alterTag_online.sim
+run unique/arbitrator/offline_replica3_createTable_online.sim
+run unique/arbitrator/offline_replica3_dropDb_online.sim
+run unique/arbitrator/offline_replica3_dropTable_online.sim
+run unique/arbitrator/replica_changeWithArbitrator.sim
+run unique/arbitrator/sync_replica2_alterTable_add.sim
+run unique/arbitrator/sync_replica2_alterTable_drop.sim
+run unique/arbitrator/sync_replica2_dropDb.sim
+run unique/arbitrator/sync_replica2_dropTable.sim
+run unique/arbitrator/sync_replica3_alterTable_add.sim
+run unique/arbitrator/sync_replica3_alterTable_drop.sim
+run unique/arbitrator/sync_replica3_dropDb.sim
+run unique/arbitrator/sync_replica3_dropTable.sim

tests/script/unique/column/replica3.sim

@@ -29,8 +29,8 @@ while $x < 1010
   $x = $x + 1
 endw 
 
-sql_error create database d1 replica 2 wal 0
+sql_error create database d1 replica 2 wallevel 0
-sql create database d2 replica 1 wal 0
+sql_error create database d2 replica 1 wallevel 0
 sql_error alter database d2 replica 2
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/unique/db/replica_add12.sim

@@ -148,25 +148,10 @@ print ========= step5
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 sleep 5000
 
-sql select * from d1.t1
+sql_error select * from d1.t1
-if $rows != 2 then
+sql_error select * from d2.t2
-	return -1
+sql_error select * from d3.t3
-endi
+sql_error select * from d4.t4
-
-sql select * from d2.t2 
-if $rows != 2 then
-	return -1
-endi
-
-sql select * from d3.t3
-if $rows != 2 then
-	return -1
-endi
-
-sql select * from d4.t4
-if $rows != 2 then
-	return -1
-endi
 
 print ===== insert data
 
@@ -175,26 +160,6 @@ sql_error insert into d2.t2 values(now, 3)
 sql_error insert into d3.t3 values(now, 3)
 sql_error insert into d4.t4 values(now, 3)
 
-sql select * from d1.t1
-if $rows != 2 then
-	return -1
-endi
-
-sql select * from d2.t2
-if $rows != 2 then
-	return -1
-endi
-
-sql select * from d3.t3
-if $rows != 2 then
-	return -1
-endi
-
-sql select * from d4.t4
-if $rows != 2 then
-	return -1
-endi
-
 print ========= step6
 system sh/exec.sh -n dnode2 -s start
 sleep 5000
@@ -234,25 +199,10 @@ sql_error insert into d2.t2 values(now, 3)
 sql_error insert into d3.t3 values(now, 3)
 sql_error insert into d4.t4 values(now, 3)
 
-sql select * from d1.t1
+sql_error select * from d1.t1
-if $rows != 3 then
+sql_error select * from d2.t2
-	return -1
+sql_error select * from d3.t3
-endi
+sql_error select * from d4.t4
-
-sql select * from d2.t2
-if $rows != 3 then
-	return -1
-endi
-
-sql select * from d3.t3
-if $rows != 3 then
-	return -1
-endi
-
-sql select * from d4.t4
-if $rows != 3 then
-	return -1
-endi
 
 print ========= step7
 system sh/exec.sh -n dnode3 -s start