Merge pull request #17713 from taosdata/enh/TD-19459

test: restore some cases

source/common/src/systable.c

@@ -270,7 +270,7 @@ static const SSysTableMeta infosMeta[] = {
     {TSDB_INS_TABLE_MNODES, mnodesSchema, tListLen(mnodesSchema), true},
     {TSDB_INS_TABLE_MODULES, modulesSchema, tListLen(modulesSchema), true},
     {TSDB_INS_TABLE_QNODES, qnodesSchema, tListLen(qnodesSchema), true},
-    //    {TSDB_INS_TABLE_SNODES, snodesSchema, tListLen(snodesSchema)},
+    {TSDB_INS_TABLE_SNODES, snodesSchema, tListLen(snodesSchema)},
     {TSDB_INS_TABLE_CLUSTER, clusterSchema, tListLen(clusterSchema), true},
     {TSDB_INS_TABLE_DATABASES, userDBSchema, tListLen(userDBSchema), false},
     {TSDB_INS_TABLE_FUNCTIONS, userFuncSchema, tListLen(userFuncSchema), false},

source/dnode/mgmt/mgmt_dnode/src/dmHandle.c

@@ -332,7 +332,6 @@ SArray *dmGetMsgHandles() {
 
   // Requests handled by MNODE
   if (dmSetMgmtHandle(pArray, TDMT_MND_GRANT, dmPutNodeMsgToMgmtQueue, 0) == NULL) goto _OVER;
-  // if (dmSetMgmtHandle(pArray, TDMT_MND_GRANT_RSP, dmPutNodeMsgToMgmtQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_AUTH_RSP, dmPutNodeMsgToMgmtQueue, 0) == NULL) goto _OVER;
 
   code = 0;

source/dnode/mnode/impl/src/mndDb.c

@@ -640,12 +640,8 @@ static int32_t mndSetDbCfgFromAlterDbReq(SDbObj *pDb, SAlterDbReq *pAlter) {
   }
 
   if (pAlter->pageSize > 0 && pAlter->pageSize != pDb->cfg.pageSize) {
-#if 1
-    terrno = TSDB_CODE_OPS_NOT_SUPPORT;
-#else
     pDb->cfg.pageSize = pAlter->pageSize;
     terrno = 0;
-#endif
   }
 
   if (pAlter->daysPerFile > 0 && pAlter->daysPerFile != pDb->cfg.daysPerFile) {

source/dnode/mnode/impl/src/mndSnode.c

@@ -273,9 +273,6 @@ _OVER:
 }
 
 static int32_t mndProcessCreateSnodeReq(SRpcMsg *pReq) {
-#if 1
-  return TSDB_CODE_OPS_NOT_SUPPORT;
-#else
   SMnode          *pMnode = pReq->info.node;
   int32_t          code = -1;
   SSnodeObj       *pObj = NULL;
@@ -318,7 +315,6 @@ _OVER:
   mndReleaseSnode(pMnode, pObj);
   mndReleaseDnode(pMnode, pDnode);
   return code;
-#endif
 }
 
 static int32_t mndSetDropSnodeRedoLogs(STrans *pTrans, SSnodeObj *pObj) {
@@ -390,9 +386,6 @@ _OVER:
 }
 
 static int32_t mndProcessDropSnodeReq(SRpcMsg *pReq) {
-#if 1
-  return TSDB_CODE_OPS_NOT_SUPPORT;
-#else
   SMnode *pMnode = pReq->info.node;
   int32_t code = -1;
   SSnodeObj *pObj = NULL;
@@ -429,7 +422,6 @@ _OVER:
 
   mndReleaseSnode(pMnode, pObj);
   return code;
-#endif
 }
 
 static int32_t mndRetrieveSnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {

tests/script/jenkins/basic.txt

@@ -25,7 +25,6 @@
 ./test.sh -f tsim/db/delete_reusevnode2.sim
 ./test.sh -f tsim/db/delete_writing1.sim
 ./test.sh -f tsim/db/delete_writing2.sim
-# unsupport ./test.sh -f tsim/db/dropdnodes.sim
 ./test.sh -f tsim/db/error1.sim
 ./test.sh -f tsim/db/keep.sim
 ./test.sh -f tsim/db/len.sim
@@ -44,7 +43,7 @@
 ./test.sh -f tsim/dnode/balancex.sim
 ./test.sh -f tsim/dnode/create_dnode.sim
 ./test.sh -f tsim/dnode/drop_dnode_has_mnode.sim
-# unsupport ./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim
+./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim
 ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica1.sim
 ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica3.sim
 ./test.sh -f tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim
@@ -155,7 +154,7 @@
 ./test.sh -f tsim/parser/select_with_tags.sim
 ./test.sh -f tsim/parser/selectResNum.sim
 ./test.sh -f tsim/parser/set_tag_vals.sim
-# TD-19572 ./test.sh -f tsim/parser/single_row_in_tb.sim
+./test.sh -f tsim/parser/single_row_in_tb.sim
 ./test.sh -f tsim/parser/sliding.sim
 ./test.sh -f tsim/parser/slimit_alter_tags.sim
 ./test.sh -f tsim/parser/slimit.sim
@@ -185,7 +184,7 @@
 ./test.sh -f tsim/qnode/basic1.sim
 
 # ---- snode ----
-# unsupport ./test.sh -f tsim/snode/basic1.sim
+./test.sh -f tsim/snode/basic1.sim
 
 # ---- mnode
 ./test.sh -f tsim/mnode/basic1.sim
@@ -303,7 +302,6 @@
 # --- sma
 ./test.sh -f tsim/sma/drop_sma.sim
 ./test.sh -f tsim/sma/tsmaCreateInsertQuery.sim
-# temp disable
 ./test.sh -f tsim/sma/rsmaCreateInsertQuery.sim
 ./test.sh -f tsim/sma/rsmaPersistenceRecovery.sim
 
@@ -319,13 +317,13 @@
 ./test.sh -f tsim/valgrind/checkUdf.sim
 
 # --- vnode ----
-# unsupport ./test.sh -f tsim/vnode/replica3_basic.sim
-# unsupport ./test.sh -f tsim/vnode/replica3_repeat.sim
-# unsupport ./test.sh -f tsim/vnode/replica3_vgroup.sim
-# unsupport ./test.sh -f tsim/vnode/replica3_many.sim
-# unsupport ./test.sh -f tsim/vnode/replica3_import.sim
-# unsupport ./test.sh -f tsim/vnode/stable_balance_replica1.sim
-# unsupport ./test.sh -f tsim/vnode/stable_dnode2_stop.sim
+./test.sh -f tsim/vnode/replica3_basic.sim
+./test.sh -f tsim/vnode/replica3_repeat.sim
+./test.sh -f tsim/vnode/replica3_vgroup.sim
+./test.sh -f tsim/vnode/replica3_many.sim
+./test.sh -f tsim/vnode/replica3_import.sim
+./test.sh -f tsim/vnode/stable_balance_replica1.sim
+./test.sh -f tsim/vnode/stable_dnode2_stop.sim
 ./test.sh -f tsim/vnode/stable_dnode2.sim
 ./test.sh -f tsim/vnode/stable_dnode3.sim
 ./test.sh -f tsim/vnode/stable_replica3_dnode6.sim

tests/script/tsim/db/dropdnodes.sim

-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel            -v 2
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c walLevel            -v 2
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
-
-print ==========  prepare data
-system sh/exec.sh -n dnode1 -s start
-system sh/exec.sh -n dnode2 -s start
-
-sleep 2000
-sql connect
-
-sql create dnode $hostname2
-sleep 2000
-
-sql create database db
-sql use db
-
-print ==========  step1
-sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int)
-sql create table db.t1 using db.mt tags(1)
-sql create table db.t2 using db.mt tags(2)
-sql create table db.t3 using db.mt tags(3)
-sql create table db.t4 using db.mt tags(4)
-sql create table db.t5 using db.mt tags(5)
-sql create table db.t6 using db.mt tags(6)
-sql create table db.t7 using db.mt tags(7)
-sql create table db.t8 using db.mt tags(8)
-sql create table db.t9 using db.mt tags(9)
-sql create table db.t10 using db.mt tags(10)
-sql create table db.t11 using db.mt tags(11)
-sql create table db.t12 using db.mt tags(12)
-sql create table db.t13 using db.mt tags(13)
-sql create table db.t14 using db.mt tags(14)
-sql create table db.t15 using db.mt tags(15)
-sql create table db.t16 using db.mt tags(16)
-
-sql insert into db.t1 values(now, 1)
-sql insert into db.t2 values(now, 1)
-sql insert into db.t3 values(now, 1)
-sql insert into db.t4 values(now, 1)
-sql insert into db.t5 values(now, 1)
-sql insert into db.t6 values(now, 1)
-sql insert into db.t7 values(now, 1)
-sql insert into db.t8 values(now, 1)
-sql insert into db.t9 values(now, 1)
-sql insert into db.t10 values(now, 1)
-sql insert into db.t11 values(now, 1)
-sql insert into db.t12 values(now, 1)
-sql insert into db.t13 values(now, 1)
-sql insert into db.t14 values(now, 1)
-sql insert into db.t15 values(now, 1)
-sql insert into db.t16 values(now, 1)
-
-print ========== step2
-sql show tables
-print $rows
-if $rows != 16 then
-  return -1
-endi
-
-sql select * from mt
-print $rows
-if $rows != 16 then
-  return -1
-endi
-
-print ========== step3
-
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 3000
-sql drop dnode $hostname2
-sleep 2000
-
-print ========== step3
-
-sql show tables
-print $rows
-if $rows != 8 then
-  return -1
-endi
-
-sql select * from mt
-print $rows
-if $rows != 8 then
-  return -1
-endi
-
-sql select * from db.t5
-if $rows != 1 then
-  return -1
-endi
-
-sql select * from db.t13
-if $rows != 1 then
-  return -1
-endi
-
-sql_error select * from db.t1
-sql_error select * from db.t9
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode2 -s stop -x SIGINT

tests/script/tsim/vnode/replica3_many.sim

@@ -59,7 +59,7 @@ step12:
 	  print ====> db not ready!
 		return -1
 	endi
-sql show d1.vgroups
+sql show db1.vgroups
 print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 $leaderExist = 0
 if $rows != 1 then
@@ -87,19 +87,19 @@ step13:
 	  print ====> db not ready!
 		return -1
 	endi
-sql show d1.vgroups
+sql show db1.vgroups
 print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 $leaderExist = 0
 if $rows != 1 then
   return -1
 endi
-if $data(3)[4] == leader then
+if $data(2)[4] == leader then
   $leaderExist = 1
 endi
-if $data(3)[6] == leader then
+if $data(2)[6] == leader then
   $leaderExist = 1
 endi
-if $data(3)[8] == leader then
+if $data(2)[8] == leader then
   $leaderExist = 1
 endi
 if  $leaderExist != 1 then
@@ -115,16 +115,16 @@ step14:
 	  print ====> db not ready!
 		return -1
 	endi
-sql show d1.vgroups
+sql show db1.vgroups
 print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 $leaderExist = 0
-if $data(4)[4] == leader then
+if $data(2)[4] == leader then
   $leaderExist = 1
 endi
-if $data(4)[6] == leader then
+if $data(2)[6] == leader then
   $leaderExist = 1
 endi
-if $data(4)[8] == leader then
+if $data(2)[8] == leader then
   $leaderExist = 1
 endi
 if  $leaderExist != 1 then
@@ -140,16 +140,16 @@ step15:
 	  print ====> db not ready!
 		return -1
 	endi
-sql show d1.vgroups
+sql show db1.vgroups
 print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 $leaderExist = 0
-if $data(4)[4] == leader then
+if $data(2)[4] == leader then
   $leaderExist = 1
 endi
-if $data(4)[6] == leader then
+if $data(2)[6] == leader then
   $leaderExist = 1
 endi
-if $data(4)[8] == leader then
+if $data(2)[8] == leader then
   $leaderExist = 1
 endi
 if  $leaderExist != 1 then

tests/script/tsim/vnode/replica3_repeat.sim

@@ -56,7 +56,7 @@ step1:
 	endi
 sql show db.vgroups
 print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $rows != 4 then
+if $rows != 1 then
   return -1
 endi
 if $data(2)[4] == leader then