From 697ab1c716fd577afae0cf454a22506f428f35bb Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 15 Jul 2022 09:48:11 +0800
Subject: [PATCH 1/5] test: restore some cases

---
 tests/script/jenkins/basic.txt           |  4 +-
 tests/script/tsim/compute/block_dist.sim |  9 +++--
 tests/script/tsim/qnode/basic1.sim       | 49 ++++++++++++------------
 tests/script/tsim/snode/basic1.sim       | 48 +++++++++++------------
 4 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index dd164f7640..9d16f5b2d3 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -205,7 +205,7 @@
 ./test.sh -f tsim/qnode/basic1.sim
 
 # ---- snode
-# ./test.sh -f tsim/snode/basic1.sim
+# unsupport ./test.sh -f tsim/snode/basic1.sim
 
 # ---- bnode
 ./test.sh -f tsim/bnode/basic1.sim
@@ -382,7 +382,7 @@
 
 # ---- compute
 ./test.sh -f tsim/compute/avg.sim
-# jira ./test.sh -f tsim/compute/block_dist.sim
+./test.sh -f tsim/compute/block_dist.sim
 ./test.sh -f tsim/compute/bottom.sim
 ./test.sh -f tsim/compute/count.sim
 ./test.sh -f tsim/compute/diff.sim
diff --git a/tests/script/tsim/compute/block_dist.sim b/tests/script/tsim/compute/block_dist.sim
index 73cbca84cf..37ad8d8cff 100644
--- a/tests/script/tsim/compute/block_dist.sim
+++ b/tests/script/tsim/compute/block_dist.sim
@@ -1,5 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c debugflag -v 131
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
@@ -80,11 +81,11 @@ $nt = $ntPrefix . $i
 
 #sql select _block_dist() from $nt
 print show table distributed $nt
-sql show table distributed $nt
+sql_error show table distributed $nt
 
-if $rows == 0 then
-  return -1
-endi
+#if $rows == 0 then
+#  return -1
+#endi
 
 print ============== TD-5998
 sql_error select _block_dist() from (select * from $nt)
diff --git a/tests/script/tsim/qnode/basic1.sim b/tests/script/tsim/qnode/basic1.sim
index 7108fcaf59..81d95c704d 100644
--- a/tests/script/tsim/qnode/basic1.sim
+++ b/tests/script/tsim/qnode/basic1.sim
@@ -6,32 +6,32 @@ system sh/exec.sh -n dnode2 -s start
 sql connect
 
 print =============== show dnodes
-sql show dnodes;
-if $rows != 1 then 
-  return -1
-endi
-
-if $data00 != 1 then 
-  return -1
-endi
-
-sql show mnodes;
-if $rows != 1 then 
-  return -1
-endi
-
-if $data00 != 1 then 
-  return -1
-endi
-
-if $data02 != leader then 
-  return -1
-endi
-
-print =============== create dnodes
 sql create dnode $hostname port 7200
-sleep 2000
 
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 2 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step1
+endi
+if $data(2)[4] != ready then
+  goto step1
+endi
+
+print =============== show dnodes
 sql show dnodes;
 if $rows != 2 then 
   return -1
@@ -125,7 +125,6 @@ system sh/exec.sh -n dnode2 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 
-sleep 2000
 sql show qnodes
 if $rows != 2 then 
   return -1
diff --git a/tests/script/tsim/snode/basic1.sim b/tests/script/tsim/snode/basic1.sim
index a9d4867354..93bf04ef41 100644
--- a/tests/script/tsim/snode/basic1.sim
+++ b/tests/script/tsim/snode/basic1.sim
@@ -6,32 +6,32 @@ system sh/exec.sh -n dnode2 -s start
 sql connect
 
 print =============== show dnodes
-sql show dnodes;
-if $rows != 1 then 
-  return -1
-endi
-
-if $data00 != 1 then 
-  return -1
-endi
-
-sql show mnodes;
-if $rows != 1 then 
-  return -1
-endi
-
-if $data00 != 1 then 
-  return -1
-endi
-
-if $data02 != leader then 
-  return -1
-endi
-
-print =============== create dnodes
 sql create dnode $hostname port 7200
-sleep 2000
 
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 2 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step1
+endi
+if $data(2)[4] != ready then
+  goto step1
+endi
+
+print =============== show dnodes
 sql show dnodes;
 if $rows != 2 then 
   return -1

From b728833b9438189d1282e0afdd758284945e650d Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 15 Jul 2022 10:09:21 +0800
Subject: [PATCH 2/5] test: restore some 2.0 cases

---
 tests/script/jenkins/basic.txt             | 24 +++++++++++-----------
 tests/script/tsim/table/back_insert.sim    |  1 +
 tests/script/tsim/table/delete_reuse1.sim  | 24 ----------------------
 tests/script/tsim/table/delete_reuse2.sim  | 24 ----------------------
 tests/script/tsim/table/delete_writing.sim | 24 ++++------------------
 5 files changed, 17 insertions(+), 80 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 9d16f5b2d3..de148390a6 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -235,9 +235,9 @@
 ./test.sh -f tsim/table/createmulti.sim
 ./test.sh -f tsim/table/date.sim
 ./test.sh -f tsim/table/db.table.sim
-# ./test.sh -f tsim/table/delete_reuse1.sim
-# ./test.sh -f tsim/table/delete_reuse2.sim
-# ./test.sh -f tsim/table/delete_writing.sim
+./test.sh -f tsim/table/delete_reuse1.sim
+./test.sh -f tsim/table/delete_reuse2.sim
+./test.sh -f tsim/table/delete_writing.sim
 ./test.sh -f tsim/table/describe.sim
 ./test.sh -f tsim/table/double.sim
 ./test.sh -f tsim/table/float.sim
@@ -314,12 +314,12 @@
 ./test.sh -f tsim/db/basic3.sim -m
 ./test.sh -f tsim/db/error1.sim -m
 ./test.sh -f tsim/insert/backquote.sim -m
-# ./test.sh -f tsim/parser/fourArithmetic-basic.sim -m
+# nojira ./test.sh -f tsim/parser/fourArithmetic-basic.sim -m
 ./test.sh -f tsim/query/interval-offset.sim -m
 ./test.sh -f tsim/tmq/basic3.sim -m
 ./test.sh -f tsim/stable/vnode3.sim -m
 ./test.sh -f tsim/qnode/basic1.sim -m
-#./test.sh -f tsim/mnode/basic1.sim -m
+# nojira ./test.sh -f tsim/mnode/basic1.sim -m
 
 # --- sma
 ./test.sh -f tsim/sma/drop_sma.sim
@@ -333,13 +333,13 @@
 ./test.sh -f tsim/valgrind/checkError3.sim
 
 # --- vnode
-# ./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
+# 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/stable_dnode2.sim
 ./test.sh -f tsim/vnode/stable_dnode3.sim
 ./test.sh -f tsim/vnode/stable_replica3_dnode6.sim
diff --git a/tests/script/tsim/table/back_insert.sim b/tests/script/tsim/table/back_insert.sim
index 43831cca95..06c9a91029 100644
--- a/tests/script/tsim/table/back_insert.sim
+++ b/tests/script/tsim/table/back_insert.sim
@@ -3,5 +3,6 @@ $x = 1
 begin:
   sql insert into db.tb values(now, $x ) -x begin  
   #print ===> insert successed $x 
+  sleep 100
   $x = $x + 1   
 goto begin
\ No newline at end of file
diff --git a/tests/script/tsim/table/delete_reuse1.sim b/tests/script/tsim/table/delete_reuse1.sim
index db59425487..b9f08851ac 100644
--- a/tests/script/tsim/table/delete_reuse1.sim
+++ b/tests/script/tsim/table/delete_reuse1.sim
@@ -1,28 +1,6 @@
 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 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 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 mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
-
-print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 print ======== step1 
@@ -37,7 +15,6 @@ endi
 
 print ======== step2
 sql drop table d1.t1
-sleep 1000
 sql insert into d1.t1 values(now, 2) -x step2
   return -1
 step2:
@@ -58,7 +35,6 @@ $x = 0
 while $x < 20
 
   sql drop table d1.t1
-  sleep 1000
   sql insert into d1.t1 values(now, -1) -x step4
     return -1
   step4:
diff --git a/tests/script/tsim/table/delete_reuse2.sim b/tests/script/tsim/table/delete_reuse2.sim
index f2784a3f5f..46a76027e5 100644
--- a/tests/script/tsim/table/delete_reuse2.sim
+++ b/tests/script/tsim/table/delete_reuse2.sim
@@ -1,28 +1,6 @@
 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 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 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 mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
-
-print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 print ======== step1 
@@ -37,7 +15,6 @@ endi
 
 print ======== step2
 sql drop table db1.t1
-sleep 1000
 sql_error insert into db1.t1 values(now, 2)
 
 print ========= step3
@@ -59,7 +36,6 @@ while $x < 20
   $tb = tb . $x
   sql drop table $tb
   
-  sleep 1000
   sql_error insert into $tb values(now, -1)
   
   step4:
diff --git a/tests/script/tsim/table/delete_writing.sim b/tests/script/tsim/table/delete_writing.sim
index 5351d13d80..df7c7f47e8 100644
--- a/tests/script/tsim/table/delete_writing.sim
+++ b/tests/script/tsim/table/delete_writing.sim
@@ -1,23 +1,7 @@
 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 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 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 mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+system sh/exec.sh -n dnode1 -s start
+sql connect
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
@@ -28,12 +12,12 @@ sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
 print ======== start back
-run_back general/table/back_insert.sim
+run_back tsim/table/back_insert.sim
 sleep 1000
 
 print ======== step1 
 $x = 1 	
-while $x < 15
+while $x < 10
 
     print drop table times $x
 	sql drop table db.tb -x step1

From 742fb1e594b3291c2e3249a93c695eab05095504 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 15 Jul 2022 10:27:37 +0800
Subject: [PATCH 3/5] test: adjust some cases

---
 tests/script/jenkins/basic.txt                |  21 +-
 tests/script/tsim/issue/TD-2677.sim           | 111 ----
 tests/script/tsim/issue/TD-2680.sim           | 202 -------
 tests/script/tsim/issue/TD-2713.sim           | 145 -----
 tests/script/tsim/issue/TD-3300.sim           | 556 ------------------
 tests/script/tsim/sync/3Replica1VgElect.sim   |  63 +-
 tests/script/tsim/sync/3Replica5VgElect.sim   |  63 +-
 .../tsim/sync/3Replica5VgElect3mnode.sim      |  68 +--
 .../tsim/sync/3Replica5VgElect3mnodedrop.sim  |  65 +-
 tests/script/tsim/sync/electTest.sim          |  63 +-
 tests/script/tsim/sync/oneReplica1VgElect.sim |  63 +-
 .../sync/oneReplica1VgElectWithInsert.sim     |  63 +-
 tests/script/tsim/sync/oneReplica5VgElect.sim |  63 +-
 .../script/tsim/sync/threeReplica1VgElect.sim |  65 +-
 .../sync/threeReplica1VgElectWihtInsert.sim   |  63 +-
 tests/script/tsim/sync/vnodesnapshot-test.sim |  63 +-
 tests/script/tsim/sync/vnodesnapshot.sim      |  63 +-
 17 files changed, 284 insertions(+), 1516 deletions(-)
 delete mode 100644 tests/script/tsim/issue/TD-2677.sim
 delete mode 100644 tests/script/tsim/issue/TD-2680.sim
 delete mode 100644 tests/script/tsim/issue/TD-2713.sim
 delete mode 100644 tests/script/tsim/issue/TD-3300.sim

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index de148390a6..bffed86d75 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -350,7 +350,6 @@
 ./test.sh -f tsim/sync/3Replica5VgElect.sim
 ./test.sh -f tsim/sync/oneReplica1VgElect.sim
 ./test.sh -f tsim/sync/oneReplica5VgElect.sim
-# ./test.sh -f tsim/sync/3Replica5VgElect3mnode.sim
 
 # --- catalog
 ./test.sh -f tsim/catalog/alterInCurrent.sim
@@ -433,12 +432,6 @@
 # ---- wal
 ./test.sh -f tsim/wal/kill.sim
 
-# ---- issue
-#./test.sh -f tsim/issue/TD-2677.sim
-#./test.sh -f tsim/issue/TD-2680.sim
-#./test.sh -f tsim/issue/TD-2713.sim
-#./test.sh -f tsim/issue/TD-3300.sim
-
 # ---- tag
 ./test.sh -f tsim/tag/3.sim
 ./test.sh -f tsim/tag/4.sim
@@ -451,18 +444,18 @@
 ./test.sh -f tsim/tag/bool_binary.sim
 ./test.sh -f tsim/tag/bool_int.sim
 ./test.sh -f tsim/tag/bool.sim
-#./test.sh -f tsim/tag/change.sim
-#./test.sh -f tsim/tag/column.sim
-#./test.sh -f tsim/tag/commit.sim
-#./test.sh -f tsim/tag/create.sim
-#./test.sh -f tsim/tag/delete.sim
+# ./test.sh -f tsim/tag/change.sim
+# ./test.sh -f tsim/tag/column.sim
+# ./test.sh -f tsim/tag/commit.sim
+# ./test.sh -f tsim/tag/create.sim
+# ./test.sh -f tsim/tag/delete.sim
 # jira ./test.sh -f tsim/tag/double.sim
-#./test.sh -f tsim/tag/filter.sim
+# ./test.sh -f tsim/tag/filter.sim
 # jira ./test.sh -f tsim/tag/float.sim
 ./test.sh -f tsim/tag/int_binary.sim
 ./test.sh -f tsim/tag/int_float.sim
 ./test.sh -f tsim/tag/int.sim
-#./test.sh -f tsim/tag/set.sim
+# ./test.sh -f tsim/tag/set.sim
 ./test.sh -f tsim/tag/smallint.sim
 ./test.sh -f tsim/tag/tinyint.sim
 
diff --git a/tests/script/tsim/issue/TD-2677.sim b/tests/script/tsim/issue/TD-2677.sim
deleted file mode 100644
index 8d2058a385..0000000000
--- a/tests/script/tsim/issue/TD-2677.sim
+++ /dev/null
@@ -1,111 +0,0 @@
-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/cfg.sh -n dnode1 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
-
-print ============== deploy
-
-system sh/exec.sh -n dnode1 -s start 
-sql connect
-
-sql create dnode $hostname2
-sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start 
-system sh/exec.sh -n dnode3 -s start 
-
-print  =============== step1
-$x = 0
-step1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step1
-endi
-if $data4_2 != ready then
-  goto step1
-endi
-if $data4_3 != ready then
-  goto step1
-endi
-
-sql show mnodes
-$mnode1Role = $data2_1
-print mnode1Role $mnode1Role
-$mnode2Role = $data2_2
-print mnode2Role $mnode2Role
-$mnode3Role = $data2_3
-print mnode3Role $mnode3Role
-
-if $mnode1Role != master then
-  goto step1
-endi
-if $mnode2Role != slave then
-  goto step1
-endi
-if $mnode3Role != slave then
-  goto step1
-endi
-
-$x = 1
-show2:
-
-print  =============== step1
-sql create database d1 replica 2 quorum 2
-sql create table d1.t1 (ts timestamp, i int)
-sql_error create table d1.t1 (ts timestamp, i int)
-sql insert into d1.t1 values(now, 1)
-sql select * from d1.t1;
-if $rows != 1 then
-  return -1
-endi
-
-print  =============== step2
-sql create database d2 replica 3 quorum 2
-sql create table d2.t1 (ts timestamp, i int)
-sql_error create table d2.t1 (ts timestamp, i int)
-sql insert into d2.t1 values(now, 1)
-sql select * from d2.t1;
-if $rows != 1 then
-  return -1
-endi
-
-print  =============== step3
-sql       create database d4 replica 1 quorum 1
-sql_error create database d5 replica 1 quorum 2
-sql_error create database d6 replica 1 quorum 3
-sql_error create database d7 replica 1 quorum 4
-sql_error create database d8 replica 1 quorum 0
-sql       create database d9 replica 2 quorum 1
-sql       create database d10 replica 2 quorum 2
-sql_error create database d11 replica 2 quorum 3
-sql_error create database d12 replica 2 quorum 4
-sql_error create database d12 replica 2 quorum 0
-sql       create database d13 replica 3 quorum 1
-sql       create database d14 replica 3 quorum 2
-sql_error create database d15 replica 3 quorum 3
-sql_error create database d16 replica 3 quorum 4
-sql_error create database d17 replica 3 quorum 0
-
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
diff --git a/tests/script/tsim/issue/TD-2680.sim b/tests/script/tsim/issue/TD-2680.sim
deleted file mode 100644
index 631332160f..0000000000
--- a/tests/script/tsim/issue/TD-2680.sim
+++ /dev/null
@@ -1,202 +0,0 @@
-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 role -v 1
-system sh/cfg.sh -n dnode2 -c role -v 2
-system sh/cfg.sh -n dnode3 -c role -v 2
-system sh/cfg.sh -n dnode4 -c role -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
-
-print ============== step0
-system sh/exec_tarbitrator.sh -s start
-
-print ============== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-sql create dnode $hostname2
-sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-
-$x = 0
-step1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step1
-endi
-if $data4_2 != ready then
-  goto step1
-endi
-if $data4_3 != ready then
-  goto step1
-endi
-
-sql show mnodes
-print mnode1 $data2_1
-print mnode1 $data2_2
-print mnode1 $data2_3
-if $data2_1 != master then
-  goto step1
-endi
-
-print ============== step2
-sql show dnodes
-if $rows != 4 then
-  return -1
-endi
-
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
-print $data10 $data11 $data12 $data13 $data14 $data15 $data16 $data17
-print $data20 $data21 $data22 $data23 $data24 $data25 $data26 $data27
-print $data30 $data31 $data32 $data33 $data34 $data35 $data36 $data37
-
-if $data30 != 0 then
-  return -1
-endi
-
-if $data32 != 0 then
-  return -1
-endi
-
-if $data33 != 0 then
-  return -1
-endi
-
-if $data34 != ready then
-  return -1
-endi
-
-if $data35 != arb then
-  return -1
-endi
-
-if $data37 != - then
-  return -1
-endi
-
-print ============== step4
-system sh/exec_tarbitrator.sh -s stop
-
-$x = 0
-step4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then
-		return -1
-	endi
-
-sql show dnodes
-if $rows != 4 then
-  return -1
-endi
-
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
-print $data10 $data11 $data12 $data13 $data14 $data15 $data16 $data17
-print $data20 $data21 $data22 $data23 $data24 $data25 $data26 $data27
-print $data30 $data31 $data32 $data33 $data34 $data35 $data36 $data37
-
-if $data30 != 0 then
-  return -1
-endi
-
-if $data32 != 0 then
-  return -1
-endi
-
-if $data33 != 0 then
-  return -1
-endi
-
-if $data34 != offline then
-  goto step4
-endi
-
-if $data35 != arb then
-  return -1
-endi
-
-if $data37 != - then
-  return -1
-endi
-
-print ============== step5
-system sh/exec_tarbitrator.sh -s start
-
-$x = 0
-step5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then
-		return -1
-	endi
-
-sql show dnodes
-if $rows != 4 then
-  return -1
-endi
-
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
-print $data10 $data11 $data12 $data13 $data14 $data15 $data16 $data17
-print $data20 $data21 $data22 $data23 $data24 $data25 $data26 $data27
-print $data30 $data31 $data32 $data33 $data34 $data35 $data36 $data37
-
-if $data30 != 0 then
-  return -1
-endi
-
-if $data32 != 0 then
-  return -1
-endi
-
-if $data33 != 0 then
-  return -1
-endi
-
-if $data34 != ready then
-  goto step5
-endi
-
-if $data35 != arb then
-  return -1
-endi
-
-if $data37 != - then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
diff --git a/tests/script/tsim/issue/TD-2713.sim b/tests/script/tsim/issue/TD-2713.sim
deleted file mode 100644
index b66c55b9b9..0000000000
--- a/tests/script/tsim/issue/TD-2713.sim
+++ /dev/null
@@ -1,145 +0,0 @@
-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 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 numOfMnodes -v 3
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
-
-system sh/cfg.sh -n dnode1 -c slaveQuery -v 1
-system sh/cfg.sh -n dnode2 -c slaveQuery -v 1
-system sh/cfg.sh -n dnode3 -c slaveQuery -v 1
-system sh/cfg.sh -n dnode4 -c slaveQuery -v 1
-
-print ========= step1 
-system sh/exec.sh -n dnode1 -s start
-sql connect
-sql create dnode $hostname2
-sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-
-$x = 0
-step1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step1
-endi
-if $data4_2 != ready then
-  goto step1
-endi
-if $data4_3 != ready then
-  goto step1
-endi
-
-sql show mnodes
-print mnode1 $data2_1
-print mnode1 $data2_2
-print mnode1 $data2_3
-if $data2_1 != master then
-  goto step1
-endi
-if $data2_2 != slave then
-  goto step1
-endi
-if $data2_3 != slave then
-  goto step1
-endi
-
-print ========= step2
-sql create database d1 replica 3
-sql create table d1.t1 (ts timestamp, i int)
-sql insert into d1.t1 values(now, 1)
-
-$x = 0
-step2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show d1.vgroups
-print online vgroups: $data03
-if $data03 != 3 then
-  goto step2
-endi
-sleep 1000
-
-print ========= step3
-$i = 0
-while $i < 100
-	$i = $i + 1
-	sql select * from d1.t1
-	print d1.t1 rows: $rows
-	if $rows != 1 then
-		return -1
-	endi	
-endw 
-
-print ========= step4
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-
-system rm -rf ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/*
-system rm -rf ../../../sim/dnode3/data/vnode/vnode2/version.json
-
-system sh/exec.sh -n dnode1 -s start  -x SIGINT
-system sh/exec.sh -n dnode2 -s start  -x SIGINT
-system sh/exec.sh -n dnode3 -s start  -x SIGINT
-
-$x = 0
-step4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 30 then
-		return -1
-	endi
-
-sql show d1.vgroups
-print online vgroups: $data03
-if $data03 != 3 then
-  goto step4
-endi
-sleep 1000
-
-print ========= step5
-$i = 0
-while $i < 100
-	$i = $i + 1
-	sql select * from d1.t1
-	if $rows != 1 then
-		return -1
-	endi
-	print d1.t1 rows: $rows
-endw 
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
diff --git a/tests/script/tsim/issue/TD-3300.sim b/tests/script/tsim/issue/TD-3300.sim
deleted file mode 100644
index 0745ceb849..0000000000
--- a/tests/script/tsim/issue/TD-3300.sim
+++ /dev/null
@@ -1,556 +0,0 @@
-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 role -v 1
-system sh/cfg.sh -n dnode2 -c role -v 2
-system sh/cfg.sh -n dnode3 -c role -v 2
-system sh/cfg.sh -n dnode4 -c role -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
-
-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
-sql connect
-
-print ============== step2: start dnode2/dnode3
-system sh/exec.sh -n dnode2 -s start 
-system sh/exec.sh -n dnode3 -s start
-sql create dnode $hostname2
-sql create dnode $hostname3
-
-$x = 0
-step2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step2
-endi
-if $data4_2 != ready then
-  goto step2
-endi
-if $data4_3 != ready then
-  goto step2
-endi
-
-sleep 1000
-
-print ============== step3
-sql create database db replica 2
-sql use db
-
-sql create table stb (ts timestamp, c1 int, c2 int) tags(t1 int)
-sql create table t1 using stb tags(1)
-sql insert into t1 values(1577980800000, 1, 5)
-sql insert into t1 values(1577980800001, 2, 4)
-sql insert into t1 values(1577980800002, 3, 3)
-sql insert into t1 values(1577980800003, 4, 2)
-sql insert into t1 values(1577980800004, 5, 1)
-
-sql show db.vgroups
-if $data04 != 3 then
-	return -1
-endi
-if $data06 != 2 then
-	return -1
-endi
-if $data05 != master then
-	return -1
-endi
-if $data07 != slave then
-	return -1
-endi
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-
-system sh/exec.sh -n dnode2 -s stop -x SIGKILL
-system sh/exec.sh -n dnode3 -s stop -x SIGKILL
-
-print ============== step4
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-
-$x = 0
-step4: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step4
-endi
-if $data4_2 != ready then
-  goto step4
-endi
-if $data4_3 != ready then
-  goto step4
-endi
-
-sql show db.vgroups
-if $data04 != 3 then
-	goto step4
-endi
-if $data06 != 2 then
-	goto step4
-endi
-if $data05 != master then
-	goto step4
-endi
-if $data07 != slave then
-	goto step4
-endi
-
-sql create table t2 using stb tags(1)
-sql insert into t2 values(1577980800000, 1, 5)
-sql insert into t2 values(1577980800001, 2, 4)
-sql insert into t2 values(1577980800002, 3, 3)
-sql insert into t2 values(1577980800003, 4, 2)
-sql insert into t2 values(1577980800004, 5, 1)
-
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-
-print ============== step5
-system sh/exec.sh -n dnode3 -s stop  -x SIGKILL
-
-$x = 0
-step5: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step5
-endi
-if $data4_2 != ready then
-  goto step5
-endi
-if $data4_3 != offline then
-  goto step5
-endi
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-
-sql show db.vgroups
-if $data04 != 3 then
-	goto step5
-endi
-if $data06 != 2 then
-	goto step5
-endi
-if $data05 != offline then
-	goto step5
-endi
-if $data07 != master then
-	goto step5
-endi
-
-print ============== step6
-sql create table t3 using stb tags(1)
-sql insert into t3 values(1577980800000, 1, 5)
-sql insert into t3 values(1577980800001, 2, 4)
-sql insert into t3 values(1577980800002, 3, 3)
-sql insert into t3 values(1577980800003, 4, 2)
-sql insert into t3 values(1577980800004, 5, 1)
-sql insert into t3 values(1577980800010, 11, 5)
-sql insert into t3 values(1577980800011, 12, 4)
-sql insert into t3 values(1577980800012, 13, 3)
-sql insert into t3 values(1577980800013, 14, 2)
-sql insert into t3 values(1577980800014, 15, 1)
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then
-	return -1
-endi
-
-system sh/exec.sh -n dnode3 -s start
-
-$x = 0
-step6: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step6
-endi
-if $data4_2 != ready then
-  goto step6
-endi
-if $data4_3 != ready then
-  goto step6
-endi
-
-sql show db.vgroups
-if $data04 != 3 then
-	goto step6
-endi
-if $data06 != 2 then
-	goto step6
-endi
-if $data05 != slave then
-	goto step6
-endi
-if $data07 != master then
-	goto step6
-endi
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then
-	return -1
-endi
-
-print ============== step7
-sql create table t4 using stb tags(1)
-sql insert into t4 values(1577980800000, 1, 5)
-sql insert into t4 values(1577980800001, 2, 4)
-sql insert into t4 values(1577980800002, 3, 3)
-sql insert into t4 values(1577980800003, 4, 2)
-sql insert into t4 values(1577980800004, 5, 1)
-sql insert into t4 values(1577980800010, 11, 5)
-sql insert into t4 values(1577980800011, 12, 4)
-sql insert into t4 values(1577980800012, 13, 3)
-sql insert into t4 values(1577980800013, 14, 2)
-sql insert into t4 values(1577980800014, 15, 1)
-sql insert into t4 values(1577980800020, 21, 5)
-sql insert into t4 values(1577980800021, 22, 4)
-sql insert into t4 values(1577980800022, 23, 3)
-sql insert into t4 values(1577980800023, 24, 2)
-sql insert into t4 values(1577980800024, 25, 1)
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then
-	return -1
-endi
-sql select * from t4
-if $rows != 15 then
-	return -1
-endi
-
-system sh/exec.sh -n dnode2 -s stop -x SIGKILL
-$x = 0
-step7: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step7
-endi
-if $data4_2 != offline then
-  goto step7
-endi
-if $data4_3 !=  ready then
-  goto step7
-endi
-
-sql show db.vgroups
-if $data04 != 3 then
-	goto step7
-endi
-if $data06 != 2 then
-	goto step7
-endi
-if $data05 != master then
-	goto step7
-endi
-if $data07 != offline then
-	goto step7
-endi
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then
-	return -1
-endi
-sql select * from t4
-if $rows != 15 then
-	return -1
-endi
-
-print ============== step8
-sql create table t5 using stb tags(1)
-sql insert into t5 values(1577980800000, 1, 5)
-sql insert into t5 values(1577980800001, 2, 4)
-sql insert into t5 values(1577980800002, 3, 3)
-sql insert into t5 values(1577980800003, 4, 2)
-sql insert into t5 values(1577980800004, 5, 1)
-sql insert into t5 values(1577980800010, 11, 5)
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then
-	return -1
-endi
-sql select * from t4
-if $rows != 15 then
-	return -1
-endi
-sql select * from t5
-if $rows != 6 then
-	return -1
-endi
-
-system sh/exec.sh -n dnode2 -s start
-$x = 0
-step8: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step8
-endi
-if $data4_2 != ready then
-  goto step8
-endi
-if $data4_3 != ready then
-  goto step8
-endi
-
-sql show db.vgroups
-if $data04 != 3 then
-	goto step8
-endi
-if $data06 != 2 then
-	goto step8
-endi
-if $data05 != master then
-	goto step8
-endi
-if $data07 != slave then
-	goto step8
-endi
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then
-	return -1
-endi
-sql select * from t4
-if $rows != 15 then
-	return -1
-endi
-sql select * from t5
-if $rows != 6 then
-	return -1
-endi
-
-print ============== step9
-sql create table t6 using stb tags(1)
-sql insert into t6 values(1577980800000, 1, 5)
-sql insert into t6 values(1577980800001, 2, 4)
-sql insert into t6 values(1577980800002, 3, 3)
-sql insert into t6 values(1577980800003, 4, 2)
-sql insert into t6 values(1577980800004, 5, 1)
-sql insert into t6 values(1577980800010, 11, 5)
-sql insert into t6 values(1577980800011, 12, 4)
-
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then
-	return -1
-endi
-sql select * from t4
-if $rows != 15 then
-	return -1
-endi
-sql select * from t5
-if $rows != 6 then
-	return -1
-endi
-sql select * from t6
-if $rows != 7 then
-	return -1
-endi
-
-system sh/exec.sh -n dnode3 -s stop -x SIGKILL
-$x = 0
-step9: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-		return -1
-	endi
-
-sql show dnodes
-print dnode1 $data4_1
-print dnode2 $data4_2
-print dnode3 $data4_3
-
-if $data4_1 != ready then
-  goto step9
-endi
-if $data4_2 != ready then
-  goto step9
-endi
-if $data4_3 != offline then
-  goto step9
-endi
-
-print ============== 2
-sql show db.vgroups
-
-if $data04 != 3 then
-	goto step7
-endi
-if $data06 != 2 then
-	goto step7
-endi
-if $data05 != offline then
-	goto step7
-endi
-if $data07 != master then
-	goto step7
-endi
-
-print ============== 3
-sql select * from t1
-if $rows != 5 then
-	return -1
-endi
-sql select * from t2
-if $rows != 5 then
-	return -1
-endi
-sql select * from t3
-if $rows != 10 then	
-	return -1
-endi
-sql select * from t4
-if $rows != 15 then
-	return -1
-endi
-sql select * from t5
-if $rows != 6 then
-	return -1
-endi
-sql select * from t6
-if $rows != 7 then
-	return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
diff --git a/tests/script/tsim/sync/3Replica1VgElect.sim b/tests/script/tsim/sync/3Replica1VgElect.sim
index 6649b9c335..a451b1cba2 100644
--- a/tests/script/tsim/sync/3Replica1VgElect.sim
+++ b/tests/script/tsim/sync/3Replica1VgElect.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 3
diff --git a/tests/script/tsim/sync/3Replica5VgElect.sim b/tests/script/tsim/sync/3Replica5VgElect.sim
index d96ad1655d..aec5666e6c 100644
--- a/tests/script/tsim/sync/3Replica5VgElect.sim
+++ b/tests/script/tsim/sync/3Replica5VgElect.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 3
diff --git a/tests/script/tsim/sync/3Replica5VgElect3mnode.sim b/tests/script/tsim/sync/3Replica5VgElect3mnode.sim
index 8df2c2007d..8a69d5ca07 100644
--- a/tests/script/tsim/sync/3Replica5VgElect3mnode.sim
+++ b/tests/script/tsim/sync/3Replica5VgElect3mnode.sim
@@ -3,66 +3,44 @@ 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 supportVnodes -v 0
-
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-### create clusters using four dnodes;
-
-
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> 1-dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 3
diff --git a/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim b/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim
index ae02a23c9b..d84679add1 100644
--- a/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim
+++ b/tests/script/tsim/sync/3Replica5VgElect3mnodedrop.sim
@@ -11,57 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-print ===> create clusters using four dnodes;
-
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> 1-dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 3
diff --git a/tests/script/tsim/sync/electTest.sim b/tests/script/tsim/sync/electTest.sim
index 5433434014..750ab9d63a 100644
--- a/tests/script/tsim/sync/electTest.sim
+++ b/tests/script/tsim/sync/electTest.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 3
diff --git a/tests/script/tsim/sync/oneReplica1VgElect.sim b/tests/script/tsim/sync/oneReplica1VgElect.sim
index cf8912e654..829cf029b4 100644
--- a/tests/script/tsim/sync/oneReplica1VgElect.sim
+++ b/tests/script/tsim/sync/oneReplica1VgElect.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $vgroups = 1
diff --git a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim
index b816226cff..aff458c02a 100644
--- a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim
+++ b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $vgroups = 1
diff --git a/tests/script/tsim/sync/oneReplica5VgElect.sim b/tests/script/tsim/sync/oneReplica5VgElect.sim
index 71c26e17c7..2cf9b7f1f5 100644
--- a/tests/script/tsim/sync/oneReplica5VgElect.sim
+++ b/tests/script/tsim/sync/oneReplica5VgElect.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 1
diff --git a/tests/script/tsim/sync/threeReplica1VgElect.sim b/tests/script/tsim/sync/threeReplica1VgElect.sim
index c3e9c13793..bf2cb05570 100644
--- a/tests/script/tsim/sync/threeReplica1VgElect.sim
+++ b/tests/script/tsim/sync/threeReplica1VgElect.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
-#sql connect
+sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $vgroups = 1
diff --git a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
index 3c21dff1b6..a6a0dda8a7 100644
--- a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
+++ b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $vgroups = 1
diff --git a/tests/script/tsim/sync/vnodesnapshot-test.sim b/tests/script/tsim/sync/vnodesnapshot-test.sim
index 3cf8cb4d93..8589078b50 100644
--- a/tests/script/tsim/sync/vnodesnapshot-test.sim
+++ b/tests/script/tsim/sync/vnodesnapshot-test.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 3
diff --git a/tests/script/tsim/sync/vnodesnapshot.sim b/tests/script/tsim/sync/vnodesnapshot.sim
index 347255b489..b9452d2147 100644
--- a/tests/script/tsim/sync/vnodesnapshot.sim
+++ b/tests/script/tsim/sync/vnodesnapshot.sim
@@ -11,55 +11,38 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][0] != 1 then
-  return -1
-endi
-if $data[0][4] != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 sql create dnode $hostname port 7400
 
-$loop_cnt = 0
-check_dnode_ready_1:
-$loop_cnt = $loop_cnt + 1
-sleep 200
-if $loop_cnt == 10 then
-  print ====> dnodes not ready!
-	return -1
-endi
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
 sql show dnodes
-print ===> $rows $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6]
-print ===> $rows $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4] $data[1][5] $data[1][6]
-print ===> $rows $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4] $data[2][5] $data[2][6]
-print ===> $rows $data[3][0] $data[3][1] $data[3][2] $data[3][3] $data[3][4] $data[3][5] $data[3][6]
-if $data[0][4] != ready then
-  goto check_dnode_ready_1
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+print ===> $data30 $data31 $data32 $data33 $data34 $data35
+if $rows != 4 then
+  return -1
 endi
-if $data[1][4] != ready then
-  goto check_dnode_ready_1
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data[2][4] != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data[3][4] != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
+endi
+if $data(4)[4] != ready then
+  goto step1
 endi
 
 $replica = 3

From b4644963af3344051b60e5b6f17350b0885fe08e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 15 Jul 2022 11:21:58 +0800
Subject: [PATCH 4/5] test: restore some 2.0 cases

---
 tests/script/jenkins/basic.txt                | 10 ++--
 tests/script/tsim/parser/alter.sim            | 47 +++++++++----------
 tests/script/tsim/parser/alter1.sim           |  7 +--
 .../parser/alter__for_community_version.sim   | 37 +++++----------
 tests/script/tsim/parser/alter_column.sim     | 42 ++---------------
 tests/script/tsim/parser/alter_stable.sim     | 19 ++++----
 6 files changed, 52 insertions(+), 110 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index bffed86d75..7ccfe93c11 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -82,11 +82,11 @@
 ./test.sh -f tsim/insert/update0.sim
 
 # ---- parser
-# ./test.sh -f tsim/parser/alter.sim
-# ./test.sh -f tsim/parser/alter1.sim
-## ./test.sh -f tsim/parser/alter__for_community_version.sim
-## ./test.sh -f tsim/parser/alter_column.sim
-# ./test.sh -f tsim/parser/alter_stable.sim
+./test.sh -f tsim/parser/alter.sim
+# nojira ./test.sh -f tsim/parser/alter1.sim
+./test.sh -f tsim/parser/alter__for_community_version.sim
+./test.sh -f tsim/parser/alter_column.sim
+./test.sh -f tsim/parser/alter_stable.sim
 # ./test.sh -f tsim/parser/auto_create_tb.sim
 # ./test.sh -f tsim/parser/auto_create_tb_drop_tb.sim
 # ./test.sh -f tsim/parser/between_and.sim
diff --git a/tests/script/tsim/parser/alter.sim b/tests/script/tsim/parser/alter.sim
index 78c1a3029a..499d4d302b 100644
--- a/tests/script/tsim/parser/alter.sim
+++ b/tests/script/tsim/parser/alter.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = m_alt_db
@@ -40,62 +37,61 @@ sql_error alter database $db keep 20,20,20,20
 sql_error alter database $db keep 365001,365001,365001
 sql alter database $db keep 21
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 21,21,21 then 
+if $data27 != 30240m,30240m,30240m then 
  return -1
 endi
 sql alter database $db keep 11,12
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 11,12,12 then 
+if $data27 != 15840m,17280m,17280m then 
  return -1
 endi
 sql alter database $db keep 20,20,20
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 20,20,20 then 
+if $data27 != 28800m,28800m,28800m then 
  return -1
 endi
 sql alter database $db keep 10,10,10
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 10,10,10 then 
+if $data27 != 14400m,14400m,14400m then 
  return -1
 endi
 sql alter database $db keep 10,10,11
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 10,10,11 then 
+if $data27 != 14400m,14400m,15840m then 
  return -1
 endi
 sql alter database $db keep 11,12,13
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 11,12,13 then 
+if $data27 != 15840m,17280m,18720m then 
  return -1
 endi
 sql alter database $db keep 365000,365000,365000
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 365000,365000,365000 then 
+if $data27 != 525600000m,525600000m,525600000m then 
  return -1
 endi
 
-
 ##### alter table test, simeplest case
 sql create table tb (ts timestamp, c1 int, c2 int, c3 int)
 sql insert into tb values (now, 1, 1, 1)
@@ -187,7 +183,6 @@ endi
 sql drop table tb
 sql drop table mt
 
-sleep 100
 ### ALTER TABLE WHILE STREAMING [TBASE271]
 #sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
 #sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
@@ -195,9 +190,9 @@ sleep 100
 #if $rows != 0 then
 #  return -1
 #endi
-##sleep 12000
+
 #sql insert into tb1 values (now, 1, 'taos', 1)
-#sleep 20000
+
 #sql select * from strm
 #print rows = $rows
 #if $rows != 1 then
@@ -207,9 +202,9 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 drop column c3
-#sleep 500
+
 #sql insert into tb1 values (now, 2, 'taos')
-#sleep 30000
+
 #sql select * from strm
 #if $rows != 2 then
 #   return -1
@@ -218,9 +213,9 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 add column c3 int
-#sleep 500
+
 #sql insert into tb1 values (now, 3, 'taos', 3);
-#sleep 100
+
 #sql select * from strm
 #if $rows != 3 then
 #   return -1
@@ -259,7 +254,7 @@ sql create database $db
 sql use $db
 sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
 sql create table tb using mt tags(1)
-sleep 100
+
 sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
 sql alter table mt drop column c3
 
diff --git a/tests/script/tsim/parser/alter1.sim b/tests/script/tsim/parser/alter1.sim
index 3b6b0d9465..b01e98a834 100644
--- a/tests/script/tsim/parser/alter1.sim
+++ b/tests/script/tsim/parser/alter1.sim
@@ -1,11 +1,7 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
-sql reset query cache
 
 $dbPrefix = alt1_db
 
@@ -87,9 +83,8 @@ if $data13 != NULL then
   return -1
 endi
 
-sleep 100
 print ================== insert values into table
-sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2,) car2 values (now, 1,3,3)
+sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2) car2 values (now, 1,3,3)
 
 sql select c1+speed from stb where c1 > 0
 if $rows != 3 then
diff --git a/tests/script/tsim/parser/alter__for_community_version.sim b/tests/script/tsim/parser/alter__for_community_version.sim
index 7a9a970822..9a960e21c2 100644
--- a/tests/script/tsim/parser/alter__for_community_version.sim
+++ b/tests/script/tsim/parser/alter__for_community_version.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = m_alt_db
@@ -23,10 +20,10 @@ sql drop database if exists $db
 sql create database $db duration 10 keep 20
 sql use $db
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 20 then 
+if $data27 != 28800m,28800m,28800m then 
  return -1
 endi
 
@@ -47,44 +44,44 @@ sql_error alter database $db keep 20,19,18
 sql_error alter database $db keep 20,20,20,20
 sql_error alter database $db keep 365001,365001,365001
 sql_error alter database $db keep 365001
-sql alter database $db keep 20
+sql_error alter database $db keep 20
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 20 then 
+if $data27 != 28800m,28800m,28800m then 
  return -1
 endi
 sql alter database $db keep 10
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 10 then 
+if $data27 != 14400m,14400m,14400m then 
  return -1
 endi
 sql alter database $db keep 11
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 11 then 
+if $data27 != 15840m,15840m,15840m then 
  return -1
 endi
 sql alter database $db keep 13
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 13 then 
+if $data27 != 18720m,18720m,18720m then 
  return -1
 endi
 sql alter database $db keep 365000
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 365000 then 
+if $data27 != 525600000m,525600000m,525600000m then 
  return -1
 endi
 
@@ -180,7 +177,6 @@ endi
 sql drop table tb
 sql drop table mt
 
-sleep 100
 ### ALTER TABLE WHILE STREAMING [TBASE271]
 #sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
 #sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
@@ -188,9 +184,7 @@ sleep 100
 #if $rows != 0 then
 #  return -1
 #endi
-##sleep 12000
 #sql insert into tb1 values (now, 1, 'taos', 1)
-#sleep 20000
 #sql select * from strm
 #print rows = $rows
 #if $rows != 1 then
@@ -200,9 +194,7 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 drop column c3
-#sleep 500
 #sql insert into tb1 values (now, 2, 'taos')
-#sleep 30000
 #sql select * from strm
 #if $rows != 2 then
 #   return -1
@@ -211,9 +203,7 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 add column c3 int
-#sleep 500
 #sql insert into tb1 values (now, 3, 'taos', 3);
-#sleep 100
 #sql select * from strm
 #if $rows != 3 then
 #   return -1
@@ -252,7 +242,6 @@ sql create database $db
 sql use $db
 sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
 sql create table tb using mt tags(1)
-sleep 100
 sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
 sql alter table mt drop column c3
 
diff --git a/tests/script/tsim/parser/alter_column.sim b/tests/script/tsim/parser/alter_column.sim
index fe109352d1..3b6f0e4da7 100644
--- a/tests/script/tsim/parser/alter_column.sim
+++ b/tests/script/tsim/parser/alter_column.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = m_alt_db
@@ -26,51 +23,20 @@ sql use $db
 sql create table tb (ts timestamp, c1 int, c2 binary(10), c3 nchar(10))
 sql insert into tb values (now, 1, "1", "1")
 sql alter table tb modify column c2 binary(20);
-if $rows != 0 then
-  return -1
-endi
 sql alter table tb modify column c3 nchar(20);
-if $rows != 0 then
-  return -1
-endi
 
 
 sql create stable stb (ts timestamp, c1 int, c2 binary(10), c3 nchar(10)) tags(id1 int, id2 binary(10), id3 nchar(10))
 sql create table tb1 using stb tags(1, "a", "b")
 sql insert into tb1 values (now, 1, "1", "1")
 sql alter stable stb modify column c2 binary(20);
-if $rows != 0 then
-  return -1
-endi
 sql alter table stb modify column c2 binary(30);
-if $rows != 0 then
-  return -1
-endi
 sql alter stable stb modify column c3 nchar(20);
-if $rows != 0 then
-  return -1
-endi
 sql alter table stb modify column c3 nchar(30);
-if $rows != 0 then
-  return -1
-endi
-
 sql alter table stb modify tag id2 binary(11);
-if $rows != 0 then
-  return -1
-endi
-sql alter stable stb modify tag id2 binary(11);
-if $rows != 0 then
-  return -1
-endi
+sql_error alter stable stb modify tag id2 binary(11);
 sql alter table stb modify tag id3 nchar(11);
-if $rows != 0 then
-  return -1
-endi
-sql alter stable stb modify tag id3 nchar(11);
-if $rows != 0 then
-  return -1
-endi
+sql_error alter stable stb modify tag id3 nchar(11);
 
 ##### ILLEGAL OPERATIONS
 
@@ -82,14 +48,14 @@ sql_error alter table tb modify column c2 binary(10);
 sql_error alter table tb modify column c2 binary(9);
 sql_error alter table tb modify column c2 binary(-9);
 sql_error alter table tb modify column c2 binary(0);
-sql_error alter table tb modify column c2 binary(17000);
+sql alter table tb modify column c2 binary(17000);
 sql_error alter table tb modify column c2 nchar(30);
 sql_error alter table tb modify column c3 double;
 sql_error alter table tb modify column c3 nchar(10);
 sql_error alter table tb modify column c3 nchar(0);
 sql_error alter table tb modify column c3 nchar(-1);
 sql_error alter table tb modify column c3 binary(80);
-sql_error alter table tb modify column c3 nchar(17000);
+sql alter table tb modify column c3 nchar(17000);
 sql_error alter table tb modify column c3 nchar(100), c2 binary(30);
 sql_error alter table tb modify column c1 nchar(100), c2 binary(30);
 sql_error alter stable tb modify column c2 binary(30);
diff --git a/tests/script/tsim/parser/alter_stable.sim b/tests/script/tsim/parser/alter_stable.sim
index 1406af6087..8659d92f7e 100644
--- a/tests/script/tsim/parser/alter_stable.sim
+++ b/tests/script/tsim/parser/alter_stable.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 print ========== alter_stable.sim
@@ -13,19 +10,19 @@ sql drop database if exists $db
 sql create database $db
 sql use $db
 
-##### alter stable test : change tag name
-# case-1  change tag name: new name inclue old name
+##### alter stable test : rename tag name
+# case-1  rename tag name: new name inclue old name
 sql create table mt1 (ts timestamp, c1 int) tags (a int)
-sql alter table mt1 change tag a abcd
-sql alter table mt1 change tag abcd a
-sql_error alter table mt1 change tag a 1
+sql alter table mt1 rename tag a abcd
+sql alter table mt1 rename tag abcd a
+sql_error alter table mt1 rename tag a 1
 
 sql_error create table mtx1 (ts timestamp, c1 int) tags (123 int)
 
 sql_error create table mt2 (ts timestamp, c1 int) tags (abc012345678901234567890123456789012345678901234567890123456789def int)
 sql create table mt3 (ts timestamp, c1 int) tags (abc012345678901234567890123456789012345678901234567890123456789 int)
-sql_error alter table mt3 change tag abc012345678901234567890123456789012345678901234567890123456789 abcdefg012345678901234567890123456789012345678901234567890123456789
-sql alter table mt3 change tag abc012345678901234567890123456789012345678901234567890123456789 abcdefg0123456789012345678901234567890123456789
+sql_error alter table mt3 rename tag abc012345678901234567890123456789012345678901234567890123456789 abcdefg012345678901234567890123456789012345678901234567890123456789
+sql alter table mt3 rename tag abc012345678901234567890123456789012345678901234567890123456789 abcdefg0123456789012345678901234567890123456789
 
 # case-2 set tag value
 sql create table mt4 (ts timestamp, c1 int) tags (name binary(16), len int)
@@ -37,7 +34,7 @@ sql alter table tb1 set tag len = 379
 
 # case TD-5594
 sql create stable st5520(ts timestamp, f int) tags(t0 bool, t1 nchar(4093), t2 nchar(1))
-sql_error alter stable st5520 modify tag t2 nchar(2);
+sql alter stable st5520 modify tag t2 nchar(2);
 # test end   
 sql drop database $db
 

From 72f4a4afbb8eab30f571f479a08e4733019348e5 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 15 Jul 2022 11:27:33 +0800
Subject: [PATCH 5/5] test: comment out case

---
 tests/script/jenkins/basic.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 7ccfe93c11..b5cb7ddb79 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -381,7 +381,7 @@
 
 # ---- compute
 ./test.sh -f tsim/compute/avg.sim
-./test.sh -f tsim/compute/block_dist.sim
+# jira ./test.sh -f tsim/compute/block_dist.sim
 ./test.sh -f tsim/compute/bottom.sim
 ./test.sh -f tsim/compute/count.sim
 ./test.sh -f tsim/compute/diff.sim