From b2a35f359b7c1aabbcc53f60174483070896ea19 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 18 Jun 2020 17:13:54 +0800 Subject: [PATCH] merge develop branch. --- tests/script/fullGeneralSuite.sim | 35 +++++++++--------- tests/script/jenkins/basic.txt | 26 ++++++------- tests/script/regressionSuite.sim | 61 ++++++++++++++++--------------- 3 files changed, 62 insertions(+), 60 deletions(-) diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim index 9d9bf91758..2f45ab077c 100644 --- a/tests/script/fullGeneralSuite.sim +++ b/tests/script/fullGeneralSuite.sim @@ -1,10 +1,10 @@ #unsupport run general/alter/cached_schema_after_alter.sim -#unsupport run general/alter/count.sim -#unsupport run general/alter/import.sim +run general/alter/count.sim +run general/alter/import.sim #unsupport run general/alter/insert1.sim -#unsupport run general/alter/insert2.sim -#unsupport run general/alter/metrics.sim -#unsupport run general/alter/table.sim +run general/alter/insert2.sim +run general/alter/metrics.sim +run general/alter/table.sim run general/cache/new_metrics.sim run general/cache/restart_metrics.sim run general/cache/restart_table.sim @@ -87,8 +87,8 @@ run general/insert/query_file_memory.sim run general/insert/query_multi_file.sim run general/insert/tcp.sim #unsupport run general/parser/alter.sim -#unsupport run general/parser/alter1.sim -#unsupport run general/parser/alter_stable.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 @@ -125,13 +125,13 @@ run general/parser/fill.sim run general/parser/fill_stb.sim run general/parser/interp.sim run general/parser/where.sim -#unsupport run general/parser/join.sim -#unsupport run general/parser/join_multivnode.sim +run general/parser/join.sim +run general/parser/join_multivnode.sim run general/parser/select_with_tags.sim -#unsupport run general/parser/groupby.sim -#unsupport run general/parser/bug.sim -#unsupport run general/parser/tags_dynamically_specifiy.sim -#unsupport run general/parser/set_tag_vals.sim +run general/parser/groupby.sim +run general/parser/bug.sim +run general/parser/tags_dynamically_specifiy.sim +run general/parser/set_tag_vals.sim #unsupport run general/parser/repeatAlter.sim #unsupport run general/parser/slimit_alter_tags.sim #unsupport run general/parser/stream_on_sys.sim @@ -173,25 +173,25 @@ run general/tag/3.sim run general/tag/4.sim run general/tag/5.sim run general/tag/6.sim -#unsupport run general/tag/add.sim +run general/tag/add.sim run general/tag/bigint.sim run general/tag/binary_binary.sim run general/tag/binary.sim run general/tag/bool_binary.sim run general/tag/bool_int.sim run general/tag/bool.sim -#unsupport run general/tag/change.sim +run general/tag/change.sim run general/tag/column.sim #unsupport run general/tag/commit.sim run general/tag/create.sim -#unsupport run general/tag/delete.sim +run general/tag/delete.sim run general/tag/double.sim run general/tag/filter.sim run general/tag/float.sim run general/tag/int_binary.sim run general/tag/int_float.sim run general/tag/int.sim -#unsupport run general/tag/set.sim +run general/tag/set.sim run general/tag/smallint.sim run general/tag/tinyint.sim run general/user/authority.sim @@ -211,6 +211,7 @@ run general/vector/table_field.sim run general/vector/table_mix.sim run general/vector/table_query.sim run general/vector/table_time.sim +run general/stream/restart_stream.sim run general/stream/stream_1.sim run general/stream/stream_2.sim run general/stream/stream_3.sim diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 75be6943c9..673022e0c6 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -159,20 +159,20 @@ cd ../../../debug; make ./test.sh -f general/stable/values.sim ./test.sh -f general/stable/vnode3.sim -./test.sh general/stream/stream_1.sim -./test.sh general/stream/stream_2.sim -./test.sh general/stream/stream_3.sim -./test.sh general/stream/stream_restart.sim -./test.sh general/stream/table_1.sim -./test.sh general/stream/metrics_1.sim -./test.sh general/stream/table_n.sim -./test.sh general/stream/metrics_n.sim -./test.sh general/stream/table_del.sim -./test.sh general/stream/metrics_del.sim -./test.sh general/stream/table_replica1_vnoden.sim -./test.sh general/stream/metrics_replica1_vnoden.sim +./test.sh -f general/stream/metrics_1.sim +./test.sh -f general/stream/metrics_del.sim +./test.sh -f general/stream/metrics_n.sim +./test.sh -f general/stream/metrics_replica1_vnoden.sim #./test.sh -f general/stream/new_stream.sim -#./test.sh -f general/stream/restart_stream.sim +./test.sh -f general/stream/restart_stream.sim +./test.sh -f general/stream/stream_1.sim +./test.sh -f general/stream/stream_2.sim +./test.sh -f general/stream/stream_3.sim +./test.sh -f general/stream/stream_restart.sim +./test.sh -f general/stream/table_1.sim +./test.sh -f general/stream/table_del.sim +./test.sh -f general/stream/table_n.sim +./test.sh -f general/stream/table_replica1_vnoden.sim ./test.sh -f general/table/autocreate.sim ./test.sh -f general/table/basic1.sim diff --git a/tests/script/regressionSuite.sim b/tests/script/regressionSuite.sim index ae5c200a80..0fbec7ebd8 100644 --- a/tests/script/regressionSuite.sim +++ b/tests/script/regressionSuite.sim @@ -1,10 +1,10 @@ -#unsupport run general/alter/cached_schema_after_alter.sim -#unsupport run general/alter/count.sim -#unsupport run general/alter/import.sim -#unsupport run general/alter/insert1.sim -#unsupport run general/alter/insert2.sim -#unsupport run general/alter/metrics.sim -#unsupport run general/alter/table.sim +##unsupport run general/alter/cached_schema_after_alter.sim +unsupport run general/alter/count.sim +unsupport run general/alter/import.sim +##unsupport run general/alter/insert1.sim +unsupport run general/alter/insert2.sim +unsupport run general/alter/metrics.sim +unsupport run general/alter/table.sim run general/cache/new_metrics.sim run general/cache/restart_metrics.sim run general/cache/restart_table.sim @@ -86,14 +86,14 @@ run general/insert/query_block2_file.sim run general/insert/query_file_memory.sim run general/insert/query_multi_file.sim run general/insert/tcp.sim -#unsupport run general/parser/alter.sim -#unsupport run general/parser/alter1.sim -#unsupport run general/parser/alter_stable.sim +##unsupport 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/commit.sim run general/parser/create_db.sim run general/parser/create_mt.sim run general/parser/create_tb.sim @@ -103,17 +103,17 @@ run general/parser/import_commit2.sim run general/parser/import_commit3.sim run general/parser/insert_tb.sim run general/parser/first_last.sim -#unsupport run general/parser/import_file.sim +##unsupport run general/parser/import_file.sim run general/parser/lastrow.sim run general/parser/nchar.sim -#unsupport run general/parser/null_char.sim +##unsupport run general/parser/null_char.sim run general/parser/single_row_in_tb.sim run general/parser/select_from_cache_disk.sim run general/parser/limit.sim -# run general/parser/limit1.sim +run general/parser/limit1.sim run general/parser/limit1_tblocks100.sim run general/parser/mixed_blocks.sim -# run general/parser/selectResNum.sim +run general/parser/selectResNum.sim run general/parser/select_across_vnodes.sim run general/parser/slimit1.sim run general/parser/tbnameIn.sim @@ -123,18 +123,18 @@ run general/parser/limit2.sim run general/parser/slimit.sim run general/parser/fill.sim run general/parser/fill_stb.sim -# run general/parser/interp.sim +run general/parser/interp.sim # run general/parser/where.sim -#unsupport run general/parser/join.sim -#unsupport run general/parser/join_multivnode.sim +run general/parser/join.sim +run general/parser/join_multivnode.sim run general/parser/select_with_tags.sim -#unsupport run general/parser/groupby.sim -#unsupport run general/parser/bug.sim -#unsupport run general/parser/tags_dynamically_specifiy.sim -#unsupport run general/parser/set_tag_vals.sim -#unsupport run general/parser/repeatAlter.sim -#unsupport run general/parser/slimit_alter_tags.sim -#unsupport run general/parser/stream_on_sys.sim +run general/parser/groupby.sim +run general/parser/bug.sim +run general/parser/tags_dynamically_specifiy.sim +run general/parser/set_tag_vals.sim +##unsupport run general/parser/repeatAlter.sim +##unsupport run general/parser/slimit_alter_tags.sim +##unsupport run general/parser/stream_on_sys.sim run general/parser/stream.sim #unsupport run general/parser/repeatStream.sim run general/stable/disk.sim @@ -173,25 +173,25 @@ run general/tag/3.sim run general/tag/4.sim run general/tag/5.sim run general/tag/6.sim -#unsupport run general/tag/add.sim +run general/tag/add.sim run general/tag/bigint.sim run general/tag/binary_binary.sim run general/tag/binary.sim run general/tag/bool_binary.sim run general/tag/bool_int.sim run general/tag/bool.sim -#unsupport run general/tag/change.sim +run general/tag/change.sim run general/tag/column.sim -#unsupport run general/tag/commit.sim +##unsupport run general/tag/commit.sim run general/tag/create.sim -#unsupport run general/tag/delete.sim +run general/tag/delete.sim run general/tag/double.sim run general/tag/filter.sim run general/tag/float.sim run general/tag/int_binary.sim run general/tag/int_float.sim run general/tag/int.sim -#unsupport run general/tag/set.sim +run general/tag/set.sim run general/tag/smallint.sim run general/tag/tinyint.sim run general/user/authority.sim @@ -211,6 +211,7 @@ run general/vector/table_field.sim run general/vector/table_mix.sim run general/vector/table_query.sim run general/vector/table_time.sim +run general/stream/restart_stream.sim run general/stream/stream_1.sim run general/stream/stream_2.sim run general/stream/stream_3.sim -- GitLab