Merge pull request #2604 from taosdata/hotfix/test

[TD-876]

src/inc/taoserror.h

@@ -158,6 +158,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION,        0, 0x0382, "mnode inva
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB,               0, 0x0383, "mnode invalid database")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_MONITOR_DB_FORBIDDEN,     0, 0x0384, "mnode monitor db forbidden")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_DATABASES,       0, 0x0385, "mnode too many databases")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_IN_DROPPING,           0, 0x0386, "mnode db in dropping")
 
 // dnode
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_MSG_NOT_PROCESSED,        0, 0x0400, "dnode message not processed")

src/mnode/src/mnodeDb.c

@@ -965,6 +965,11 @@ static int32_t mnodeProcessAlterDbMsg(SMnodeMsg *pMsg) {
     mError("db:%s, failed to alter, invalid db", pAlter->db);
     return TSDB_CODE_MND_INVALID_DB;
   }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pAlter->db, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   return mnodeAlterDb(pMsg->pDb, pAlter, pMsg);
 }

src/mnode/src/mnodeShow.c

@@ -307,6 +307,11 @@ static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
       code = TSDB_CODE_MND_INVALID_DB;
       goto connect_over;
     }
+    
+    if (pDb->status != TSDB_DB_STATUS_READY) {
+      mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+      return TSDB_CODE_MND_DB_IN_DROPPING;
+    }
     mnodeDecDbRef(pDb);
   }
 
@@ -352,6 +357,11 @@ static int32_t mnodeProcessUseMsg(SMnodeMsg *pMsg) {
   if (pMsg->pDb == NULL) {
     code = TSDB_CODE_MND_INVALID_DB;
   }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   return code;
 }
@@ -403,4 +413,4 @@ void mnodeVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_t capa
       memmove(data + pShow->offset[i] * rows, data + pShow->offset[i] * capacity, pShow->bytes[i] * rows);
     }
   }
-}
+}
\ No newline at end of file

src/mnode/src/mnodeTable.c

@@ -116,6 +116,11 @@ static int32_t mnodeChildTableActionInsert(SSdbOper *pOper) {
     mError("ctable:%s, vgId:%d not in db:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName);
     return TSDB_CODE_MND_INVALID_DB;
   }
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
   mnodeDecDbRef(pDb);
 
   SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
@@ -284,8 +289,8 @@ static int32_t mnodeChildTableActionRestored() {
     if (pTable == NULL) break;
 
     SDbObj *pDb = mnodeGetDbByTableId(pTable->info.tableId);
-    if (pDb == NULL) {
-      mError("ctable:%s, failed to get db, discard it", pTable->info.tableId);
+    if (pDb == NULL || pDb->status != TSDB_DB_STATUS_READY) {
+      mError("ctable:%s, failed to get db or db in dropping, discard it", pTable->info.tableId);
       SSdbOper desc = {.type = SDB_OPER_LOCAL, .pObj = pTable, .table = tsChildTableSdb};
       sdbDeleteRow(&desc);
       mnodeDecTableRef(pTable);
@@ -423,7 +428,7 @@ static int32_t mnodeSuperTableActionDestroy(SSdbOper *pOper) {
 static int32_t mnodeSuperTableActionInsert(SSdbOper *pOper) {
   SSuperTableObj *pStable = pOper->pObj;
   SDbObj *pDb = mnodeGetDbByTableId(pStable->info.tableId);
-  if (pDb != NULL) {
+  if (pDb != NULL && pDb->status == TSDB_DB_STATUS_READY) {
     mnodeAddSuperTableIntoDb(pDb);
   }
   mnodeDecDbRef(pDb);
@@ -685,10 +690,15 @@ static int32_t mnodeProcessCreateTableMsg(SMnodeMsg *pMsg) {
   SCMCreateTableMsg *pCreate = pMsg->rpcMsg.pCont;
   
   if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pCreate->db);
-  if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+  if (pMsg->pDb == NULL) {
     mError("app:%p:%p, table:%s, failed to create, db not selected", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pCreate->tableId);
   if (pMsg->pTable != NULL && pMsg->retry == 0) {
@@ -719,10 +729,15 @@ static int32_t mnodeProcessCreateTableMsg(SMnodeMsg *pMsg) {
 static int32_t mnodeProcessDropTableMsg(SMnodeMsg *pMsg) {
   SCMDropTableMsg *pDrop = pMsg->rpcMsg.pCont;
   if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pDrop->tableId);
-  if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) {
-    mError("app:%p:%p, table:%s, failed to drop table, db not selected", pMsg->rpcMsg.ahandle, pMsg, pDrop->tableId);
+  if (pMsg->pDb == NULL) {
+    mError("app:%p:%p, table:%s, failed to drop table, db not selected or db in dropping", pMsg->rpcMsg.ahandle, pMsg, pDrop->tableId);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
     mError("app:%p:%p, table:%s, failed to drop table, in monitor database", pMsg->rpcMsg.ahandle, pMsg,
@@ -757,11 +772,16 @@ static int32_t mnodeProcessTableMetaMsg(SMnodeMsg *pMsg) {
          pInfo->tableId, pMsg->rpcMsg.handle, pInfo->createFlag);
 
   if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pInfo->tableId);
-  if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+  if (pMsg->pDb == NULL) {
     mError("app:%p:%p, table:%s, failed to get table meta, db not selected", pMsg->rpcMsg.ahandle, pMsg,
            pInfo->tableId);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pInfo->tableId);
   if (pMsg->pTable == NULL) {
@@ -1209,6 +1229,11 @@ static int32_t mnodeDropSuperTableColumn(SMnodeMsg *pMsg, char *colName) {
 static int32_t mnodeGetShowSuperTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return TSDB_CODE_MND_DB_NOT_SELECTED;
+    
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   int32_t cols = 0;
   SSchema *pSchema = pMeta->schema;
@@ -1268,6 +1293,11 @@ int32_t mnodeRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows,
 
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return 0;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return 0;
+  }
 
   tstrncpy(prefix, pDb->name, 64);
   strcat(prefix, TS_PATH_DELIMITER);
@@ -2299,7 +2329,7 @@ static int32_t mnodeProcessMultiTableMetaMsg(SMnodeMsg *pMsg) {
     if (pTable == NULL) continue;
 
     if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(tableId);
-    if (pMsg->pDb == NULL) {
+    if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) {
       mnodeDecTableRef(pTable);
       continue;
     }
@@ -2337,6 +2367,11 @@ static int32_t mnodeProcessMultiTableMetaMsg(SMnodeMsg *pMsg) {
 static int32_t mnodeGetShowTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return TSDB_CODE_MND_DB_NOT_SELECTED;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   int32_t cols = 0;
   SSchema *pSchema = pMeta->schema;
@@ -2385,6 +2420,11 @@ static int32_t mnodeGetShowTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void
 static int32_t mnodeRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return 0;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return 0;
+  }
 
   int32_t numOfRows  = 0;
   SChildTableObj *pTable = NULL;
@@ -2476,10 +2516,15 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
          pAlter->tableId, pMsg->rpcMsg.handle);
 
   if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pAlter->tableId);
-  if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+  if (pMsg->pDb == NULL) {
     mError("app:%p:%p, table:%s, failed to alter table, db not selected", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId);
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
     mError("app:%p:%p, table:%s, failed to alter table, its log db", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId);
@@ -2539,6 +2584,11 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
 static int32_t mnodeGetStreamTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return TSDB_CODE_MND_DB_NOT_SELECTED;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   int32_t cols = 0;
   SSchema *pSchema = pMeta->schema;
@@ -2586,7 +2636,11 @@ static int32_t mnodeGetStreamTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, vo
 static int32_t mnodeRetrieveStreamTables(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return 0;
-
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return 0;
+  }
   
   int32_t numOfRows  = 0;
   SChildTableObj *pTable = NULL;

src/mnode/src/mnodeVgroup.c

@@ -75,6 +75,11 @@ static int32_t mnodeVgroupActionInsert(SSdbOper *pOper) {
   if (pDb == NULL) {
     return TSDB_CODE_MND_INVALID_DB;
   }
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   pVgroup->pDb = pDb;
   pVgroup->prev = NULL;
@@ -435,6 +440,11 @@ int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
   if (pDb == NULL) {
     return TSDB_CODE_MND_DB_NOT_SELECTED;
   }
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
 
   int32_t cols = 0;
   SSchema *pSchema = pMeta->schema;
@@ -523,6 +533,11 @@ int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pC
 
   SDbObj *pDb = mnodeGetDb(pShow->db);
   if (pDb == NULL) return 0;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    return 0;
+  }
 
   pVgroup = pDb->pHead;
   while (pVgroup != NULL) {

tests/script/sh/deploy.sh

@@ -110,6 +110,7 @@ echo "second              ${HOSTNAME}:7200" >> $TAOS_CFG
 echo "serverPort          ${NODE}"          >> $TAOS_CFG
 echo "dataDir             $DATA_DIR"      >> $TAOS_CFG
 echo "logDir              $LOG_DIR"       >> $TAOS_CFG
+echo "debugFlag           143"            >> $TAOS_CFG
 echo "mDebugFlag          135"            >> $TAOS_CFG
 echo "sdbDebugFlag        135"            >> $TAOS_CFG
 echo "dDebugFlag          135"            >> $TAOS_CFG

tests/script/unique/cluster/client1_0.sim

+$tblStart = 0
+$tblEnd = 10000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
 sql connect
 
 $db = db1
 $stb = stb1
-print =============== client1_0:
 
 sql use $db
 
-$tblNum = 1000
 
-$i = 1
-while $i < $tblNum
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+
+print ====================== client1_0 create table end, start insert data ............
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
   $tb = tb . $i
-  sql create table $tb using $stb tags ($i, 'abcd')
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
   $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client1_0  insert data complete once ............
+  endi
 endw 

tests/script/unique/cluster/client1_1.sim

+$tblStart = 10000
+$tblEnd = 20000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 

tests/script/unique/cluster/client1_2.sim

+$tblStart = 20000
+$tblEnd = 30000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 

tests/script/unique/cluster/client1_3.sim

+$tblStart = 30000
+$tblEnd = 40000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 

tests/script/unique/cluster/client2_0.sim

+$tblStart = 0
+$tblEnd = 10000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.001
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 

tests/script/unique/cluster/client2_1.sim

+$tblStart = 10000
+$tblEnd = 20000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 

tests/script/unique/cluster/client2_2.sim

+$tblStart = 20000
+$tblEnd = 30000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 

tests/script/unique/cluster/client2_3.sim

+$tblStart = 30000
+$tblEnd = 40000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 

tests/script/unique/cluster/cluster_main.sim

@@ -61,19 +61,29 @@ sql use $db
 
 print ============== step3: create stable stb1
 $stb = stb1
-sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int, t2 binary(8))
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
 
 print ============== step4: start 10 client1/ 10 client2/ 10 client3/ 10 client4/ 1 client5
+#run_back unique/cluster/client_test.sim
 run_back unique/cluster/client1_0.sim
-#run_back unique/cluster/client1_1.sim
-#run_back unique/big_cluster/client1_2.sim
-#run_back unique/big_cluster/client1_3.sim
-#run_back unique/big_cluster/client1_4.sim
-#run_back unique/big_cluster/client1_5.sim
-#run_back unique/big_cluster/client1_6.sim
-#run_back unique/big_cluster/client1_7.sim
-#run_back unique/big_cluster/client1_8.sim
-#run_back unique/big_cluster/client1_9.sim
+run_back unique/cluster/client1_1.sim
+run_back unique/cluster/client1_2.sim
+run_back unique/cluster/client1_3.sim
+run_back unique/cluster/client2_0.sim
+run_back unique/cluster/client2_1.sim
+run_back unique/cluster/client2_2.sim
+run_back unique/cluster/client2_3.sim
+run_back unique/cluster/client3.sim
+run_back unique/cluster/client4.sim
+
+sleep 20000
+wait_subsim_insert_data:
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
 
 
 print wait for a while to let clients start insert data
@@ -81,7 +91,7 @@ sleep 5000
 
 $loop_cnt = 0
 loop_cluster_do:
-print **** **** **** START loop cluster do **** **** **** ****
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
 print ============== step5: start dnode4 and add into cluster, then wait dnode4 ready
 system sh/exec.sh -n dnode4 -s start
 sql create dnode $hostname4
@@ -112,7 +122,7 @@ elif $loop_cnt == 1 then
 elif $loop_cnt == 2 then
   $dnode4Status = $data4_8 
 else then
-  print **** **** **** END loop cluster do 2**** **** **** ****
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
   return
 endi
 
@@ -154,7 +164,7 @@ elif $loop_cnt == 2 then
 elif $loop_cnt == 3 then
   $dnode1Status = $data4_9 
 else then
-  print **** **** **** END loop cluster do 1**** **** **** ****
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
   return
 endi
 
@@ -163,44 +173,124 @@ if $dnode1Status != offline then
   goto wait_dnode1_offline_0
 endi
 
+
+
+$cnt = 0
+wait_mnode1_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+print show mnodes
+sql show mnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_mnode1_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
+$mnode1Status = $data2_1
+$mnode2Status = $data2_2
+$mnode3Status = $data2_3
+$mnode4Status = $data2_4
+
+if $loop_cnt == 0 then
+  $mnode1Status = $data2_1 
+elif $loop_cnt == 1 then
+  $mnode1Status = $data2_5 
+elif $loop_cnt == 2 then
+  $mnode1Status = $data2_7 
+elif $loop_cnt == 3 then
+  $mnode1Status = $data2_9 
+else then
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+  return
+endi
+
+if $mnode1Status != offline then
+  sleep 2000
+  goto wait_mnode1_offline_0
+endi
+
+
+
 sql drop dnode $hostname1
-system rm -rf ../../../sim/dnode1
+system rm -rf ../../../sim/dnode1/data
 
+$cnt = 0
+wait_mnode4_slave_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+print show mnodes
+sql show mnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_mnode4_slave_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
+$mnode1Status = $data2_1
+$mnode2Status = $data2_2
+$mnode3Status = $data2_3
+$mnode4Status = $data2_4
 
-print ============== step7: stop dnode2, because mnodes < 50%, so clusert don't provide services
+if $loop_cnt == 0 then
+  $mnode4Status = $data2_4 
+elif $loop_cnt == 1 then
+  $mnode4Status = $data2_6 
+elif $loop_cnt == 2 then
+  $mnode4Status = $data2_8 
+else then
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+  return
+endi
+
+if $mnode4Status != slave then
+  sleep 2000
+  goto wait_mnode4_slave_0
+endi
+
+print ============== step7: stop dnode2, waiting dnode4 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 
-sql show dnodes -x wait_dnode2_offline_0
+$cnt = 0
+wait_dnode2_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
 if $rows != 3 then
   sleep 2000
   goto wait_dnode2_offline_0
 endi
-wait_dnode2_offline_0:
+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
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
 
-#$cnt = 0
-#wait_dnode2_offline_0:
-#$cnt = $cnt + 1
-#if $cnt == 10 then
-#  return -1
-#endi
-#sql show dnodes -x wait_dnode2_offline_0
-#if $rows != 3 then
-#  sleep 2000
-#  goto wait_dnode2_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
-#$dnode1Status = $data4_1  
-#$dnode2Status = $data4_2
-#$dnode3Status = $data4_3  
-#$dnode4Status = $data4_4 
-#
-#if $dnode2Status != offline then
-#  sleep 2000
-#  goto wait_dnode1_offline_0
-#endi
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+
+sleep 3000
+print show mnodes
+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
 
 print ============== step8: restart dnode2, then wait sync end
 system sh/exec.sh -n dnode2 -s start
@@ -230,9 +320,17 @@ if $dnode2Status != ready then
   goto wait_dnode2_ready_0
 endi
 
+sleep 3000
+print show mnodes
+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
 
 print ============== step9: stop dnode3, then wait sync end
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 3000
 
 $cnt = 0
 wait_dnode3_offline_0:
@@ -261,6 +359,7 @@ endi
 
 print ============== step10: restart dnode3, then wait sync end
 system sh/exec.sh -n dnode3 -s start
+sleep 3000
 
 $cnt = 0
 wait_dnode3_ready_0:
@@ -289,6 +388,7 @@ endi
 
 print ============== step11: stop dnode4, then wait sync end
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 3000
 
 $cnt = 0
 wait_dnode4_offline_0:
@@ -317,7 +417,7 @@ elif $loop_cnt == 1 then
 elif $loop_cnt == 2 then
   $dnode4Status = $data4_8 
 else then
-  print **** **** **** END loop cluster do 2**** **** **** ****
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
   return
 endi
 
@@ -328,9 +428,10 @@ endi
 
 print ============== step12: restart dnode4, then wait sync end
 system sh/exec.sh -n dnode4 -s start
+sleep 3000
 
 $cnt = 0
-wait_dnode4_ready_0:
+wait_dnode4_ready_1:
 $cnt = $cnt + 1
 if $cnt == 10 then
   return -1
@@ -338,7 +439,7 @@ endi
 sql show dnodes
 if $rows != 3 then
   sleep 2000
-  goto wait_dnode4_ready_0
+  goto wait_dnode4_ready_1
 endi
 print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
 print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
@@ -356,27 +457,28 @@ elif $loop_cnt == 1 then
 elif $loop_cnt == 2 then
   $dnode4Status = $data4_8 
 else then
-  print **** **** **** END loop cluster do 2**** **** **** ****
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
   return
 endi
 
 if $dnode4Status != ready then
   sleep 2000
-  goto wait_dnode4_ready_0
+  goto wait_dnode4_ready_1
 endi
 
 print ============== step13: alter replica 2
 sql alter database $db replica 2
-sql show database
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
 
-if $data0_5 != 2 then
+if $data04 != 2 then
   print rplica is not modify to 2, error!!!!!!
-  return
+  return -1
 endi
 
 print ============== step14: stop and drop dnode4, then remove data dir of dnode4 
 system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 3000
 
 $cnt = 0
 wait_dnode4_offline_1:
@@ -405,7 +507,7 @@ elif $loop_cnt == 1 then
 elif $loop_cnt == 2 then
   $dnode4Status = $data4_8 
 else then
-  print **** **** **** END loop cluster do 2**** **** **** ****
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
   return
 endi
 
@@ -414,32 +516,34 @@ if $dnode4Status != offline then
   goto wait_dnode4_offline_1
 endi
 
+sleep 3000
 sql drop dnode $hostname4
-system rm -rf ../../../sim/dnode4
+system rm -rf ../../../sim/dnode4/data
 
 
 print ============== step15: alter replica 1
 sql alter database $db replica 1
-sql show database
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-
-if $data0_5 != 1 then
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 1 then
   print rplica is not modify to 1, error!!!!!!
-  return
+  return -1
 endi
 
 
 print ============== step16: alter replica 2
-sql alter database $db replica 1
-sql show database
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-
-if $data0_5 != 2 then
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 2 then
   print rplica is not modify to 2, error!!!!!!
-  return
+  return -1
 endi
 
 print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+system sh/cfg.sh -n dnode1 -c first -v $hostname2
+system sh/cfg.sh -n dnode1 -c second -v $hostname3
+
 system sh/exec.sh -n dnode1 -s start
 sql create dnode $hostname1
 
@@ -457,21 +561,20 @@ 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
 #$dnode1Status = $data4_1  
 $dnode2Status = $data4_2
 $dnode3Status = $data4_3  
 $dnode4Status = $data4_4 
 
 if $loop_cnt == 0 then
-  $dnode1Status = $data4_1 
-elif $loop_cnt == 1 then
   $dnode1Status = $data4_5 
-elif $loop_cnt == 2 then
+elif $loop_cnt == 1 then
   $dnode1Status = $data4_7 
-elif $loop_cnt == 3 then
-  $dnode1Status = $data4_9 
+elif $loop_cnt == 2 then
+  $dnode1Status = $data4_9
 else then
-  print **** **** **** END loop cluster do 3**** **** **** ****
+  print **** **** **** END loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
   return
 endi
 
@@ -482,13 +585,13 @@ endi
 
 print ============== step18: alter replica 3
 sql alter database $db replica 3
-sql show database
-print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
-
-if $data0_5 != 3 then
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 3 then
   print rplica is not modify to 3, error!!!!!!
-  return
+  return -1
 endi
 
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
 $loop_cnt = $loop_cnt + 1
 goto loop_cluster_do

tests/tsim/inc/sim.h

@@ -51,24 +51,12 @@
 #define FAILED_POSTFIX ""
 #endif
 
-#define simError(...)                        \
-  if (simDebugFlag & DEBUG_ERROR) {          \
-    taosPrintLog("ERROR SIM ", 255, __VA_ARGS__); \
-  }
-#define simWarn(...)                                 \
-  if (simDebugFlag & DEBUG_WARN) {                   \
-    taosPrintLog("WARN SIM ", simDebugFlag, __VA_ARGS__); \
-  }
-#define simTrace(...)                           \
-  if (simDebugFlag & DEBUG_TRACE) {             \
-    taosPrintLog("SIM ", simDebugFlag, __VA_ARGS__); \
-  }
-#define simDump(x, y)              \
-  if (simDebugFlag & DEBUG_DUMP) { \
-    taosDumpData(x, y);            \
-  }
-#define simPrint(...) \
-  { taosPrintLog("SIM ", 255, __VA_ARGS__); }
+#define simFatal(...) { if (simDebugFlag & DEBUG_FATAL) { taosPrintLog("SIM FATAL ", 255, __VA_ARGS__); }}
+#define simError(...) { if (simDebugFlag & DEBUG_ERROR) { taosPrintLog("SIM ERROR ", 255, __VA_ARGS__); }}
+#define simWarn(...)  { if (simDebugFlag & DEBUG_WARN)  { taosPrintLog("SIM WARN  ", 255, __VA_ARGS__); }}
+#define simInfo(...)  { if (simDebugFlag & DEBUG_INFO)  { taosPrintLog("SIM INFO  ", 255, __VA_ARGS__); }}
+#define simDebug(...) { if (simDebugFlag & DEBUG_DEBUG) { taosPrintLog("SIM DEBUG ", simDebugFlag, __VA_ARGS__); }}
+#define simTrace(...) { if (simDebugFlag & DEBUG_TRACE) { taosPrintLog("SIM TRACE ", simDebugFlag, __VA_ARGS__); }}
 
 enum { SIM_SCRIPT_TYPE_MAIN, SIM_SCRIPT_TYPE_BACKGROUND };
 

tests/tsim/src/simExe.c

@@ -75,7 +75,7 @@ char *simGetVariable(SScript *script, char *varName, int varLen) {
 
       for (int i = 0; i < MAX_QUERY_ROW_NUM; ++i) {
         if (strncmp(keyName, script->data[i][0], keyLen) == 0) {
-          simTrace("script:%s, keyName:%s, keyValue:%s", script->fileName, script->data[i][0], script->data[i][col]);
+          simDebug("script:%s, keyName:%s, keyValue:%s", script->fileName, script->data[i][0], script->data[i][col]);
           return script->data[i][col];
         }
       }
@@ -90,7 +90,7 @@ char *simGetVariable(SScript *script, char *varName, int varLen) {
         return "null";
       }
 
-      simTrace("script:%s, data[%d][%d]=%s", script->fileName, row, col, script->data[row][col]);
+      simDebug("script:%s, data[%d][%d]=%s", script->fileName, row, col, script->data[row][col]);
       return script->data[row][col];
     }
   }
@@ -102,7 +102,7 @@ char *simGetVariable(SScript *script, char *varName, int varLen) {
     }
     if (strncmp(varName, var->varName, varLen) == 0) {
       // if (strlen(var->varValue) != 0)
-      //  simTrace("script:%s, var:%s, value:%s", script->fileName,
+      //  simDebug("script:%s, var:%s, value:%s", script->fileName,
       //  var->varName, var->varValue);
       return var->varValue;
     }
@@ -240,7 +240,7 @@ bool simExecuteRunCmd(SScript *script, char *option) {
     return false;
   }
 
-  simPrint("script:%s, start to execute", newScript->fileName);
+  simInfo("script:%s, start to execute", newScript->fileName);
 
   newScript->type = SIM_SCRIPT_TYPE_MAIN;
   simScriptPos++;
@@ -262,7 +262,7 @@ bool simExecuteRunBackCmd(SScript *script, char *option) {
     sprintf(script->error, "lineNum:%d. parse file:%s error", script->lines[script->linePos].lineNum, fileName);
     return false;
   }
-  simPrint("script:%s, start to execute in background", newScript->fileName);
+  simInfo("script:%s, start to execute in background", newScript->fileName);
 
   newScript->type = SIM_SCRIPT_TYPE_BACKGROUND;
   script->bgScripts[script->bgScriptLen++] = newScript;
@@ -336,7 +336,7 @@ bool simExecutePrintCmd(SScript *script, char *rest) {
   simVisuallizeOption(script, rest, buf);
   rest = buf;
 
-  simPrint("script:%s, %s", script->fileName, rest);
+  simInfo("script:%s, %s", script->fileName, rest);
   script->linePos++;
   return true;
 }
@@ -351,9 +351,9 @@ bool simExecuteSleepCmd(SScript *script, char *option) {
   delta = atoi(option);
   if (delta <= 0) delta = 5;
 
-  simPrint("script:%s, sleep %dms begin", script->fileName, delta);
+  simInfo("script:%s, sleep %dms begin", script->fileName, delta);
   taosMsleep(delta);
-  simPrint("script:%s, sleep %dms finished", script->fileName, delta);
+  simInfo("script:%s, sleep %dms finished", script->fileName, delta);
 
   script->linePos++;
   return true;
@@ -372,7 +372,7 @@ bool simExecuteReturnCmd(SScript *script, char *option) {
     sprintf(script->error, "lineNum:%d. error return %s", script->lines[script->linePos].lineNum, option);
     return false;
   } else {
-    simPrint("script:%s, return cmd execute with:%d", script->fileName, ret);
+    simInfo("script:%s, return cmd execute with:%d", script->fileName, ret);
     script->linePos = script->numOfLines;
   }
 
@@ -418,7 +418,7 @@ void simCloseRestFulConnect(SScript *script) {
 void simCloseNativeConnect(SScript *script) {
   if (script->taos == NULL) return;
 
-  simTrace("script:%s, taos:%p closed", script->fileName, script->taos);
+  simDebug("script:%s, taos:%p closed", script->fileName, script->taos);
   taos_close(script->taos);
   taosMsleep(1200);
 
@@ -468,7 +468,7 @@ int simParseHttpCommandResult(SScript *script, char *command) {
       cJSON_Delete(root);
       return retcode;
     } else {
-      simTrace("script:%s, json:status:%s not equal to succ, but code is %d, response:%s", script->fileName,
+      simDebug("script:%s, json:status:%s not equal to succ, but code is %d, response:%s", script->fileName,
           status->valuestring, retcode, command);
       cJSON_Delete(root);
       return 0;
@@ -568,10 +568,10 @@ bool simCreateRestFulConnect(SScript *script, char *user, char *pass) {
   for (int attempt = 0; attempt < 10; ++attempt) {
     success = simExecuteRestFulCommand(script, command) == 0;
     if (!success) {
-      simTrace("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
+      simDebug("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
       taosMsleep(1000);
     } else {
-      simTrace("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
+      simDebug("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
       break;
     }
   }
@@ -581,7 +581,7 @@ bool simCreateRestFulConnect(SScript *script, char *user, char *pass) {
     return false;
   }
 
-  simTrace("script:%s, connect taosd successed, auth:%p", script->fileName, script->auth);
+  simDebug("script:%s, connect taosd successed, auth:%p", script->fileName, script->auth);
   return true;
 }
 
@@ -592,10 +592,10 @@ bool simCreateNativeConnect(SScript *script, char *user, char *pass) {
   for (int attempt = 0; attempt < 10; ++attempt) {
     taos = taos_connect(NULL, user, pass, NULL, tsDnodeShellPort);
     if (taos == NULL) {
-      simTrace("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
+      simDebug("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
       taosMsleep(1000);
     } else {
-      simTrace("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
+      simDebug("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
       break;
     }
   }
@@ -606,7 +606,7 @@ bool simCreateNativeConnect(SScript *script, char *user, char *pass) {
   }
 
   script->taos = taos;
-  simTrace("script:%s, connect taosd successed, taos:%p", script->fileName, taos);
+  simDebug("script:%s, connect taosd successed, taos:%p", script->fileName, taos);
 
   return true;
 }
@@ -643,11 +643,11 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
     ret = taos_errno(pSql);
     
     if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST || ret == TSDB_CODE_MND_DB_ALREADY_EXIST) {
-      simTrace("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
+      simDebug("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
       ret = 0;
       break;
     } else if (ret != 0) {
-      simTrace("script:%s, taos:%p, %s failed, ret:%d:%s, error:%s",
+      simDebug("script:%s, taos:%p, %s failed, ret:%d:%s, error:%s",
                script->fileName, script->taos, rest, ret, tstrerror(ret), taos_errstr(pSql));
 
       if (line->errorJump == SQL_JUMP_TRUE) {
@@ -672,7 +672,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
   int num_fields = taos_field_count(pSql);
   if (num_fields != 0) {
     if (pSql == NULL) {
-      simTrace("script:%s, taos:%p, %s failed, result is null", script->fileName, script->taos, rest);
+      simDebug("script:%s, taos:%p, %s failed, result is null", script->fileName, script->taos, rest);
       if (line->errorJump == SQL_JUMP_TRUE) {
         script->linePos = line->jump;
         return true;
@@ -794,11 +794,11 @@ bool simExecuteRestFulSqlCommand(SScript *script, char *rest) {
     ret = simExecuteRestFulCommand(script, command);
     if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST ||
         ret == TSDB_CODE_MND_DB_ALREADY_EXIST) {
-      simTrace("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
+      simDebug("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
       ret = 0;
       break;
     } else if (ret != 0) {
-      simTrace("script:%s, taos:%p, %s failed, ret:%d",
+      simDebug("script:%s, taos:%p, %s failed, ret:%d",
                script->fileName, script->taos, rest, ret);
 
       if (line->errorJump == SQL_JUMP_TRUE) {
@@ -827,7 +827,7 @@ bool simExecuteSqlImpCmd(SScript *script, char *rest, bool isSlow) {
   simVisuallizeOption(script, rest, buf);
   rest = buf;
 
-  simTrace("script:%s, exec:%s", script->fileName, rest);
+  simDebug("script:%s, exec:%s", script->fileName, rest);
   strcpy(script->rows, "-1");
   for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) {
     for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) {
@@ -883,7 +883,7 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
   simVisuallizeOption(script, rest, buf);
   rest = buf;
 
-  simTrace("script:%s, exec:%s", script->fileName, rest);
+  simDebug("script:%s, exec:%s", script->fileName, rest);
   strcpy(script->rows, "-1");
   for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) {
     for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) {
@@ -929,7 +929,7 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
   }
 
   if (ret != TSDB_CODE_SUCCESS) {
-    simTrace("script:%s, taos:%p, %s execute, expect failed, so success, ret:%d:%s",
+    simDebug("script:%s, taos:%p, %s execute, expect failed, so success, ret:%d:%s",
         script->fileName, script->taos, rest, ret, tstrerror(ret));
     script->linePos++;
     return true;

tests/tsim/src/simMain.c

@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
     exit(1);
   }
 
-  simPrint("simulator is running ...");
+  simInfo("simulator is running ...");
   signal(SIGINT, simHandleSignal);
 
   SScript *script = simParseScript(scriptFile);

tests/tsim/src/simSystem.c

@@ -71,7 +71,7 @@ char *simParseHostName(char *varName) {
   }
   
   sprintf(hostName, "'%s:%d'", simHostName, port);
-  //simPrint("hostName:%s", hostName);
+  //simInfo("hostName:%s", hostName);
   return hostName;
 }
 
@@ -102,20 +102,20 @@ void simFreeScript(SScript *script) {
 SScript *simProcessCallOver(SScript *script) {
   if (script->type == SIM_SCRIPT_TYPE_MAIN) {
     if (script->killed) {
-      simPrint("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX
+      simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX
                "failed" FAILED_POSTFIX ", error:%s",
                script->fileName, script->error);
       exit(-1);
     } else {
-      simPrint("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX
+      simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX
                "success" SUCCESS_POSTFIX,
                script->fileName);
       simCloseTaosdConnect(script);
       simScriptSucced++;
       simScriptPos--;
       if (simScriptPos == -1) {
-        simPrint("----------------------------------------------------------------------");
-        simPrint("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
+        simInfo("----------------------------------------------------------------------");
+        simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
         exit(0);
       }
 
@@ -123,7 +123,7 @@ SScript *simProcessCallOver(SScript *script) {
       return simScriptList[simScriptPos];
     }
   } else {
-    simPrint("script:%s, is stopped by main script", script->fileName);
+    simInfo("script:%s, is stopped by main script", script->fileName);
     simFreeScript(script);
     return NULL;
   }
@@ -143,7 +143,7 @@ void *simExecuteScript(void *inputScript) {
     } else {
       SCmdLine *line = &script->lines[script->linePos];
       char *option = script->optionBuffer + line->optionOffset;
-      simTrace("script:%s, line:%d with option \"%s\"", script->fileName, line->lineNum, option);
+      simDebug("script:%s, line:%d with option \"%s\"", script->fileName, line->lineNum, option);
 
       SCommand *cmd = &simCmdList[line->cmdno];
       int ret = (*(cmd->executeCmd))(script, option);