test: adjust case for db option

tests/script/tsim/sync/3Replica1VgElect.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 
@@ -406,7 +406,7 @@ print $data(db1)[0] $data(db1)[1] $data(db1)[2] $data(db1)[3] $data(db1)[4] $dat
 if $rows != 4 then
   return -1
 endi
-if $data(db1)[19] != ready then
+if $data(db1)[15] != ready then
   goto check_db_ready1
 endi
 

tests/script/tsim/sync/3Replica5VgElect.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 
@@ -590,7 +590,7 @@ print $data(db1)[0] $data(db1)[1] $data(db1)[2] $data(db1)[3] $data(db1)[4] $dat
 if $rows != 4 then
   return -1
 endi
-if $data(db1)[19] != ready then
+if $data(db1)[15] != ready then
   goto check_db_ready1
 endi
 

tests/script/tsim/sync/3Replica5VgElect3mnode.sim

@@ -63,7 +63,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 
@@ -698,7 +698,7 @@ print $data(db1)[0] $data(db1)[1] $data(db1)[2] $data(db1)[3] $data(db1)[4] $dat
 if $rows != 4 then
   return -1
 endi
-if $data(db1)[19] != ready then
+if $data(db1)[15] != ready then
   goto check_db_ready1
 endi
 

tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/sync/electTest.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/sync/oneReplica1VgElect.sim

@@ -66,7 +66,7 @@ print $data(db)[13] $data(db)[14] $data(db)[15] $data(db)[16] $data(db)[17] $dat
 if $rows != 3 then
   return -1
 endi
-if $data(db1)[19] != ready then
+if $data(db1)[15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/sync/oneReplica5VgElect.sim

@@ -65,7 +65,7 @@ print $data(db1)[0] $data(db)[1] $data(db)[2] $data(db)[3] $data(db)[4] $data(db
 if $rows != 3 then
   return -1
 endi
-if $data(db1)[19] != ready then
+if $data(db1)[15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/sync/vnode-insert.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/sync/vnodeLeaderTransfer.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/sync/vnodesnapshot-test.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/sync/vnodesnapshot.sim

@@ -65,7 +65,7 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $d
 if $rows != 3 then
   return -1
 endi
-if $data[2][19] != ready then
+if $data[2][15] != ready then
   goto check_db_ready
 endi
 

tests/script/tsim/tmq/basic1Of2Cons.sim

@@ -115,7 +115,7 @@ $expectmsgcnt  = $totalMsgOfStb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from stb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -w $cdbName -s start
@@ -217,7 +217,7 @@ $totalMsgOfCtb = $rowsPerCtb
 $expectmsgcnt  = $totalMsgOfCtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ctb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start
@@ -319,7 +319,7 @@ $totalMsgOfNtb = $rowsPerCtb
 $expectmsgcnt  = $totalMsgOfNtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ntb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start

tests/script/tsim/tmq/basic2Of2Cons.sim

@@ -85,7 +85,7 @@ $totalMsgOfStb = $totalMsgOfStb * $topicNum
 $expectmsgcnt  = $totalMsgOfStb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from stb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -w $dbName -s start
@@ -172,7 +172,7 @@ $totalMsgOfCtb = $rowsPerCtb * $topicNum
 $expectmsgcnt  = $totalMsgOfCtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ctb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start
@@ -259,7 +259,7 @@ $totalMsgOfNtb = $rowsPerCtb * $topicNum
 $expectmsgcnt  = $totalMsgOfNtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ntb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start

tests/script/tsim/tmq/basic2Of2ConsOverlap.sim

@@ -89,7 +89,7 @@ $topicList = $topicList . ,
 $topicList = $topicList . topic_stb_function
 $topicList = $topicList . '
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now +1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from stb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -w $dbName -s start
@@ -197,7 +197,7 @@ $topicList = $topicList . ,
 $topicList = $topicList . topic_ctb_all
 $topicList = $topicList . '
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now +1s, $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ctb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -w $cdbName -s start
@@ -289,7 +289,7 @@ $topicList = $topicList . ,
 $topicList = $topicList . topic_ntb_all
 $topicList = $topicList . '
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ntb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start

tests/script/tsim/tmq/basic3Of2Cons.sim

@@ -113,7 +113,7 @@ $totalMsgOfStb = $ctbNum * $rowsPerCtb
 $expectmsgcnt  = $totalMsgOfStb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from stb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -w $cdbName -s start
@@ -228,7 +228,7 @@ $totalMsgOfCtb = $rowsPerCtb
 $expectmsgcnt  = $totalMsgOfCtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ctb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start
@@ -330,7 +330,7 @@ $totalMsgOfNtb = $rowsPerCtb
 $expectmsgcnt  = $totalMsgOfNtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ntb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start

tests/script/tsim/tmq/basic4Of2Cons.sim

@@ -82,7 +82,7 @@ $totalMsgOfStb = $totalMsgOfStb * $topicNum
 $expectmsgcnt  = $totalMsgOfStb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from stb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -w $dbName -s start
@@ -181,7 +181,7 @@ $totalMsgOfCtb = $rowsPerCtb * $topicNum
 $expectmsgcnt  = $totalMsgOfCtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ctb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start
@@ -269,7 +269,7 @@ $totalMsgOfNtb = $rowsPerCtb * $topicNum
 $expectmsgcnt  = $totalMsgOfNtb
 sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 $consumerId    = 1
-sql insert into consumeinfo values (now , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
+sql insert into consumeinfo values (now+1s , $consumerId , $topicList , $keyList , $expectmsgcnt , $ifcheckdata , $ifmanualcommit )
 
 print == start consumer to pull msgs from ntb
 print == tsim/tmq/consume.sh -d $dbName -y $pullDelay -g $showMsg -r $showRow -s start

tests/script/tsim/trans/create_db.sim

@@ -128,8 +128,8 @@ if $system_content != Windows_NT then
   if $rows != 4 then
     return -1
   endi
-  print d2 ==> $data(d2)[19]
-  if $data(d2)[19] != creating then
+  print d2 ==> $data(d2)[15]
+  if $data(d2)[15] != creating then
     return -1
   endi
 

tests/system-test/6-cluster/clusterCommonCheck.py

@@ -82,7 +82,7 @@ class ClusterComCheck:
                 for i in range(alldbNumbers):
                     tdSql.query("show databases;")
                     if "%s_%d"%(dbNameIndex,j) == tdSql.queryResult[i][0] :   
-                        if tdSql.queryResult[i][19] == "ready":
+                        if tdSql.queryResult[i][15] == "ready":
                             query_status+=1
                             tdLog.debug("check %s_%d that status is ready "%(dbNameIndex,j))      
                         else:

tests/system-test/7-tmq/basic5.py

@@ -265,7 +265,7 @@ class TDTestCase:
                 else:
                     continue
                 
-                if tdSql.getData(index,19) == 'ready':
+                if tdSql.getData(index,15) == 'ready':
                     print("******************** index: %d"%index)
                     break
 
@@ -395,7 +395,7 @@ class TDTestCase:
         while 1:
             tdSql.query("show databases")
             if tdSql.getRows() == 5: 
-                print ('==================================================')
+                print ('==================================================dbname: %s'%parameterDict['dbName'])
                 print (tdSql.getData(0,0), tdSql.getData(1,0),tdSql.getData(2,0),tdSql.getData(3,0),tdSql.getData(4,0))   
                 index = 0
                 if tdSql.getData(0,0) == parameterDict['dbName']:
@@ -409,9 +409,9 @@ class TDTestCase:
                 elif tdSql.getData(4,0) == parameterDict['dbName']:
                     index = 4
                 else:
-                    continue
+                    continue                
                 
-                if tdSql.getData(index,19) == 'ready':
+                if tdSql.getData(index,15) == 'ready':
                     print("******************** index: %d"%index)
                     break