From 80f0a880634bc17f532f3794b380208404667317 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 12 May 2020 18:28:00 +0800 Subject: [PATCH] scripts --- tests/script/basicSuite.sim | 3 +- tests/script/general/parser/alter.sim | 2 + tests/script/general/parser/alter_stable.sim | 2 +- .../script/general/parser/auto_create_tb.sim | 4 +- .../general/parser/auto_create_tb_drop_tb.sim | 3 +- .../general/parser/binary_escapeCharacter.sim | 7 +-- tests/script/general/parser/bug.sim | 1 - .../parser/col_arithmetic_operation.sim | 2 + tests/script/general/parser/columnValue.sim | 12 +---- tests/script/general/parser/commit.sim | 2 + tests/script/general/parser/create_db.sim | 2 + tests/script/general/parser/create_mt.sim | 2 + tests/script/general/parser/create_tb.sim | 2 + .../general/parser/dbtbnameValidate.sim | 3 +- tests/script/general/parser/fill.sim | 2 + tests/script/general/parser/fill_stb.sim | 2 + tests/script/general/parser/first_last.sim | 1 + tests/script/general/parser/groupby.sim | 4 +- .../script/general/parser/import_commit1.sim | 1 + .../script/general/parser/import_commit2.sim | 1 + .../script/general/parser/import_commit3.sim | 1 + tests/script/general/parser/import_file.sim | 4 +- tests/script/general/parser/insert_tb.sim | 1 + tests/script/general/parser/interp.sim | 2 + tests/script/general/parser/join.sim | 2 + .../script/general/parser/join_multivnode.sim | 4 +- tests/script/general/parser/lastrow.sim | 2 + tests/script/general/parser/limit.sim | 2 + tests/script/general/parser/limit1.sim | 2 + .../general/parser/limit1_tblocks100.sim | 2 + tests/script/general/parser/limit2.sim | 2 + tests/script/general/parser/mixed_blocks.sim | 2 + tests/script/general/parser/nchar.sim | 2 + tests/script/general/parser/null_char.sim | 1 + .../parser/projection_limit_offset.sim | 2 +- tests/script/general/parser/repeatAlter.sim | 2 + tests/script/general/parser/repeatStream.sim | 2 + tests/script/general/parser/selectResNum.sim | 2 + .../general/parser/select_across_vnodes.sim | 2 + .../general/parser/select_from_cache_disk.sim | 2 + .../general/parser/select_with_tags.sim | 2 + tests/script/general/parser/set_tag_vals.sim | 2 + .../general/parser/single_row_in_tb.sim | 2 + tests/script/general/parser/slimit.sim | 2 + tests/script/general/parser/slimit1.sim | 2 + .../general/parser/slimit_alter_tags.sim | 2 + tests/script/general/parser/stream.sim | 2 + tests/script/general/parser/stream_on_sys.sim | 2 + .../parser/tags_dynamically_specifiy.sim | 4 +- tests/script/general/parser/tbnameIn.sim | 2 + tests/script/general/parser/testSuite.sim | 5 +++ tests/script/general/parser/where.sim | 2 + tests/script/jenkins/basic.txt | 45 +++++++++---------- 53 files changed, 117 insertions(+), 56 deletions(-) diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim index d0bb58ec20..420b08c1e1 100644 --- a/tests/script/basicSuite.sim +++ b/tests/script/basicSuite.sim @@ -9,7 +9,6 @@ run general/import/basic.sim run general/import/commit.sim run general/insert/query_file_memory.sim run general/parser/binary_escapeCharacter.sim -run general/parser/columnValue_bigint.sim run general/parser/select_from_cache_disk.sim run general/table/autocreate.sim run general/table/column_name.sim @@ -18,5 +17,5 @@ run general/table/vgroup.sim run general/user/basic1.sim run general/user/pass_alter.sim run general/vector/single.sim -run general/connection/connection.sim +#run general/connection/connection.sim run general/user/authority.sim diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim index f97581c5f5..e57b1f43d2 100644 --- a/tests/script/general/parser/alter.sim +++ b/tests/script/general/parser/alter.sim @@ -238,3 +238,5 @@ sql show databases if $rows != 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim index 6715c44b96..b64c919042 100644 --- a/tests/script/general/parser/alter_stable.sim +++ b/tests/script/general/parser/alter_stable.sim @@ -39,4 +39,4 @@ sql alter table tb1 set tag len = 379 # test end sql drop database $db - +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim index bcbf5474ad..a29d917244 100644 --- a/tests/script/general/parser/auto_create_tb.sim +++ b/tests/script/general/parser/auto_create_tb.sim @@ -1,6 +1,4 @@ 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 @@ -305,3 +303,5 @@ sql select * from tu if $rows != 2 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim index e3a3b0c7a0..9d38b40ab3 100644 --- a/tests/script/general/parser/auto_create_tb_drop_tb.sim +++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim @@ -1,5 +1,4 @@ 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 @@ -81,3 +80,5 @@ while $x < 100 $x = $x + 1 print loop $x endw + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim index 5f7d98a75a..c3c867795a 100644 --- a/tests/script/general/parser/binary_escapeCharacter.sim +++ b/tests/script/general/parser/binary_escapeCharacter.sim @@ -95,9 +95,4 @@ if $data41 != @udp005@ then endi - - - - - - +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/bug.sim b/tests/script/general/parser/bug.sim index 0233b2ee04..0e97acb453 100644 --- a/tests/script/general/parser/bug.sim +++ b/tests/script/general/parser/bug.sim @@ -42,4 +42,3 @@ sql select st1.ts, st1.f1, st2.f2 from db.st1, db.st2 where st1.t1=st2.t2 and st system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select st1.ts, st1.f1, st2.f2 from db.st1, db.st2 where st1.t1=st2.t2 and st1.ts=st2.ts' 127.0.0.1:6020/restful/sql system sh/exec.sh -n dnode1 -s stop -x SIGINT - diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim index 9ea8492907..132ecf4342 100644 --- a/tests/script/general/parser/col_arithmetic_operation.sim +++ b/tests/script/general/parser/col_arithmetic_operation.sim @@ -90,3 +90,5 @@ endi #### illegal operations sql_error select max(c2*2) from $tb sql_error select max(c1-c2) from $tb + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim index aa5c5f72c8..e905f61215 100644 --- a/tests/script/general/parser/columnValue.sim +++ b/tests/script/general/parser/columnValue.sim @@ -22,15 +22,5 @@ run general/parser/columnValue_bigint.sim run general/parser/columnValue_float.sim run general/parser/columnValue_double.sim - - - - - - - - - - - +system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim index 2b69b1ab8c..f1c980f3db 100644 --- a/tests/script/general/parser/commit.sim +++ b/tests/script/general/parser/commit.sim @@ -107,3 +107,5 @@ while $loop <= $loops endi $loop = $loop + 1 endw + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim index 8048770198..817d712aa6 100644 --- a/tests/script/general/parser/create_db.sim +++ b/tests/script/general/parser/create_db.sim @@ -188,3 +188,5 @@ sql show databases if $rows != 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim index 76fb486f1e..5b951b7b35 100644 --- a/tests/script/general/parser/create_mt.sim +++ b/tests/script/general/parser/create_mt.sim @@ -258,3 +258,5 @@ sql show databases if $rows != 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim index 7df7d8a4da..7bb329396c 100644 --- a/tests/script/general/parser/create_tb.sim +++ b/tests/script/general/parser/create_tb.sim @@ -188,3 +188,5 @@ sql show databases if $rows != 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim index 5dea4a09c5..cf72f3ae61 100644 --- a/tests/script/general/parser/dbtbnameValidate.sim +++ b/tests/script/general/parser/dbtbnameValidate.sim @@ -127,5 +127,4 @@ if $rows != 7 then return -1 endi - - +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim index 459bc7611e..4dfee222cc 100644 --- a/tests/script/general/parser/fill.sim +++ b/tests/script/general/parser/fill.sim @@ -849,3 +849,5 @@ sql show databases if $rows != 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim index 113f4b68a4..402b79d6b5 100644 --- a/tests/script/general/parser/fill_stb.sim +++ b/tests/script/general/parser/fill_stb.sim @@ -430,3 +430,5 @@ sql show databases if $rows != 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim index d2586ce04a..48288daeca 100644 --- a/tests/script/general/parser/first_last.sim +++ b/tests/script/general/parser/first_last.sim @@ -83,3 +83,4 @@ sleep 3000 run general/parser/first_last_query.sim +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim index 5bf41772ed..9788e4d484 100644 --- a/tests/script/general/parser/groupby.sim +++ b/tests/script/general/parser/groupby.sim @@ -406,4 +406,6 @@ endi if $data97 != @group_tb0@ then return -1 -endi \ No newline at end of file +endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim index d88e6e986a..a929c1846b 100644 --- a/tests/script/general/parser/import_commit1.sim +++ b/tests/script/general/parser/import_commit1.sim @@ -53,3 +53,4 @@ if $data00 != $res then return -1 endi +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim index 9ed8ac0ea4..c93b3168f1 100644 --- a/tests/script/general/parser/import_commit2.sim +++ b/tests/script/general/parser/import_commit2.sim @@ -52,3 +52,4 @@ if $data00 != $res then return -1 endi +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim index ee71e03182..916bf6d05e 100644 --- a/tests/script/general/parser/import_commit3.sim +++ b/tests/script/general/parser/import_commit3.sim @@ -59,3 +59,4 @@ if $data00 != $res then return -1 endi +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim index cd63612a0e..6b4dd07c79 100644 --- a/tests/script/general/parser/import_file.sim +++ b/tests/script/general/parser/import_file.sim @@ -34,4 +34,6 @@ endi #system rm -f $inFileName # invalid shell -system rm -f ~/data.csv \ No newline at end of file +system rm -f ~/data.csv + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim index 4f2c5fcc78..4ba455c244 100644 --- a/tests/script/general/parser/insert_tb.sim +++ b/tests/script/general/parser/insert_tb.sim @@ -233,3 +233,4 @@ endi #endi +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim index c7c633d422..4033d1c735 100644 --- a/tests/script/general/parser/interp.sim +++ b/tests/script/general/parser/interp.sim @@ -65,3 +65,5 @@ system sh/exec.sh -n dnode1 -s start print ================== server restart completed run general/parser/interp_test.sim + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim index 6addcb1ac1..2524fbe631 100644 --- a/tests/script/general/parser/join.sim +++ b/tests/script/general/parser/join.sim @@ -444,3 +444,5 @@ sql insert into um1 using m2 tags(1) values(1000001, 10)(2000000, 20); sql insert into um2 using m2 tags(9) values(1000001, 10)(2000000, 20); sql_error select count(*) from m1,m2 where m1.a=m2.a and m1.ts=m2.ts; + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim index 86488ea844..3e32064f3b 100644 --- a/tests/script/general/parser/join_multivnode.sim +++ b/tests/script/general/parser/join_multivnode.sim @@ -127,4 +127,6 @@ sql select join_mt0.ts, join_mt1.t1 from join_mt0, join_mt1 where join_mt0.ts=jo sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1 -sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1 limit 1 \ No newline at end of file +sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1 limit 1 + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim index 5eb3b144a6..29f535942d 100644 --- a/tests/script/general/parser/lastrow.sim +++ b/tests/script/general/parser/lastrow.sim @@ -68,3 +68,5 @@ sql connect sleep 3000 run general/parser/lastrow_query.sim + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim index 8f00912a59..e3e952bdd3 100644 --- a/tests/script/general/parser/limit.sim +++ b/tests/script/general/parser/limit.sim @@ -69,3 +69,5 @@ sleep 3000 run general/parser/limit_tb.sim run general/parser/limit_stb.sim + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim index 040b6303de..48fb6aaede 100644 --- a/tests/script/general/parser/limit1.sim +++ b/tests/script/general/parser/limit1.sim @@ -67,3 +67,5 @@ print ================== server restart completed run general/parser/limit1_tb.sim run general/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/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim index a776459640..af4d3eda85 100644 --- a/tests/script/general/parser/limit1_tblocks100.sim +++ b/tests/script/general/parser/limit1_tblocks100.sim @@ -67,3 +67,5 @@ print ================== server restart completed run general/parser/limit1_tb.sim run general/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/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim index cc9334db36..61f817644a 100644 --- a/tests/script/general/parser/limit2.sim +++ b/tests/script/general/parser/limit2.sim @@ -74,3 +74,5 @@ system sh/exec.sh -n dnode1 -s start print ================== server restart completed run general/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/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim index 77838774df..569decaa14 100644 --- a/tests/script/general/parser/mixed_blocks.sim +++ b/tests/script/general/parser/mixed_blocks.sim @@ -142,3 +142,5 @@ endi if $data03 != 319 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim index 2a6bc83b41..2c86748f21 100644 --- a/tests/script/general/parser/nchar.sim +++ b/tests/script/general/parser/nchar.sim @@ -310,3 +310,5 @@ endi # if $rows != 0 then # return -1 # endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim index e4f6c5f849..d395b4c8ba 100644 --- a/tests/script/general/parser/null_char.sim +++ b/tests/script/general/parser/null_char.sim @@ -488,3 +488,4 @@ sql_error alter table st51 set tag tag_tinyint = abc379 #sql drop database $db +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim index 4b10694190..52be50c032 100644 --- a/tests/script/general/parser/projection_limit_offset.sim +++ b/tests/script/general/parser/projection_limit_offset.sim @@ -375,4 +375,4 @@ sql_error select 'abc'; #=============================tbase-1205 sql select count(*) from tm1 where ts= now -1d interval(1h) fill(NULL); - +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/repeatAlter.sim b/tests/script/general/parser/repeatAlter.sim index 5f6a8e6a2a..3695206f90 100644 --- a/tests/script/general/parser/repeatAlter.sim +++ b/tests/script/general/parser/repeatAlter.sim @@ -5,3 +5,5 @@ while $i <= $loops run general/parser/alter.sim $i = $i + 1 endw + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/repeatStream.sim b/tests/script/general/parser/repeatStream.sim index bd631e36a1..616679e78b 100644 --- a/tests/script/general/parser/repeatStream.sim +++ b/tests/script/general/parser/repeatStream.sim @@ -5,3 +5,5 @@ while $i <= $repeats run general/parser/stream.sim $i = $i + 1 endw + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim index 0a4eafc8a0..a0adc46d5f 100644 --- a/tests/script/general/parser/selectResNum.sim +++ b/tests/script/general/parser/selectResNum.sim @@ -182,3 +182,5 @@ while $loop <= $loops endw $loop = $loop + 1 endw + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim index 883d4d59cd..65e8cbb7b1 100644 --- a/tests/script/general/parser/select_across_vnodes.sim +++ b/tests/script/general/parser/select_across_vnodes.sim @@ -80,3 +80,5 @@ sql show databases if $rows != 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim index 04cc68c310..9ffdf817d7 100644 --- a/tests/script/general/parser/select_from_cache_disk.sim +++ b/tests/script/general/parser/select_from_cache_disk.sim @@ -68,3 +68,5 @@ endi if $data12 != 1 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim index 181d7f312a..329787b69c 100644 --- a/tests/script/general/parser/select_with_tags.sim +++ b/tests/script/general/parser/select_with_tags.sim @@ -838,3 +838,5 @@ sql_error select first(c1), count(*), t2, t1, tbname from select_tags_mt0 group #sql select first(ts), tbname from select_tags_mt0 group by tbname; #sql select count(c1) from select_tags_mt0 where c1=99 group by tbname; #sql select count(*),tbname from select_tags_mt0 group by tbname + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim index de29c28ba3..a684fd5406 100644 --- a/tests/script/general/parser/set_tag_vals.sim +++ b/tests/script/general/parser/set_tag_vals.sim @@ -225,3 +225,5 @@ endi if $data04 != NULL then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim index 5ee65e3b10..52bdad2065 100644 --- a/tests/script/general/parser/single_row_in_tb.sim +++ b/tests/script/general/parser/single_row_in_tb.sim @@ -36,3 +36,5 @@ system sh/exec.sh -n dnode1 -s start print ================== server restart completed run general/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/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim index 017e8d4d2e..161463a7c1 100644 --- a/tests/script/general/parser/slimit.sim +++ b/tests/script/general/parser/slimit.sim @@ -105,3 +105,5 @@ sql connect sleep 3000 run general/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/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim index 3dbe9f0a06..b987a6852b 100644 --- a/tests/script/general/parser/slimit1.sim +++ b/tests/script/general/parser/slimit1.sim @@ -64,3 +64,5 @@ sql connect sleep 3000 run general/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/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim index 5c62482802..b8397f950c 100644 --- a/tests/script/general/parser/slimit_alter_tags.sim +++ b/tests/script/general/parser/slimit_alter_tags.sim @@ -255,3 +255,5 @@ endi #if $rows != 0 then # return -1 #endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/stream.sim b/tests/script/general/parser/stream.sim index c4be6efa1c..8e5dad1595 100644 --- a/tests/script/general/parser/stream.sim +++ b/tests/script/general/parser/stream.sim @@ -220,3 +220,5 @@ sql create database $db sql use $db sql create table stb (ts timestamp, c1 int) tags(t1 int) sql create table tb1 using stb tags(1) + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim index b7bf7a8900..5170ddb036 100644 --- a/tests/script/general/parser/stream_on_sys.sim +++ b/tests/script/general/parser/stream_on_sys.sim @@ -58,3 +58,5 @@ sql select * from iostrm if $rows <= 0 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim index af514d1a07..6e1766a91d 100644 --- a/tests/script/general/parser/tags_dynamically_specifiy.sim +++ b/tests/script/general/parser/tags_dynamically_specifiy.sim @@ -55,4 +55,6 @@ endi #if $data06 != 100.90000 then # print "expect: 100.90000, act: $data06" # return -1 -#endi \ No newline at end of file +#endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim index 548560e945..16302888d0 100644 --- a/tests/script/general/parser/tbnameIn.sim +++ b/tests/script/general/parser/tbnameIn.sim @@ -73,3 +73,5 @@ system sh/exec.sh -n dnode1 -s start print ================== server restart completed run general/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/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim index fb56868f1f..0b7d705688 100644 --- a/tests/script/general/parser/testSuite.sim +++ b/tests/script/general/parser/testSuite.sim @@ -98,3 +98,8 @@ sleep 2000 run general/parser/select_with_tags.sim sleep 2000 run general/parser/groupby.sim + +sleep 2000 +run general/parser/binary_escapeCharacter.sim +sleep 2000 +#run general/parser/bug.sim \ No newline at end of file diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim index fb3a0a69e7..de2312f2b9 100644 --- a/tests/script/general/parser/where.sim +++ b/tests/script/general/parser/where.sim @@ -272,3 +272,5 @@ sql select * from tb_where_NULL where c2 <> "nUll" if $rows != 2 then return -1 endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index cbf83f68c7..5a5793f069 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -41,6 +41,8 @@ cd ../../../debug; make ./test.sh -f general/compute/sum.sim ./test.sh -f general/compute/top.sim +#jeff ./test.sh -f general/connection/connection.sim + ./test.sh -f general/db/basic.sim ./test.sh -f general/db/basic1.sim ./test.sh -f general/db/basic2.sim @@ -97,61 +99,54 @@ cd ../../../debug; make #unsupport ./test.sh -f general/parser/alter.sim #unsupport ./test.sh -f general/parser/alter1.sim #unsupport ./test.sh -f general/parser/alter_stable.sim -#rpc error? ./test.sh -f general/parser/auto_create_tb.sim -# ./test.sh -f general/parser/auto_create_tb_drop_tb.sim -./test.sh -f general/parser/binary_escapeCharacter.sim -#./test.sh -f general/parser/bug.sim +./test.sh -f general/parser/auto_create_tb.sim +#slguan ./test.sh -f general/parser/auto_create_tb_drop_tb.sim ./test.sh -f general/parser/col_arithmetic_operation.sim -./test.sh -f general/parser/columnValue_bigint.sim -./test.sh -f general/parser/columnValue_bool.sim -./test.sh -f general/parser/columnValue_double.sim -./test.sh -f general/parser/columnValue_float.sim -./test.sh -f general/parser/columnValue_int.sim -# ./test.sh -f general/parser/col_arithmetic_operation.sim ./test.sh -f general/parser/columnValue.sim ./test.sh -f general/parser/commit.sim # ./test.sh -f general/parser/create_db.sim # ./test.sh -f general/parser/create_mt.sim # ./test.sh -f general/parser/create_tb.sim # ./test.sh -f general/parser/dbtbnameValidate.sim -# ./test.sh -f general/parser/fill.sim -# ./test.sh -f general/parser/fill_stb.sim -# ./test.sh -f general/parser/first_last.sim ./test.sh -f general/parser/import_commit1.sim ./test.sh -f general/parser/import_commit2.sim ./test.sh -f general/parser/import_commit3.sim -# ./test.sh -f general/parser/import_file.sim # ./test.sh -f general/parser/insert_tb.sim -# ./test.sh -f general/parser/tags_dynamically_specifiy.sim -# ./test.sh -f general/parser/interp.sim +# ./test.sh -f general/parser/first_last.sim +# ./test.sh -f general/parser/import_file.sim # ./test.sh -f general/parser/lastrow.sim +# ./test.sh -f general/parser/nchar.sim +# ./test.sh -f general/parser/null_char.sim +# ./test.sh -f general/parser/single_row_in_tb.sim +./test.sh -f general/parser/select_from_cache_disk.sim # ./test.sh -f general/parser/limit.sim +# ./test.sh -f general/parser/fill.sim +# ./test.sh -f general/parser/fill_stb.sim +# ./test.sh -f general/parser/tags_dynamically_specifiy.sim +# ./test.sh -f general/parser/interp.sim # ./test.sh -f general/parser/limit1.sim # ./test.sh -f general/parser/limit1_tblocks100.sim # ./test.sh -f general/parser/limit2.sim # ./test.sh -f general/parser/mixed_blocks.sim -# ./test.sh -f general/parser/nchar.sim -# ./test.sh -f general/parser/null_char.sim # ./test.sh -f general/parser/selectResNum.sim # ./test.sh -f general/parser/select_across_vnodes.sim -./test.sh -f general/parser/select_from_cache_disk.sim # ./test.sh -f general/parser/set_tag_vals.sim -# ./test.sh -f general/parser/single_row_in_tb.sim # ./test.sh -f general/parser/slimit.sim ./test.sh -f general/parser/slimit1.sim -./test.sh -f general/parser/slimit1_query.sim -# ./test.sh -f general/parser/slimit_alter_tags.sim -# ./test.sh -f general/parser/stream_on_sys.sim -# ./test.sh -f general/parser/stream.sim +#unsupport ./test.sh -f general/parser/slimit_alter_tags.sim +#unsupport ./test.sh -f general/parser/stream_on_sys.sim +#unsupport ./test.sh -f general/parser/stream.sim # ./test.sh -f general/parser/tbnameIn.sim # ./test.sh -f general/parser/where.sim # ./test.sh -f general/parser/repeatAlter.sim -# ./test.sh -f general/parser/repeatStream.sim +#unsupport ./test.sh -f general/parser/repeatStream.sim # ./test.sh -f general/parser/join.sim # ./test.sh -f general/parser/join_multivnode.sim # ./test.sh -f general/parser/projection_limit_offset.sim # ./test.sh -f general/parser/select_with_tags.sim # ./test.sh -f general/parser/groupby.sim +./test.sh -f general/parser/binary_escapeCharacter.sim +#./test.sh -f general/parser/bug.sim ./test.sh -f general/stable/disk.sim ./test.sh -f general/stable/metrics.sim -- GitLab