diff --git a/tests/script/general/db/alter_option.sim b/tests/script/general/db/alter_option.sim deleted file mode 100644 index 89a32b5a5c..0000000000 --- a/tests/script/general/db/alter_option.sim +++ /dev/null @@ -1,263 +0,0 @@ -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 1000 - -system sh/exec.sh -n dnode1 -s start - -sleep 2000 -sql connect - -print ============= create database -sql create database db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1 -sql show databases -if $data00 != db then - return -1 -endi -if $data02 != 0 then - return -1 -endi -if $data03 != 0 then - return -1 -endi -if $data04 != 1 then - return -1 -endi -if $data06 != 10 then - return -1 -endi -if $data07 != 20,20,20 then - return -1 -endi -if $data08 != 2 then - return -1 -endi -if $data09 != 4 then - return -1 -endi - -print ============== step name -sql_error alter database db name d1 -sql_error alter database db name d2 - -print ============== step ntables -sql_error alter database db ntables -1 -sql_error alter database db ntables 0 -sql_error alter database db ntables 1 -sql_error alter database db ntables 10 - -print ============== step vgroups -sql_error alter database db vgroups -1 -sql_error alter database db vgroups 0 -sql_error alter database db vgroups 1 -sql_error alter database db vgroups 10 - -print ============== step replica -sql_error alter database db replica 2 -sql_error alter database db replica 3 -sql_error alter database db replica 0 - -sql alter database db replica 1 -sql show databases -print replica $data4_db -if $data4_db != 1 then - return -1 -endi - -print ============== step quorum -sql show databases -print quorum $data5_db -if $data5_db != 1 then - return -1 -endi - -sql alter database db quorum 1 -sql show databases -print quorum $data5_db -if $data5_db != 1 then - return -1 -endi - -sql_error alter database db quorum 2 - -sql_error alter database db quorum 3 - -sql_error alter database db quorum 0 -sql_error alter database db quorum 4 -sql_error alter database db quorum 5 -sql_error alter database db quorum -1 - -print ============== step duration -sql_error alter database db duration 0 -sql_error alter database db duration 1 -sql_error alter database db duration 2 -sql_error alter database db duration 10 -sql_error alter database db duration 50 -sql_error alter database db duration 100 - -print ============== step keep -sql show databases -print keep $data7_db -if $data7_db != 20,20,20 then - return -1 -endi - -sql alter database db keep 20 -sql show databases -print keep $data7_db -if $data7_db != 20,20,20 then - return -1 -endi - -sql alter database db keep 30 -sql show databases -print keep $data7_db -if $data7_db != 30,30,30 then - return -1 -endi - -sql alter database db keep 40 -sql show databases -print keep $data7_db -if $data7_db != 40,40,40 then - return -1 -endi - -sql alter database db keep 40,50 -sql alter database db keep 30,31 -sql alter database db keep 20 -sql_error alter database db keep 10.0 -sql_error alter database db keep 9 -sql_error alter database db keep 1 -sql_error alter database db keep 0 -sql_error alter database db keep -1 -sql_error alter database db keep 365001 - -print ============== step cache -sql_error alter database db cache 60 -sql_error alter database db cache 50 -sql_error alter database db cache 20 -sql_error alter database db cache 3 -sql_error alter database db cache 129 -sql_error alter database db cache 300 -sql_error alter database db cache 0 -sql_error alter database db cache -1 - -print ============== step blocks -sql show databases -print blocks $data9_db -if $data9_db != 4 then - return -1 -endi - -sql alter database db blocks 10 -sql show databases -print blocks $data9_db -if $data9_db != 10 then - return -1 -endi - -sql alter database db blocks 20 -sql show databases -print blocks $data9_db -if $data9_db != 20 then - return -1 -endi - -sql alter database db blocks 30 -sql show databases -print blocks $data9_db -if $data9_db != 30 then - return -1 -endi - -sql alter database db blocks 40 -sql alter database db blocks 30 -sql alter database db blocks 20 -sql alter database db blocks 10 -sql_error alter database db blocks 2 -sql_error alter database db blocks 1 -sql_error alter database db blocks 0 -sql_error alter database db blocks -1 -sql_error alter database db blocks 10001 - -print ============== step minrows -sql_error alter database db minrows 1 -sql_error alter database db minrows 100 -sql_error alter database db minrows 1000 - -print ============== step maxrows -sql_error alter database db maxrows 1 -sql_error alter database db maxrows 100 -sql_error alter database db maxrows 1000 - -print ============== step wallevel -sql show databases -print wallevel $data12_db -if $data12_db != 1 then - return -1 -endi - -sql_error alter database db wal 1 - - -sql_error alter database db wal 1 -sql_error alter database db wal 2 -sql_error alter database db wal 1 -sql_error alter database db wal 2 -sql_error alter database db wal 0 -sql_error alter database db wal 3 -sql_error alter database db wal 4 -sql_error alter database db wal -1 -sql_error alter database db wal 1000 - -print ============== step fsync -sql_error alter database db fsync 0 -sql_error alter database db fsync 1 -sql_error alter database db fsync 3600 -sql_error alter database db fsync 18000 -sql_error alter database db fsync 180000 -sql_error alter database db fsync 180001 -sql_error alter database db fsync -1 - -print ============== step comp -sql show databases -print comp $data14_db -if $data14_db != 2 then - return -1 -endi - -sql alter database db comp 1 -sql show databases -print comp $data14_db -if $data14_db != 1 then - return -1 -endi - -sql alter database db comp 2 -sql show databases -print comp $data14_db -if $data14_db != 2 then - return -1 -endi - -sql alter database db comp 0 -sql show databases -print comp $data14_db -if $data14_db != 0 then - return -1 -endi - -sql_error alter database db comp 3 -sql_error alter database db comp 4 -sql_error alter database db comp 5 -sql_error alter database db comp -1 - - -print ============== step precision -sql_error alter database db prec 'us' - -print ============== step status -sql_error alter database db status 'delete' - -system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/general/db/back_insert.sim b/tests/script/general/db/back_insert.sim deleted file mode 100644 index 642df63ff2..0000000000 --- a/tests/script/general/db/back_insert.sim +++ /dev/null @@ -1,9 +0,0 @@ -sql connect -$x = 1 -begin: - sql reset query cache - sleep 1000 - sql insert into db.tb values(now, $x ) -x begin - #print ===> insert successed $x - $x = $x + 1 -goto begin \ No newline at end of file diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim deleted file mode 100644 index fcd9d49fe5..0000000000 --- a/tests/script/general/parser/testSuite.sim +++ /dev/null @@ -1,68 +0,0 @@ -run general/parser/alter.sim -run general/parser/alter1.sim -run general/parser/alter_stable.sim -run general/parser/auto_create_tb.sim -run general/parser/auto_create_tb_drop_tb.sim -run general/parser/col_arithmetic_operation.sim -run general/parser/columnValue.sim -run general/parser/commit.sim -run general/parser/create_db.sim -run general/parser/create_mt.sim -run general/parser/create_tb.sim -run general/parser/dbtbnameValidate.sim -run general/parser/fill.sim -run general/parser/fill_stb.sim -#run general/parser/fill_us.sim # -run general/parser/first_last.sim -run general/parser/import_commit1.sim -run general/parser/import_commit2.sim -run general/parser/import_commit3.sim -run general/parser/import_file.sim -run general/parser/insert_tb.sim -run general/parser/tags_dynamically_specifiy.sim -run general/parser/interp.sim -run general/parser/lastrow.sim -run general/parser/limit.sim -run general/parser/limit1.sim -run general/parser/limit1_tblocks100.sim -run general/parser/limit2.sim -run general/parser/mixed_blocks.sim -run general/parser/nchar.sim -run general/parser/null_char.sim -run general/parser/selectResNum.sim -run general/parser/select_across_vnodes.sim -run general/parser/select_from_cache_disk.sim -run general/parser/set_tag_vals.sim -run general/parser/single_row_in_tb.sim -run general/parser/slimit.sim -run general/parser/slimit1.sim -run general/parser/slimit_alter_tags.sim -run general/parser/tbnameIn.sim -run general/parser/join.sim -run general/parser/join_multivnode.sim -run general/parser/join_manyblocks.sim -run general/parser/projection_limit_offset.sim -run general/parser/select_with_tags.sim -run general/parser/select_distinct_tag.sim -run general/parser/groupby.sim -run general/parser/tags_filter.sim -run general/parser/topbot.sim -run general/parser/union.sim -run general/parser/constCol.sim -run general/parser/where.sim -run general/parser/timestamp.sim -run general/parser/sliding.sim -run general/parser/function.sim -run general/parser/stableOp.sim -run general/parser/having.sim -run general/parser/having_child.sim -run general/parser/slimit_alter_tags.sim -run general/parser/binary_escapeCharacter.sim -run general/parser/between_and.sim -run general/parser/last_cache.sim -run general/parser/slimit_alter_tags.sim -run general/parser/udf.sim -run general/parser/udf_dll.sim -run general/parser/udf_dll_stable.sim -run general/parser/nestquery.sim -run general/parser/precision_ns.sim diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 4de8b3667d..c2c102c241 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -11,17 +11,41 @@ ./test.sh -f tsim/db/alter_option.sim # ./test.sh -f tsim/db/alter_replica_13.sim # ./test.sh -f tsim/db/alter_replica_31.sim +#./test.sh -f tsim/db/alter_tables_d2.sim +#./test.sh -f tsim/db/alter_tables_v1.sim +#./test.sh -f tsim/db/alter_tables_v4.sim +#./test.sh -f tsim/db/alter_vgroups.sim ./test.sh -f tsim/db/basic1.sim ./test.sh -f tsim/db/basic2.sim ./test.sh -f tsim/db/basic3.sim +#./test.sh -f tsim/db/basic4.sim +#./test.sh -f tsim/db/basic5.sim ./test.sh -f tsim/db/basic6.sim ./test.sh -f tsim/db/basic7.sim #./test.sh -f tsim/db/commit.sim ./test.sh -f tsim/db/create_all_options.sim #./test.sh -f tsim/db/delete_part.sim +#./test.sh -f tsim/db/delete_reuse1.sim +#./test.sh -f tsim/db/delete_reuse2.sim +#./test.sh -f tsim/db/delete_reusevnode.sim +#./test.sh -f tsim/db/delete_reusevnode2.sim +#./test.sh -f tsim/db/delete_writing1.sim +#./test.sh -f tsim/db/delete_writing2.sim #./test.sh -f tsim/db/delete.sim +#./test.sh -f tsim/db/delete2.sim +#./test.sh -f tsim/db/dropvnodes.sim ./test.sh -f tsim/db/error1.sim +#./test.sh -f tsim/db/keep.sim +#./test.sh -f tsim/db/len.sim +#./test.sh -f tsim/db/nosuchfile.sim +#./test.sh -f tsim/db/repeat.sim +#./test.sh -f tsim/db/show_create_db.sim +#./test.sh -f tsim/db/show_create_table.sim +#./test.sh -f tsim/db/tables.sim ./test.sh -f tsim/db/taosdlog.sim +#./test.sh -f tsim/db/topic1.sim +#./test.sh -f tsim/db/topic2.sim +#./test.sh -f tsim/db/vnodes.sim # ---- dnode # ./test.sh -f tsim/dnode/balance_replica1.sim @@ -70,8 +94,114 @@ ./test.sh -f tsim/insert/update0.sim # ---- parser -./test.sh -f tsim/parser/groupby-basic.sim +# ./test.sh -f tsim/parser/alter.sim +# ./test.sh -f tsim/parser/alter1.sim +## ./test.sh -f tsim/parser/alter__for_community_version.sim +## ./test.sh -f tsim/parser/alter_column.sim +# ./test.sh -f tsim/parser/alter_stable.sim +# ./test.sh -f tsim/parser/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/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 +# ./test.sh -f tsim/parser/create_mt.sim +# ./test.sh -f tsim/parser/create_tb.sim +## ./test.sh -f tsim/parser/create_tb_with_tag_name.sim +# ./test.sh -f tsim/parser/dbtbnameValidate.sim +##./test.sh -f tsim/parser/distinct.sim +# ./test.sh -f tsim/parser/fill.sim +# ./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 +# ./test.sh -f tsim/parser/groupby.sim +## ./test.sh -f tsim/parser/having.sim +# ./test.sh -f tsim/parser/having_child.sim +## ./test.sh -f tsim/parser/import.sim +# ./test.sh -f tsim/parser/import_commit1.sim +# ./test.sh -f tsim/parser/import_commit2.sim +# ./test.sh -f tsim/parser/import_commit3.sim +## ./test.sh -f tsim/parser/import_file.sim +## ./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 +## ./test.sh -f tsim/parser/line_insert.sim +# ./test.sh -f tsim/parser/mixed_blocks.sim +# ./test.sh -f tsim/parser/nchar.sim +# ./test.sh -f tsim/parser/nestquery.sim +# ./test.sh -f tsim/parser/null_char.sim +## ./test.sh -f tsim/parser/precision_ns.sim +# ./test.sh -f tsim/parser/projection_limit_offset.sim +## ./test.sh -f tsim/parser/regex.sim +# ./test.sh -f tsim/parser/repeatAlter.sim +# ./test.sh -f tsim/parser/selectResNum.sim +# ./test.sh -f tsim/parser/select_across_vnodes.sim +# ./test.sh -f tsim/parser/select_distinct_tag.sim +# ./test.sh -f tsim/parser/select_from_cache_disk.sim +# ./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 +# ./test.sh -f tsim/parser/udf_dll.sim +# ./test.sh -f tsim/parser/udf_dll_stable.sim +# ./test.sh -f tsim/parser/union.sim +# ./test.sh -f tsim/parser/where.sim # ---- query ./test.sh -f tsim/query/interval.sim @@ -196,7 +326,7 @@ ./test.sh -f tsim/db/basic3.sim -m ./test.sh -f tsim/db/error1.sim -m ./test.sh -f tsim/insert/backquote.sim -m -./test.sh -f tsim/parser/fourArithmetic-basic.sim -m +# ./test.sh -f tsim/parser/fourArithmetic-basic.sim -m ./test.sh -f tsim/query/interval-offset.sim -m ./test.sh -f tsim/tmq/basic3.sim -m ./test.sh -f tsim/stable/vnode3.sim -m @@ -244,7 +374,7 @@ # ---- alter ./test.sh -f tsim/alter/cached_schema_after_alter.sim ./test.sh -f tsim/alter/dnode.sim -#./test.sh -f tsim/alter/table.sim +./test.sh -f tsim/alter/table.sim # ---- cache ./test.sh -f tsim/cache/new_metrics.sim @@ -315,6 +445,12 @@ # ---- wal ./test.sh -f tsim/wal/kill.sim +# ---- issue +#./test.sh -f tsim/issue/TD-2677.sim +#./test.sh -f tsim/issue/TD-2680.sim +#./test.sh -f tsim/issue/TD-2713.sim +#./test.sh -f tsim/issue/TD-3300.sim + # ---- tag ./test.sh -f tsim/tag/3.sim ./test.sh -f tsim/tag/4.sim diff --git a/tests/script/tsim/db/alter_option.sim b/tests/script/tsim/db/alter_option.sim index f24e32279d..1eb4e36da6 100644 --- a/tests/script/tsim/db/alter_option.sim +++ b/tests/script/tsim/db/alter_option.sim @@ -6,64 +6,36 @@ system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start system sh/exec.sh -n dnode3 -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 sql create dnode $hostname port 7200 sql create dnode $hostname port 7300 -$loop_cnt = 0 -check_dnode_ready_1: - $loop_cnt = $loop_cnt + 1 - sleep 200 - if $loop_cnt == 10 then +$x = 0 +step1: + $x = $x + 1 + sleep 1000 + if $x == 10 then print ====> dnode not ready! return -1 endi sql show dnodes -print ===> rows: $rows print ===> $data00 $data01 $data02 $data03 $data04 $data05 print ===> $data10 $data11 $data12 $data13 $data14 $data15 print ===> $data20 $data21 $data22 $data23 $data24 $data25 -if $data00 != 1 then +if $rows != 3 then return -1 endi -system_content printf %OS% -if $system_content == Windows_NT then - system_content printf %COMPUTERNAME%:7100 - if $data01 != $system_content then - return -1 - endi -else - if $data01 != localhost:7100 then - return -1 - endi +if $data(1)[4] != ready then + goto step1 endi -if $data04 != ready then - goto check_dnode_ready_1 +if $data(2)[4] != ready then + goto step1 endi -if $data14 != ready then - goto check_dnode_ready_1 -endi -if $data24 != ready then - goto check_dnode_ready_1 +if $data(3)[4] != ready then + goto step1 endi + print ============= create database #database_option: { # | BUFFER value [3~16384, default: 96] @@ -137,7 +109,6 @@ if $data17_db != ns then # precision return -1 endi -sleep 3000 #sql show db.vgroups #if $data[0][4] == leader then # if $data[0][6] != follower then diff --git a/tests/script/general/db/alter_tables_d2.sim b/tests/script/tsim/db/alter_tables_d2.sim similarity index 100% rename from tests/script/general/db/alter_tables_d2.sim rename to tests/script/tsim/db/alter_tables_d2.sim diff --git a/tests/script/general/db/alter_tables_v1.sim b/tests/script/tsim/db/alter_tables_v1.sim similarity index 100% rename from tests/script/general/db/alter_tables_v1.sim rename to tests/script/tsim/db/alter_tables_v1.sim diff --git a/tests/script/general/db/alter_tables_v4.sim b/tests/script/tsim/db/alter_tables_v4.sim similarity index 100% rename from tests/script/general/db/alter_tables_v4.sim rename to tests/script/tsim/db/alter_tables_v4.sim diff --git a/tests/script/general/db/alter_vgroups.sim b/tests/script/tsim/db/alter_vgroups.sim similarity index 100% rename from tests/script/general/db/alter_vgroups.sim rename to tests/script/tsim/db/alter_vgroups.sim diff --git a/tests/script/tsim/db/back_insert.sim b/tests/script/tsim/db/back_insert.sim index 43831cca95..642df63ff2 100644 --- a/tests/script/tsim/db/back_insert.sim +++ b/tests/script/tsim/db/back_insert.sim @@ -1,6 +1,8 @@ sql connect $x = 1 begin: + sql reset query cache + sleep 1000 sql insert into db.tb values(now, $x ) -x begin #print ===> insert successed $x $x = $x + 1 diff --git a/tests/script/general/db/basic4.sim b/tests/script/tsim/db/basic4.sim similarity index 100% rename from tests/script/general/db/basic4.sim rename to tests/script/tsim/db/basic4.sim diff --git a/tests/script/general/db/basic5.sim b/tests/script/tsim/db/basic5.sim similarity index 100% rename from tests/script/general/db/basic5.sim rename to tests/script/tsim/db/basic5.sim diff --git a/tests/script/general/db/delete.sim b/tests/script/tsim/db/delete2.sim similarity index 100% rename from tests/script/general/db/delete.sim rename to tests/script/tsim/db/delete2.sim diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/tsim/db/delete_reuse1.sim similarity index 100% rename from tests/script/general/db/delete_reuse1.sim rename to tests/script/tsim/db/delete_reuse1.sim diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/tsim/db/delete_reuse2.sim similarity index 100% rename from tests/script/general/db/delete_reuse2.sim rename to tests/script/tsim/db/delete_reuse2.sim diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/tsim/db/delete_reusevnode.sim similarity index 100% rename from tests/script/general/db/delete_reusevnode.sim rename to tests/script/tsim/db/delete_reusevnode.sim diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/tsim/db/delete_reusevnode2.sim similarity index 100% rename from tests/script/general/db/delete_reusevnode2.sim rename to tests/script/tsim/db/delete_reusevnode2.sim diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/tsim/db/delete_writing1.sim similarity index 100% rename from tests/script/general/db/delete_writing1.sim rename to tests/script/tsim/db/delete_writing1.sim diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/tsim/db/delete_writing2.sim similarity index 100% rename from tests/script/general/db/delete_writing2.sim rename to tests/script/tsim/db/delete_writing2.sim diff --git a/tests/script/general/db/dropdnodes.sim b/tests/script/tsim/db/dropdnodes.sim similarity index 100% rename from tests/script/general/db/dropdnodes.sim rename to tests/script/tsim/db/dropdnodes.sim diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/tsim/db/keep.sim similarity index 100% rename from tests/script/general/db/backup/keep.sim rename to tests/script/tsim/db/keep.sim diff --git a/tests/script/general/db/len.sim b/tests/script/tsim/db/len.sim similarity index 100% rename from tests/script/general/db/len.sim rename to tests/script/tsim/db/len.sim diff --git a/tests/script/general/db/nosuchfile.sim b/tests/script/tsim/db/nosuchfile.sim similarity index 100% rename from tests/script/general/db/nosuchfile.sim rename to tests/script/tsim/db/nosuchfile.sim diff --git a/tests/script/general/db/repeat.sim b/tests/script/tsim/db/repeat.sim similarity index 100% rename from tests/script/general/db/repeat.sim rename to tests/script/tsim/db/repeat.sim diff --git a/tests/script/general/db/show_create_db.sim b/tests/script/tsim/db/show_create_db.sim similarity index 100% rename from tests/script/general/db/show_create_db.sim rename to tests/script/tsim/db/show_create_db.sim diff --git a/tests/script/general/db/show_create_table.sim b/tests/script/tsim/db/show_create_table.sim similarity index 100% rename from tests/script/general/db/show_create_table.sim rename to tests/script/tsim/db/show_create_table.sim diff --git a/tests/script/general/db/tables.sim b/tests/script/tsim/db/tables.sim similarity index 100% rename from tests/script/general/db/tables.sim rename to tests/script/tsim/db/tables.sim diff --git a/tests/script/general/db/testSuite.sim b/tests/script/tsim/db/testSuite.sim similarity index 100% rename from tests/script/general/db/testSuite.sim rename to tests/script/tsim/db/testSuite.sim diff --git a/tests/script/general/db/topic1.sim b/tests/script/tsim/db/topic1.sim similarity index 100% rename from tests/script/general/db/topic1.sim rename to tests/script/tsim/db/topic1.sim diff --git a/tests/script/general/db/topic2.sim b/tests/script/tsim/db/topic2.sim similarity index 100% rename from tests/script/general/db/topic2.sim rename to tests/script/tsim/db/topic2.sim diff --git a/tests/script/general/db/vnodes.sim b/tests/script/tsim/db/vnodes.sim similarity index 100% rename from tests/script/general/db/vnodes.sim rename to tests/script/tsim/db/vnodes.sim diff --git a/tests/script/issue/TD-2677.sim b/tests/script/tsim/issue/TD-2677.sim similarity index 100% rename from tests/script/issue/TD-2677.sim rename to tests/script/tsim/issue/TD-2677.sim diff --git a/tests/script/issue/TD-2680.sim b/tests/script/tsim/issue/TD-2680.sim similarity index 100% rename from tests/script/issue/TD-2680.sim rename to tests/script/tsim/issue/TD-2680.sim diff --git a/tests/script/issue/TD-2713.sim b/tests/script/tsim/issue/TD-2713.sim similarity index 100% rename from tests/script/issue/TD-2713.sim rename to tests/script/tsim/issue/TD-2713.sim diff --git a/tests/script/issue/TD-3300.sim b/tests/script/tsim/issue/TD-3300.sim similarity index 100% rename from tests/script/issue/TD-3300.sim rename to tests/script/tsim/issue/TD-3300.sim diff --git a/tests/script/general/parser/README.txt b/tests/script/tsim/parser/README.txt similarity index 100% rename from tests/script/general/parser/README.txt rename to tests/script/tsim/parser/README.txt diff --git a/tests/script/general/parser/alter.sim b/tests/script/tsim/parser/alter.sim similarity index 100% rename from tests/script/general/parser/alter.sim rename to tests/script/tsim/parser/alter.sim diff --git a/tests/script/general/parser/alter1.sim b/tests/script/tsim/parser/alter1.sim similarity index 100% rename from tests/script/general/parser/alter1.sim rename to tests/script/tsim/parser/alter1.sim diff --git a/tests/script/general/parser/alter__for_community_version.sim b/tests/script/tsim/parser/alter__for_community_version.sim similarity index 100% rename from tests/script/general/parser/alter__for_community_version.sim rename to tests/script/tsim/parser/alter__for_community_version.sim diff --git a/tests/script/general/parser/alter_column.sim b/tests/script/tsim/parser/alter_column.sim similarity index 100% rename from tests/script/general/parser/alter_column.sim rename to tests/script/tsim/parser/alter_column.sim diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/tsim/parser/alter_stable.sim similarity index 100% rename from tests/script/general/parser/alter_stable.sim rename to tests/script/tsim/parser/alter_stable.sim diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/tsim/parser/auto_create_tb.sim similarity index 100% rename from tests/script/general/parser/auto_create_tb.sim rename to tests/script/tsim/parser/auto_create_tb.sim diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/tsim/parser/auto_create_tb_drop_tb.sim similarity index 100% rename from tests/script/general/parser/auto_create_tb_drop_tb.sim rename to tests/script/tsim/parser/auto_create_tb_drop_tb.sim diff --git a/tests/script/general/parser/between_and.sim b/tests/script/tsim/parser/between_and.sim similarity index 100% rename from tests/script/general/parser/between_and.sim rename to tests/script/tsim/parser/between_and.sim diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/tsim/parser/binary_escapeCharacter.sim similarity index 100% rename from tests/script/general/parser/binary_escapeCharacter.sim rename to tests/script/tsim/parser/binary_escapeCharacter.sim diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/tsim/parser/col_arithmetic_operation.sim similarity index 100% rename from tests/script/general/parser/col_arithmetic_operation.sim rename to tests/script/tsim/parser/col_arithmetic_operation.sim diff --git a/tests/script/general/parser/col_arithmetic_query.sim b/tests/script/tsim/parser/col_arithmetic_query.sim similarity index 100% rename from tests/script/general/parser/col_arithmetic_query.sim rename to tests/script/tsim/parser/col_arithmetic_query.sim diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/tsim/parser/columnValue.sim similarity index 100% rename from tests/script/general/parser/columnValue.sim rename to tests/script/tsim/parser/columnValue.sim diff --git a/tests/script/general/parser/columnValue_bigint.sim b/tests/script/tsim/parser/columnValue_bigint.sim similarity index 100% rename from tests/script/general/parser/columnValue_bigint.sim rename to tests/script/tsim/parser/columnValue_bigint.sim diff --git a/tests/script/general/parser/columnValue_bool.sim b/tests/script/tsim/parser/columnValue_bool.sim similarity index 100% rename from tests/script/general/parser/columnValue_bool.sim rename to tests/script/tsim/parser/columnValue_bool.sim diff --git a/tests/script/general/parser/columnValue_double.sim b/tests/script/tsim/parser/columnValue_double.sim similarity index 100% rename from tests/script/general/parser/columnValue_double.sim rename to tests/script/tsim/parser/columnValue_double.sim diff --git a/tests/script/general/parser/columnValue_float.sim b/tests/script/tsim/parser/columnValue_float.sim similarity index 100% rename from tests/script/general/parser/columnValue_float.sim rename to tests/script/tsim/parser/columnValue_float.sim diff --git a/tests/script/general/parser/columnValue_int.sim b/tests/script/tsim/parser/columnValue_int.sim similarity index 100% rename from tests/script/general/parser/columnValue_int.sim rename to tests/script/tsim/parser/columnValue_int.sim diff --git a/tests/script/general/parser/columnValue_smallint.sim b/tests/script/tsim/parser/columnValue_smallint.sim similarity index 100% rename from tests/script/general/parser/columnValue_smallint.sim rename to tests/script/tsim/parser/columnValue_smallint.sim diff --git a/tests/script/general/parser/columnValue_tinyint.sim b/tests/script/tsim/parser/columnValue_tinyint.sim similarity index 100% rename from tests/script/general/parser/columnValue_tinyint.sim rename to tests/script/tsim/parser/columnValue_tinyint.sim diff --git a/tests/script/general/parser/columnValue_unsign.sim b/tests/script/tsim/parser/columnValue_unsign.sim similarity index 100% rename from tests/script/general/parser/columnValue_unsign.sim rename to tests/script/tsim/parser/columnValue_unsign.sim diff --git a/tests/script/general/parser/commit.sim b/tests/script/tsim/parser/commit.sim similarity index 100% rename from tests/script/general/parser/commit.sim rename to tests/script/tsim/parser/commit.sim diff --git a/tests/script/general/parser/condition.sim b/tests/script/tsim/parser/condition.sim similarity index 100% rename from tests/script/general/parser/condition.sim rename to tests/script/tsim/parser/condition.sim diff --git a/tests/script/general/parser/condition_query.sim b/tests/script/tsim/parser/condition_query.sim similarity index 100% rename from tests/script/general/parser/condition_query.sim rename to tests/script/tsim/parser/condition_query.sim diff --git a/tests/script/general/parser/constCol.sim b/tests/script/tsim/parser/constCol.sim similarity index 100% rename from tests/script/general/parser/constCol.sim rename to tests/script/tsim/parser/constCol.sim diff --git a/tests/script/general/parser/create_db.sim b/tests/script/tsim/parser/create_db.sim similarity index 100% rename from tests/script/general/parser/create_db.sim rename to tests/script/tsim/parser/create_db.sim diff --git a/tests/script/general/parser/create_db__for_community_version.sim b/tests/script/tsim/parser/create_db__for_community_version.sim similarity index 100% rename from tests/script/general/parser/create_db__for_community_version.sim rename to tests/script/tsim/parser/create_db__for_community_version.sim diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/tsim/parser/create_mt.sim similarity index 100% rename from tests/script/general/parser/create_mt.sim rename to tests/script/tsim/parser/create_mt.sim diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/tsim/parser/create_tb.sim similarity index 100% rename from tests/script/general/parser/create_tb.sim rename to tests/script/tsim/parser/create_tb.sim diff --git a/tests/script/general/parser/create_tb_with_tag_name.sim b/tests/script/tsim/parser/create_tb_with_tag_name.sim similarity index 100% rename from tests/script/general/parser/create_tb_with_tag_name.sim rename to tests/script/tsim/parser/create_tb_with_tag_name.sim diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/tsim/parser/dbtbnameValidate.sim similarity index 100% rename from tests/script/general/parser/dbtbnameValidate.sim rename to tests/script/tsim/parser/dbtbnameValidate.sim diff --git a/tests/script/general/parser/distinct.sim b/tests/script/tsim/parser/distinct.sim similarity index 100% rename from tests/script/general/parser/distinct.sim rename to tests/script/tsim/parser/distinct.sim diff --git a/tests/script/general/parser/fill.sim b/tests/script/tsim/parser/fill.sim similarity index 100% rename from tests/script/general/parser/fill.sim rename to tests/script/tsim/parser/fill.sim diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/tsim/parser/fill_stb.sim similarity index 100% rename from tests/script/general/parser/fill_stb.sim rename to tests/script/tsim/parser/fill_stb.sim diff --git a/tests/script/general/parser/fill_us.sim b/tests/script/tsim/parser/fill_us.sim similarity index 100% rename from tests/script/general/parser/fill_us.sim rename to tests/script/tsim/parser/fill_us.sim diff --git a/tests/script/general/parser/first_last.sim b/tests/script/tsim/parser/first_last.sim similarity index 100% rename from tests/script/general/parser/first_last.sim rename to tests/script/tsim/parser/first_last.sim diff --git a/tests/script/general/parser/first_last_query.sim b/tests/script/tsim/parser/first_last_query.sim similarity index 100% rename from tests/script/general/parser/first_last_query.sim rename to tests/script/tsim/parser/first_last_query.sim diff --git a/tests/script/general/parser/function.sim b/tests/script/tsim/parser/function.sim similarity index 100% rename from tests/script/general/parser/function.sim rename to tests/script/tsim/parser/function.sim diff --git a/tests/script/general/parser/gendata.sh b/tests/script/tsim/parser/gendata.sh similarity index 100% rename from tests/script/general/parser/gendata.sh rename to tests/script/tsim/parser/gendata.sh diff --git a/tests/script/general/parser/groupby.sim b/tests/script/tsim/parser/groupby.sim similarity index 100% rename from tests/script/general/parser/groupby.sim rename to tests/script/tsim/parser/groupby.sim diff --git a/tests/script/general/parser/having.sim b/tests/script/tsim/parser/having.sim similarity index 100% rename from tests/script/general/parser/having.sim rename to tests/script/tsim/parser/having.sim diff --git a/tests/script/general/parser/having_child.sim b/tests/script/tsim/parser/having_child.sim similarity index 100% rename from tests/script/general/parser/having_child.sim rename to tests/script/tsim/parser/having_child.sim diff --git a/tests/script/general/parser/import.sim b/tests/script/tsim/parser/import.sim similarity index 100% rename from tests/script/general/parser/import.sim rename to tests/script/tsim/parser/import.sim diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/tsim/parser/import_commit1.sim similarity index 100% rename from tests/script/general/parser/import_commit1.sim rename to tests/script/tsim/parser/import_commit1.sim diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/tsim/parser/import_commit2.sim similarity index 100% rename from tests/script/general/parser/import_commit2.sim rename to tests/script/tsim/parser/import_commit2.sim diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/tsim/parser/import_commit3.sim similarity index 100% rename from tests/script/general/parser/import_commit3.sim rename to tests/script/tsim/parser/import_commit3.sim diff --git a/tests/script/general/parser/import_file.sim b/tests/script/tsim/parser/import_file.sim similarity index 100% rename from tests/script/general/parser/import_file.sim rename to tests/script/tsim/parser/import_file.sim diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/tsim/parser/insert_multiTbl.sim similarity index 100% rename from tests/script/general/parser/insert_multiTbl.sim rename to tests/script/tsim/parser/insert_multiTbl.sim diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/tsim/parser/insert_tb.sim similarity index 100% rename from tests/script/general/parser/insert_tb.sim rename to tests/script/tsim/parser/insert_tb.sim diff --git a/tests/script/general/parser/interp.sim b/tests/script/tsim/parser/interp.sim similarity index 100% rename from tests/script/general/parser/interp.sim rename to tests/script/tsim/parser/interp.sim diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/tsim/parser/interp_test.sim similarity index 100% rename from tests/script/general/parser/interp_test.sim rename to tests/script/tsim/parser/interp_test.sim diff --git a/tests/script/general/parser/join.sim b/tests/script/tsim/parser/join.sim similarity index 100% rename from tests/script/general/parser/join.sim rename to tests/script/tsim/parser/join.sim diff --git a/tests/script/general/parser/join_manyblocks.sim b/tests/script/tsim/parser/join_manyblocks.sim similarity index 100% rename from tests/script/general/parser/join_manyblocks.sim rename to tests/script/tsim/parser/join_manyblocks.sim diff --git a/tests/script/general/parser/join_multitables.sim b/tests/script/tsim/parser/join_multitables.sim similarity index 100% rename from tests/script/general/parser/join_multitables.sim rename to tests/script/tsim/parser/join_multitables.sim diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/tsim/parser/join_multivnode.sim similarity index 100% rename from tests/script/general/parser/join_multivnode.sim rename to tests/script/tsim/parser/join_multivnode.sim diff --git a/tests/script/general/parser/last_cache.sim b/tests/script/tsim/parser/last_cache.sim similarity index 100% rename from tests/script/general/parser/last_cache.sim rename to tests/script/tsim/parser/last_cache.sim diff --git a/tests/script/general/parser/last_cache_query.sim b/tests/script/tsim/parser/last_cache_query.sim similarity index 100% rename from tests/script/general/parser/last_cache_query.sim rename to tests/script/tsim/parser/last_cache_query.sim diff --git a/tests/script/general/parser/last_groupby.sim b/tests/script/tsim/parser/last_groupby.sim similarity index 100% rename from tests/script/general/parser/last_groupby.sim rename to tests/script/tsim/parser/last_groupby.sim diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/tsim/parser/lastrow.sim similarity index 100% rename from tests/script/general/parser/lastrow.sim rename to tests/script/tsim/parser/lastrow.sim diff --git a/tests/script/general/parser/lastrow_query.sim b/tests/script/tsim/parser/lastrow_query.sim similarity index 100% rename from tests/script/general/parser/lastrow_query.sim rename to tests/script/tsim/parser/lastrow_query.sim diff --git a/tests/script/general/parser/like.sim b/tests/script/tsim/parser/like.sim similarity index 100% rename from tests/script/general/parser/like.sim rename to tests/script/tsim/parser/like.sim diff --git a/tests/script/general/parser/limit.sim b/tests/script/tsim/parser/limit.sim similarity index 100% rename from tests/script/general/parser/limit.sim rename to tests/script/tsim/parser/limit.sim diff --git a/tests/script/general/parser/limit1.sim b/tests/script/tsim/parser/limit1.sim similarity index 100% rename from tests/script/general/parser/limit1.sim rename to tests/script/tsim/parser/limit1.sim diff --git a/tests/script/general/parser/limit1_stb.sim b/tests/script/tsim/parser/limit1_stb.sim similarity index 100% rename from tests/script/general/parser/limit1_stb.sim rename to tests/script/tsim/parser/limit1_stb.sim diff --git a/tests/script/general/parser/limit1_tb.sim b/tests/script/tsim/parser/limit1_tb.sim similarity index 100% rename from tests/script/general/parser/limit1_tb.sim rename to tests/script/tsim/parser/limit1_tb.sim diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/tsim/parser/limit1_tblocks100.sim similarity index 100% rename from tests/script/general/parser/limit1_tblocks100.sim rename to tests/script/tsim/parser/limit1_tblocks100.sim diff --git a/tests/script/general/parser/limit2.sim b/tests/script/tsim/parser/limit2.sim similarity index 100% rename from tests/script/general/parser/limit2.sim rename to tests/script/tsim/parser/limit2.sim diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/tsim/parser/limit2_query.sim similarity index 100% rename from tests/script/general/parser/limit2_query.sim rename to tests/script/tsim/parser/limit2_query.sim diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/tsim/parser/limit2_tblocks100.sim similarity index 100% rename from tests/script/general/parser/limit2_tblocks100.sim rename to tests/script/tsim/parser/limit2_tblocks100.sim diff --git a/tests/script/general/parser/limit_stb.sim b/tests/script/tsim/parser/limit_stb.sim similarity index 100% rename from tests/script/general/parser/limit_stb.sim rename to tests/script/tsim/parser/limit_stb.sim diff --git a/tests/script/general/parser/limit_tb.sim b/tests/script/tsim/parser/limit_tb.sim similarity index 100% rename from tests/script/general/parser/limit_tb.sim rename to tests/script/tsim/parser/limit_tb.sim diff --git a/tests/script/general/parser/line_insert.sim b/tests/script/tsim/parser/line_insert.sim similarity index 100% rename from tests/script/general/parser/line_insert.sim rename to tests/script/tsim/parser/line_insert.sim diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/tsim/parser/mixed_blocks.sim similarity index 100% rename from tests/script/general/parser/mixed_blocks.sim rename to tests/script/tsim/parser/mixed_blocks.sim diff --git a/tests/script/general/parser/nchar.sim b/tests/script/tsim/parser/nchar.sim similarity index 100% rename from tests/script/general/parser/nchar.sim rename to tests/script/tsim/parser/nchar.sim diff --git a/tests/script/general/parser/nestquery.sim b/tests/script/tsim/parser/nestquery.sim similarity index 100% rename from tests/script/general/parser/nestquery.sim rename to tests/script/tsim/parser/nestquery.sim diff --git a/tests/script/general/parser/null_char.sim b/tests/script/tsim/parser/null_char.sim similarity index 100% rename from tests/script/general/parser/null_char.sim rename to tests/script/tsim/parser/null_char.sim diff --git a/tests/script/general/parser/precision_ns.sim b/tests/script/tsim/parser/precision_ns.sim similarity index 100% rename from tests/script/general/parser/precision_ns.sim rename to tests/script/tsim/parser/precision_ns.sim diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/tsim/parser/projection_limit_offset.sim similarity index 100% rename from tests/script/general/parser/projection_limit_offset.sim rename to tests/script/tsim/parser/projection_limit_offset.sim diff --git a/tests/script/general/parser/regex.sim b/tests/script/tsim/parser/regex.sim similarity index 100% rename from tests/script/general/parser/regex.sim rename to tests/script/tsim/parser/regex.sim diff --git a/tests/script/general/parser/repeatAlter.sim b/tests/script/tsim/parser/repeatAlter.sim similarity index 100% rename from tests/script/general/parser/repeatAlter.sim rename to tests/script/tsim/parser/repeatAlter.sim diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/tsim/parser/selectResNum.sim similarity index 100% rename from tests/script/general/parser/selectResNum.sim rename to tests/script/tsim/parser/selectResNum.sim diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/tsim/parser/select_across_vnodes.sim similarity index 100% rename from tests/script/general/parser/select_across_vnodes.sim rename to tests/script/tsim/parser/select_across_vnodes.sim diff --git a/tests/script/general/parser/select_distinct_tag.sim b/tests/script/tsim/parser/select_distinct_tag.sim similarity index 100% rename from tests/script/general/parser/select_distinct_tag.sim rename to tests/script/tsim/parser/select_distinct_tag.sim diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/tsim/parser/select_from_cache_disk.sim similarity index 100% rename from tests/script/general/parser/select_from_cache_disk.sim rename to tests/script/tsim/parser/select_from_cache_disk.sim diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/tsim/parser/select_with_tags.sim similarity index 100% rename from tests/script/general/parser/select_with_tags.sim rename to tests/script/tsim/parser/select_with_tags.sim diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/tsim/parser/set_tag_vals.sim similarity index 100% rename from tests/script/general/parser/set_tag_vals.sim rename to tests/script/tsim/parser/set_tag_vals.sim diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/tsim/parser/single_row_in_tb.sim similarity index 100% rename from tests/script/general/parser/single_row_in_tb.sim rename to tests/script/tsim/parser/single_row_in_tb.sim diff --git a/tests/script/general/parser/single_row_in_tb_query.sim b/tests/script/tsim/parser/single_row_in_tb_query.sim similarity index 100% rename from tests/script/general/parser/single_row_in_tb_query.sim rename to tests/script/tsim/parser/single_row_in_tb_query.sim diff --git a/tests/script/general/parser/sliding.sim b/tests/script/tsim/parser/sliding.sim similarity index 100% rename from tests/script/general/parser/sliding.sim rename to tests/script/tsim/parser/sliding.sim diff --git a/tests/script/general/parser/slimit.sim b/tests/script/tsim/parser/slimit.sim similarity index 100% rename from tests/script/general/parser/slimit.sim rename to tests/script/tsim/parser/slimit.sim diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/tsim/parser/slimit1.sim similarity index 100% rename from tests/script/general/parser/slimit1.sim rename to tests/script/tsim/parser/slimit1.sim diff --git a/tests/script/general/parser/slimit1_query.sim b/tests/script/tsim/parser/slimit1_query.sim similarity index 100% rename from tests/script/general/parser/slimit1_query.sim rename to tests/script/tsim/parser/slimit1_query.sim diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/tsim/parser/slimit_alter_tags.sim similarity index 100% rename from tests/script/general/parser/slimit_alter_tags.sim rename to tests/script/tsim/parser/slimit_alter_tags.sim diff --git a/tests/script/general/parser/slimit_query.sim b/tests/script/tsim/parser/slimit_query.sim similarity index 100% rename from tests/script/general/parser/slimit_query.sim rename to tests/script/tsim/parser/slimit_query.sim diff --git a/tests/script/general/parser/stableOp.sim b/tests/script/tsim/parser/stableOp.sim similarity index 100% rename from tests/script/general/parser/stableOp.sim rename to tests/script/tsim/parser/stableOp.sim diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/tsim/parser/tags_dynamically_specifiy.sim similarity index 100% rename from tests/script/general/parser/tags_dynamically_specifiy.sim rename to tests/script/tsim/parser/tags_dynamically_specifiy.sim diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/tsim/parser/tags_filter.sim similarity index 100% rename from tests/script/general/parser/tags_filter.sim rename to tests/script/tsim/parser/tags_filter.sim diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/tsim/parser/tbnameIn.sim similarity index 100% rename from tests/script/general/parser/tbnameIn.sim rename to tests/script/tsim/parser/tbnameIn.sim diff --git a/tests/script/general/parser/tbnameIn_query.sim b/tests/script/tsim/parser/tbnameIn_query.sim similarity index 100% rename from tests/script/general/parser/tbnameIn_query.sim rename to tests/script/tsim/parser/tbnameIn_query.sim diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/tsim/parser/timestamp.sim similarity index 100% rename from tests/script/general/parser/timestamp.sim rename to tests/script/tsim/parser/timestamp.sim diff --git a/tests/script/general/parser/timestamp_query.sim b/tests/script/tsim/parser/timestamp_query.sim similarity index 100% rename from tests/script/general/parser/timestamp_query.sim rename to tests/script/tsim/parser/timestamp_query.sim diff --git a/tests/script/general/parser/top_groupby.sim b/tests/script/tsim/parser/top_groupby.sim similarity index 100% rename from tests/script/general/parser/top_groupby.sim rename to tests/script/tsim/parser/top_groupby.sim diff --git a/tests/script/general/parser/topbot.sim b/tests/script/tsim/parser/topbot.sim similarity index 100% rename from tests/script/general/parser/topbot.sim rename to tests/script/tsim/parser/topbot.sim diff --git a/tests/script/general/parser/udf.sim b/tests/script/tsim/parser/udf.sim similarity index 100% rename from tests/script/general/parser/udf.sim rename to tests/script/tsim/parser/udf.sim diff --git a/tests/script/general/parser/udf_dll.sim b/tests/script/tsim/parser/udf_dll.sim similarity index 100% rename from tests/script/general/parser/udf_dll.sim rename to tests/script/tsim/parser/udf_dll.sim diff --git a/tests/script/general/parser/udf_dll_stable.sim b/tests/script/tsim/parser/udf_dll_stable.sim similarity index 100% rename from tests/script/general/parser/udf_dll_stable.sim rename to tests/script/tsim/parser/udf_dll_stable.sim diff --git a/tests/script/general/parser/union.sim b/tests/script/tsim/parser/union.sim similarity index 100% rename from tests/script/general/parser/union.sim rename to tests/script/tsim/parser/union.sim diff --git a/tests/script/general/parser/where.sim b/tests/script/tsim/parser/where.sim similarity index 100% rename from tests/script/general/parser/where.sim rename to tests/script/tsim/parser/where.sim