From af57edccb817226106c7cfff5bedfa138e003f65 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 15 Jul 2022 14:39:37 +0800
Subject: [PATCH] test: restore some 2.0 cases

---
 tests/script/jenkins/basic.txt                | 32 +------
 .../tsim/parser/auto_create_tb_drop_tb.sim    | 12 +--
 tests/script/tsim/parser/between_and.sim      | 94 ++++++-------------
 .../tsim/parser/binary_escapeCharacter.sim    |  4 -
 .../tsim/parser/col_arithmetic_operation.sim  | 10 +-
 .../tsim/parser/col_arithmetic_query.sim      | 24 ++---
 tests/script/tsim/parser/columnValue.sim      | 20 ++--
 tests/script/tsim/parser/commit.sim           |  4 -
 tests/script/tsim/parser/condition.sim        | 11 +--
 tests/script/tsim/parser/constCol.sim         | 21 -----
 tests/script/tsim/parser/create_db.sim        |  6 +-
 .../create_db__for_community_version.sim      |  6 +-
 tests/script/tsim/parser/create_mt.sim        |  6 +-
 tests/script/tsim/parser/create_tb.sim        |  6 +-
 .../tsim/parser/create_tb_with_tag_name.sim   |  5 +-
 tests/script/tsim/parser/dbtbnameValidate.sim |  3 -
 tests/script/tsim/parser/distinct.sim         |  4 -
 tests/script/tsim/parser/fill.sim             |  3 -
 tests/script/tsim/parser/fill_stb.sim         |  3 -
 tests/script/tsim/parser/fill_us.sim          |  3 -
 tests/script/tsim/parser/first_last.sim       |  8 +-
 .../tsim/parser/fourArithmetic-basic.sim      | 19 ----
 tests/script/tsim/parser/function.sim         |  3 -
 tests/script/tsim/parser/groupby-basic.sim    |  4 +-
 tests/script/tsim/parser/groupby.sim          |  4 -
 tests/script/tsim/parser/having.sim           |  5 +-
 tests/script/tsim/parser/having_child.sim     |  5 +-
 tests/script/tsim/parser/import.sim           |  3 -
 tests/script/tsim/parser/import_commit1.sim   |  4 -
 tests/script/tsim/parser/import_commit2.sim   |  4 -
 tests/script/tsim/parser/import_commit3.sim   |  4 -
 tests/script/tsim/parser/import_file.sim      |  6 +-
 tests/script/tsim/parser/insert_multiTbl.sim  |  6 +-
 tests/script/tsim/parser/insert_tb.sim        |  6 +-
 tests/script/tsim/parser/interp.sim           |  7 +-
 tests/script/tsim/parser/join.sim             |  7 --
 tests/script/tsim/parser/join_manyblocks.sim  |  5 -
 tests/script/tsim/parser/join_multitables.sim |  5 +-
 tests/script/tsim/parser/join_multivnode.sim  |  5 -
 tests/script/tsim/parser/last_cache.sim       |  9 +-
 tests/script/tsim/parser/last_groupby.sim     |  5 +-
 tests/script/tsim/parser/lastrow.sim          |  8 +-
 tests/script/tsim/parser/like.sim             |  5 +-
 tests/script/tsim/parser/limit.sim            | 12 +--
 tests/script/tsim/parser/limit1.sim           | 12 +--
 .../script/tsim/parser/limit1_tblocks100.sim  | 12 +--
 tests/script/tsim/parser/limit2.sim           |  4 +-
 .../script/tsim/parser/limit2_tblocks100.sim  |  4 +-
 tests/script/tsim/parser/line_insert.sim      |  3 -
 tests/script/tsim/parser/mixed_blocks.sim     |  5 -
 tests/script/tsim/parser/nchar.sim            |  4 -
 tests/script/tsim/parser/nestquery.sim        |  4 -
 tests/script/tsim/parser/null_char.sim        |  5 -
 tests/script/tsim/parser/precision_ns.sim     |  3 -
 .../tsim/parser/projection_limit_offset.sim   |  4 -
 tests/script/tsim/parser/regex.sim            |  4 -
 tests/script/tsim/parser/repeatAlter.sim      |  2 +-
 tests/script/tsim/parser/selectResNum.sim     |  4 -
 .../tsim/parser/select_across_vnodes.sim      |  4 -
 .../tsim/parser/select_distinct_tag.sim       |  4 -
 .../tsim/parser/select_from_cache_disk.sim    |  4 -
 tests/script/tsim/parser/select_with_tags.sim |  4 -
 tests/script/tsim/parser/set_tag_vals.sim     |  4 -
 tests/script/tsim/parser/single_row_in_tb.sim |  8 +-
 tests/script/tsim/parser/sliding.sim          |  6 --
 tests/script/tsim/parser/slimit.sim           |  8 +-
 tests/script/tsim/parser/slimit1.sim          |  8 +-
 tests/script/tsim/parser/stableOp.sim         |  5 +-
 .../tsim/parser/tags_dynamically_specifiy.sim |  4 -
 tests/script/tsim/parser/tags_filter.sim      |  3 -
 tests/script/tsim/parser/tbnameIn.sim         |  7 +-
 tests/script/tsim/parser/timestamp.sim        |  9 +-
 tests/script/tsim/parser/top_groupby.sim      |  5 +-
 tests/script/tsim/parser/topbot.sim           |  5 -
 tests/script/tsim/parser/union.sim            |  7 --
 tests/script/tsim/parser/where.sim            |  8 +-
 76 files changed, 115 insertions(+), 484 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index f37d6c6796..6c1938d9fc 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -88,23 +88,13 @@
 ./test.sh -f tsim/parser/alter_column.sim
 ./test.sh -f tsim/parser/alter_stable.sim
 # jira ./test.sh -f tsim/parser/auto_create_tb.sim
-# ./test.sh -f tsim/parser/auto_create_tb_drop_tb.sim
-# ./test.sh -f tsim/parser/between_and.sim
-# ./test.sh -f tsim/parser/binary_escapeCharacter.sim
-# ./test.sh -f tsim/parser/col_arithmetic_operation.sim                                                                                                                            
-## ./test.sh -f tsim/parser/col_arithmetic_query.sim
-## ./test.sh -f tsim/parser/columnValue.sim
-## ./test.sh -f tsim/parser/columnValue_bigint.sim
-## ./test.sh -f tsim/parser/columnValue_bool.sim
-## ./test.sh -f tsim/parser/columnValue_double.sim
-## ./test.sh -f tsim/parser/columnValue_float.sim
-## ./test.sh -f tsim/parser/columnValue_int.sim
-## ./test.sh -f tsim/parser/columnValue_smallint.sim
-## ./test.sh -f tsim/parser/columnValue_tinyint.sim
-## ./test.sh -f tsim/parser/columnValue_unsign.sim
+./test.sh -f tsim/parser/auto_create_tb_drop_tb.sim
+./test.sh -f tsim/parser/between_and.sim
+./test.sh -f tsim/parser/binary_escapeCharacter.sim
+# nojira ./test.sh -f tsim/parser/col_arithmetic_operation.sim     
+# nojira ./test.sh -f tsim/parser/columnValue.sim
 ## ./test.sh -f tsim/parser/commit.sim
 ## ./test.sh -f tsim/parser/condition.sim
-## ./test.sh -f tsim/parser/condition_query.sim
 ## ./test.sh -f tsim/parser/constCol.sim
 # ./test.sh -f tsim/parser/create_db.sim
 ## ./test.sh -f tsim/parser/create_db__for_community_version.sim
@@ -117,7 +107,6 @@
 # ./test.sh -f tsim/parser/fill_stb.sim
 ## ./test.sh -f tsim/parser/fill_us.sim
 # ./test.sh -f tsim/parser/first_last.sim
-## ./test.sh -f tsim/parser/first_last_query.sim
 ./test.sh -f tsim/parser/fourArithmetic-basic.sim
 ## ./test.sh -f tsim/parser/function.sim
 ./test.sh -f tsim/parser/groupby-basic.sim
@@ -132,24 +121,18 @@
 ## ./test.sh -f tsim/parser/insert_multiTbl.sim
 # ./test.sh -f tsim/parser/insert_tb.sim
 ## ./test.sh -f tsim/parser/interp.sim
-## ./test.sh -f tsim/parser/interp_test.sim
 # ./test.sh -f tsim/parser/join.sim
 # ./test.sh -f tsim/parser/join_manyblocks.sim
 ## ./test.sh -f tsim/parser/join_multitables.sim
 # ./test.sh -f tsim/parser/join_multivnode.sim
 # ./test.sh -f tsim/parser/last_cache.sim
-## ./test.sh -f tsim/parser/last_cache_query.sim
 ## ./test.sh -f tsim/parser/last_groupby.sim
 # ./test.sh -f tsim/parser/lastrow.sim
-## ./test.sh -f tsim/parser/lastrow_query.sim
 ## ./test.sh -f tsim/parser/like.sim
 # ./test.sh -f tsim/parser/limit.sim
 # ./test.sh -f tsim/parser/limit1.sim
-## ./test.sh -f tsim/parser/limit1_stb.sim
-## ./test.sh -f tsim/parser/limit1_tb.sim
 # ./test.sh -f tsim/parser/limit1_tblocks100.sim
 ## ./test.sh -f tsim/parser/limit2.sim
-## ./test.sh -f tsim/parser/limit2_query.sim
 ## ./test.sh -f tsim/parser/limit2_tblocks100.sim
 ## ./test.sh -f tsim/parser/limit_stb.sim
 ## ./test.sh -f tsim/parser/limit_tb.sim
@@ -169,20 +152,15 @@
 # ./test.sh -f tsim/parser/select_with_tags.sim
 # ./test.sh -f tsim/parser/set_tag_vals.sim
 # ./test.sh -f tsim/parser/single_row_in_tb.sim
-## ./test.sh -f tsim/parser/single_row_in_tb_query.sim
 # ./test.sh -f tsim/parser/sliding.sim
 # ./test.sh -f tsim/parser/slimit.sim
 # ./test.sh -f tsim/parser/slimit1.sim
-## ./test.sh -f tsim/parser/slimit1_query.sim
 # ./test.sh -f tsim/parser/slimit_alter_tags.sim
-## ./test.sh -f tsim/parser/slimit_query.sim
 # ./test.sh -f tsim/parser/stableOp.sim
 # ./test.sh -f tsim/parser/tags_dynamically_specifiy.sim
 # ./test.sh -f tsim/parser/tags_filter.sim
 # ./test.sh -f tsim/parser/tbnameIn.sim
-## ./test.sh -f tsim/parser/tbnameIn_query.sim
 # ./test.sh -f tsim/parser/timestamp.sim
-## ./test.sh -f tsim/parser/timestamp_query.sim
 ## ./test.sh -f tsim/parser/top_groupby.sim
 # ./test.sh -f tsim/parser/topbot.sim
 # ./test.sh -f tsim/parser/udf.sim
diff --git a/tests/script/tsim/parser/auto_create_tb_drop_tb.sim b/tests/script/tsim/parser/auto_create_tb_drop_tb.sim
index b04d024643..0cff016b5f 100644
--- a/tests/script/tsim/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/tsim/parser/auto_create_tb_drop_tb.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/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 100
 sql connect
 
 $dbPrefix = db
@@ -20,9 +16,9 @@ $i = 0
 $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
-sql drop database $db -x step1
-step1:
-sql create database $db maxrows 200 cache 2
+sql drop database if exists $db
+sql create database $db
+
 print ====== create tables
 sql use $db
 
@@ -49,8 +45,6 @@ while $t < $tbNum
 endw
 print ====== tables created
 
-sleep 100
-
 sql drop table tb2
 $x = 0
 while $x < $rowNum 
diff --git a/tests/script/tsim/parser/between_and.sim b/tests/script/tsim/parser/between_and.sim
index cdced47cb6..aa9944d9a4 100644
--- a/tests/script/tsim/parser/between_and.sim
+++ b/tests/script/tsim/parser/between_and.sim
@@ -1,20 +1,14 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
-print ======================== dnode1 start
 
+print ======================== dnode1 start
 $db = testdb
-
 sql create database $db
 sql use $db
 
 sql create stable st2 (ts timestamp, f1 int, f2 float, f3 double, f4 bigint, f5 smallint, f6 tinyint, f7 bool, f8 binary(10), f9 nchar(10)) tags (id1 int, id2 float, id3 nchar(10), id4 double, id5 smallint, id6 bigint, id7 binary(10))
-
 sql create table tb1 using st2 tags (1,1.0,"1",1.0,1,1,"1");
 sql create table tb2 using st2 tags (2,2.0,"2",2.0,2,2,"2");
 sql create table tb3 using st2 tags (3,3.0,"3",3.0,3,3,"3");
@@ -25,132 +19,102 @@ sql insert into tb1 values (now-100s,2,2.0,2.0,2,2,2,true,"2","2")
 sql insert into tb1 values (now,3,3.0,3.0,3,3,3,true,"3","3")
 sql insert into tb1 values (now+100s,4,4.0,4.0,4,4,4,true,"4","4")
 sql insert into tb1 values (now+200s,4,4.0,4.0,4,4,4,true,"4","4")
-sql insert into tb1 values (now+300s,4,4.0,4.0,4,4,4,true,"4","4")
-sql insert into tb1 values (now+400s,4,4.0,4.0,4,4,4,true,"4","4")
-sql insert into tb1 values (now+500s,4,4.0,4.0,4,4,4,true,"4","4")
-
-sql select tbname,id1 from st2;
+sql insert into tb2 values (now+300s,4,4.0,4.0,4,4,4,true,"4","4")
+sql insert into tb3 values (now+400s,4,4.0,4.0,4,4,4,true,"4","4")
+sql insert into tb4 values (now+500s,4,4.0,4.0,4,4,4,true,"4","4")
 
+sql select distinct(tbname), id1 from st2;
 if $rows != 4 then
   return -1
 endi
 
-
 sql select * from st2;
-
 if $rows != 8 then
   return -1
 endi
 
 sql select * from st2 where ts between now-50s and now+450s
-
 if $rows != 5 then
   return -1
 endi
 
-sql select tbname,id1 from st2 where id1 between 2 and 3;
-
+sql select tbname, id1 from st2 where id1 between 2 and 3;
 if $rows != 2 then
   return -1
 endi
 
-if $data00 != tb2 then 
-  return -1
-endi
-if $data01 != 2 then 
-  return -1
-endi
-if $data10 != tb3 then 
-  return -1
-endi
-if $data11 != 3 then 
-  return -1
-endi
-
-sql select tbname,id2 from st2 where id2 between 2.0 and 3.0;
-
-if $rows != 2 then
+sql select tbname, id2 from st2 where id2 between 0.0 and 3.0;
+if $rows != 7 then
   return -1
 endi
-
-if $data00 != tb2 then 
+if $data(tb2)[0] != tb2 then 
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data(tb2)[1] != 2.00000 then 
   return -1
 endi
-if $data10 != tb3 then 
+if $data(tb3)[0] != tb3 then 
   return -1
 endi
-if $data11 != 3.00000 then 
+if $data(tb3)[1] != 3.00000 then 
   return -1
 endi
 
-
-sql select tbname,id4 from st2 where id4 between 2.0 and 3.0;
-
+sql select tbname, id4 from st2 where id2 between 2.0 and 3.0;
 if $rows != 2 then
   return -1
 endi
-
-if $data00 != tb2 then 
+if $data(tb2)[0] != tb2 then 
   return -1
 endi
-if $data01 != 2.000000000 then 
+if $data(tb2)[1] != 2.000000000 then 
   return -1
 endi
-if $data10 != tb3 then 
+if $data(tb3)[0] != tb3 then 
   return -1
 endi
-if $data11 != 3.000000000 then 
+if $data(tb3)[1] != 3.000000000 then 
   return -1
 endi
 
-
-sql select tbname,id5 from st2 where id5 between 2.0 and 3.0;
-
+sql select tbname, id5 from st2 where id5 between 2.0 and 3.0;
 if $rows != 2 then
   return -1
 endi
-
-if $data00 != tb2 then 
+if $data(tb2)[0] != tb2 then 
   return -1
 endi
-if $data01 != 2 then 
+if $data(tb2)[1] != 2 then 
   return -1
 endi
-if $data10 != tb3 then 
+if $data(tb3)[0] != tb3 then 
   return -1
 endi
-if $data11 != 3 then 
+if $data(tb3)[1] != 3 then 
   return -1
 endi
 
 sql select tbname,id6 from st2 where id6 between 2.0 and 3.0;
-
 if $rows != 2 then
   return -1
 endi
-
-if $data00 != tb2 then 
+if $data(tb2)[0] != tb2 then 
   return -1
 endi
-if $data01 != 2 then 
+if $data(tb2)[1] != 2 then 
   return -1
 endi
-if $data10 != tb3 then 
+if $data(tb3)[0] != tb3 then 
   return -1
 endi
-if $data11 != 3 then 
+if $data(tb3)[1] != 3 then 
   return -1
 endi
 
 sql select * from st2 where f1 between 2 and 3 and f2 between 2.0 and 3.0 and f3 between 2.0 and 3.0 and f4 between 2.0 and 3.0 and f5 between 2.0 and 3.0 and f6 between 2.0 and 3.0;
-
 if $rows != 2 then
   return -1
 endi
-
 if $data01 != 2 then 
   return -1
 endi
@@ -158,8 +122,8 @@ if $data11 != 3 then
   return -1
 endi
 
-sql_error select * from st2 where f7 between 2.0 and 3.0;
-sql_error select * from st2 where f8 between 2.0 and 3.0;
-sql_error select * from st2 where f9 between 2.0 and 3.0;
+sql select * from st2 where f7 between 2.0 and 3.0;
+sql select * from st2 where f8 between 2.0 and 3.0;
+sql select * from st2 where f9 between 2.0 and 3.0;
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/parser/binary_escapeCharacter.sim b/tests/script/tsim/parser/binary_escapeCharacter.sim
index 176edd4e29..0b437d8b04 100644
--- a/tests/script/tsim/parser/binary_escapeCharacter.sim
+++ b/tests/script/tsim/parser/binary_escapeCharacter.sim
@@ -1,10 +1,6 @@
-
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 sql drop database if exists ecdb
diff --git a/tests/script/tsim/parser/col_arithmetic_operation.sim b/tests/script/tsim/parser/col_arithmetic_operation.sim
index 8bb692e3bb..add2945c66 100644
--- a/tests/script/tsim/parser/col_arithmetic_operation.sim
+++ b/tests/script/tsim/parser/col_arithmetic_operation.sim
@@ -1,10 +1,8 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
+
 #========================================= setup environment ================================
 
 $dbPrefix = ca_db
@@ -101,19 +99,17 @@ $halfTbNum = $tbNum / 2
 #endw
 
 #=================================== above are setup test environment =============================
-run general/parser/col_arithmetic_query.sim
+run tsim/parser/col_arithmetic_query.sim
 
 #======================================= all in files query =======================================
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 500
 system sh/exec.sh -n dnode1 -s start
 
 print ================== server restart completed
 sql connect
-sleep 5000
 
-run general/parser/col_arithmetic_query.sim
+run tsim/parser/col_arithmetic_query.sim
 
 # ================================================================================================
 
diff --git a/tests/script/tsim/parser/col_arithmetic_query.sim b/tests/script/tsim/parser/col_arithmetic_query.sim
index 17ae6cfd6b..8ee891660b 100644
--- a/tests/script/tsim/parser/col_arithmetic_query.sim
+++ b/tests/script/tsim/parser/col_arithmetic_query.sim
@@ -173,7 +173,7 @@ endi
 # multi row result aggregation [d.4]
 sql_error select top(c1, 1) - bottom(c1, 1) from $tb
 sql_error select top(c1, 99) - bottom(c1, 99) from $tb
-sql_error select top(c1,1) - 88 from $tb
+sql       select top(c1,1) - 88 from $tb
 
 # all data types [d.6] ================================================================
 sql select c2-c1*1.1, c3/c2, c4*c3, c5%c4, (c6+c4)%22, c2-c2 from $tb
@@ -227,13 +227,13 @@ endi
 
 # error case, ts/bool/binary/nchar not support arithmetic expression
 sql_error select ts+ts from $tb
-sql_error select ts+22 from $tb
-sql_error select c7*12 from $tb
-sql_error select c8/55 from $tb
-sql_error select c9+c8 from $tb
-sql_error select c7-c8, c9-c8 from $tb
+sql       select ts+22 from $tb
+sql       select c7*12 from $tb
+sql       select c8/55 from $tb
+sql       select c9+c8 from $tb
+sql       select c7-c8, c9-c8 from $tb
 sql_error select ts-c9 from $tb
-sql_error select c8+c7, c9+c9+c8+c7/c6 from $tb
+sql       select c8+c7, c9+c9+c8+c7/c6 from $tb
 
 # arithmetic expression in join [d.7]==================================================
 
@@ -339,7 +339,7 @@ if $data20 != 0 then
 endi
 
 # tag filter(not support for normal table). [d.15]=====================================
-sql_error select c2+99 from $tb where t1=12;
+sql select c2+99 from $tb where t1=12;
 
 # multi-field output [d.16]============================================================
 sql select c4*1+1/2,c4*1+1/2,c4*1+1/2,c4*1+1/2,c4*1+1/2 from $tb
@@ -391,7 +391,7 @@ if $data00 != 0.000000000 then
   return -1
 endi
 
-sql select (count(c1) * 2) % 7.9, (count(c1) * 2), ( count(1)*2) from $stb order by ts desc;
+sql select (count(c1) * 2) % 7.9, (count(c1) * 2), ( count(1)*2) from $stb
 if $rows != 1 then
   return -1
 endi
@@ -408,7 +408,7 @@ if $data02 != 200000.000000000 then
   return -1
 endi
 
-sql select spread( c1 )/44, spread(c1), 0.204545455 * 44 from $stb order by ts asc;
+sql select spread( c1 )/44, spread(c1), 0.204545455 * 44 from $stb
 if $rows != 1 then
   return -1
 endi
@@ -487,8 +487,8 @@ sql_error select top(c1, 99) - bottom(c1, 99) from $stb
 sql select c2-c1, c3/c2, c4*c3, c5%c4, c6+99%22 from $stb
 
 # error case, ts/bool/binary/nchar not support arithmetic expression
-sql_error select first(c7)*12 from $stb
-sql_error select last(c8)/55 from $stb
+sql       select first(c7)*12 from $stb
+sql       select last(c8)/55 from $stb
 sql_error select last_row(c9) + last_row(c8) from $stb
 
 # arithmetic expression in join [d.7]===============================================================
diff --git a/tests/script/tsim/parser/columnValue.sim b/tests/script/tsim/parser/columnValue.sim
index c98542fbf2..68336cdcc1 100644
--- a/tests/script/tsim/parser/columnValue.sim
+++ b/tests/script/tsim/parser/columnValue.sim
@@ -1,10 +1,6 @@
-####
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 print ========== columnValues.sim
@@ -13,14 +9,14 @@ sql drop database if exists db
 sql create database db
 sql use db
 
-run general/parser/columnValue_bool.sim
-run general/parser/columnValue_tinyint.sim
-run general/parser/columnValue_smallint.sim
-run general/parser/columnValue_int.sim
-run general/parser/columnValue_bigint.sim
-run general/parser/columnValue_float.sim
-run general/parser/columnValue_double.sim
-run general/parser/columnValue_unsign.sim
+run tsim/parser/columnValue_bool.sim
+run tsim/parser/columnValue_tinyint.sim
+run tsim/parser/columnValue_smallint.sim
+run tsim/parser/columnValue_int.sim
+run tsim/parser/columnValue_bigint.sim
+run tsim/parser/columnValue_float.sim
+run tsim/parser/columnValue_double.sim
+run tsim/parser/columnValue_unsign.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 
diff --git a/tests/script/tsim/parser/commit.sim b/tests/script/tsim/parser/commit.sim
index 7c4c883fb1..83b457673b 100644
--- a/tests/script/tsim/parser/commit.sim
+++ b/tests/script/tsim/parser/commit.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxTablesperVnode -v 100
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = sc_db
diff --git a/tests/script/tsim/parser/condition.sim b/tests/script/tsim/parser/condition.sim
index c3aed7e2a3..8c1327baae 100644
--- a/tests/script/tsim/parser/condition.sim
+++ b/tests/script/tsim/parser/condition.sim
@@ -1,14 +1,7 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
-system sh/cfg.sh -n dnode1 -c cache -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
-
 sql drop database if exists cdb
 sql create database if not exists cdb 
 sql use cdb
@@ -139,7 +132,7 @@ sleep 100
 
 sql connect
 
-run general/parser/condition_query.sim
+run tsim/parser/condition_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -149,5 +142,5 @@ print ================== server restart completed
 sql connect
 sleep 100
 
-run general/parser/condition_query.sim
+run tsim/parser/condition_query.sim
 
diff --git a/tests/script/tsim/parser/constCol.sim b/tests/script/tsim/parser/constCol.sim
index 66523517be..5f50c950dd 100644
--- a/tests/script/tsim/parser/constCol.sim
+++ b/tests/script/tsim/parser/constCol.sim
@@ -1,26 +1,5 @@
 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 dDebugFlag       -v 135
-system sh/cfg.sh -n dnode1 -c mDebugFlag       -v 135
-system sh/cfg.sh -n dnode1 -c sdbDebugFlag     -v 135
-system sh/cfg.sh -n dnode1 -c rpcDebugFlag    -v 135
-system sh/cfg.sh -n dnode1 -c cDebugFlag       -v 135
-system sh/cfg.sh -n dnode1 -c monitorDebugflag -v 135
-system sh/cfg.sh -n dnode1 -c httpDebugFlag    -v 135
-system sh/cfg.sh -n dnode1 -c uDebugFlag       -v 135
-
-system sh/cfg.sh -n dnode1 -c httpCacheSessions  -v 10
-system sh/cfg.sh -n dnode1 -c httpMaxThreads     -v 10
-system sh/cfg.sh -n dnode1 -c httpEnableCompress -v 0
-
-system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 30000
-system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 30000
-system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 30000
-system sh/cfg.sh -n dnode1 -c maxShellConns       -v 30000
-
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/tsim/parser/create_db.sim b/tests/script/tsim/parser/create_db.sim
index 040331ec4f..c4c5b89bd2 100644
--- a/tests/script/tsim/parser/create_db.sim
+++ b/tests/script/tsim/parser/create_db.sim
@@ -1,12 +1,8 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $dbPrefix = fi_in_db
diff --git a/tests/script/tsim/parser/create_db__for_community_version.sim b/tests/script/tsim/parser/create_db__for_community_version.sim
index 5dc4263d5d..32a8f303c1 100644
--- a/tests/script/tsim/parser/create_db__for_community_version.sim
+++ b/tests/script/tsim/parser/create_db__for_community_version.sim
@@ -1,12 +1,8 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $dbPrefix = fi_in_db
diff --git a/tests/script/tsim/parser/create_mt.sim b/tests/script/tsim/parser/create_mt.sim
index c606ba99ec..fafee66c76 100644
--- a/tests/script/tsim/parser/create_mt.sim
+++ b/tests/script/tsim/parser/create_mt.sim
@@ -1,12 +1,8 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $dbPrefix = fi_in_db
diff --git a/tests/script/tsim/parser/create_tb.sim b/tests/script/tsim/parser/create_tb.sim
index ca57f401b9..5203f289dc 100644
--- a/tests/script/tsim/parser/create_tb.sim
+++ b/tests/script/tsim/parser/create_tb.sim
@@ -1,12 +1,8 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $dbPrefix = fi_in_db
diff --git a/tests/script/tsim/parser/create_tb_with_tag_name.sim b/tests/script/tsim/parser/create_tb_with_tag_name.sim
index 130f4097f6..b7b39b2f5f 100644
--- a/tests/script/tsim/parser/create_tb_with_tag_name.sim
+++ b/tests/script/tsim/parser/create_tb_with_tag_name.sim
@@ -1,11 +1,8 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $db = testdb
diff --git a/tests/script/tsim/parser/dbtbnameValidate.sim b/tests/script/tsim/parser/dbtbnameValidate.sim
index bc3bfefafb..86ffbe5c37 100644
--- a/tests/script/tsim/parser/dbtbnameValidate.sim
+++ b/tests/script/tsim/parser/dbtbnameValidate.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 print ========== db name and table name check in create and drop, describe
diff --git a/tests/script/tsim/parser/distinct.sim b/tests/script/tsim/parser/distinct.sim
index e0eb74b5a5..b90ca593ba 100644
--- a/tests/script/tsim/parser/distinct.sim
+++ b/tests/script/tsim/parser/distinct.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = sav_db
diff --git a/tests/script/tsim/parser/fill.sim b/tests/script/tsim/parser/fill.sim
index 3413a0b596..642c7bd8d4 100644
--- a/tests/script/tsim/parser/fill.sim
+++ b/tests/script/tsim/parser/fill.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/tsim/parser/fill_stb.sim b/tests/script/tsim/parser/fill_stb.sim
index ba8ddbdf6a..0aadcc5a9f 100644
--- a/tests/script/tsim/parser/fill_stb.sim
+++ b/tests/script/tsim/parser/fill_stb.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = fl1_db
diff --git a/tests/script/tsim/parser/fill_us.sim b/tests/script/tsim/parser/fill_us.sim
index 762413d0a1..98c37c435d 100644
--- a/tests/script/tsim/parser/fill_us.sim
+++ b/tests/script/tsim/parser/fill_us.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/tsim/parser/first_last.sim b/tests/script/tsim/parser/first_last.sim
index 09047b4528..27bf42ead3 100644
--- a/tests/script/tsim/parser/first_last.sim
+++ b/tests/script/tsim/parser/first_last.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxTablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = first_db
@@ -73,7 +69,7 @@ sql import into $tb (ts) values ( $ts )
 
 print ====== test data created
 
-run general/parser/first_last_query.sim
+run tsim/parser/first_last_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -83,7 +79,7 @@ print ================== server restart completed
 sql connect
 sleep 100
 
-run general/parser/first_last_query.sim
+run tsim/parser/first_last_query.sim
 
 print =================> insert data regression test
 sql create database test keep 36500
diff --git a/tests/script/tsim/parser/fourArithmetic-basic.sim b/tests/script/tsim/parser/fourArithmetic-basic.sim
index bd01813c61..bfda75e54d 100644
--- a/tests/script/tsim/parser/fourArithmetic-basic.sim
+++ b/tests/script/tsim/parser/fourArithmetic-basic.sim
@@ -1,25 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1 then
-  return -1
-endi
-if $data04 != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 
 $dbNamme = d0
diff --git a/tests/script/tsim/parser/function.sim b/tests/script/tsim/parser/function.sim
index 556292b21b..451947e82a 100644
--- a/tests/script/tsim/parser/function.sim
+++ b/tests/script/tsim/parser/function.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = m_func_db
diff --git a/tests/script/tsim/parser/groupby-basic.sim b/tests/script/tsim/parser/groupby-basic.sim
index 4d6b33612f..1edc99624a 100644
--- a/tests/script/tsim/parser/groupby-basic.sim
+++ b/tests/script/tsim/parser/groupby-basic.sim
@@ -1,9 +1,7 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
+sql connect
 
 $loop_cnt = 0
 check_dnode_ready:
diff --git a/tests/script/tsim/parser/groupby.sim b/tests/script/tsim/parser/groupby.sim
index 1fe19714bb..8d7fad8cbc 100644
--- a/tests/script/tsim/parser/groupby.sim
+++ b/tests/script/tsim/parser/groupby.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = group_db
diff --git a/tests/script/tsim/parser/having.sim b/tests/script/tsim/parser/having.sim
index e063333853..b3d64a4e3d 100644
--- a/tests/script/tsim/parser/having.sim
+++ b/tests/script/tsim/parser/having.sim
@@ -1,11 +1,8 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $db = testdb
diff --git a/tests/script/tsim/parser/having_child.sim b/tests/script/tsim/parser/having_child.sim
index 0fe5448869..1ee1481943 100644
--- a/tests/script/tsim/parser/having_child.sim
+++ b/tests/script/tsim/parser/having_child.sim
@@ -1,11 +1,8 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $db = testdb
diff --git a/tests/script/tsim/parser/import.sim b/tests/script/tsim/parser/import.sim
index 4468ab87a9..5946cff4e2 100644
--- a/tests/script/tsim/parser/import.sim
+++ b/tests/script/tsim/parser/import.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = impt_db
diff --git a/tests/script/tsim/parser/import_commit1.sim b/tests/script/tsim/parser/import_commit1.sim
index f330fe4cd9..23259d8b01 100644
--- a/tests/script/tsim/parser/import_commit1.sim
+++ b/tests/script/tsim/parser/import_commit1.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = ic_db
diff --git a/tests/script/tsim/parser/import_commit2.sim b/tests/script/tsim/parser/import_commit2.sim
index 47b30acb49..49fca0d477 100644
--- a/tests/script/tsim/parser/import_commit2.sim
+++ b/tests/script/tsim/parser/import_commit2.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = ic_db
diff --git a/tests/script/tsim/parser/import_commit3.sim b/tests/script/tsim/parser/import_commit3.sim
index 1e041375de..d353c10387 100644
--- a/tests/script/tsim/parser/import_commit3.sim
+++ b/tests/script/tsim/parser/import_commit3.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = ic_db
diff --git a/tests/script/tsim/parser/import_file.sim b/tests/script/tsim/parser/import_file.sim
index cf11194ba7..35b656eb87 100644
--- a/tests/script/tsim/parser/import_file.sim
+++ b/tests/script/tsim/parser/import_file.sim
@@ -1,11 +1,7 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 500
 sql connect
-sleep 500
 
 sql drop database if exists indb
 sql create database if not exists indb
@@ -13,7 +9,7 @@ sql use indb
 
 $inFileName = '~/data.csv'
 $numOfRows = 10000
-system general/parser/gendata.sh
+system tsim/parser/gendata.sh
 
 sql create table stbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16),  imei BINARY(16),  mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2)) tags(a int, b binary(12));
 
diff --git a/tests/script/tsim/parser/insert_multiTbl.sim b/tests/script/tsim/parser/insert_multiTbl.sim
index b17323280e..85c58ef3d3 100644
--- a/tests/script/tsim/parser/insert_multiTbl.sim
+++ b/tests/script/tsim/parser/insert_multiTbl.sim
@@ -1,12 +1,8 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 500
 sql connect
-sleep 100
+
 print ======================== dnode1 start
 
 sql create database mul_db
diff --git a/tests/script/tsim/parser/insert_tb.sim b/tests/script/tsim/parser/insert_tb.sim
index 1e431aef3d..4fa04e0625 100644
--- a/tests/script/tsim/parser/insert_tb.sim
+++ b/tests/script/tsim/parser/insert_tb.sim
@@ -1,12 +1,8 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $dbPrefix = fi_in_db
diff --git a/tests/script/tsim/parser/interp.sim b/tests/script/tsim/parser/interp.sim
index f192837bb7..4bb273af46 100644
--- a/tests/script/tsim/parser/interp.sim
+++ b/tests/script/tsim/parser/interp.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = intp_db
@@ -58,7 +55,7 @@ print ====== tables created
 sql create table ap1 (ts timestamp, pav float);
 sql INSERT INTO ap1 VALUES ('2021-07-25 02:19:54.100',1) ('2021-07-25 02:19:54.200',2) ('2021-07-25 02:19:54.300',3) ('2021-07-25 02:19:56.500',4) ('2021-07-25 02:19:57.500',5) ('2021-07-25 02:19:57.600',6) ('2021-07-25 02:19:57.900',7) ('2021-07-25 02:19:58.100',8) ('2021-07-25 02:19:58.300',9) ('2021-07-25 02:19:59.100',10) ('2021-07-25 02:19:59.300',11) ('2021-07-25 02:19:59.500',12) ('2021-07-25 02:19:59.700',13) ('2021-07-25 02:19:59.900',14) ('2021-07-25 02:20:05.000', 20) ('2021-07-25 02:25:00.000', 10000);
 
-run general/parser/interp_test.sim
+run tsim/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -66,7 +63,7 @@ sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run general/parser/interp_test.sim
+run tsim/parser/interp_test.sim
 
 print ================= TD-5931
 sql create stable st5931(ts timestamp, f int) tags(t int)
diff --git a/tests/script/tsim/parser/join.sim b/tests/script/tsim/parser/join.sim
index e2132589bd..55842d5c16 100644
--- a/tests/script/tsim/parser/join.sim
+++ b/tests/script/tsim/parser/join.sim
@@ -1,13 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c 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 100
 sql connect
 
 $dbPrefix = join_db
diff --git a/tests/script/tsim/parser/join_manyblocks.sim b/tests/script/tsim/parser/join_manyblocks.sim
index fddd59c0a1..eb5e34b079 100644
--- a/tests/script/tsim/parser/join_manyblocks.sim
+++ b/tests/script/tsim/parser/join_manyblocks.sim
@@ -1,12 +1,7 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
-
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 100
 
 $dbPrefix = join_m_db
 $tbPrefix = join_tb
diff --git a/tests/script/tsim/parser/join_multitables.sim b/tests/script/tsim/parser/join_multitables.sim
index d675499640..7a1c77acff 100644
--- a/tests/script/tsim/parser/join_multitables.sim
+++ b/tests/script/tsim/parser/join_multitables.sim
@@ -1,11 +1,8 @@
 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $db = testdb
diff --git a/tests/script/tsim/parser/join_multivnode.sim b/tests/script/tsim/parser/join_multivnode.sim
index 61438241b0..a204b4fcea 100644
--- a/tests/script/tsim/parser/join_multivnode.sim
+++ b/tests/script/tsim/parser/join_multivnode.sim
@@ -1,12 +1,7 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
-
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 100
 
 $dbPrefix = join_m_db
 $tbPrefix = join_tb
diff --git a/tests/script/tsim/parser/last_cache.sim b/tests/script/tsim/parser/last_cache.sim
index 9c414263ec..5f45b64796 100644
--- a/tests/script/tsim/parser/last_cache.sim
+++ b/tests/script/tsim/parser/last_cache.sim
@@ -1,11 +1,8 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $db = testdb
@@ -57,13 +54,13 @@ sql insert into tbb values ("2021-05-10 10:12:28",33,NULL, '35', -3005)
 sql insert into tbc values ("2021-05-11 10:12:29",36,  37, NULL, -4005)
 sql insert into tbd values ("2021-05-11 10:12:29",NULL,NULL,NULL,NULL )
 
-run general/parser/last_cache_query.sim
+run tsim/parser/last_cache_query.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 
 system sh/exec.sh -n dnode1 -s start
 
-run general/parser/last_cache_query.sim
+run tsim/parser/last_cache_query.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 
diff --git a/tests/script/tsim/parser/last_groupby.sim b/tests/script/tsim/parser/last_groupby.sim
index f993324cd1..8f9574412d 100644
--- a/tests/script/tsim/parser/last_groupby.sim
+++ b/tests/script/tsim/parser/last_groupby.sim
@@ -1,11 +1,8 @@
 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $db = testdb
diff --git a/tests/script/tsim/parser/lastrow.sim b/tests/script/tsim/parser/lastrow.sim
index 7cdd04e2cc..d6638f2e98 100644
--- a/tests/script/tsim/parser/lastrow.sim
+++ b/tests/script/tsim/parser/lastrow.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = lr_db
@@ -58,7 +54,7 @@ endw
 
 print ====== test data created
 
-run general/parser/lastrow_query.sim
+run tsim/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -68,7 +64,7 @@ print ================== server restart completed
 sql connect
 sleep 100
 
-run general/parser/lastrow_query.sim
+run tsim/parser/lastrow_query.sim
 
 print =================== last_row + nested query
 sql use $db
diff --git a/tests/script/tsim/parser/like.sim b/tests/script/tsim/parser/like.sim
index fce996ebee..3d1bff6abf 100644
--- a/tests/script/tsim/parser/like.sim
+++ b/tests/script/tsim/parser/like.sim
@@ -1,11 +1,8 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-
-sleep 10
 sql connect
+
 print ======================== dnode1 start
 
 
diff --git a/tests/script/tsim/parser/limit.sim b/tests/script/tsim/parser/limit.sim
index 3af2cb3018..f4a23697cd 100644
--- a/tests/script/tsim/parser/limit.sim
+++ b/tests/script/tsim/parser/limit.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = lm_db
@@ -61,8 +57,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run general/parser/limit_tb.sim
-run general/parser/limit_stb.sim
+run tsim/parser/limit_tb.sim
+run tsim/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -72,8 +68,8 @@ print ================== server restart completed
 sql connect
 sleep 100
 
-run general/parser/limit_tb.sim
-run general/parser/limit_stb.sim
+run tsim/parser/limit_tb.sim
+run tsim/parser/limit_stb.sim
 
 print ========> TD-6017
 sql use $db
diff --git a/tests/script/tsim/parser/limit1.sim b/tests/script/tsim/parser/limit1.sim
index e37bea9220..1f72999784 100644
--- a/tests/script/tsim/parser/limit1.sim
+++ b/tests/script/tsim/parser/limit1.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = lm1_db
@@ -56,8 +52,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run general/parser/limit1_tb.sim
-run general/parser/limit1_stb.sim
+run tsim/parser/limit1_tb.sim
+run tsim/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,7 +61,7 @@ sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run general/parser/limit1_tb.sim
-run general/parser/limit1_stb.sim
+run tsim/parser/limit1_tb.sim
+run tsim/parser/limit1_stb.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/parser/limit1_tblocks100.sim b/tests/script/tsim/parser/limit1_tblocks100.sim
index 4546ffdb79..f541ea7158 100644
--- a/tests/script/tsim/parser/limit1_tblocks100.sim
+++ b/tests/script/tsim/parser/limit1_tblocks100.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = lm1_db
@@ -56,8 +52,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run general/parser/limit1_tb.sim
-run general/parser/limit1_stb.sim
+run tsim/parser/limit1_tb.sim
+run tsim/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,7 +61,7 @@ sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run general/parser/limit1_tb.sim
-run general/parser/limit1_stb.sim
+run tsim/parser/limit1_tb.sim
+run tsim/parser/limit1_stb.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/parser/limit2.sim b/tests/script/tsim/parser/limit2.sim
index 336f9234c8..af03c6bb7f 100644
--- a/tests/script/tsim/parser/limit2.sim
+++ b/tests/script/tsim/parser/limit2.sim
@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run general/parser/limit2_query.sim
+#run tsim/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,6 +73,6 @@ sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run general/parser/limit2_query.sim
+run tsim/parser/limit2_query.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/parser/limit2_tblocks100.sim b/tests/script/tsim/parser/limit2_tblocks100.sim
index 11f7a15eb0..0d87a41838 100644
--- a/tests/script/tsim/parser/limit2_tblocks100.sim
+++ b/tests/script/tsim/parser/limit2_tblocks100.sim
@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run general/parser/limit2_query.sim
+#run tsim/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ sleep 100
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run general/parser/limit2_query.sim
+run tsim/parser/limit2_query.sim
diff --git a/tests/script/tsim/parser/line_insert.sim b/tests/script/tsim/parser/line_insert.sim
index 85f2714ad3..cbd960bed6 100644
--- a/tests/script/tsim/parser/line_insert.sim
+++ b/tests/script/tsim/parser/line_insert.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
 sql connect
 
 print =============== step1
diff --git a/tests/script/tsim/parser/mixed_blocks.sim b/tests/script/tsim/parser/mixed_blocks.sim
index c20cf9a915..50229ab35a 100644
--- a/tests/script/tsim/parser/mixed_blocks.sim
+++ b/tests/script/tsim/parser/mixed_blocks.sim
@@ -1,11 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
 
 $dbPrefix = mb_db
diff --git a/tests/script/tsim/parser/nchar.sim b/tests/script/tsim/parser/nchar.sim
index 84719efcab..52fc8b6864 100644
--- a/tests/script/tsim/parser/nchar.sim
+++ b/tests/script/tsim/parser/nchar.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/tsim/parser/nestquery.sim b/tests/script/tsim/parser/nestquery.sim
index 3c1ba03369..c82718c1cb 100644
--- a/tests/script/tsim/parser/nestquery.sim
+++ b/tests/script/tsim/parser/nestquery.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/tsim/parser/null_char.sim b/tests/script/tsim/parser/null_char.sim
index cb65290d25..2bdb960968 100644
--- a/tests/script/tsim/parser/null_char.sim
+++ b/tests/script/tsim/parser/null_char.sim
@@ -1,11 +1,6 @@
-#### TBASE-679
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
 
 print ========== NULL_char.sim
diff --git a/tests/script/tsim/parser/precision_ns.sim b/tests/script/tsim/parser/precision_ns.sim
index 3e9a2dd3ff..bb822cd2b1 100644
--- a/tests/script/tsim/parser/precision_ns.sim
+++ b/tests/script/tsim/parser/precision_ns.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
 sql connect
 
 $dbPrefix = m_di_db_ns
diff --git a/tests/script/tsim/parser/projection_limit_offset.sim b/tests/script/tsim/parser/projection_limit_offset.sim
index ffbcb28ffd..37f2e79995 100644
--- a/tests/script/tsim/parser/projection_limit_offset.sim
+++ b/tests/script/tsim/parser/projection_limit_offset.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = group_db
diff --git a/tests/script/tsim/parser/regex.sim b/tests/script/tsim/parser/regex.sim
index eed36018d4..41f52575d6 100644
--- a/tests/script/tsim/parser/regex.sim
+++ b/tests/script/tsim/parser/regex.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
 
 $db = testdb
diff --git a/tests/script/tsim/parser/repeatAlter.sim b/tests/script/tsim/parser/repeatAlter.sim
index 3695206f90..d28a03e193 100644
--- a/tests/script/tsim/parser/repeatAlter.sim
+++ b/tests/script/tsim/parser/repeatAlter.sim
@@ -2,7 +2,7 @@ $i = 1
 $loops = 10
 while $i <= $loops
   print ====== repeat: $i
-  run general/parser/alter.sim
+  run tsim/parser/alter.sim
   $i = $i + 1
 endw
 
diff --git a/tests/script/tsim/parser/selectResNum.sim b/tests/script/tsim/parser/selectResNum.sim
index dfd204e152..ac5ccd6e07 100644
--- a/tests/script/tsim/parser/selectResNum.sim
+++ b/tests/script/tsim/parser/selectResNum.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = sc_db
diff --git a/tests/script/tsim/parser/select_across_vnodes.sim b/tests/script/tsim/parser/select_across_vnodes.sim
index 9bf61ee61d..0ee011cf8a 100644
--- a/tests/script/tsim/parser/select_across_vnodes.sim
+++ b/tests/script/tsim/parser/select_across_vnodes.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = sav_db
diff --git a/tests/script/tsim/parser/select_distinct_tag.sim b/tests/script/tsim/parser/select_distinct_tag.sim
index d8e92d4bc5..92303ce64e 100644
--- a/tests/script/tsim/parser/select_distinct_tag.sim
+++ b/tests/script/tsim/parser/select_distinct_tag.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = sav_db
diff --git a/tests/script/tsim/parser/select_from_cache_disk.sim b/tests/script/tsim/parser/select_from_cache_disk.sim
index 7f8af52c6b..2c9f359afe 100644
--- a/tests/script/tsim/parser/select_from_cache_disk.sim
+++ b/tests/script/tsim/parser/select_from_cache_disk.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = scd_db
diff --git a/tests/script/tsim/parser/select_with_tags.sim b/tests/script/tsim/parser/select_with_tags.sim
index eb6cd75d21..b840a666f4 100644
--- a/tests/script/tsim/parser/select_with_tags.sim
+++ b/tests/script/tsim/parser/select_with_tags.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = select_tags_db
diff --git a/tests/script/tsim/parser/set_tag_vals.sim b/tests/script/tsim/parser/set_tag_vals.sim
index 4a63f9c6f1..07b424ec6a 100644
--- a/tests/script/tsim/parser/set_tag_vals.sim
+++ b/tests/script/tsim/parser/set_tag_vals.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = db
diff --git a/tests/script/tsim/parser/single_row_in_tb.sim b/tests/script/tsim/parser/single_row_in_tb.sim
index 5de2a51f0f..59a0552809 100644
--- a/tests/script/tsim/parser/single_row_in_tb.sim
+++ b/tests/script/tsim/parser/single_row_in_tb.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = sr_db
@@ -28,7 +24,7 @@ sql create table $tb1 using $stb tags( 1 )
 sql insert into $tb1 values ( $ts0 , 1, 2, 3, 4, true, 'binay10', '涛思nchar10' )
 print ====== tables created
 
-run general/parser/single_row_in_tb_query.sim
+run tsim/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
@@ -36,6 +32,6 @@ sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run general/parser/single_row_in_tb_query.sim
+run tsim/parser/single_row_in_tb_query.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/parser/sliding.sim b/tests/script/tsim/parser/sliding.sim
index b2695ff95f..18d7bda8a1 100644
--- a/tests/script/tsim/parser/sliding.sim
+++ b/tests/script/tsim/parser/sliding.sim
@@ -1,12 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c 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 100
 sql connect
 
 $dbPrefix = sliding_db
diff --git a/tests/script/tsim/parser/slimit.sim b/tests/script/tsim/parser/slimit.sim
index 0af31f9826..9ca5da678a 100644
--- a/tests/script/tsim/parser/slimit.sim
+++ b/tests/script/tsim/parser/slimit.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = slm_db
@@ -93,7 +89,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run general/parser/slimit_query.sim
+run tsim/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -103,6 +99,6 @@ print ================== server restart completed
 sql connect
 sleep 100
 
-run general/parser/slimit_query.sim
+run tsim/parser/slimit_query.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/parser/slimit1.sim b/tests/script/tsim/parser/slimit1.sim
index 2dede439ec..bb12bc32f1 100644
--- a/tests/script/tsim/parser/slimit1.sim
+++ b/tests/script/tsim/parser/slimit1.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = slm_alt_tg_db
@@ -52,7 +48,7 @@ endw
 
 print ================== tables and data created
   
-run general/parser/slimit1_query.sim
+run tsim/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -62,6 +58,6 @@ print ================== server restart completed
 sql connect
 sleep 100
 
-run general/parser/slimit1_query.sim
+run tsim/parser/slimit1_query.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/parser/stableOp.sim b/tests/script/tsim/parser/stableOp.sim
index 8647657e7b..4fe0a6f38d 100644
--- a/tests/script/tsim/parser/stableOp.sim
+++ b/tests/script/tsim/parser/stableOp.sim
@@ -1,11 +1,8 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $dbPrefix = fi_in_db
diff --git a/tests/script/tsim/parser/tags_dynamically_specifiy.sim b/tests/script/tsim/parser/tags_dynamically_specifiy.sim
index f6b3dabf15..d1f73c4f60 100644
--- a/tests/script/tsim/parser/tags_dynamically_specifiy.sim
+++ b/tests/script/tsim/parser/tags_dynamically_specifiy.sim
@@ -1,11 +1,7 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
-sleep 100
 
 $db = dytag_db
 $tbNum = 10
diff --git a/tests/script/tsim/parser/tags_filter.sim b/tests/script/tsim/parser/tags_filter.sim
index 3d3e79b6f5..bf33febdae 100644
--- a/tests/script/tsim/parser/tags_filter.sim
+++ b/tests/script/tsim/parser/tags_filter.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $db = tf_db
diff --git a/tests/script/tsim/parser/tbnameIn.sim b/tests/script/tsim/parser/tbnameIn.sim
index 003a86f90b..e9206b59e2 100644
--- a/tests/script/tsim/parser/tbnameIn.sim
+++ b/tests/script/tsim/parser/tbnameIn.sim
@@ -1,9 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = ti_db
@@ -63,7 +60,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run general/parser/tbnameIn_query.sim
+run tsim/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -71,6 +68,6 @@ sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run general/parser/tbnameIn_query.sim
+run tsim/parser/tbnameIn_query.sim
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/parser/timestamp.sim b/tests/script/tsim/parser/timestamp.sim
index 0a87bce51d..524f6d5de3 100644
--- a/tests/script/tsim/parser/timestamp.sim
+++ b/tests/script/tsim/parser/timestamp.sim
@@ -1,11 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
-
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = ts_db
@@ -55,7 +50,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run general/parser/timestamp_query.sim
+run tsim/parser/timestamp_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,4 +60,4 @@ print ================== server restart completed
 sql connect
 sleep 100
 
-run general/parser/timestamp_query.sim
+run tsim/parser/timestamp_query.sim
diff --git a/tests/script/tsim/parser/top_groupby.sim b/tests/script/tsim/parser/top_groupby.sim
index 5709f4d1d7..ff479a1494 100644
--- a/tests/script/tsim/parser/top_groupby.sim
+++ b/tests/script/tsim/parser/top_groupby.sim
@@ -1,11 +1,8 @@
 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
+
 print ======================== dnode1 start
 
 $db = testdb
diff --git a/tests/script/tsim/parser/topbot.sim b/tests/script/tsim/parser/topbot.sim
index ddab1b3f83..61b2db2862 100644
--- a/tests/script/tsim/parser/topbot.sim
+++ b/tests/script/tsim/parser/topbot.sim
@@ -1,11 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
-
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = tb_db
diff --git a/tests/script/tsim/parser/union.sim b/tests/script/tsim/parser/union.sim
index 0cd3cba84d..4d05d4ced7 100644
--- a/tests/script/tsim/parser/union.sim
+++ b/tests/script/tsim/parser/union.sim
@@ -1,13 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c 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 100
 sql connect
 
 $dbPrefix = union_db
diff --git a/tests/script/tsim/parser/where.sim b/tests/script/tsim/parser/where.sim
index 6b789de490..77eb3fd87e 100644
--- a/tests/script/tsim/parser/where.sim
+++ b/tests/script/tsim/parser/where.sim
@@ -1,11 +1,6 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-
-sleep 100
 sql connect
 
 $dbPrefix = wh_db
@@ -62,7 +57,7 @@ $i = 1
 $tb = $tbPrefix . $i
 
 ##
-sql_error select * from $tb where c7
+sql select * from $tb where c7
 
 # TBASE-654 : invalid filter expression cause server crashed
 sql select count(*) from $tb where c1<10 and c1<>2
@@ -73,7 +68,6 @@ if $data00 != 900 then
   return -1
 endi
 
-
 sql select * from $tb where c7 = false
 $val = $rowNum / 100
 if $rows != $val then
-- 
GitLab