diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index 2a9e3a88736cf526cc4429d81caf67617fd60e4d..5c15656f246ffa09217a991ca60e127c74353700 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = m_alt_db
@@ -114,7 +114,7 @@ endi
 sql drop table tb
 sql drop table mt
 
-sleep 1000
+sleep 500
 ### ALTER TABLE WHILE STREAMING [TBASE271]
 #sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
 #sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
@@ -134,7 +134,7 @@ sleep 1000
 #  return -1
 #endi
 #sql alter table tb1 drop column c3
-#sleep 6000
+#sleep 3000
 #sql insert into tb1 values (now, 2, 'taos')
 #sleep 30000
 #sql select * from strm
@@ -145,9 +145,9 @@ sleep 1000
 #  return -1
 #endi
 #sql alter table tb1 add column c3 int
-#sleep 6000
+#sleep 3000
 #sql insert into tb1 values (now, 3, 'taos', 3);
-#sleep 1000
+#sleep 500
 #sql select * from strm
 #if $rows != 3 then
 #   return -1
@@ -186,7 +186,7 @@ sql create database $db
 sql use $db
 sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
 sql create table tb using mt tags(1)
-sleep 1000
+sleep 500
 sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
 sql alter table mt drop column c3
 
diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim
index 0326f9b23fb3fb6dc121ed8366f0d7244e83cc91..e013242b824a42f9100557f7a9cc267833138e16 100644
--- a/tests/script/general/parser/alter1.sim
+++ b/tests/script/general/parser/alter1.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 sql reset query cache
 
@@ -87,7 +87,7 @@ if $data13 != NULL then
   return -1
 endi
 
-sleep 1000
+sleep 500
 print ================== insert values into table
 sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2,) car2 values (now, 1,3,3)
 
diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim
index b0d94ef68cb10d479de24f2ea2b02b212f7c2d3c..6b3f3a8f53548979f12707cf381d583674114616 100644
--- a/tests/script/general/parser/alter_stable.sim
+++ b/tests/script/general/parser/alter_stable.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 print ========== alter_stable.sim
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
index c72147be9553da786993791189d59779e9f38318..6deaf92a6c8e713a8fb5281ec2f8e4ca4f2d425f 100644
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
@@ -208,11 +208,11 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 sql use $db
 
 #### auto create multiple tables
@@ -298,7 +298,7 @@ endi
 sql create table tu(ts timestamp, k int);
 sql_error create table txu using tu tags(0) values(now, 1);
 
-#[TBASE-675]
+print =================> [TBASE-675]
 sql insert into tu values(1565971200000, 1) (1565971200000,2) (1565971200001, 3)(1565971200001, 4)
 sql select * from tu
 if $rows != 2 then
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
index 2a809fa9db03082bb17e22e732b770be30e5c906..8a429cf91abff583abd104344ec1ba300ca684bb 100644
--- a/tests/script/general/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = db
@@ -49,7 +49,7 @@ while $t < $tbNum
 endw
 print ====== tables created
 
-sleep 60000
+sleep 500
 
 sql drop table tb2
 $x = 0
@@ -59,9 +59,7 @@ while $x < $rowNum
   $t1 = $t1 . '
   sql insert into tb1 using $stb tags( $t1 ) values ( $ts , $x ) 
   $x = $x + 1
-endw 
-  
-sleep 6000
+endw
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim
index 780916258b892ea380e2f7da6df75ee00f94e86e..e9e61f35bfda688fcd735085672be95a0fcf626f 100644
--- a/tests/script/general/parser/binary_escapeCharacter.sim
+++ b/tests/script/general/parser/binary_escapeCharacter.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 sql drop database if exists ecdb
diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim
index f5e91b933a6fc5f42814555699f6b6ec5b28d83e..d5ba57e6c7dd5befcacb777a1e22f96ba8dae79d 100644
--- a/tests/script/general/parser/col_arithmetic_operation.sim
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $dbPrefix = ca_db
@@ -34,7 +34,7 @@ while $i < $halfTbNum
   $tb1 = $tbPrefix . $tbId
   sql create table $tb using $stb tags( $i )
   sql create table $tb1 using $stb tags( $tbId )
-  
+
   $x = 0
   while $x < $rowNum
     $xs = $x * $delta
@@ -46,8 +46,7 @@ while $i < $halfTbNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar )
     $x = $x + 1
   endw 
   $i = $i + 1
diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim
index c7aac1a8fae575b7d5f4ce76e5a59534831474c1..2c03a3552a26ff8c64640f908b15fcc5d194f61e 100644
--- a/tests/script/general/parser/columnValue.sim
+++ b/tests/script/general/parser/columnValue.sim
@@ -5,7 +5,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 print ========== columnValues.sim
diff --git a/tests/script/general/parser/columnValue_bigint.sim b/tests/script/general/parser/columnValue_bigint.sim
index 002240fa25b0ea050d21a8b713a9497d4e843764..3546ca15ee15eba485f1868d4bae5f4c545218f9 100644
--- a/tests/script/general/parser/columnValue_bigint.sim
+++ b/tests/script/general/parser/columnValue_bigint.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_bool.sim b/tests/script/general/parser/columnValue_bool.sim
index e43f2289e78709d6dbc8d632d056b8c3a8d09e21..d68f37590091ab892599d4017a73b6cbb2f28450 100644
--- a/tests/script/general/parser/columnValue_bool.sim
+++ b/tests/script/general/parser/columnValue_bool.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_double.sim b/tests/script/general/parser/columnValue_double.sim
index 009ef971c976ee73b8e6590744242a0360637d2e..fd2da37838cbabea9c6cee2e992a6904df132c3e 100644
--- a/tests/script/general/parser/columnValue_double.sim
+++ b/tests/script/general/parser/columnValue_double.sim
@@ -1,5 +1,5 @@
 ####
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_float.sim b/tests/script/general/parser/columnValue_float.sim
index f7b77cdc0aefde817ad2c7e2b90ed6fd3399e37a..019cf176d0e0f455b5f6b61fcabb501806378c96 100644
--- a/tests/script/general/parser/columnValue_float.sim
+++ b/tests/script/general/parser/columnValue_float.sim
@@ -1,5 +1,5 @@
 ####
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_int.sim b/tests/script/general/parser/columnValue_int.sim
index 46e466c41764b9af5429155278dba55684dabcff..1f84df5ca05ef70e95c2db03efe0a670abaff8da 100644
--- a/tests/script/general/parser/columnValue_int.sim
+++ b/tests/script/general/parser/columnValue_int.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_smallint.sim b/tests/script/general/parser/columnValue_smallint.sim
index cdaceaa05fe64f96109413e0d0ec1266b1477615..af5c5818717b6c2f01e4726975ceaee4703cdbfb 100644
--- a/tests/script/general/parser/columnValue_smallint.sim
+++ b/tests/script/general/parser/columnValue_smallint.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_tinyint.sim b/tests/script/general/parser/columnValue_tinyint.sim
index 31eff422d4f2d999ecda09ed4856586d4ae382c7..3efe52cc91f2ecb1f22000a3f212ec491b9a16c1 100644
--- a/tests/script/general/parser/columnValue_tinyint.sim
+++ b/tests/script/general/parser/columnValue_tinyint.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim
index 5aa5b8f40c407db2b2a72735b2b69333b5e344d6..c798bf9d7cc21f2c91c8c14e8debe22ad253b72b 100644
--- a/tests/script/general/parser/commit.sim
+++ b/tests/script/general/parser/commit.sim
@@ -4,7 +4,7 @@ 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 maxTablesperVnode -v 100
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sc_db
@@ -50,8 +50,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -83,12 +82,12 @@ endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 print ====== select from table and check num of rows returned
 sql use $db
diff --git a/tests/script/general/parser/constCol.sim b/tests/script/general/parser/constCol.sim
index b5a4d4abea614e6618ac91a5df4af9d387c7ad37..4a8e443281dbaa0892106a8fe91bbdd6d61c3e8a 100644
--- a/tests/script/general/parser/constCol.sim
+++ b/tests/script/general/parser/constCol.sim
@@ -353,8 +353,8 @@ if $rows != 3 then
 endi
 
 print =============================> td-2036
-if $data00 != 0.3000000 then
-  print expect: 0.3000000, actual:$data00
+if $data00 != 0.300000000 then
+  print expect: 0.300000000, actual:$data00
   return -1
 endi
 
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index c8337ea81dd6f8c417f779cb357b5e4cf0b93e66..3b7f24b6d900dc1f130f91a138da81fd708b16fe 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -5,7 +5,7 @@ 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 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim
index d940853984cf29d37691944984e5346c1ac6807f..e11f32276187d15334193af688b3c50604df2b32 100644
--- a/tests/script/general/parser/create_mt.sim
+++ b/tests/script/general/parser/create_mt.sim
@@ -5,7 +5,7 @@ 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 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim
index 1027e2b25f6f9c0a93ca02b69e9dedba5b99d8cc..609aad2adbc9611d33c595d33191e5b8a26b3359 100644
--- a/tests/script/general/parser/create_tb.sim
+++ b/tests/script/general/parser/create_tb.sim
@@ -5,7 +5,7 @@ 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 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim
index b46a22228280c73a2cfffa145c9ed71d75dd4957..fd40ecc3f758affa3ca401813132b830a241a049 100644
--- a/tests/script/general/parser/dbtbnameValidate.sim
+++ b/tests/script/general/parser/dbtbnameValidate.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 print ========== db name and table name check in create and drop, describe
diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim
index 0b535272bdaeb88e317704c38c316e1a3259ca57..9851a4e7fcfea026271729cbe7436c47e184df40 100644
--- a/tests/script/general/parser/fill.sim
+++ b/tests/script/general/parser/fill.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim
index a84aa0c5575e1401522adcc363951d214cbd6c40..83eb98c465927beb70ce403491dcd100f2556c7d 100644
--- a/tests/script/general/parser/fill_stb.sim
+++ b/tests/script/general/parser/fill_stb.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $dbPrefix = fl1_db
diff --git a/tests/script/general/parser/fill_us.sim b/tests/script/general/parser/fill_us.sim
index b6de72464f8d018fc7f899d8cf33c42721e51cbb..dc8ee8659d6c3b99e8103e3ee0a622a10e7bc7df 100644
--- a/tests/script/general/parser/fill_us.sim
+++ b/tests/script/general/parser/fill_us.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index e4f50ea365a6098ae3458d9bd44a397301f07abc..a934d3bcabf09ebe1584c296d6cab2f5c80654d2 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -4,7 +4,7 @@ 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 maxTablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = first_db
@@ -76,11 +76,11 @@ run general/parser/first_last_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/first_last_query.sim
 
diff --git a/tests/script/general/parser/first_last_query.sim b/tests/script/general/parser/first_last_query.sim
index 512fc70245f3f5acc43d21e225ab478efafd03c5..a982f10362a46e7c671e8df4674b06c5c9f60b75 100644
--- a/tests/script/general/parser/first_last_query.sim
+++ b/tests/script/general/parser/first_last_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = first_db
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 145c4a008f1ae26378baeabdfd5103cc807266f3..c0a6709fe4b4369a5415860b87d949351a85c7ca 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = group_db
diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim
index 9ef83fa35b5cf7bb9f46d7336ff641ffdb74a0e1..6da2483738a6d5c805e3a29129183845e64c4f22 100644
--- a/tests/script/general/parser/import.sim
+++ b/tests/script/general/parser/import.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $dbPrefix = impt_db
@@ -64,7 +64,7 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 sql use $db
 sql select * from tb
diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim
index 9af1acfe7703bb5dd9b313407a07542e402cf78d..9c5144a630cbd0df20e8842211c1d3d3e5d5cbb0 100644
--- a/tests/script/general/parser/import_commit1.sim
+++ b/tests/script/general/parser/import_commit1.sim
@@ -4,7 +4,7 @@ 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 ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ic_db
@@ -40,7 +40,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 6000
+sleep 3000
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim
index 3c8635f3fdf33968861ad7015e85e6801df40fc9..000394386ec169bba4b907969d73878760584eb6 100644
--- a/tests/script/general/parser/import_commit2.sim
+++ b/tests/script/general/parser/import_commit2.sim
@@ -4,7 +4,7 @@ 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 ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ic_db
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 6000
+sleep 3000
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim
index 3ceb025f32185d30111f5874ad65b5d340a17a42..997a4a22aada1d3f02becd8e02f82c35a41a6175 100644
--- a/tests/script/general/parser/import_commit3.sim
+++ b/tests/script/general/parser/import_commit3.sim
@@ -4,7 +4,7 @@ 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 ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ic_db
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 6000
+sleep 3000
 
 $ts = $ts + 1
 sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
@@ -47,7 +47,7 @@ $ts = $ts0 + $delta
 $ts = $ts + 1
 sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
 
-sleep 6000
+sleep 3000
 
 sql show databases
 
diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim
index f3b9c4a3905a5c66053aaf892ff6aa35741037b1..887f97a198237ff9c181c3d313525ae4fb66aec5 100644
--- a/tests/script/general/parser/insert_multiTbl.sim
+++ b/tests/script/general/parser/insert_multiTbl.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 2000
 sql connect
-sleep 1000
+sleep 500
 print ======================== dnode1 start
 
 sql create database mul_db
diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim
index 5eb973520ac82d308eedc4ab77064b0e585bfc78..0a9eb9f678c12de13b33e7dd1ca438c768addf81 100644
--- a/tests/script/general/parser/insert_tb.sim
+++ b/tests/script/general/parser/insert_tb.sim
@@ -5,7 +5,7 @@ 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 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
@@ -103,7 +103,7 @@ if $rows != 1 then
 endi
 
 sql drop database $db
-sleep 1000
+sleep 500
 sql create database $db
 sql use $db
 sql create table stb1 (ts timestamp, c1 int) tags(t1 int)
@@ -136,7 +136,7 @@ if $data21 != 1.000000000 then
 endi
 
 sql drop database $db
-sleep 1000
+sleep 500
 sql create database $db
 sql use $db
 sql create table stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 nchar(10), c6 binary(20)) tags(t1 int, t2 bigint, t3 double, t4 float, t5 nchar(10))
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index c83d3ab5c4ea7c129b25ce5a2d8db0f633466b57..8777c3ed9bd4cb22b72253b6503e8c78b96bb703 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $dbPrefix = intp_db
@@ -60,7 +60,7 @@ run general/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/general/parser/interp_test.sim
index 6de8de0b7a04aeaa14210e27678e1692b8ea57ce..42738a8bd134c3b7cc72569fe490285baa694e57 100644
--- a/tests/script/general/parser/interp_test.sim
+++ b/tests/script/general/parser/interp_test.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = intp_db
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index d6e4a6a5a76a5f269a3968bfce15af5002ce5890..3ee90cda352002961c131b7e014f8aa6d8155c05 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = join_db
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index 6bca0e75c40be80f6aa7ef7f25562fa019fe2020..52489bba0124f914acb56402dc43c5055f3d94c3 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 1000
+sleep 500
 
 $dbPrefix = join_m_db
 $tbPrefix = join_tb
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index 7db233ee9d4d4b851b8d9400b62fed4ba31f55f0..cc71123a77e7e48c491d8c1450addb55e243bdd6 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lr_db
@@ -62,11 +62,11 @@ run general/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/lastrow_query.sim
 
diff --git a/tests/script/general/parser/lastrow_query.sim b/tests/script/general/parser/lastrow_query.sim
index 1a9b1a74a92d02696f299c9fbf8f31bc52495283..5b9c8b60c3f62b48159d13f5cb82ccffd32d0feb 100644
--- a/tests/script/general/parser/lastrow_query.sim
+++ b/tests/script/general/parser/lastrow_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lr_db
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index 909ac71cbfe4ff059c62ea340cd54d0fda7fdce3..fb5e704bf1ba3bab457dae2dc06a23628fde316c 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm_db
@@ -62,11 +62,11 @@ run general/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/limit_tb.sim
 run general/parser/limit_stb.sim
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index 59ecdb92b057fa1b926666604857bd9228808982..7236421ec2eb1617c7c16b5d659b9b57f300559a 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
@@ -48,8 +48,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -62,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit1_stb.sim b/tests/script/general/parser/limit1_stb.sim
index 3eee6132a4ce7b65799564695d9d303df781ceb6..d5846adc45327e6faa7b2bd7cdd10b44ea6fc094 100644
--- a/tests/script/general/parser/limit1_stb.sim
+++ b/tests/script/general/parser/limit1_stb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit1_tb.sim b/tests/script/general/parser/limit1_tb.sim
index 52c4615c9fb42cae43c25c6081092521d147740b..1e473eb8580965b6e777c7fe09cbc607af8938a8 100644
--- a/tests/script/general/parser/limit1_tb.sim
+++ b/tests/script/general/parser/limit1_tb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index 2860305b3dd46af1deee9e13ba169c0c700a02ba..9a123e645ce070f5146d2507b90e16b06d258c4d 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
@@ -48,8 +48,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -62,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index 8ffa1579454499ebc5e8dc1b471cbf970ff25ab3..47c3eb6d08ca1f01ded0b8e4597f91d0cd2f1933 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -4,7 +4,7 @@ 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 rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm2_db
@@ -69,7 +69,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim
index 327c867be4f8f957c8d59f77ac2fa1ee24efe7c0..f9a1dd8e4b51107d6713d52f850f792f339b3fa4 100644
--- a/tests/script/general/parser/limit2_query.sim
+++ b/tests/script/general/parser/limit2_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm2_db
diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim
index 2f3e30de60919c4a3b248169312bba395329fb23..1aaa8e885a21b4db79c28645029a015d12a24fb5 100644
--- a/tests/script/general/parser/limit2_tblocks100.sim
+++ b/tests/script/general/parser/limit2_tblocks100.sim
@@ -4,7 +4,7 @@ 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 rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm2_db
@@ -69,7 +69,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 1000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit_stb.sim b/tests/script/general/parser/limit_stb.sim
index e43a78bc316006c8acb36b22e255a6679696d16a..b41b7b726bc24b83f64cecbec8ac0eb83afa57ea 100644
--- a/tests/script/general/parser/limit_stb.sim
+++ b/tests/script/general/parser/limit_stb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm_db
diff --git a/tests/script/general/parser/limit_tb.sim b/tests/script/general/parser/limit_tb.sim
index eed78a37ec4632c68839d13e3293f6db450e4dc0..b917627fdf6499fe2dacf948af7badb2b5de43d7 100644
--- a/tests/script/general/parser/limit_tb.sim
+++ b/tests/script/general/parser/limit_tb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm_db
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index f6744f22ab09af22a94038d102cad19eb77d3324..d3558560df95d02256e0bc6b4a04ae9fae6e5890 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = mb_db
diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim
index 082a6331a60eacf06ada64c9f55d15f47c2023b3..ab4ed2607a062ed32ebe52527d30705aa135aa86 100644
--- a/tests/script/general/parser/nchar.sim
+++ b/tests/script/general/parser/nchar.sim
@@ -5,7 +5,7 @@ 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 1000
+sleep 500
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim
index 9ac83eb77980f392f58ad182968294f2e672521f..7b1c81a2958c36acbe96641494a8c156dabb275d 100644
--- a/tests/script/general/parser/null_char.sim
+++ b/tests/script/general/parser/null_char.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 
 print ========== NULL_char.sim
@@ -251,7 +251,7 @@ endi
 ################### nchar
 sql alter table st41 set tag tag_nchar = "��˼����"
 sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
-#sleep 1000
+#sleep 500
 #if $data01 != ��˼���� then
 #  print ==== expect ��˼����, actually $data01
 #  return -1
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index 4cadc706d98b358391eba49d999b4c83b4836f7c..92ebb6fd79627f2e655178df2c031cd77675d1d6 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = group_db
@@ -402,7 +402,7 @@ sql_error select k, sum(k)+1 from tm0;
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim
index b80cfa9ce4788a1b8aeb7de67a90306d3f7e60d3..464f363222b2d135b68d7e41d18ec33d71d843d2 100644
--- a/tests/script/general/parser/selectResNum.sim
+++ b/tests/script/general/parser/selectResNum.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 200
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sc_db
@@ -50,8 +50,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -119,12 +118,12 @@ endw
 
 print ====== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 6000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ====== server restart completed
-sleep 1000
+sleep 500
 sql connect
-sleep 1000
+sleep 500
 sql use $db
 
 ##### repeat test after server restart
diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim
index ed8c3a51eb6a7baa64a9a89c30c55a6e792536ef..44e5576dac11d9f8ebffb9eee8f067bab86344c1 100644
--- a/tests/script/general/parser/select_across_vnodes.sim
+++ b/tests/script/general/parser/select_across_vnodes.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 5
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sav_db
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
index d778f20de079333eb308fe437397ea95a48346a7..0fa0848144c740c6ed8c7583cbca46816d3da6bc 100644
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = scd_db
@@ -35,11 +35,11 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 sql use $db
 
 # generate some data in cache
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
index 68d145a5f277464a224ccf0b3c92767a48e26fb6..dab76f60044c7b587e6c98bb256f895aeedb656e 100644
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = select_tags_db
diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim
index 95ec4a77ecc57820b85ea76a7d9ec4e415c4f5e0..bf29fe3902f88ae557b53068d1678a0aa1288818 100644
--- a/tests/script/general/parser/set_tag_vals.sim
+++ b/tests/script/general/parser/set_tag_vals.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = db
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index d5b61944ef648df3ccb6a730a37a087fa1b9d78d..fe1edb1f738a01831ad3e926e6b1a925b0c05dcc 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sr_db
@@ -32,7 +32,7 @@ run general/parser/single_row_in_tb_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/single_row_in_tb_query.sim b/tests/script/general/parser/single_row_in_tb_query.sim
index 2292e6d0a1c03be5a1388e8783384bc66d1c7e00..9e90b91220dae51bf31c9f3dde69eb1404223e88 100644
--- a/tests/script/general/parser/single_row_in_tb_query.sim
+++ b/tests/script/general/parser/single_row_in_tb_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sr_db
diff --git a/tests/script/general/parser/sliding.sim b/tests/script/general/parser/sliding.sim
index b9fd66334d469b09812daac4d0ad15b8a2ac3a9c..4283421169d146a19a7a46eed1c1bd819f77464d 100644
--- a/tests/script/general/parser/sliding.sim
+++ b/tests/script/general/parser/sliding.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c debugFlag -v 135
 system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sliding_db
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 4b5f013d3178e1ad3519d8be98d8c2cc9a6badd8..f7a23019cf2e1bcdca7540dd4acd997f24d31e69 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_db
@@ -97,11 +97,11 @@ run general/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/slimit_query.sim
 
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 9c69dd6c8be7696b923c42713ead1d24af8e694d..7a2511eb76b2a0d1289c509876375a2a6f06419c 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_alt_tg_db
@@ -56,11 +56,11 @@ run general/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/slimit1_query.sim
 
diff --git a/tests/script/general/parser/slimit1_query.sim b/tests/script/general/parser/slimit1_query.sim
index ad892fbf86ec815fad971a3bea43dc0e45d96e9f..c205d456892d79f7a9dd8fa1ec877c04afac49ef 100644
--- a/tests/script/general/parser/slimit1_query.sim
+++ b/tests/script/general/parser/slimit1_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_alt_tg_db
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index 178f151475c9e2795d850b4b9fd799e6679d1ad3..1072f9ccb46c69ab1156783cbcdeb8940afb9aa4 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_alt_tg_db
@@ -171,11 +171,11 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 sql use $db
 ### repeat above queries
diff --git a/tests/script/general/parser/slimit_query.sim b/tests/script/general/parser/slimit_query.sim
index dc1116405fc68c0d56e0cb7a8eb0c079472a0a2f..3020f8047217dfbd9f39b10b5b74b9280faa4737 100644
--- a/tests/script/general/parser/slimit_query.sim
+++ b/tests/script/general/parser/slimit_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_db
diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim
index 40328715917d99492d9ece93c7dc6332c68edaa5..1c8eb82c79a537ddbb322bdb164541263d92373c 100644
--- a/tests/script/general/parser/stream_on_sys.sim
+++ b/tests/script/general/parser/stream_on_sys.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c monitor       -v 1
 system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== stream_on_sys.sim
 
diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim
index 6c79f30bd2da6c15f430dc14a5dc462fa1fd7c64..8303a9c86d610476d6dba164e0af3e6a9199b1da 100644
--- a/tests/script/general/parser/tags_dynamically_specifiy.sim
+++ b/tests/script/general/parser/tags_dynamically_specifiy.sim
@@ -3,9 +3,9 @@ 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 1000
+sleep 500
 sql connect
-sleep 1000
+sleep 500
 
 $db = dytag_db
 $tbNum = 10
diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim
index 1ba7b60cfefd1c7c0ecbd92a5a85bb37b2d7844d..c3d0fdfc61d2d9ec8aa19100511577652076d91d 100644
--- a/tests/script/general/parser/tags_filter.sim
+++ b/tests/script/general/parser/tags_filter.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $db = tf_db
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index f1962d968fe9f5fdbbe48373f27916cdd0283db8..87c48717926a535f77e73e69f02464b947a42ee6 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -3,7 +3,7 @@ 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 1000
+sleep 500
 sql connect
 
 $dbPrefix = ti_db
@@ -68,7 +68,7 @@ run general/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/tbnameIn_query.sim b/tests/script/general/parser/tbnameIn_query.sim
index 3f87d203270d1d7a024842dea36ef92ec01635e8..ad7456f5578ccec76eef3262298130aaed2462c6 100644
--- a/tests/script/general/parser/tbnameIn_query.sim
+++ b/tests/script/general/parser/tbnameIn_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ti_db
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index 1374199548c92020b80abc28ea0c188b9540ed21..0e123796597c3d5009860aa85d5c2a73084a9f72 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -1,113 +1,113 @@
-sleep 1000
-run general/parser/alter.sim
-sleep 1000
-run general/parser/alter1.sim
-sleep 1000
-run general/parser/alter_stable.sim
-sleep 1000
-run general/parser/auto_create_tb.sim
-sleep 1000
-run general/parser/auto_create_tb_drop_tb.sim
-sleep 1000
-run general/parser/col_arithmetic_operation.sim
-sleep 1000
-run general/parser/columnValue.sim
-sleep 1000
-run general/parser/commit.sim
-sleep 1000
-run general/parser/create_db.sim
-sleep 1000
-run general/parser/create_mt.sim
-sleep 1000
-run general/parser/create_tb.sim
-sleep 1000
-run general/parser/dbtbnameValidate.sim
-sleep 1000
-run general/parser/fill.sim
-sleep 1000
-run general/parser/fill_stb.sim
-sleep 1000
-#run general/parser/fill_us.sim               #
-sleep 1000
-run general/parser/first_last.sim
-sleep 1000
-run general/parser/import_commit1.sim
-sleep 1000
-run general/parser/import_commit2.sim
-sleep 1000
-run general/parser/import_commit3.sim
-sleep 1000
-#run general/parser/import_file.sim
-sleep 1000
-run general/parser/insert_tb.sim
-sleep 1000
-run general/parser/tags_dynamically_specifiy.sim
-sleep 1000
-run general/parser/interp.sim
-sleep 1000
-run general/parser/lastrow.sim
-sleep 1000
-run general/parser/limit.sim
-sleep 1000
-run general/parser/limit1.sim
-sleep 1000
-run general/parser/limit1_tblocks100.sim
-sleep 1000
-run general/parser/limit2.sim
-sleep 1000
-run general/parser/mixed_blocks.sim
-sleep 1000
-run general/parser/nchar.sim
-sleep 1000
-run general/parser/null_char.sim
-sleep 1000
-run general/parser/selectResNum.sim
-sleep 1000
+#sleep 500
+#run general/parser/alter.sim
+#sleep 500
+#run general/parser/alter1.sim
+#sleep 500
+#run general/parser/alter_stable.sim
+#sleep 500
+#run general/parser/auto_create_tb.sim
+#sleep 500
+#run general/parser/auto_create_tb_drop_tb.sim
+#sleep 500
+#run general/parser/col_arithmetic_operation.sim
+#sleep 500
+#run general/parser/columnValue.sim
+#sleep 500
+#run general/parser/commit.sim
+#sleep 500
+#run general/parser/create_db.sim
+#sleep 500
+#run general/parser/create_mt.sim
+#sleep 500
+#run general/parser/create_tb.sim
+#sleep 500
+#run general/parser/dbtbnameValidate.sim
+#sleep 500
+#run general/parser/fill.sim
+#sleep 500
+#run general/parser/fill_stb.sim
+#sleep 500
+##run general/parser/fill_us.sim               #
+#sleep 500
+#run general/parser/first_last.sim
+#sleep 500
+#run general/parser/import_commit1.sim
+#sleep 500
+#run general/parser/import_commit2.sim
+#sleep 500
+#run general/parser/import_commit3.sim
+#sleep 500
+##run general/parser/import_file.sim
+#sleep 500
+#run general/parser/insert_tb.sim
+#sleep 500
+#run general/parser/tags_dynamically_specifiy.sim
+#sleep 500
+#run general/parser/interp.sim
+#sleep 500
+#run general/parser/lastrow.sim
+#sleep 500
+#run general/parser/limit.sim
+#sleep 500
+#run general/parser/limit1.sim
+#sleep 500
+#run general/parser/limit1_tblocks100.sim
+#sleep 500
+#run general/parser/limit2.sim
+#sleep 500
+#run general/parser/mixed_blocks.sim
+#sleep 500
+#run general/parser/nchar.sim
+#sleep 500
+#run general/parser/null_char.sim
+#sleep 500
+#run general/parser/selectResNum.sim
+sleep 500
 run general/parser/select_across_vnodes.sim
-sleep 1000
+sleep 500
 run general/parser/select_from_cache_disk.sim
-sleep 1000
+sleep 500
 run general/parser/set_tag_vals.sim
-sleep 1000
+sleep 500
 run general/parser/single_row_in_tb.sim
-sleep 1000
+sleep 500
 run general/parser/slimit.sim
-sleep 1000
+sleep 500
 run general/parser/slimit1.sim
-sleep 1000
+sleep 500
 run general/parser/slimit_alter_tags.sim
-sleep 1000
+sleep 500
 run general/parser/tbnameIn.sim
-sleep 1000
+sleep 500
 run general/parser/slimit_alter_tags.sim  # persistent failed
-sleep 1000
+sleep 500
 run general/parser/join.sim
-sleep 1000
+sleep 500
 run general/parser/join_multivnode.sim
-sleep 1000
+sleep 500
 run general/parser/projection_limit_offset.sim
-sleep 1000
+sleep 500
 run general/parser/select_with_tags.sim
-sleep 1000
+sleep 500
 run general/parser/groupby.sim
-sleep 1000
+sleep 500
 run general/parser/tags_filter.sim
-sleep 1000
+sleep 500
 run general/parser/topbot.sim
-sleep 1000
+sleep 500
 run general/parser/union.sim
-sleep 1000
+sleep 500
 run general/parser/constCol.sim
-sleep 1000
+sleep 500
 run general/parser/where.sim
-sleep 1000
+sleep 500
 run general/parser/timestamp.sim
-sleep 1000
+sleep 500
 run general/parser/sliding.sim
 
-#sleep 1000
+#sleep 500
 #run general/parser/repeatStream.sim
-#sleep 1000
+#sleep 500
 #run general/parser/stream_on_sys.sim
-#sleep 1000
+#sleep 500
 #run general/parser/stream.sim
\ No newline at end of file
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index 4603e2381353ab718c0e34a58b3dc64be569a08d..72966459d0ced737e2d0f44702cd5e6956a3aced 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ts_db
@@ -59,10 +59,10 @@ run general/parser/timestamp_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 1000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/timestamp_query.sim
diff --git a/tests/script/general/parser/timestamp_query.sim b/tests/script/general/parser/timestamp_query.sim
index ab892c02870eb738d9a327ab1071edc19198429d..056e8bba6bd6587fcba2c2685d9764f3f67c42b7 100644
--- a/tests/script/general/parser/timestamp_query.sim
+++ b/tests/script/general/parser/timestamp_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ts_db
diff --git a/tests/script/general/parser/topbot.sim b/tests/script/general/parser/topbot.sim
index c2b41888d739c559b24784c42ad040d54d7ae160..08e2f6ab00cdcdc3a974266420f7e66bb2e0a65b 100644
--- a/tests/script/general/parser/topbot.sim
+++ b/tests/script/general/parser/topbot.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = tb_db
@@ -128,11 +128,11 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 sql select count(*) from t1.test where ts>10000 and ts<90000 interval(5000a)
 if $rows != 3 then
@@ -169,7 +169,7 @@ endw
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 1000
+sleep 500
 sql use db;
 
 $ts = 1000
@@ -221,7 +221,7 @@ sql insert into t2 values('2020-2-2 1:1:1', 1);
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 1000
+sleep 500
 
 sql use db
 sql select count(*), first(ts), last(ts) from t2 interval(1d);
diff --git a/tests/script/general/parser/union.sim b/tests/script/general/parser/union.sim
index 024b9c76efe6b8ddd69c723ffc0e1e0b0d82e075..d779d757310336b3b97c6748301e1eab24fe331f 100644
--- a/tests/script/general/parser/union.sim
+++ b/tests/script/general/parser/union.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = union_db
@@ -96,7 +96,7 @@ while $i < $tbNum
 endw
 
 print sleep 1sec.
-sleep 1000
+sleep 500
 
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index 3ea354f4da2489082a21f1f1a4d07f2aad28c98a..4a38e3c68c64252ab9c53926c2ff33cfddbee2ae 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = wh_db