merge with develop branch.

src/mnode/src/mgmtDb.c

@@ -803,7 +803,7 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
     newCfg.daysToKeep2 = daysToKeep2;
   }
 
-  if (compression > 0 && compression != pDb->cfg.compression) {
+  if (compression >= 0 && compression != pDb->cfg.compression) {
     mTrace("db:%s, compression:%d change to %d", pDb->name, pDb->cfg.compression, compression);
     newCfg.compression = compression;
   }
@@ -823,7 +823,7 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
     }
   }
 
-  if (walLevel > 0 && (walLevel < TSDB_MIN_WAL_LEVEL || walLevel > TSDB_MAX_WAL_LEVEL)) {
+  if (walLevel >= 0 && (walLevel < TSDB_MIN_WAL_LEVEL || walLevel > TSDB_MAX_WAL_LEVEL)) {
     mError("db:%s, wal level %d should be between 0-2, origin:%d", pDb->name, walLevel, pDb->cfg.walLevel);
     terrno = TSDB_CODE_INVALID_OPTION;
   }

tests/script/general/alter/cached_schema_after_alter.sim

@@ -117,3 +117,5 @@ endi
 if $data12 != 2 then
   return -1
 endi 
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/alter/count.sim

@@ -264,3 +264,4 @@ if $data00 != 31 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/alter/import.sim

@@ -47,3 +47,5 @@ sql select count(b) from tb
 if $data00 != 5 then
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/alter/insert1.sim

@@ -1148,3 +1148,5 @@ endi
 if $data78 != 11 then
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/alter/insert2.sim

@@ -681,3 +681,4 @@ if $data62 != NULL then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/alter/metrics.sim

@@ -781,3 +781,4 @@ if $rows != 0 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/alter/table.sim

@@ -684,3 +684,4 @@ if $rows != 0 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/alter/testSuite.sim

-run general/alter/count.sim
 run general/alter/cached_schema_after_alter.sim
+run general/alter/count.sim
 run general/alter/import.sim
 run general/alter/insert1.sim
 run general/alter/insert2.sim

tests/script/general/cache/new_metrics.sim

@@ -140,6 +140,4 @@ if $data04 != 10 then
   return -1
 endi
 
-
-
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/cache/restart_metrics.sim

@@ -83,3 +83,4 @@ if $data02 != 3 then
   return -1
 endi 
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/cache/restart_table.sim

@@ -56,4 +56,4 @@ if $data01 != 1 then
   return -1
 endi  
 
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/cache/testSuite.sim

+run general/cache/new_metrics.sim
 run general/cache/restart_table.sim
 run general/cache/restart_metrics.sim
-run general/cache/new_metrics.sim

tests/script/general/column/commit.sim

@@ -151,4 +151,6 @@ if $data08 != 10 then
 endi
 if $data09 != 10 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/column/metrics.sim

@@ -215,3 +215,5 @@ endi
 if $data09 != 20 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/column/table.sim

@@ -211,3 +211,5 @@ endi
 if $data07 != 2.872281323 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/column/testSuite.sim

-run general/column/table.sim
-run general/column/metrics.sim
-run general/column/stream.sim
 run general/column/commit.sim
+run general/column/metrics.sim
+run general/column/table.sim

tests/script/general/compress/commitlog.sim

 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 compression -v 1
+system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -88,9 +87,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 20000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -124,4 +123,4 @@ if $rows != $N then
   return -1
 endi  
  
-  
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compress/compress.sim

 system sh/stop_dnodes.sh
 
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c compression -v 1
+system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -83,9 +82,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 10000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -119,4 +118,4 @@ if $rows != $N then
   return -1
 endi  
  
-  
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compress/compress2.sim

 system sh/stop_dnodes.sh
 
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c compression -v 2
+system sh/cfg.sh -n dnode1 -c comp -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -83,9 +82,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 10000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -119,4 +118,4 @@ if $rows != $N then
   return -1
 endi  
  
-  
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compress/testSuite.sim

-run general/compress/compress.sim
-run general/compress/uncompress.sim
 run general/compress/commitlog.sim
 run general/compress/compress2.sim
+run general/compress/compress.sim
+run general/compress/uncompress.sim

tests/script/general/compress/uncompress.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
-system sh/cfg.sh -n dnode1 -c compression -v 1
+system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -83,9 +81,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 10000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -119,4 +117,4 @@ if $rows != $N then
   return -1
 endi  
  
-  
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/avg.sim

@@ -153,4 +153,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/bottom.sim

@@ -94,4 +94,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/count.sim

@@ -169,4 +169,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/diff.sim

@@ -86,4 +86,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/diff2.sim

@@ -153,3 +153,5 @@ print =============== clear
 #if $rows != 0 then 
 #  return -1
 #endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/first.sim

@@ -155,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/interval.sim

@@ -171,4 +171,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/last.sim

@@ -154,4 +154,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/leastsquare.sim

@@ -96,3 +96,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/max.sim

@@ -154,4 +154,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/min.sim

@@ -155,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/null.sim

@@ -222,4 +222,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/percentile.sim

@@ -112,3 +112,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/stddev.sim

@@ -93,4 +93,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/sum.sim

@@ -154,4 +154,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/compute/testSuite.sim

-run general/compute/count.sim
 run general/compute/avg.sim
-run general/compute/sum.sim
-run general/compute/min.sim
-run general/compute/max.sim
-run general/compute/first.sim
-run general/compute/last.sim
-run general/compute/stddev.sim
-run general/compute/leastsquare.sim
-run general/compute/top.sim
 run general/compute/bottom.sim
-run general/compute/percentile.sim
+run general/compute/count.sim
 run general/compute/diff.sim
+run general/compute/diff2.sim
+run general/compute/first.sim
 run general/compute/interval.sim
+run general/compute/last.sim
+run general/compute/leastsquare.sim
+run general/compute/max.sim
+run general/compute/min.sim
 run general/compute/null.sim
-run general/compute/diff2.sim
+run general/compute/percentile.sim
+run general/compute/stddev.sim
+run general/compute/sum.sim
+run general/compute/top.sim

tests/script/general/compute/top.sim

@@ -94,4 +94,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/db/testSuite.sim

@@ -7,7 +7,7 @@ run general/db/basic5.sim
 run general/db/delete_reuse1.sim
 run general/db/delete_reuse2.sim
 run general/db/delete_reusevnode.sim
-#run general/db/delete_reusevnode2.sim
+run general/db/delete_reusevnode2.sim
 run general/db/delete_writing1.sim
 run general/db/delete_writing2.sim
 run general/db/len.sim

tests/script/general/field/2.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_bt_db
-$tbPrefix = fi_bt_tb
-$mtPrefix = fi_bt_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -233,6 +231,8 @@ if $data00 != 100 then
   return -1
 endi
 
+print sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
+
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
 if $data00 != 100 then 
@@ -292,4 +292,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/3.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_3_db
-$tbPrefix = fi_3_tb
-$mtPrefix = fi_3_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -518,4 +516,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/4.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_4_db
-$tbPrefix = fi_4_tb
-$mtPrefix = fi_4_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -708,4 +706,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/5.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_5_db
-$tbPrefix = fi_5_tb
-$mtPrefix = fi_5_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -831,4 +829,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/6.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_6_db
-$tbPrefix = fi_6_tb
-$mtPrefix = fi_6_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -986,4 +984,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/bigint.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_bi_db
-$tbPrefix = fi_bi_tb
-$mtPrefix = fi_bi_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/binary.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_by_db
-$tbPrefix = fi_by_tb
-$mtPrefix = fi_by_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -81,4 +79,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/bool.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_bo_db
-$tbPrefix = fi_bo_tb
-$mtPrefix = fi_bo_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -158,4 +156,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/double.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_do_db
-$tbPrefix = fi_do_tb
-$mtPrefix = fi_do_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/float.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_fl_db
-$tbPrefix = fi_fl_tb
-$mtPrefix = fi_fl_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/int.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_in_db
-$tbPrefix = fi_in_tb
-$mtPrefix = fi_in_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/single.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_si_db
-$tbPrefix = fi_si_tb
-$mtPrefix = fi_si_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $rowNum = 20
 
 print =============== step1
@@ -215,4 +213,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/smallint.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_sm_db
-$tbPrefix = fi_sm_tb
-$mtPrefix = fi_sm_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/field/tinyint.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -10,9 +8,9 @@ sql connect
 
 print ======================== dnode1 start
 
-$dbPrefix = fi_ti_db
-$tbPrefix = fi_ti_tb
-$mtPrefix = fi_ti_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -158,4 +156,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/http/testSuite.sim

@@ -4,5 +4,5 @@ run general/http/restful_limit.sim
 run general/http/restful_full.sim
 run general/http/prepare.sim
 run general/http/telegraf.sim
-#run general/http/grafana_bug.sim
-#run general/http/grafana.sim
+run general/http/grafana_bug.sim
+run general/http/grafana.sim

tests/script/general/import/basic.sim

 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
@@ -25,10 +19,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -50,14 +44,14 @@ endi
 print ================= step2
 sql insert into tb values(1564641708000, 8000)
 sql select * from tb;
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
 print ================= step3
 sql insert into tb values(1564641720000, 20000)
 sql select * from tb;
-if $rows != 2 then 
+if $rows != 3 then 
   return -1
 endi
 
@@ -76,7 +70,7 @@ sql insert into tb values(1564641714000, 14000)
 sql insert into tb values(1564641725000, 25000)
 sql insert into tb values(1564641740000, 40000)
 sql select * from tb;
-if $rows != 6 then 
+if $rows != 8 then 
   return -1
 endi
 
@@ -87,7 +81,7 @@ sql import into tb values(1564641723000, 23000)
 sql import into tb values(1564641734000, 34000)
 sql import into tb values(1564641750000, 50000)
 sql select * from tb;
-if $rows != 11 then 
+if $rows != 13 then 
   return -1
 endi
 
@@ -98,7 +92,7 @@ sql import into tb values(1564641723001, 23001)
 sql import into tb values(1564641734001, 34001)
 sql import into tb values(1564641750001, 50001)
 sql select * from tb;
-if $rows != 16 then 
+if $rows != 18 then 
   return -1
 endi
 
@@ -108,28 +102,28 @@ sql insert into tb values(1564641714002, 14002)
 sql insert into tb values(1564641725002, 25002)
 sql insert into tb values(1564641900000, 200000)
 sql select * from tb;
-if $rows != 17 then 
+if $rows != 22 then 
   return -1
 endi
 
 print ================= step9 only insert last one
 sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 700000)
 sql select * from tb;
-if $rows != 20 then
+if $rows != 25 then
   return -1
 endi
 
 print ================= step10
 sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 70000)
 sql select * from tb;
-if $rows != 20 then
+if $rows != 25 then
   return -1
 endi
 
 print ================= step11
 sql import into tb values(1564642400000, 700000)
 sql select * from tb;
-if $rows != 20 then
+if $rows != 25 then
   return -1
 endi
 
@@ -137,7 +131,7 @@ print ================= step12
 sql import into tb values(1564641709527, 9527)(1564641709527, 9528)
 sql select * from tb;
 print rows=> $rows
-if $rows != 21 then
+if $rows != 26 then
   return -1
 endi
 
@@ -145,7 +139,8 @@ print ================= step13
 sql import into tb values(1564641709898, 9898)(1564641709897, 9897)
 sql select * from tb;
 print rows=> $rows
-if $rows != 23 then
+if $rows != 28 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/import/commit.sim

 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
@@ -25,10 +19,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -93,6 +87,4 @@ if $rows != 12 then
   return -1
 endi
 
-
-
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/import/large.sim

 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
@@ -25,10 +19,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -99,4 +93,6 @@ while $i < 1000
   $i = $i + 1
 endw 
 
-print ================= step2
\ No newline at end of file
+print ================= step2
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/import/replica1.sim

 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
@@ -25,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+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
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -40,53 +35,59 @@ sql use ir1db
 sql create table tb(ts timestamp, i int)
 
 print ================= step1
-sql import into tb values(now+10000a, 10000)
+sql import into tb values(1520000010000, 10000)
 sql select * from tb;
+print $rows
 if $rows != 1 then 
   return -1
 endi
 
 print ================= step2
-sql insert into tb values(now+8000a, 8000)
+sql insert into tb values(1520000008000, 8000)
+print $rows
 sql select * from tb;
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
 print ================= step3
-sql insert into tb values(now+20000a, 20000)
+sql insert into tb values(1520000020000, 20000)
 sql select * from tb;
-if $rows != 2 then 
+print $rows
+if $rows != 3 then 
   return -1
 endi
 
 print ================= step4
-sql import into tb values(now+8000a, 9000)
-sql import into tb values(now+15000a, 15000)
-sql import into tb values(now+30000a, 30000)
+sql import into tb values(1520000009000, 9000)
+sql import into tb values(1520000015000, 15000)
+sql import into tb values(1520000030000, 30000)
 sql select * from tb;
-if $rows != 5 then 
+print $rows
+if $rows != 6 then 
   return -1
 endi
 
 print ================= step5
-sql insert into tb values(now+8000a, 8000)
-sql insert into tb values(now+14000a, 14000)
-sql insert into tb values(now+25000a, 25000)
-sql insert into tb values(now+40000a, 40000)
+sql insert into tb values(1520000008000, 8000)
+sql insert into tb values(1520000014000, 14000)
+sql insert into tb values(1520000025000, 25000)
+sql insert into tb values(1520000040000, 40000)
 sql select * from tb;
-if $rows != 6 then 
+print $rows
+if $rows != 9 then 
   return -1
 endi
 
 print ================= step6
-sql import into tb values(now+7000a, 7000)
-sql import into tb values(now+12000a, 12000)
-sql import into tb values(now+23000a, 23000)
-sql import into tb values(now+34000a, 34000)
-sql import into tb values(now+50000a, 50000)
+sql import into tb values(1520000007000, 7000)
+sql import into tb values(1520000012000, 12000)
+sql import into tb values(1520000023000, 23000)
+sql import into tb values(1520000034000, 34000)
+sql import into tb values(1520000050000, 50000)
 sql select * from tb;
-if $rows != 11 then 
+print $rows
+if $rows != 14 then 
   return -1
 endi
 
@@ -98,46 +99,63 @@ sleep 5000
 
 sql use ir1db
 sql select * from tb;
-if $rows != 11 then 
+if $rows != 14 then 
   return -1
 endi
 
 print ================= step7
-sql import into tb values(now+7001a, 7001)
-sql import into tb values(now+12001a, 12001)
-sql import into tb values(now+23001a, 23001)
-sql import into tb values(now+34001a, 34001)
-sql import into tb values(now+50001a, 50001)
+sql import into tb values(1520000007001, 7001)
+sql import into tb values(1520000012001, 12001)
+sql import into tb values(1520000023001, 23001)
+sql import into tb values(1520000034001, 34001)
+sql import into tb values(1520000050001, 50001)
 sql select * from tb;
-if $rows != 16 then 
+print $rows
+if $rows != 19 then 
   return -1
 endi
 
 print ================= step8
-sql insert into tb values(now+8002a, 8002)
-sql insert into tb values(now+14002a, 14002)
-sql insert into tb values(now+25002a, 25002)
-sql insert into tb values(now+200000a, 60000)
+sql insert into tb values(1520000008002, 8002)
+sql insert into tb values(1520000014002, 14002)
+sql insert into tb values(1520000025002, 25002)
+sql insert into tb values(1520000060000, 60000)
 sql select * from tb;
-if $rows != 17 then 
+print $rows
+if $rows != 24 then 
   return -1
 endi
 
 print ================= step9
-sql import into tb values(now-30d, 7003)
-sql import into tb values(now-20d, 34003)
-sql import into tb values(now-10d, 34003)
-sql import into tb values(now-5d, 34003)
-sql import into tb values(now+1m, 50001)
-sql import into tb values(now+2m, 50001)
-sql import into tb values(now+3m, 50001)
-sql import into tb values(now+4m, 50002)
-sql import into tb values(now+5m, 50003)
-sql import into tb values(now+6m, 50004)
-sql import into tb values(now+7m, 50001)
-sql import into tb values(now+8m, 500051)
+#1520000000000
+#sql import into tb values(now-30d, 7003)
+#sql import into tb values(now-20d, 34003)
+#sql import into tb values(now-10d, 34003)
+#sql import into tb values(now-5d, 34003)
+#sql import into tb values(now+1d, 50001)
+#sql import into tb values(now+2d, 50001)
+#sql import into tb values(now+6d, 50001)
+#sql import into tb values(now+8d, 50002)
+#sql import into tb values(now+10d, 50003)
+#sql import into tb values(now+12d, 50004)
+#sql import into tb values(now+14d, 50001)
+#sql import into tb values(now+16d, 500051)
+
+sql import into tb values(1517408000000, 7003)
+sql import into tb values(1518272000000, 34003)
+sql import into tb values(1519136000000, 34003)
+sql import into tb values(1519568000000, 34003)
+sql import into tb values(1519654400000, 50001)
+sql import into tb values(1519827200000, 50001)
+sql import into tb values(1520345600000, 50001)
+sql import into tb values(1520691200000, 50002)
+sql import into tb values(1520864000000, 50003)
+sql import into tb values(1521900800000, 50004)
+sql import into tb values(1523110400000, 50001)
+sql import into tb values(1521382400000, 500051)
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
@@ -149,23 +167,44 @@ sleep 5000
 
 sql use ir1db
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
 print ================= step11
-sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+
+#sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+sql import into tb values(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003)
 sql select * from tb;
-if $rows != 34 then 
+if $rows != 41 then 
   return -1
 endi
 
-sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
+print ================= step12
+#1520000000000
+#sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
+sql import into tb values(1518358400000, 7003) (1518444800000, 7003) (1518531200000, 7003) (1518617600000, 7003) (1518704000000, 7003) (1518790400000, 7003) (1518876800000, 7003) (1518963200000, 7003) (1519049600000, 7003)
 sql select * from tb;
-if $rows != 43 then 
+print $rows
+if $rows != 50 then 
   return -1
 endi
 
 
+print ================= step14
+#1520000000000
+#sql import into tb values(now-48d, 34003)
+#sql import into tb values(now-38d, 50001)
+#sql import into tb values(now-28d, 50001)
+
+sql import into tb values(1515852800001, 34003)
+sql import into tb values(1516716800000, 50001)
+sql import into tb values(1517580800000, 50001)
 
+sql select * from tb;
+if $rows != 50 then 
+  return -1
+endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/import/testSuite.sim

 run general/import/basic.sim
-#run general/import/commit.sim
+run general/import/commit.sim
 run general/import/large.sim
 run general/import/replica1.sim

tests/script/general/insert/tcp.sim

@@ -28,10 +28,4 @@ endw
 
 sql select * from tb
 
-sql drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/insert/testSuite.sim

 run general/insert/basic.sim
-#run general/insert/insert_drop.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

tests/script/general/metrics/disk.sim

@@ -194,4 +194,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/metrics/metrics.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
@@ -135,3 +133,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/metrics/values.sim

@@ -102,25 +102,4 @@ if $rows != 100 then
   return -1
 endi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/metrics/vnode3.sim

@@ -175,4 +175,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/table/testSuite.sim

@@ -11,17 +11,17 @@ 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/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/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_len.sim
 run general/table/table.sim
 run general/table/tinyint.sim
 run general/table/vgroup.sim

tests/script/general/tag/3.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
 sql connect
-sql reset query cache
 
 print ======================== dnode1 start
 
@@ -521,3 +518,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/4.sim

@@ -711,3 +711,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/5.sim

@@ -834,3 +834,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/6.sim

@@ -989,3 +989,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/add.sim

@@ -851,4 +851,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/bigint.sim

@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/binary.sim

@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/binary_binary.sim

@@ -306,4 +306,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/bool.sim

@@ -236,4 +236,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/bool_binary.sim

@@ -306,4 +306,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/bool_int.sim

@@ -322,4 +322,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/change.sim

@@ -511,4 +511,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/column.sim

@@ -91,4 +91,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/commit.sim

@@ -1180,4 +1180,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/create.sim

@@ -598,3 +598,5 @@ print $data00 $data01 $data02
 if $data02 != 12345 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/delete.sim

@@ -823,4 +823,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/double.sim

@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/filter.sim

 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 
@@ -146,3 +144,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/float.sim

@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/int.sim

@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/int_binary.sim

@@ -306,4 +306,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/int_float.sim

@@ -322,4 +322,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/set.sim

@@ -455,4 +455,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/smallint.sim

@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/tag/testSuite.sim

-run general/tag/filter.sim
-run general/tag/column.sim
-run general/tag/bool.sim
-run general/tag/smallint.sim
-run general/tag/tinyint.sim
-run general/tag/int.sim
-run general/tag/bigint.sim
-run general/tag/float.sim
-run general/tag/double.sim
-run general/tag/binary.sim
-run general/tag/bool_int.sim
-run general/tag/bool_binary.sim
-run general/tag/int_float.sim
-run general/tag/int_binary.sim
-run general/tag/binary_binary.sim
 run general/tag/3.sim
 run general/tag/4.sim
 run general/tag/5.sim
 run general/tag/6.sim
+run general/tag/add.sim
+run general/tag/bigint.sim
+run general/tag/binary_binary.sim
+run general/tag/binary.sim
+run general/tag/bool_binary.sim
+run general/tag/bool_int.sim
+run general/tag/bool.sim
+run general/tag/change.sim
+run general/tag/column.sim
+run general/tag/commit.sim
 run general/tag/create.sim
 run general/tag/delete.sim
-run general/tag/change.sim
+run general/tag/double.sim
+run general/tag/filter.sim
+run general/tag/float.sim
+run general/tag/int_binary.sim
+run general/tag/int_float.sim
+run general/tag/int.sim
 run general/tag/set.sim
-run general/tag/add.sim
-run general/tag/commit.sim
\ No newline at end of file
+run general/tag/smallint.sim
+run general/tag/tinyint.sim

tests/script/general/tag/tinyint.sim

@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/user/testSuite.sim

 run general/user/basic1.sim
-#run general/user/monitor.sim
+run general/user/monitor.sim
 run general/user/pass_alter.sim
 run general/user/pass_len.sim
 run general/user/user_create.sim

tests/script/general/vector/metrics_field.sim

@@ -618,4 +618,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/vector/metrics_mix.sim

@@ -618,4 +618,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/vector/metrics_query.sim

@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/vector/metrics_tag.sim

@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/vector/metrics_time.sim

@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/vector/multi.sim

@@ -206,10 +206,11 @@ sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc  -x step
   return -1
 step74:
 
-
 print =============== clear
 sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file