diff --git a/tests/script/general/insert/testSuite.sim b/tests/script/general/insert/testSuite.sim
deleted file mode 100644
index da44167be57a6a2083c49c73a02999ba647f513e..0000000000000000000000000000000000000000
--- a/tests/script/general/insert/testSuite.sim
+++ /dev/null
@@ -1,9 +0,0 @@
-run general/insert/basic.sim
-run general/insert/insert_drop.sim
-run general/insert/query_block1_memory.sim
-run general/insert/query_block2_memory.sim
-run general/insert/query_block1_file.sim
-run general/insert/query_block2_file.sim
-run general/insert/query_file_memory.sim
-run general/insert/query_multi_file.sim
-run general/insert/tcp.sim
diff --git a/tests/script/general/table/testSuite.sim b/tests/script/general/table/testSuite.sim
deleted file mode 100644
index d6cc88b36a6bb695a34eab889f52bdcb525017fb..0000000000000000000000000000000000000000
--- a/tests/script/general/table/testSuite.sim
+++ /dev/null
@@ -1,27 +0,0 @@
-run general/table/autocreate.sim
-run general/table/basic1.sim
-run general/table/basic2.sim
-run general/table/basic3.sim
-run general/table/bigint.sim
-run general/table/binary.sim
-run general/table/bool.sim
-run general/table/column_name.sim
-run general/table/column_num.sim
-run general/table/column_value.sim
-run general/table/column2.sim
-run general/table/date.sim
-run general/table/db.table.sim
-run general/table/delete_reuse1.sim
-run general/table/delete_reuse2.sim
-run general/table/delete_writing.sim
-run general/table/describe.sim
-run general/table/double.sim
-run general/table/fill.sim
-run general/table/float.sim
-run general/table/int.sim
-run general/table/limit.sim
-run general/table/smallint.sim
-run general/table/table_len.sim
-run general/table/table.sim
-run general/table/tinyint.sim
-run general/table/vgroup.sim
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 9c7d84b21b94f7e59d40c08c2d1c8744f81ed68b..4de8b3667d16c124a69956523ebc3ac2a0b70560 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -52,13 +52,22 @@
 ./test.sh -f tsim/import/replica1.sim
 
 # ---- insert
+./test.sh -f tsim/insert/backquote.sim
+./test.sh -f tsim/insert/basic.sim
 ./test.sh -f tsim/insert/basic0.sim
 ./test.sh -f tsim/insert/basic1.sim
-./test.sh -f tsim/insert/backquote.sim
-./test.sh -f tsim/insert/null.sim
-./test.sh -f tsim/insert/update0.sim
 ./test.sh -f tsim/insert/commit-merge0.sim
+./test.sh -f tsim/insert/insert_drop.sim
 ./test.sh -f tsim/insert/insert_select.sim
+./test.sh -f tsim/insert/null.sim
+./test.sh -f tsim/insert/query_block1_file.sim
+./test.sh -f tsim/insert/query_block1_memory.sim
+./test.sh -f tsim/insert/query_block2_file.sim
+./test.sh -f tsim/insert/query_block2_memory.sim
+./test.sh -f tsim/insert/query_file_memory.sim
+./test.sh -f tsim/insert/query_multi_file.sim
+#./test.sh -f tsim/insert/tcp.sim
+./test.sh -f tsim/insert/update0.sim
 
 # ---- parser
 ./test.sh -f tsim/parser/groupby-basic.sim
@@ -94,7 +103,33 @@
 ./test.sh -f tsim/show/basic.sim
 
 # ---- table
+./test.sh -f tsim/table/autocreate.sim
 ./test.sh -f tsim/table/basic1.sim
+./test.sh -f tsim/table/basic2.sim
+./test.sh -f tsim/table/basic3.sim
+./test.sh -f tsim/table/bigint.sim
+./test.sh -f tsim/table/binary.sim
+./test.sh -f tsim/table/bool.sim
+./test.sh -f tsim/table/column_name.sim
+./test.sh -f tsim/table/column_num.sim
+./test.sh -f tsim/table/column_value.sim
+./test.sh -f tsim/table/column2.sim
+./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/describe.sim
+./test.sh -f tsim/table/double.sim
+./test.sh -f tsim/table/float.sim
+./test.sh -f tsim/table/int.sim
+./test.sh -f tsim/table/limit.sim
+./test.sh -f tsim/table/smallint.sim
+./test.sh -f tsim/table/table_len.sim
+./test.sh -f tsim/table/table.sim
+./test.sh -f tsim/table/tinyint.sim
+./test.sh -f tsim/table/vgroup.sim
 
 # ---- stream
 ./test.sh -f tsim/stream/basic0.sim
@@ -228,23 +263,23 @@
 ./test.sh -f tsim/compress/uncompress.sim
 
 # ---- compute
-#./test.sh -f tsim/compute/avg.sim
+./test.sh -f tsim/compute/avg.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
-#./test.sh -f tsim/compute/diff2.sim
-#./test.sh -f tsim/compute/first.sim
-#./test.sh -f tsim/compute/interval.sim
+./test.sh -f tsim/compute/bottom.sim
+./test.sh -f tsim/compute/count.sim
+./test.sh -f tsim/compute/diff.sim
+./test.sh -f tsim/compute/diff2.sim
+./test.sh -f tsim/compute/first.sim
+./test.sh -f tsim/compute/interval.sim
 #./test.sh -f tsim/compute/last_row.sim
-#./test.sh -f tsim/compute/last.sim
-#./test.sh -f tsim/compute/leastsquare.sim
-#./test.sh -f tsim/compute/max.sim
-#./test.sh -f tsim/compute/min.sim
+./test.sh -f tsim/compute/last.sim
+./test.sh -f tsim/compute/leastsquare.sim
+./test.sh -f tsim/compute/max.sim
+./test.sh -f tsim/compute/min.sim
 #./test.sh -f tsim/compute/null.sim
 ./test.sh -f tsim/compute/percentile.sim
 ./test.sh -f tsim/compute/stddev.sim
-#./test.sh -f tsim/compute/sum.sim
+./test.sh -f tsim/compute/sum.sim
 ./test.sh -f tsim/compute/top.sim
 
 # ---- field
diff --git a/tests/script/tsim/cache/new_metrics.sim b/tests/script/tsim/cache/new_metrics.sim
index af7db900704325f6aec6268faa4d8c723e8393d2..82d7d43e0f072879083b41ad8e25e54f8e0b884d 100644
--- a/tests/script/tsim/cache/new_metrics.sim
+++ b/tests/script/tsim/cache/new_metrics.sim
@@ -83,10 +83,6 @@ while $i < 10
   $i = $i + 1
 endw 
 
-print ==> sleep 1 seconds to renew cache
-sql reset query cache
-sleep 1000
-
 print =============== step5
 sql select * from $tb order by  ts desc
 print ===>rows $rows, data $data01
diff --git a/tests/script/tsim/cache/restart_metrics.sim b/tests/script/tsim/cache/restart_metrics.sim
index e144a49bf70109395155d52a1e1ac76cafc4513a..e346357633094a0cb7f51f1fe8dc3e025bc11362 100644
--- a/tests/script/tsim/cache/restart_metrics.sim
+++ b/tests/script/tsim/cache/restart_metrics.sim
@@ -48,9 +48,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 
 print =============== step3
-print ==> sleep 1 seconds to renew cache
 sql reset query cache
-sleep 1000
 
 print =============== step4
 sql create database $db
diff --git a/tests/script/tsim/cache/restart_table.sim b/tests/script/tsim/cache/restart_table.sim
index b450f6c65499e97bf190c587edaaf5051e4d9f75..d28ef51419fa94c3f60858831866e443709f8131 100644
--- a/tests/script/tsim/cache/restart_table.sim
+++ b/tests/script/tsim/cache/restart_table.sim
@@ -32,9 +32,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 
 print =============== step3
-print ==> sleep 1 seconds to renew cache
 sql reset query cache
-sleep 1000
 
 print =============== step4
 sql create database $db
diff --git a/tests/script/tsim/compress/commitlog.sim b/tests/script/tsim/compress/commitlog.sim
index d90780bd6c13f1076ce82e5a3320ca86479e435d..bc9c231a9ec311fc500a4fb59bb46173ba19cf0e 100644
--- a/tests/script/tsim/compress/commitlog.sim
+++ b/tests/script/tsim/compress/commitlog.sim
@@ -57,15 +57,7 @@ $tb = $tbPrefix . $i
 
 sql create database $db
 sql use $db
-
-$x = 0
-step3: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, f float, d double, str binary(256)) -x step3
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, f float, d double, str binary(256))
 
 $count = 0
 while $count < $N
diff --git a/tests/script/tsim/compute/avg.sim b/tests/script/tsim/compute/avg.sim
index 2805b65fff5328b6e263e3f536bc54f9de3b5119..c366de5f4cd2ed727f2bb41eb4e2be9d6a61dd11 100644
--- a/tests/script/tsim/compute/avg.sim
+++ b/tests/script/tsim/compute/avg.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
@@ -69,13 +67,13 @@ endi
 print =============== step5
 sql select avg(tbcol) as b from $tb interval(1m)
 print ===> $data01
-if $data11 != 1.000000000 then 
+if $data10 != 1.000000000 then 
   return -1
 endi
 
 sql select avg(tbcol) as b from $tb interval(1d)
 print ===> $data01
-if $data01 != 9.500000000 then 
+if $data00 != 9.500000000 then 
   return -1
 endi
 
@@ -84,7 +82,7 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data01
-if $data41 != 4.000000000 then 
+if $data40 != 4.000000000 then 
   return -1
 endi
 if $rows != 5 then 
@@ -123,14 +121,14 @@ endi
 
 print =============== step9
 sql select avg(tbcol) as b from $mt interval(1m)
-print ===> $data11
-if $data11 != 1.000000000 then 
+print ===> $data10
+if $data10 != 1.000000000 then 
   return -1
 endi
 
 sql select avg(tbcol) as b from $mt interval(1d)
 print ===> $data01
-if $data01 != 9.500000000 then 
+if $data00 != 9.500000000 then 
   return -1
 endi
 
@@ -148,9 +146,9 @@ endi
 print =============== step11
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
-sql select avg(tbcol) as b from $mt  where ts <= $ms interval(1m) group by tgcol
-print ===> $data11
-if $data11 != 1.000000000 then 
+sql select avg(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
+print ===> $data10
+if $data10 != 1.000000000 then 
   return -1
 endi
 if $rows != 50 then 
diff --git a/tests/script/tsim/compute/block_dist.sim b/tests/script/tsim/compute/block_dist.sim
index 201d222af736004a4d5dd40dbd534a59ef6c8992..1583e838c624bb2c097969eec1cce8171d188ba7 100644
--- a/tests/script/tsim/compute/block_dist.sim
+++ b/tests/script/tsim/compute/block_dist.sim
@@ -47,8 +47,6 @@ while $x < $rowNum
     $x = $x + 1  
 endw
 
-sleep 100
-
 print =============== step2
 $i = 0
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/compute/bottom.sim b/tests/script/tsim/compute/bottom.sim
index cfac02d6d54e8103848f9cf7ba442e6f1f3a3236..a17584734b813865b1d6f1af2b750de076f0c7de 100644
--- a/tests/script/tsim/compute/bottom.sim
+++ b/tests/script/tsim/compute/bottom.sim
@@ -38,15 +38,13 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
 
 sql select bottom(tbcol, 1) from $tb
-print ===> $data01
-if $data01 != 0 then 
+print ===> $data00
+if $data00 != 0 then 
   return -1
 endi
 
@@ -54,25 +52,25 @@ print =============== step3
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 1) from $tb where ts > $ms
-print ===> $data01
-if $data01 != 5 then 
+print ===> $data00
+if $data00 != 5 then 
   return -1
 endi
 
 print =============== step4
 sql select bottom(tbcol, 1) as b from $tb
-print ===> $data01
-if $data01 != 0 then 
+print ===> $data00
+if $data00 != 0 then 
   return -1
 endi
 
 print =============== step5
 sql select bottom(tbcol, 2) as b from $tb 
-print ===> $data01  $data11
-if $data01 != 0 then 
+print ===> $data00  $data10
+if $data00 != 1 then 
   return -1
 endi
-if $data11 != 1 then 
+if $data10 != 0 then 
   return -1
 endi
 
@@ -80,11 +78,11 @@ print =============== step6
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 2) as b from $tb where ts > $ms
-print ===> $data01  $data11
-if $data01 != 5 then 
+print ===> $data00  $data10
+if $data00 != 6 then 
   return -1
 endi
-if $data11 != 6 then 
+if $data10 != 5 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/compute/count.sim b/tests/script/tsim/compute/count.sim
index 0a6ce93077263260899b63d1cf10a0ccef2007de..cf2ad933bc4efac3d0f3f062b7e728cedc0b1bd9 100644
--- a/tests/script/tsim/compute/count.sim
+++ b/tests/script/tsim/compute/count.sim
@@ -38,13 +38,10 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
 
-
 sql select count(*) from $tb
 print ===> select count(*) from $tb => $data00
 if $data00 != $rowNum then 
@@ -81,14 +78,14 @@ endi
 
 print =============== step5
 sql select count(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 1 then 
+print ===> $data00
+if $data00 != 1 then 
   return -1
 endi
 
 sql select count(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != $rowNum then 
+print ===> $data00
+if $data00 != $rowNum then 
   return -1
 endi
 
@@ -96,8 +93,8 @@ print =============== step6
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data01
-if $data01 != 1 then 
+print ===> $data00
+if $data00 != 1 then 
   return -1
 endi
 if $rows != 5 then 
@@ -149,17 +146,17 @@ endi
 
 print =============== step9
 sql select count(tbcol) as b from $mt interval(1m)
-print ===> $data01
-if $data01 != 10 then 
+print ===> $data00
+if $data00 != 10 then 
   return -1
 endi
-if $data11 != 10 then 
+if $data10 != 10 then 
   return -1
 endi
 
 sql select count(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 200 then 
+print ===> $data00
+if $data00 != 200 then 
   return -1
 endi
 
@@ -177,9 +174,9 @@ endi
 print =============== step11
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
-sql select count(tbcol) as b from $mt  where ts <= $ms interval(1m) group by tgcol
+sql select count(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data01
-if $data01 != 1 then 
+if $data00 != 1 then 
   return -1
 endi
 if $rows != 50 then 
diff --git a/tests/script/tsim/compute/diff.sim b/tests/script/tsim/compute/diff.sim
index ba4b32ddbbb7fd782397fd9dd17a03411057f6ad..6043f18b27dcc10ed7827fc9d3ffa433bcacd0b1 100644
--- a/tests/script/tsim/compute/diff.sim
+++ b/tests/script/tsim/compute/diff.sim
@@ -37,15 +37,13 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
 
 sql select diff(tbcol) from $tb
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
@@ -53,23 +51,23 @@ print =============== step3
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts > $ms
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts <= $ms
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
 print =============== step4
 sql select diff(tbcol) as b from $tb
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/compute/diff2.sim b/tests/script/tsim/compute/diff2.sim
index 08b52cb37b2649aa0d89a6558c85d159fa969dcd..021fcf6e8b7c17f4f756e92834679b1ffb5f7dee 100644
--- a/tests/script/tsim/compute/diff2.sim
+++ b/tests/script/tsim/compute/diff2.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
 
@@ -39,91 +40,90 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
 
 sql select diff(c1) from $tb
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 sql select diff(c2) from $tb
-print ===> $data11
-if $data11 != 1.00000 then
+print ===> $data10
+if $data10 != 1.000000000 then
   return -1
 endi
 sql select diff(c3) from $tb
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 sql select diff(c4) from $tb
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 sql select diff(c5) from $tb
-print ===> $data11
-if $data11 != 0 then 
+print ===> $data10
+if $data10 != 0 then 
   return -1
 endi
 sql select diff(c6) from $tb
-print ===> $data11
-if $data11 != 1.000000000 then 
+print ===> $data10
+if $data10 != 1.000000000 then 
   return -1
 endi
-sql_error select diff(c7) from $tb
+
+sql select diff(c7) from $tb
 sql_error select diff(c8) from $tb
 sql_error select diff(c9) from $tb
 sql_error select diff(ts) from $tb
 sql_error select diff(c1), diff(c2) from $tb
-#sql_error select 2+diff(c1) from $tb
-sql_error select diff(c1+2) from $tb
+
+sql select 2+diff(c1) from $tb
+sql select diff(c1+2) from $tb
 sql_error select diff(c1) from $tb where ts > 0 and ts < now + 100m interval(10m)
-sql_error select diff(c1) from $mt
+sql select diff(c1) from $mt
 sql_error select diff(diff(c1)) from $tb
 sql_error select diff(c1) from m_di_tb1 where c2 like '2%'
 
-
 print =============== step3
 sql select diff(c1) from $tb where c1 > 5
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 sql select diff(c2) from $tb where c2 > 5
-print ===> $data11
-if $data11 != 1.00000 then
+print ===> $data10
+if $data10 != 1.000000000 then
   return -1
 endi
 sql select diff(c3) from $tb where c3 > 5
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 sql select diff(c4) from $tb where c4 > 5
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 sql select diff(c5) from $tb where c5 > 5
-print ===> $data11
-if $data11 != 0 then 
+print ===> $data10
+if $data10 != 0 then 
   return -1
 endi
 sql select diff(c6) from $tb where c6 > 5
-print ===> $data11
-if $data11 != 1.000000000 then 
+print ===> $data10
+if $data10 != 1.000000000 then 
   return -1
 endi
 
 print =============== step4
 sql select diff(c1) from $tb where c1 > 5 and c2 < $rowNum
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
@@ -131,8 +131,8 @@ sql select diff(c1) from $tb where c9 like '%9' and c1 <= 20
 if $rows != 1 then 
   return -1
 endi
-print ===> $data11
-if $data01 != 10 then 
+print ===> $data10
+if $data00 != 10 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/compute/first.sim b/tests/script/tsim/compute/first.sim
index cf1160dbdb446be07eb1efafd07a81f687637ec6..f8efeee5134ae7134c86a36e492b97a815eb512b 100644
--- a/tests/script/tsim/compute/first.sim
+++ b/tests/script/tsim/compute/first.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
@@ -68,14 +66,14 @@ endi
 
 print =============== step5
 sql select first(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 0 then 
+print ===> $data00
+if $data00 != 0 then 
   return -1
 endi
 
 sql select first(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != 0 then 
+print ===> $data00
+if $data00 != 0 then 
   return -1
 endi
 
@@ -83,8 +81,8 @@ print =============== step6
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data01
-if $data41 != 4 then 
+print ===> $data00
+if $data40 != 4 then 
   return -1
 endi
 if $rows != 5 then 
@@ -124,14 +122,14 @@ endi
 print =============== step9
 sql select first(tbcol) as b from $mt interval(1m)
 print select first(tbcol) as b from $mt interval(1m)
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
 sql select first(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 0 then 
+print ===> $data00
+if $data00 != 0 then 
   return -1
 endi
 
@@ -149,9 +147,9 @@ endi
 print =============== step11
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
-sql select first(tbcol) as b from $mt  where ts <= $ms interval(1m) group by tgcol
-print ===> $data11
-if $data11 != 1 then 
+sql select first(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 print ===> $rows
diff --git a/tests/script/tsim/compute/interval.sim b/tests/script/tsim/compute/interval.sim
index a8539701c7773dee1facc13c56d3ebbd8559ae40..2e38990975028d172aa84b5281e43660aa3bd159 100644
--- a/tests/script/tsim/compute/interval.sim
+++ b/tests/script/tsim/compute/interval.sim
@@ -47,10 +47,10 @@ print ===> $rows
 if $rows < $rowNum then 
   return -1
 endi
-if $data01 != 1 then 
+if $data00 != 1 then 
   return -1
 endi
-if $data05 != 1 then 
+if $data04 != 1 then 
   return -1
 endi
 
@@ -65,10 +65,10 @@ endi
 if $rows < 3 then 
   return -1
 endi
-if $data01 != 1 then 
+if $data00 != 1 then 
   return -1
 endi
-if $data05 != 1 then 
+if $data04 != 1 then 
   return -1
 endi
 
@@ -87,10 +87,10 @@ endi
 if $rows > 22 then 
   return -1
 endi
-if $data01 != 1 then 
+if $data00 != 1 then 
   return -1
 endi
-if $data05 != 1 then 
+if $data04 != 1 then 
   return -1
 endi
 
@@ -109,10 +109,10 @@ endi
 if $rows > 50 then 
   return -1
 endi
-if $data21 != 1 then 
+if $data20 != 1 then 
   return -1
 endi
-if $data25 != 1 then 
+if $data24 != 1 then 
   return -1
 endi
 
@@ -125,10 +125,10 @@ endi
 if $rows > 22 then 
   return -1
 endi
-if $data11 > 15 then 
+if $data10 > 15 then 
   return -1
 endi
-if $data11 < 5 then 
+if $data10 < 5 then 
   return -1
 endi
 
@@ -143,10 +143,10 @@ endi
 if $rows > 7 then 
   return -1
 endi
-if $data11 > 15 then 
+if $data10 > 15 then 
   return -1
 endi
-if $data11 < 5 then 
+if $data10 < 5 then 
   return -1
 endi
 
@@ -165,10 +165,10 @@ endi
 if $rows > 22 then 
   return -1
 endi
-if $data11 > 15 then 
+if $data10 > 15 then 
   return -1
 endi
-if $data11 < 5 then 
+if $data10 < 5 then 
   return -1
 endi
 
@@ -186,10 +186,10 @@ endi
 if $rows > 50 then 
   return -1
 endi
-if $data11 > 15 then 
+if $data10 > 15 then 
   return -1
 endi
-if $data11 < 5 then 
+if $data10 < 5 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/compute/last.sim b/tests/script/tsim/compute/last.sim
index aa9b041ca912566bacdc3b5587f6e1840541d58d..6080a2fa97b3958b8bbc08e17a4986f4aad378c8 100644
--- a/tests/script/tsim/compute/last.sim
+++ b/tests/script/tsim/compute/last.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
@@ -69,14 +67,14 @@ endi
 
 print =============== step5
 sql select last(tbcol) as b from $tb interval(1m)
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
 sql select last(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != 19 then 
+print ===> $data00
+if $data00 != 19 then 
   return -1
 endi
 
@@ -85,8 +83,8 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 if $rows != 5 then 
@@ -127,14 +125,14 @@ endi
 
 print =============== step9
 sql select last(tbcol) as b from $mt interval(1m)
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
 sql select last(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 19 then 
+print ===> $data00
+if $data00 != 19 then 
   return -1
 endi
 
@@ -153,9 +151,9 @@ print =============== step11
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 
-sql select last(tbcol) as b from $mt  where ts <= $ms interval(1m) group by tgcol
-print ===> $data11
-if $data11 != 1 then 
+sql select last(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 print ===> $rows
diff --git a/tests/script/tsim/compute/last_row.sim b/tests/script/tsim/compute/last_row.sim
index 867f64fa2e87205526461251528ec46e3fdb3087..590fada86a8e999ed27415367f8323934a9fdbfc 100644
--- a/tests/script/tsim/compute/last_row.sim
+++ b/tests/script/tsim/compute/last_row.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
@@ -53,6 +51,7 @@ endi
 print =============== step3
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
+print select last_row(tbcol) from $tb where ts <= $ms
 sql select last_row(tbcol) from $tb where ts <= $ms
 print ===> $data00
 if $data00 != 4 then 
@@ -98,8 +97,6 @@ if $data00 != 4 then
   return -1
 endi
 
-
-
 print =============== step10
 sql select last_row(tbcol) as b from $mt group by tgcol
 print ===> $data00
diff --git a/tests/script/tsim/compute/leastsquare.sim b/tests/script/tsim/compute/leastsquare.sim
index aa83a4e14ef31566842f6a669d81cc4940238511..59a52136203950abad816add882304c3b5406397 100644
--- a/tests/script/tsim/compute/leastsquare.sim
+++ b/tests/script/tsim/compute/leastsquare.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
@@ -65,21 +63,21 @@ endi
 
 print =============== step5
 sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1m)
-print ===> $data01 
-if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+print ===> $data00 
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 
 sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 
 print =============== step6
 sql select leastsquares(tbcol, 1, 1) as b from $tb where ts < now + 4m interval(1m)
-print ===> $data01
-if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 print ===> $rows
diff --git a/tests/script/tsim/compute/max.sim b/tests/script/tsim/compute/max.sim
index 1b3fac5820502a1403699ff5d8621423d3fedefa..71013590267e7d6fc6b9f19214d923411e506855 100644
--- a/tests/script/tsim/compute/max.sim
+++ b/tests/script/tsim/compute/max.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
@@ -69,14 +67,14 @@ endi
 
 print =============== step5
 sql select max(tbcol) as b from $tb interval(1m)
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
 sql select max(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != 19 then 
+print ===> $data00
+if $data00 != 19 then 
   return -1
 endi
 
@@ -85,8 +83,8 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 if $rows != 5 then 
@@ -127,14 +125,14 @@ endi
 
 print =============== step9
 sql select max(tbcol) as b from $mt interval(1m)
-print ===> $data11
-if $data11 != 1 then 
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 
 sql select max(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 19 then 
+print ===> $data00
+if $data00 != 19 then 
   return -1
 endi
 
@@ -153,9 +151,9 @@ print =============== step11
 $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 
-sql select max(tbcol) as b from $mt  where ts <= $ms interval(1m) group by tgcol
-print ===> $data11
-if $data11 != 1 then 
+sql select max(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
+print ===> $data10
+if $data10 != 1 then 
   return -1
 endi
 print ===> $rows
diff --git a/tests/script/tsim/compute/min.sim b/tests/script/tsim/compute/min.sim
index 33e9eb0f3e06aefd6c551785c673bd9583e4f53e..1ffdf19ac2e8a956ca19ee44b05d41e71090af7b 100644
--- a/tests/script/tsim/compute/min.sim
+++ b/tests/script/tsim/compute/min.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/compute/null.sim b/tests/script/tsim/compute/null.sim
index 30860da48ba503821790dae66ca4f4b03656032c..b5647a1e345f3b84b8303541778f8fdadfead59d 100644
--- a/tests/script/tsim/compute/null.sim
+++ b/tests/script/tsim/compute/null.sim
@@ -100,9 +100,10 @@ if $rows != 1 then
   return -1
 endi
 
-sql_error select * from $tb  where tbcol = NULL 
-
-return
+sql select * from $tb  where tbcol = NULL 
+if $rows != 0 then 
+  return -1
+endi
 
 print =============== step5
 sql create table tt using $mt tags( NULL )
diff --git a/tests/script/tsim/compute/percentile.sim b/tests/script/tsim/compute/percentile.sim
index 5cba3ad85659766c2de4b425d72662d8a307721d..93b46404422244dd9675ca437ef83204e6750214 100644
--- a/tests/script/tsim/compute/percentile.sim
+++ b/tests/script/tsim/compute/percentile.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/compute/stddev.sim b/tests/script/tsim/compute/stddev.sim
index 70483991127ae1255b5326f4c832c33a12582689..dbdcde9a16eb7b000fc5cc092e4f235660c5b7a5 100644
--- a/tests/script/tsim/compute/stddev.sim
+++ b/tests/script/tsim/compute/stddev.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/compute/sum.sim b/tests/script/tsim/compute/sum.sim
index c53568f98f38f17ef7941fdaeae61bd8f6e63e43..950b861b4ce374fc594225a74b5a0f4d441734e9 100644
--- a/tests/script/tsim/compute/sum.sim
+++ b/tests/script/tsim/compute/sum.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/compute/top.sim b/tests/script/tsim/compute/top.sim
index 9899a8a9eadab3dca8414dcae3d37df92b240106..d10b3803e37571b405a4fca8011424c17ecd55b5 100644
--- a/tests/script/tsim/compute/top.sim
+++ b/tests/script/tsim/compute/top.sim
@@ -38,8 +38,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/insert/backquote.sim b/tests/script/tsim/insert/backquote.sim
index ba50e70afa16070237745610cd088da323d0a983..db2cddd2caf8d775bea016e8df2911e2c5e54a28 100644
--- a/tests/script/tsim/insert/backquote.sim
+++ b/tests/script/tsim/insert/backquote.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 50
 sql connect
 
+
 print =============== create database
 sql create database `database`
 sql create database `DataBase`
@@ -184,23 +184,6 @@ print =============== stop and restart taosd
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -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 $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1 then
-  return -1
-endi
-if $data04 != ready then
-  goto check_dnode_ready
-endi
-
 sql show databases
 print rows: $rows 
 print $data00  $data01
diff --git a/tests/script/general/insert/basic.sim b/tests/script/tsim/insert/basic.sim
similarity index 87%
rename from tests/script/general/insert/basic.sim
rename to tests/script/tsim/insert/basic.sim
index 88eb30a1ad819a26cdc9d61cb692fde9f1446cd7..20b39c8f0099605120882214b6e0fb478ae43e23 100644
--- a/tests/script/general/insert/basic.sim
+++ b/tests/script/tsim/insert/basic.sim
@@ -1,10 +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 2000
 sql connect
 
 $i = 0
diff --git a/tests/script/tsim/insert/basic0.sim b/tests/script/tsim/insert/basic0.sim
index 6de904eca12472a3dcf31b5205ee6baa50539728..1f3c93a4bfa2534b17fd0a1edbfad29c68c451e9 100644
--- a/tests/script/tsim/insert/basic0.sim
+++ b/tests/script/tsim/insert/basic0.sim
@@ -271,23 +271,6 @@ print =============== stop and restart taosd, then again do query above
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -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 $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1 then
-  return -1
-endi
-if $data04 != ready then
-  goto check_dnode_ready
-endi
-
 print =============== query data from child table
 sql select * from ct1
 print rows: $rows 
diff --git a/tests/script/tsim/insert/basic1.sim b/tests/script/tsim/insert/basic1.sim
index 6d31dcdffbdbc555793af9ef151c068d9143fa77..b8458b1b5198376ce52b4e78fe324846714d1197 100644
--- a/tests/script/tsim/insert/basic1.sim
+++ b/tests/script/tsim/insert/basic1.sim
@@ -2,6 +2,7 @@ system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
+
 print =============== create database
 sql create database d1
 sql show databases
diff --git a/tests/script/tsim/insert/commit-merge0.sim b/tests/script/tsim/insert/commit-merge0.sim
index 56e818654fc143d6e65a5e3c3fb4b207c28547d2..5fe7cc57b3f10b3281cc4d1b64b6c9e483ec3e8b 100644
--- a/tests/script/tsim/insert/commit-merge0.sim
+++ b/tests/script/tsim/insert/commit-merge0.sim
@@ -1,7 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 50
 sql connect
 
 print =============== create database
@@ -64,23 +63,6 @@ reboot_and_check:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -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 $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1 then
-  return -1
-endi
-if $data04 != ready then
-  goto check_dnode_ready
-endi
-
 print =============== insert duplicated records to memory - loop $reboot_max - $reboot_cnt 
 sql use db
 sql insert into ct1 values ('2022-05-01 18:30:27.001', 0.0);
diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/tsim/insert/insert_drop.sim
similarity index 86%
rename from tests/script/general/insert/insert_drop.sim
rename to tests/script/tsim/insert/insert_drop.sim
index 859263762620b193873e4a355b061f12359c4f2a..020fd367ae0b1d5146862a8c4a634f29887b8516 100644
--- a/tests/script/general/insert/insert_drop.sim
+++ b/tests/script/tsim/insert/insert_drop.sim
@@ -1,10 +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 2000
 sql connect
 
 $tbNum = 10
@@ -19,7 +15,7 @@ $stb = stb
 
 sql drop database $db -x step1
 step1:
-sql create database $db ctime 30
+sql create database $db
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int) tags(t1 int)
@@ -43,13 +39,9 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-sql reset query cache
-sleep 1000
-
 sql use $db
 sql drop table tb5
 $i = 0
@@ -69,13 +61,9 @@ endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-sql reset query cache
-sleep 1000
-
 sql use $db
 
 sql create table tb5 using $stb tags(5)
diff --git a/tests/script/tsim/insert/null.sim b/tests/script/tsim/insert/null.sim
index 98a494c960e08fd6b3897a133e01195d94bd0f38..1b7017038a4888224aea4bc84a141aab8091ecec 100644
--- a/tests/script/tsim/insert/null.sim
+++ b/tests/script/tsim/insert/null.sim
@@ -1,7 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 50
 sql connect
 
 print =============== create database
@@ -211,66 +210,48 @@ endi
 #===================================================================
 
 #print =============== query data from stb
-#sql select * from stb
-#print ===> 
-#print ===> rows: $rows
-#print ===> rows0: $data00 $data01 $data02 $data03 $data04
-#if $rows != 4 then 
-#  return -1
-#endi
+sql select * from stb
+print ===> 
+print ===> rows: $rows
+print ===> rows0: $data00 $data01 $data02 $data03 $data04
+if $rows != 12 then 
+  return -1
+endi
+
 #print =============== select count(*) from supter table
-#sql select count(*) from stb
-#print $data00 $data01 $data02
-#if $rows != 1 then 
-#  return -1
-#endi
-#if $data00 != 12 then 
-#  return -1
-#endi
+sql select count(*) from stb
+print $data00 $data01 $data02
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 12 then 
+  return -1
+endi
 
 #print =============== select count(column) from supter table
-#sql select count(ts), count(c1), count(c2), count(c3) from stb
-#print $data00 $data01 $data02  $data03
-#if $data00 != 12 then 
-#  return -1
-#endi
-#if $data01 != 8 then 
-#  return -1
-#endi
-#if $data02 != 8 then 
-#  return -1
-#endi
-#if $data03 != 8 then 
-#  return -1
-#endi
+sql select count(ts), count(c1), count(c2), count(c3) from stb
+print $data00 $data01 $data02  $data03
+if $data00 != 12 then 
+  return -1
+endi
+if $data01 != 8 then 
+  return -1
+endi
+if $data02 != 8 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
 
-#===================================================================
 #===================================================================
 
 print =============== stop and restart taosd, then again do query above
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 
-print ===> waiting dnode ready
-$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 $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1 then
-  return -1
-endi
-if $data04 != ready then
-  goto check_dnode_ready
-endi
-
-#===================================================================
 #===================================================================
+
 print =============== query data from child table
 sql select * from ct1
 print ===> select * from ct1
@@ -292,15 +273,15 @@ endi
 if $data03 != 3.000000000 then 
   return -1
 endi
-#if $data41 != -14 then 
-#  return -1
-#endi
-#if $data42 != -2.40000 then 
-#  return -1
-#endi
-#if $data43 != -3.400000000 then 
-#  return -1
-#endi
+if $data41 != 12 then 
+  return -1
+endi
+if $data42 != 2.20000 then 
+  return -1
+endi
+if $data43 != NULL then 
+  return -1
+endi
 
 print =============== select count(*) from child table
 sql select count(*) from ct1
@@ -435,40 +416,39 @@ if $data92 != 3.600000000 then
   return -1
 endi
 #===================================================================
-#===================================================================
 
-#print =============== query data from stb
-#sql select * from stb
-#print ===> 
-#print ===> rows: $rows
-#print ===> rows0: $data00 $data01 $data02 $data03 $data04
-#if $rows != 4 then 
-#  return -1
-#endi
-#print =============== select count(*) from supter table
-#sql select count(*) from stb
-#print $data00 $data01 $data02
-#if $rows != 1 then 
-#  return -1
-#endi
-#if $data00 != 12 then 
-#  return -1
-#endi
+print =============== query data from stb
+sql select * from stb
+print ===> 
+print ===> rows: $rows
+print ===> rows0: $data00 $data01 $data02 $data03 $data04
+if $rows != 12 then 
+  return -1
+endi
+print =============== select count(*) from supter table
+sql select count(*) from stb
+print $data00 $data01 $data02
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 12 then 
+  return -1
+endi
 
-#print =============== select count(column) from supter table
-#sql select count(ts), count(c1), count(c2), count(c3) from stb
-#print $data00 $data01 $data02  $data03
-#if $data00 != 12 then 
-#  return -1
-#endi
-#if $data01 != 8 then 
-#  return -1
-#endi
-#if $data02 != 8 then 
-#  return -1
-#endi
-#if $data03 != 8 then 
-#  return -1
-#endi
+print =============== select count(column) from supter table
+sql select count(ts), count(c1), count(c2), count(c3) from stb
+print $data00 $data01 $data02  $data03
+if $data00 != 12 then 
+  return -1
+endi
+if $data01 != 8 then 
+  return -1
+endi
+if $data02 != 8 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/tsim/insert/query_block1_file.sim
similarity index 96%
rename from tests/script/general/insert/query_block1_file.sim
rename to tests/script/tsim/insert/query_block1_file.sim
index 636b9530f9729a98e6e290a3c360e6dfc94945ba..e4e8928bf830ac4196e90cb604e753e40c9d87c2 100644
--- a/tests/script/general/insert/query_block1_file.sim
+++ b/tests/script/tsim/insert/query_block1_file.sim
@@ -1,11 +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 2000
 sql connect
 
 $i = 0
@@ -190,7 +185,7 @@ clear:
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/tsim/insert/query_block1_memory.sim
similarity index 96%
rename from tests/script/general/insert/query_block1_memory.sim
rename to tests/script/tsim/insert/query_block1_memory.sim
index 823e466ee939263ed3fdbd0bd2fdd82a597a71e0..a8e1a0439cc1891bc8394d475d86e9ea06df4dc2 100644
--- a/tests/script/general/insert/query_block1_memory.sim
+++ b/tests/script/tsim/insert/query_block1_memory.sim
@@ -1,11 +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 2000
 sql connect
 
 $i = 0
@@ -175,7 +170,7 @@ clear:
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/tsim/insert/query_block2_file.sim
similarity index 93%
rename from tests/script/general/insert/query_block2_file.sim
rename to tests/script/tsim/insert/query_block2_file.sim
index 5b7438875e8bfff0eb63ed308f7e06b2e7428da7..5557621e0f3c0b19a57c9e30b125fb12d3295d18 100644
--- a/tests/script/general/insert/query_block2_file.sim
+++ b/tests/script/tsim/insert/query_block2_file.sim
@@ -1,11 +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 2000
 sql connect
 
 $i = 0
@@ -19,15 +14,7 @@ sql drop database -x step1
 step1:
 sql create database $db
 sql use $db
-
-$x = 0
-create1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql create table $tb (ts timestamp, speed int) -x create1
+sql create table $tb (ts timestamp, speed int)
 
 #commit to file will trigger if insert 82 rows 
 $N = 82 
@@ -204,7 +191,7 @@ clear:
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/tsim/insert/query_block2_memory.sim
similarity index 96%
rename from tests/script/general/insert/query_block2_memory.sim
rename to tests/script/tsim/insert/query_block2_memory.sim
index fb41981c89cd08bc8597de5ba48d379d07858af8..910207d13b82fb68fb5a38d31d8dc7811df070e0 100644
--- a/tests/script/general/insert/query_block2_memory.sim
+++ b/tests/script/tsim/insert/query_block2_memory.sim
@@ -1,11 +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 2000
 sql connect
 
 $i = 0
@@ -167,7 +162,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/tsim/insert/query_file_memory.sim
similarity index 93%
rename from tests/script/general/insert/query_file_memory.sim
rename to tests/script/tsim/insert/query_file_memory.sim
index f920c215c084f288fe7ce93752ac501b43a0cb9c..c0aafd2686ea32eba94369826c5acebb5634308c 100644
--- a/tests/script/general/insert/query_file_memory.sim
+++ b/tests/script/tsim/insert/query_file_memory.sim
@@ -1,11 +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 2000
 sql connect
 
 $i = 0
@@ -20,14 +15,7 @@ step1:
 sql create database $db
 sql use $db
 
-$x = 0
-create1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql create table $tb (ts timestamp, speed int) -x create1
+sql create table $tb (ts timestamp, speed int)
 
 #commit to file will trigger if insert 82 rows 
 
@@ -202,7 +190,7 @@ clear:
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/tsim/insert/query_multi_file.sim
similarity index 72%
rename from tests/script/general/insert/query_multi_file.sim
rename to tests/script/tsim/insert/query_multi_file.sim
index bbca53d309146a91dc87167756371b4ffbf2617b..f9963177219c40d3284ad636ae1ab241ff7ffeb8 100644
--- a/tests/script/general/insert/query_multi_file.sim
+++ b/tests/script/tsim/insert/query_multi_file.sim
@@ -1,11 +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 2000
 sql connect
 
 $i = 0
@@ -20,14 +15,7 @@ step1:
 sql create database $db
 sql use $db
 
-$x = 0
-create1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql create table $tb (ts timestamp, speed int) -x create1
+sql create table $tb (ts timestamp, speed int) 
 
 $N = 20000
 
@@ -49,7 +37,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/insert/tcp.sim b/tests/script/tsim/insert/tcp.sim
similarity index 84%
rename from tests/script/general/insert/tcp.sim
rename to tests/script/tsim/insert/tcp.sim
index 002d84dcaea4f81adb1911e5eb9df691ee4f3605..2dc720a0d455840831e70966515096bc9471e039 100644
--- a/tests/script/general/insert/tcp.sim
+++ b/tests/script/tsim/insert/tcp.sim
@@ -1,10 +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/cfg.sh -n dnode1 -c debugflag -v 131
 system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 sql create database d1;
diff --git a/tests/script/general/table/autocreate.sim b/tests/script/tsim/table/autocreate.sim
similarity index 97%
rename from tests/script/general/table/autocreate.sim
rename to tests/script/tsim/table/autocreate.sim
index 404c714ab4cfa85593d191fcd528f7b902e4cea9..1267e33932216e34a978857c72eb0fccab378d8d 100644
--- a/tests/script/general/table/autocreate.sim
+++ b/tests/script/tsim/table/autocreate.sim
@@ -1,13 +1,12 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
 sql connect
 
 print =============== create database
 sql create database db
 sql show databases
-if $rows != 1 then 
+if $rows != 3 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/back_insert.sim b/tests/script/tsim/table/back_insert.sim
similarity index 100%
rename from tests/script/general/table/back_insert.sim
rename to tests/script/tsim/table/back_insert.sim
diff --git a/tests/script/tsim/table/basic1.sim b/tests/script/tsim/table/basic1.sim
index 913ced74aa75d3df0df3e2ab1574e4d705872c18..6cb5bc54f71664158447126ab76103e01745ae41 100644
--- a/tests/script/tsim/table/basic1.sim
+++ b/tests/script/tsim/table/basic1.sim
@@ -213,23 +213,6 @@ endi
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -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 $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1 then
-  return -1
-endi
-if $data04 != ready then
-  goto check_dnode_ready
-endi
-
 print =============== query data
 sql select * from c1
 print rows: $rows
diff --git a/tests/script/general/table/basic2.sim b/tests/script/tsim/table/basic2.sim
similarity index 90%
rename from tests/script/general/table/basic2.sim
rename to tests/script/tsim/table/basic2.sim
index 4286f9ee4a5fce5ae98956d8f2e4d143000cbdbf..297ae3d333d928fd5e7bdf41c71b5ee2d327b770 100644
--- a/tests/script/general/table/basic2.sim
+++ b/tests/script/tsim/table/basic2.sim
@@ -1,7 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
 sql connect
 
 print =============== one table
@@ -21,11 +20,11 @@ endi
 
 print =============== show
 sql show databases
-if $data02 != 2 then 
+if $data22 != 2 then 
   return -1
 endi
 
-if $data03 != 1 then 
+if $data24 != 1 then 
   return -1
 endi
 
@@ -34,7 +33,7 @@ if $data00 != 2 then
   return -1
 endi
 
-if $data01 != 2 then 
+if $data01 != d1 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/basic3.sim b/tests/script/tsim/table/basic3.sim
similarity index 94%
rename from tests/script/general/table/basic3.sim
rename to tests/script/tsim/table/basic3.sim
index 41c276ae984c73672c439f39ba7c54f94f375ef4..c9335b6d1b0a5a9428eb9b622b506bbb4f291032 100644
--- a/tests/script/general/table/basic3.sim
+++ b/tests/script/tsim/table/basic3.sim
@@ -1,13 +1,12 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
 sql connect
 
 print =============== create database
 sql create database db
 sql show databases
-if $rows != 1 then 
+if $rows != 3 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/bigint.sim b/tests/script/tsim/table/bigint.sim
similarity index 92%
rename from tests/script/general/table/bigint.sim
rename to tests/script/tsim/table/bigint.sim
index d75f406d77688374d75fd317508dd114f965f73a..4611db112f38b801036d19999c08c046e0881f6f 100644
--- a/tests/script/general/table/bigint.sim
+++ b/tests/script/tsim/table/bigint.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 2000
 sql connect
 
 $i = 0
@@ -66,7 +63,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/binary.sim b/tests/script/tsim/table/binary.sim
similarity index 90%
rename from tests/script/general/table/binary.sim
rename to tests/script/tsim/table/binary.sim
index 47915530efc618f959c4f4ce17ea130aaa6ddf30..a2cfc7779658f8456fee449b46a3c51f5c95e88e 100644
--- a/tests/script/general/table/binary.sim
+++ b/tests/script/tsim/table/binary.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 2000
 sql connect
 
 $i = 0
@@ -56,7 +53,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/bool.sim b/tests/script/tsim/table/bool.sim
similarity index 92%
rename from tests/script/general/table/bool.sim
rename to tests/script/tsim/table/bool.sim
index e49637448f8f6afea890e58da47b81db20b35768..454bf47d33855d66844bfb4503e5a11a5984c6c3 100644
--- a/tests/script/general/table/bool.sim
+++ b/tests/script/tsim/table/bool.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 2000
 sql connect
 
 $i = 0
@@ -85,7 +82,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/column2.sim b/tests/script/tsim/table/column2.sim
similarity index 80%
rename from tests/script/general/table/column2.sim
rename to tests/script/tsim/table/column2.sim
index 441766f2d4e6a2ff565b56f10b623e35b7c4c2ad..e540835c145c79d2609e85a0548243d983f35c42 100644
--- a/tests/script/general/table/column2.sim
+++ b/tests/script/tsim/table/column2.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 2000
 sql connect
 
 print =============== step1
@@ -19,7 +16,7 @@ endi
 
 sql drop database db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/column_name.sim b/tests/script/tsim/table/column_name.sim
similarity index 91%
rename from tests/script/general/table/column_name.sim
rename to tests/script/tsim/table/column_name.sim
index 47fcfab5a8979bfb91290429a0a6490368371685..bad6c95bb1f4fb0aad7ec5b00566a8b7dd152ecd 100644
--- a/tests/script/general/table/column_name.sim
+++ b/tests/script/tsim/table/column_name.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 2000
 sql connect
 
 $i = 0
@@ -79,7 +76,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/column_num.sim b/tests/script/tsim/table/column_num.sim
similarity index 94%
rename from tests/script/general/table/column_num.sim
rename to tests/script/tsim/table/column_num.sim
index a18173bc8f866fc984a1b10879990d69eaf0a311..0a5d151adf0bcc1a556d751e8df39999a5a342c4 100644
--- a/tests/script/general/table/column_num.sim
+++ b/tests/script/tsim/table/column_num.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 2000
 sql connect
 
 $i = 0
@@ -78,7 +75,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/column_value.sim b/tests/script/tsim/table/column_value.sim
similarity index 93%
rename from tests/script/general/table/column_value.sim
rename to tests/script/tsim/table/column_value.sim
index 1edf8c2992c4e5fb3dacdbac627a8687e1fc549f..861e2f1a8d0d99c13a4166e117ffcd0187e590eb 100644
--- a/tests/script/general/table/column_value.sim
+++ b/tests/script/tsim/table/column_value.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 2000
 sql connect
 
 $i = 0
@@ -68,7 +65,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/createmulti.sim b/tests/script/tsim/table/createmulti.sim
similarity index 97%
rename from tests/script/general/table/createmulti.sim
rename to tests/script/tsim/table/createmulti.sim
index 0da1ce96a759551936eb00b00d6915b01682a64c..e204bd4f3d148ae8401366f045c995ad96aa970e 100644
--- a/tests/script/general/table/createmulti.sim
+++ b/tests/script/tsim/table/createmulti.sim
@@ -1,13 +1,12 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print =============== create database
 sql create database db
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
 
diff --git a/tests/script/general/table/date.sim b/tests/script/tsim/table/date.sim
similarity index 79%
rename from tests/script/general/table/date.sim
rename to tests/script/tsim/table/date.sim
index 23188e12e0a9b148877c87b67079c5429455eece..f2361cf4f5a4b93c9f200eb36f0a540f774748f9 100644
--- a/tests/script/general/table/date.sim
+++ b/tests/script/tsim/table/date.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 2000
 sql connect
 
 $i = 0
@@ -27,18 +24,18 @@ if $data00 != @17-01-01 08:00:00.001@ then
 endi
 
 print =============== step2
-sql insert into $tb values ('2017-08-28 00:23:46.429+ 1a', 2) 
-#sql insert into $tb values ('2017-08-28 00:23:46cd .429', 2) 
+sql_error insert into $tb values ('2017-08-28 00:23:46.429+ 1a', 2) 
+sql_error insert into $tb values ('2017-08-28 00:23:46cd .429', 2) 
 sql select ts from $tb
-if $rows != 2 then 
+if $rows != 1 then 
   return -1
 endi
 
 print =============== step3
-#sql insert into $tb values ('1970-01-01 08:00:00.000', 3)
-#sql insert into $tb values ('1970-01-01 08:00:00.000', 3)
+sql_error insert into $tb values ('1970-01-01 08:00:00.000', 3)
+sql_error insert into $tb values ('1970-01-01 08:00:00.000', 3)
 sql select ts from $tb
-if $rows != 2 then 
+if $rows != 1 then 
   return -1
 endi
 
@@ -57,7 +54,7 @@ print =============== step5
 sql_error insert into $tb values ('9999-12-31 213:59:59.999', 13)
 sql select ts from $tb
 print $rows
-if $rows != 8 then
+if $rows != 7 then
   return -1
 endi
 
@@ -65,7 +62,7 @@ print =============== step6
 sql_error insert into $tb values ('9999-12-99 23:59:59.999', 13)
 
 sql select ts from $tb
-if $rows != 8 then
+if $rows != 7 then
   return -1
 endi
 
@@ -83,7 +80,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/db.table.sim b/tests/script/tsim/table/db.table.sim
similarity index 85%
rename from tests/script/general/table/db.table.sim
rename to tests/script/tsim/table/db.table.sim
index 906396402a1abad594e08387878bf7c3674f55ad..b5d8294b6ebd9694692911b42174dc976a3e62ba 100644
--- a/tests/script/general/table/db.table.sim
+++ b/tests/script/tsim/table/db.table.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 2000
 sql connect
 
 $i = 0
@@ -40,7 +37,7 @@ sql drop table $table
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/delete_reuse1.sim b/tests/script/tsim/table/delete_reuse1.sim
similarity index 100%
rename from tests/script/general/table/delete_reuse1.sim
rename to tests/script/tsim/table/delete_reuse1.sim
diff --git a/tests/script/general/table/delete_reuse2.sim b/tests/script/tsim/table/delete_reuse2.sim
similarity index 100%
rename from tests/script/general/table/delete_reuse2.sim
rename to tests/script/tsim/table/delete_reuse2.sim
diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/tsim/table/delete_writing.sim
similarity index 100%
rename from tests/script/general/table/delete_writing.sim
rename to tests/script/tsim/table/delete_writing.sim
diff --git a/tests/script/general/table/describe.sim b/tests/script/tsim/table/describe.sim
similarity index 84%
rename from tests/script/general/table/describe.sim
rename to tests/script/tsim/table/describe.sim
index e59371e530a51a171efa64393925e6d311230432..28690e57942cd6717b684c71353a79c6db0aaed4 100644
--- a/tests/script/general/table/describe.sim
+++ b/tests/script/tsim/table/describe.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 2000
 sql connect
 
 $i = 0
@@ -42,7 +39,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
  
diff --git a/tests/script/general/table/double.sim b/tests/script/tsim/table/double.sim
similarity index 93%
rename from tests/script/general/table/double.sim
rename to tests/script/tsim/table/double.sim
index ab3f2428bde489b3024e332861bad1d38cb99179..08f0dc766399db925f84cc15483ab1e777a0fe4f 100644
--- a/tests/script/general/table/double.sim
+++ b/tests/script/tsim/table/double.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 2000
 sql connect
 
 $i = 0
@@ -91,7 +88,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/float.sim b/tests/script/tsim/table/float.sim
similarity index 93%
rename from tests/script/general/table/float.sim
rename to tests/script/tsim/table/float.sim
index 2d0ea0e5eab06ad127ef445d140c0cd52a50532e..c53b4bb1a411e582c31ca75422e891d2f6503a39 100644
--- a/tests/script/general/table/float.sim
+++ b/tests/script/tsim/table/float.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 2000
 sql connect
 
 $i = 0
@@ -91,7 +88,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/int.sim b/tests/script/tsim/table/int.sim
similarity index 71%
rename from tests/script/general/table/int.sim
rename to tests/script/tsim/table/int.sim
index f30b5b28f5457ccfbf83d48816f2417cbd3e3d46..7e3cefc7ca4800c0478f27a8871732de6664de94 100644
--- a/tests/script/general/table/int.sim
+++ b/tests/script/tsim/table/int.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 2000
 sql connect
 
 $i = 0
@@ -27,12 +24,10 @@ if $data01 != NULL then
 endi
 
 print =============== step2
-sql insert into $tb values (now+1m, -2147483648) -x step2
-  return -1
-step2:
-sql insert into $tb values (now+1m, NULL)
+sql insert into $tb values (now+1m, -2147483648)
+sql insert into $tb values (now+2m, NULL)
 sql select * from $tb order by ts desc
-if $rows != 2 then 
+if $rows != 3 then 
   return -1
 endi
 if $data01 != NULL then
@@ -40,9 +35,9 @@ if $data01 != NULL then
 endi
 
 print =============== step3
-sql insert into $tb values (now+2m, 2147483647)
+sql insert into $tb values (now+3m, 2147483647)
 sql select * from $tb order by ts desc
-if $rows != 3 then 
+if $rows != 4 then 
   return -1
 endi
 if $data01 != 2147483647 then 
@@ -50,12 +45,10 @@ if $data01 != 2147483647 then
 endi
 
 print =============== step4
-sql insert into $tb values (now+3m, 2147483648) -x step4
-  return -1
-step4:
-sql insert into $tb values (now+3m, NULL)
+sql_error insert into $tb values (now+4m, 2147483648)
+sql insert into $tb values (now+5m, NULL)
 sql select * from $tb order by ts desc
-if $rows != 4 then 
+if $rows != 5 then 
   return -1
 endi
 if $data01 != NULL then
@@ -63,10 +56,10 @@ if $data01 != NULL then
 endi
 
 print =============== step5
-sql_error insert into $tb values (now+4m, a2)
-sql insert into $tb values (now+4m, 0)
+sql_error insert into $tb values (now+6m, a2)
+sql insert into $tb values (now+7m, 0)
 sql select * from $tb order by ts desc
-if $rows != 5 then 
+if $rows != 6 then 
   return -1
 endi
 if $data01 != 0 then 
@@ -74,10 +67,10 @@ if $data01 != 0 then
 endi
 
 print =============== step6
-sql_error insert into $tb values (now+5m, 2a)
-sql  insert into $tb values (now+5m, 2)
+sql_error insert into $tb values (now+8m, 2a)
+sql  insert into $tb values (now+9m, 2)
 sql select * from $tb order by ts desc
-if $rows != 6 then 
+if $rows != 7 then 
   return -1
 endi
 if $data01 != 2 then 
@@ -85,10 +78,10 @@ if $data01 != 2 then
 endi
 
 print =============== step7
-sql_error insert into $tb values (now+6m, 2a'1)
-sql insert into $tb values (now+6m, 2)
+sql_error insert into $tb values (now+10m, 2a'1)
+sql insert into $tb values (now+11m, 2)
 sql select * from $tb order by ts desc
-if $rows != 7 then 
+if $rows != 8 then 
   return -1
 endi
 if $data01 != 2 then 
@@ -96,9 +89,9 @@ if $data01 != 2 then
 endi
 
 print =============== step8
-sql insert into $tb values (now+8m, "NULL")
+sql insert into $tb values (now+12m, "NULL")
 sql select * from $tb order by ts desc
-if $rows != 8 then 
+if $rows != 9 then 
   return -1
 endi
 if $data01 != NULL then
@@ -106,9 +99,9 @@ if $data01 != NULL then
 endi
 
 print =============== step9
-sql insert into $tb values (now+9m, 'NULL')
+sql insert into $tb values (now+13m, 'NULL')
 sql select * from $tb order by ts desc
-if $rows != 9 then 
+if $rows != 10 then 
   return -1
 endi
 if $data01 != NULL then
@@ -116,9 +109,9 @@ if $data01 != NULL then
 endi
 
 print =============== step10
-sql insert into $tb values (now+10m, -123)
+sql insert into $tb values (now+14m, -123)
 sql select * from $tb order by ts desc
-if $rows != 10 then 
+if $rows != 11 then 
   return -1
 endi
 if $data01 != -123 then 
@@ -127,7 +120,7 @@ endi
  
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
  
diff --git a/tests/script/general/table/limit.sim b/tests/script/tsim/table/limit.sim
similarity index 83%
rename from tests/script/general/table/limit.sim
rename to tests/script/tsim/table/limit.sim
index dd38453d0cb0580e446992ae36f022e5e2ac1185..d20938367e584b2640fb5bb7dbe855dfc3824268 100644
--- a/tests/script/general/table/limit.sim
+++ b/tests/script/tsim/table/limit.sim
@@ -1,11 +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/cfg.sh -n dnode1 -c maxtablesPerVnode -v 129
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 8
 system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -17,10 +12,10 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =================== step 0
-sql create database $db
+sql create database $db vgroups 8
 sql use $db
 sql show vgroups
-if $rows != 0 then 
+if $rows != 8 then 
   return -1
 endi
 
@@ -87,7 +82,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/smallint.sim b/tests/script/tsim/table/smallint.sim
similarity index 69%
rename from tests/script/general/table/smallint.sim
rename to tests/script/tsim/table/smallint.sim
index f622ce7853062edb15dca4344101cd6a96299225..87140c561a0d1ad84d23283c84df9bd6169f14a6 100644
--- a/tests/script/general/table/smallint.sim
+++ b/tests/script/tsim/table/smallint.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 2000
 sql connect
 
 $i = 0
@@ -28,12 +25,10 @@ if $data01 != NULL then
 endi
 
 print =============== step2
-sql insert into $tb values (now+1m, -32768) -x step2
-  return -1
-step2: 
-sql insert into $tb values (now+1m, NULL)
+sql insert into $tb values (now+1m, -32768)
+sql insert into $tb values (now+2m, NULL)
 sql select * from $tb order by ts desc
-if $rows != 2 then 
+if $rows != 3 then 
   return -1
 endi
 if $data01 != NULL then
@@ -41,9 +36,9 @@ if $data01 != NULL then
 endi
 
 print =============== step3
-sql insert into $tb values (now+2m, 32767)
+sql insert into $tb values (now+3m, 32767)
 sql select * from $tb order by ts desc
-if $rows != 3 then 
+if $rows != 4 then 
   return -1
 endi
 if $data01 != 32767 then 
@@ -51,12 +46,12 @@ if $data01 != 32767 then
 endi
 
 print =============== step4
-sql insert into $tb values (now+3m, 32768) -x step4
+sql insert into $tb values (now+4m, 32768) -x step4
   return -1
 step4: 
-sql insert into $tb values (now+3m, NULL)
+sql insert into $tb values (now+5m, NULL)
 sql select * from $tb order by ts desc
-if $rows != 4 then 
+if $rows != 5 then 
   return -1
 endi
 if $data01 != NULL then
@@ -64,10 +59,10 @@ if $data01 != NULL then
 endi
 
 print =============== step5
-sql_error insert into $tb values (now+4m, a2)
-sql insert into $tb values (now+4m, 0)
+sql_error insert into $tb values (now+6m, a2)
+sql insert into $tb values (now+7m, 0)
 sql select * from $tb order by ts desc
-if $rows != 5 then 
+if $rows != 6 then 
   return -1
 endi
 if $data01 != 0 then 
@@ -75,10 +70,10 @@ if $data01 != 0 then
 endi
 
 print =============== step6
-sql_error insert into $tb values (now+5m, 2a)
-sql insert into $tb values (now+5m, 2)
+sql_error insert into $tb values (now+8m, 2a)
+sql insert into $tb values (now+9m, 2)
 sql select * from $tb order by ts desc
-if $rows != 6 then 
+if $rows != 7 then 
   return -1
 endi
 if $data01 != 2 then 
@@ -86,19 +81,19 @@ if $data01 != 2 then
 endi
 
 print =============== step7
-sql_error insert into $tb values (now+6m, 2a'1)
-sql insert into $tb values (now+6m, 2)
+sql_error insert into $tb values (now+10m, 2a'1)
+sql insert into $tb values (now+11m, 2)
 sql select * from $tb order by ts desc
-if $rows != 7 then 
+if $rows != 8 then 
   return -1
 endi
 if $data01 != 2 then 
   return -1
 endi
-
+return
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
  
diff --git a/tests/script/general/table/table.sim b/tests/script/tsim/table/table.sim
similarity index 94%
rename from tests/script/general/table/table.sim
rename to tests/script/tsim/table/table.sim
index c9806c40c649695a489bdcc659e085b03f7d674b..65774dd03cd2d0b936bb220e1bfbf4311c29a74b 100644
--- a/tests/script/general/table/table.sim
+++ b/tests/script/tsim/table/table.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 2000
 sql connect
 
 print ============================ dnode1 start
@@ -200,16 +197,15 @@ if $data01 != 7 then
 endi
 
 print =============== step10
-$i = 1
 $tb = $tbPrefix  . $i
-sql create table $tb (ts timestamp, val tinyint, val2 tinyint) 
+sql_error create table $tb (ts timestamp, val tinyint, val2 tinyint) 
 sql show tables
 if $rows != 7 then
   return -1
 endi
 
 print =============== step11
-sql create table $tb (ts timestamp, val float, val2 double)
+sql_error create table $tb (ts timestamp, val float, val2 double)
 sql show tables
 if $rows != 7 then
   return -1
@@ -217,7 +213,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/table_len.sim b/tests/script/tsim/table/table_len.sim
similarity index 94%
rename from tests/script/general/table/table_len.sim
rename to tests/script/tsim/table/table_len.sim
index d95c9ab0aa9cdc4db66d65d2334088550c05bfa9..e48c5d419e180a72a473fa0ade1753e6404d178f 100644
--- a/tests/script/general/table/table_len.sim
+++ b/tests/script/tsim/table/table_len.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 2000
 sql connect
 
 $i = 0
@@ -98,7 +95,7 @@ step8:
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/tinyint.sim b/tests/script/tsim/table/tinyint.sim
similarity index 69%
rename from tests/script/general/table/tinyint.sim
rename to tests/script/tsim/table/tinyint.sim
index afa931fc79802e5790f90492576c90acb51e06dc..4764600b5b3b2c4cdae3d006e1dc781f0376d15a 100644
--- a/tests/script/general/table/tinyint.sim
+++ b/tests/script/tsim/table/tinyint.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 2000
 sql connect
 
 $i = 0
@@ -27,12 +24,10 @@ if $data01 != NULL then
 endi
 
 print =============== step2
-sql insert into $tb values (now+1m, -128)  -x step2
-  return -1
-step2: 
-sql insert into $tb values (now+1m, NULL)
+sql insert into $tb values (now+1m, -128)
+sql insert into $tb values (now+2m, NULL)
 sql select * from $tb order by ts desc
-if $rows != 2 then 
+if $rows != 3 then 
   return -1
 endi
 if $data01 != NULL then
@@ -40,9 +35,9 @@ if $data01 != NULL then
 endi
 
 print =============== step3
-sql insert into $tb values (now+2m, 127)
+sql insert into $tb values (now+3m, 127)
 sql select * from $tb order by ts desc
-if $rows != 3 then 
+if $rows != 4 then 
   return -1
 endi
 if $data01 != 127 then 
@@ -50,12 +45,12 @@ if $data01 != 127 then
 endi
 
 print =============== step4
-sql insert into $tb values (now+3m, 128) -x step4
+sql insert into $tb values (now+4m, 128) -x step4
   return -1
 step4: 
-sql insert into $tb values (now+3m, NULL)
+sql insert into $tb values (now+5m, NULL)
 sql select * from $tb
-if $rows != 4 then 
+if $rows != 5 then 
   return -1
 endi
 if $data01 != NULL then
@@ -63,10 +58,10 @@ if $data01 != NULL then
 endi
 
 print =============== step5
-sql_error insert into $tb values (now+4m, a2)
-sql insert into $tb values (now+4m, 0)
+sql_error insert into $tb values (now+6m, a2)
+sql insert into $tb values (now+7m, 0)
 sql select * from $tb order by ts desc
-if $rows != 5 then 
+if $rows != 6 then 
   return -1
 endi
 if $data01 != 0 then 
@@ -74,10 +69,10 @@ if $data01 != 0 then
 endi
 
 print =============== step6
-sql_error insert into $tb values (now+5m, 2a)
-sql insert into $tb values (now+5m, 2)
+sql_error insert into $tb values (now+8m, 2a)
+sql insert into $tb values (now+9m, 2)
 sql select * from $tb order by ts desc
-if $rows != 6 then 
+if $rows != 7 then 
   return -1
 endi
 if $data01 != 2 then 
@@ -85,10 +80,10 @@ if $data01 != 2 then
 endi
 
 print =============== step7
-sql_error insert into $tb values (now+6m, 2a'1)
-sql insert into $tb values (now+6m, 2)
+sql_error insert into $tb values (now+10m, 2a'1)
+sql insert into $tb values (now+11m, 2)
 sql select * from $tb order by ts desc
-if $rows != 7 then 
+if $rows != 8 then 
   return -1
 endi
 if $data01 != 2 then 
@@ -97,7 +92,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/general/table/vgroup.sim b/tests/script/tsim/table/vgroup.sim
similarity index 84%
rename from tests/script/general/table/vgroup.sim
rename to tests/script/tsim/table/vgroup.sim
index d306a4731db2023e87ac0e69378e448bbd555c56..2925e9de4c65fc2244910fcca345f8daed9d0787 100644
--- a/tests/script/general/table/vgroup.sim
+++ b/tests/script/tsim/table/vgroup.sim
@@ -1,12 +1,8 @@
 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/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
+
 print ============================ dnode1 start
 
 $i = 0
@@ -16,10 +12,10 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =================== step 1
-sql create database $db
+sql create database $db vgroups 4
 sql use $db
 sql show vgroups
-if $rows != 0 then 
+if $rows != 4 then 
   return -1
 endi
 
@@ -28,7 +24,7 @@ sql create table table2 (ts timestamp, speed int)
 sql create table table3 (ts timestamp, speed int)
 sql create table table4 (ts timestamp, speed int)
 sql show vgroups
-if $rows != 1 then 
+if $rows != 4 then 
   return -1
 endi
 
@@ -37,7 +33,7 @@ sql create table table6 (ts timestamp, speed int)
 sql create table table7 (ts timestamp, speed int)
 sql create table table8 (ts timestamp, speed int)
 sql show vgroups
-if $rows != 2 then 
+if $rows != 4 then 
   return -1
 endi
 
@@ -46,7 +42,7 @@ sql create table table10 (ts timestamp, speed int)
 sql create table table11 (ts timestamp, speed int)
 sql create table table12 (ts timestamp, speed int)
 sql show vgroups
-if $rows != 3 then 
+if $rows != 4 then 
   return -1
 endi
 
@@ -58,7 +54,7 @@ endi
 
 sql drop table table13
 sql show vgroups
-if $rows != 3 then 
+if $rows != 4 then 
   return -1
 endi
 
@@ -72,10 +68,10 @@ print =================== step 2
 $i = 1
 $db = $dbPrefix . $i
 
-sql create database $db 
+sql create database $db vgroups 2
 sql use $db
 sql show vgroups
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -88,13 +84,13 @@ $db = $dbPrefix . $i
 sql use $db
 sql create table table2 (ts timestamp, speed int)
 sql show vgroups
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
 sql drop table table2
 sql show vgroups
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -104,7 +100,7 @@ sql create table table3 (ts timestamp, speed int)
 sql create table table4 (ts timestamp, speed int)
 sql drop table table1
 sql show vgroups
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -133,7 +129,7 @@ sql create database $db
 sql use $db
 
 sql show databases
-if $rows != 5 then 
+if $rows != 7 then 
   return -1
 endi
 
@@ -144,7 +140,7 @@ while $i < 5
   $i = $i + 1
 endw
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/tag/bigint.sim b/tests/script/tsim/tag/bigint.sim
index 813387eb384316ac01bbb5c78da0afb38092a1e3..565688270c7f2e167cada205598d59820716583e 100644
--- a/tests/script/tsim/tag/bigint.sim
+++ b/tests/script/tsim/tag/bigint.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/tag/binary.sim b/tests/script/tsim/tag/binary.sim
index 6ede9889547fbde75bde999403d38d38dd59233a..f3f89d66591f1cf61fcb9286481e13b4d1b36ccb 100644
--- a/tests/script/tsim/tag/binary.sim
+++ b/tests/script/tsim/tag/binary.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/tag/bool.sim b/tests/script/tsim/tag/bool.sim
index 356269e1e178f103b03d1c4b8ece23d2604f3d9c..25c7b2d96792b97ee6bbb0e7e2e712a6c314c25f 100644
--- a/tests/script/tsim/tag/bool.sim
+++ b/tests/script/tsim/tag/bool.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/tag/double.sim b/tests/script/tsim/tag/double.sim
index fedc1c89ec9f610d0b06501d408c7df991e059a9..b8292b64e8f555c4a810d488eee5904726393a1f 100644
--- a/tests/script/tsim/tag/double.sim
+++ b/tests/script/tsim/tag/double.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/tag/float.sim b/tests/script/tsim/tag/float.sim
index 0ed12d226991ca93becea62ed158170b5494dfcc..26a09e297335a7a84c2248941f57dd218ed24da3 100644
--- a/tests/script/tsim/tag/float.sim
+++ b/tests/script/tsim/tag/float.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/tag/int.sim b/tests/script/tsim/tag/int.sim
index e561cde56a515ee9c7ccb6e236e936c168c45d27..13255eb2ba96e14922cfcc571cc7293b529b9bfe 100644
--- a/tests/script/tsim/tag/int.sim
+++ b/tests/script/tsim/tag/int.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/tag/smallint.sim b/tests/script/tsim/tag/smallint.sim
index 47e28db46ce7cf1c65b33b0bd5546e8b519284d9..70c5ee0771096ab1046645c3e571826a85995e2f 100644
--- a/tests/script/tsim/tag/smallint.sim
+++ b/tests/script/tsim/tag/smallint.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/tag/tinyint.sim b/tests/script/tsim/tag/tinyint.sim
index 0941c9cf18c6ef3d6075a12f6db78d6f42a2437b..b7f7616cf4440b5dc0b6b5e206ea5334067dcb0f 100644
--- a/tests/script/tsim/tag/tinyint.sim
+++ b/tests/script/tsim/tag/tinyint.sim
@@ -46,7 +46,6 @@ while $i < 10
 endw 
 
 print =============== step2
-sleep 100
 sql select * from $tb
 if $rows != $rowNum then 
   return -1
diff --git a/tests/script/tsim/vector/metrics_field.sim b/tests/script/tsim/vector/metrics_field.sim
index 4d0f9e19fce157315aaeeda1f86947d946fa071c..b75ba9cffe4455bea6ba52e743beea87ca5e7cbe 100644
--- a/tests/script/tsim/vector/metrics_field.sim
+++ b/tests/script/tsim/vector/metrics_field.sim
@@ -41,8 +41,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/metrics_mix.sim b/tests/script/tsim/vector/metrics_mix.sim
index fd36a62332c64403f3d09f6f1acc45d5d021ee99..fa93f0b2e35b5ef54205d7e90b0b104a9cb523d8 100644
--- a/tests/script/tsim/vector/metrics_mix.sim
+++ b/tests/script/tsim/vector/metrics_mix.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/metrics_query.sim b/tests/script/tsim/vector/metrics_query.sim
index 8a334acef27adc112e6cf49f1c9ef4e64f697264..5d433486e8b20d2fc95b61c423cfb8ec0b40bfd4 100644
--- a/tests/script/tsim/vector/metrics_query.sim
+++ b/tests/script/tsim/vector/metrics_query.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/metrics_tag.sim b/tests/script/tsim/vector/metrics_tag.sim
index 0b275336f9604476ee8206aea21f16f3f935a134..c8380590d5a7a28df883adc8540c727a1f0a9ad0 100644
--- a/tests/script/tsim/vector/metrics_tag.sim
+++ b/tests/script/tsim/vector/metrics_tag.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/metrics_time.sim b/tests/script/tsim/vector/metrics_time.sim
index bcd93cb5823f25a15c0bfe03b9f0ea6c615e0685..efa1ae4c840795226db09bf33c963ec39c421082 100644
--- a/tests/script/tsim/vector/metrics_time.sim
+++ b/tests/script/tsim/vector/metrics_time.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/multi.sim b/tests/script/tsim/vector/multi.sim
index dcedbe73c9ae678b7b35199b057112f8cd9a4442..1b592cdd0a86b991d3981f3b866eae3a7f10dbe7 100644
--- a/tests/script/tsim/vector/multi.sim
+++ b/tests/script/tsim/vector/multi.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/single.sim b/tests/script/tsim/vector/single.sim
index c9d794456c3604ce3d94bc2cc8ede33c42b72ecf..4da7c781106b7b6058aad0599aacf2ef50025d07 100644
--- a/tests/script/tsim/vector/single.sim
+++ b/tests/script/tsim/vector/single.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/table_field.sim b/tests/script/tsim/vector/table_field.sim
index 5ad60b2a3535ab361ca0b24af361efabcc2b5dd3..d5bdad8be2e71409b8baf8d1ee02129acc7d3ecf 100644
--- a/tests/script/tsim/vector/table_field.sim
+++ b/tests/script/tsim/vector/table_field.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/table_mix.sim b/tests/script/tsim/vector/table_mix.sim
index 358d6cf87f74186c07c15a4e6ad86bd5be4089c5..79ecb09d81a9e2f7171da8482a05d83b4f5c2f6c 100644
--- a/tests/script/tsim/vector/table_mix.sim
+++ b/tests/script/tsim/vector/table_mix.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/table_query.sim b/tests/script/tsim/vector/table_query.sim
index 0e4562716e2b96beed5bf6e307566c5050fe008c..d69d16eba57e980006e3ab089e7d228ec3fec6f5 100644
--- a/tests/script/tsim/vector/table_query.sim
+++ b/tests/script/tsim/vector/table_query.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/tsim/vector/table_time.sim b/tests/script/tsim/vector/table_time.sim
index 1e6bdb2cde91562ff2ea387d29c9eff49a88a9f3..f16c95ad4ac222dc21038cd773aac39aec76e841 100644
--- a/tests/script/tsim/vector/table_time.sim
+++ b/tests/script/tsim/vector/table_time.sim
@@ -37,8 +37,6 @@ while $i < $tbNum
   $i = $i + 1
 endw 
 
-sleep 100
-
 print =============== step2
 $i = 1
 $tb = $tbPrefix . $i