From f4c52651cb5a3d4461984f147ee33e4a70cd09da Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 18 Jun 2020 16:02:07 +0800 Subject: [PATCH] [td-225] update the test script. --- src/inc/taosdef.h | 4 +- tests/script/general/parser/alter.sim | 80 +++++++++++------------ tests/script/general/parser/testSuite.sim | 18 ++--- tests/script/jenkins/basic.txt | 22 +++---- 4 files changed, 60 insertions(+), 64 deletions(-) diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index 8b82e1f149..6de7f67291 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -209,8 +209,8 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); #define TSDB_MAX_SQL_SHOW_LEN 256 #define TSDB_MAX_ALLOWED_SQL_LEN (8*1024*1024U) // sql length should be less than 8mb -#define TSDB_MAX_BYTES_PER_ROW 65535 -#define TSDB_MAX_TAGS_LEN 65535 +#define TSDB_MAX_BYTES_PER_ROW 16384 +#define TSDB_MAX_TAGS_LEN 16384 #define TSDB_MAX_TAGS 128 #define TSDB_AUTH_LEN 16 diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim index 018ee924d1..6b28b20fb8 100644 --- a/tests/script/general/parser/alter.sim +++ b/tests/script/general/parser/alter.sim @@ -114,46 +114,46 @@ sql drop table tb sql drop table mt sleep 3000 -## ALTER TABLE WHILE STREAMING [TBASE271] -sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int) -sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s) -sql select * from strm -if $rows != 0 then - return -1 -endi -#sleep 12000 -sql insert into tb1 values (now, 1, 'taos', 1) -sleep 20000 -sql select * from strm -print rows = $rows -if $rows != 1 then - return -1 -endi -if $data04 != 1 then - return -1 -endi -sql alter table tb1 drop column c3 -sleep 6000 -sql insert into tb1 values (now, 2, 'taos') -sleep 30000 -sql select * from strm -if $rows != 2 then - return -1 -endi -if $data04 != 1 then - return -1 -endi -sql alter table tb1 add column c3 int -sleep 6000 -sql insert into tb1 values (now, 3, 'taos', 3); -sleep 3000 -sql select * from strm -if $rows != 3 then - return -1 -endi -if $data04 != 1 then - return -1 -endi +### ALTER TABLE WHILE STREAMING [TBASE271] +#sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int) +#sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s) +#sql select * from strm +#if $rows != 0 then +# return -1 +#endi +##sleep 12000 +#sql insert into tb1 values (now, 1, 'taos', 1) +#sleep 20000 +#sql select * from strm +#print rows = $rows +#if $rows != 1 then +# return -1 +#endi +#if $data04 != 1 then +# return -1 +#endi +#sql alter table tb1 drop column c3 +#sleep 6000 +#sql insert into tb1 values (now, 2, 'taos') +#sleep 30000 +#sql select * from strm +#if $rows != 2 then +# return -1 +#endi +#if $data04 != 1 then +# return -1 +#endi +#sql alter table tb1 add column c3 int +#sleep 6000 +#sql insert into tb1 values (now, 3, 'taos', 3); +#sleep 3000 +#sql select * from strm +#if $rows != 3 then +# return -1 +#endi +#if $data04 != 1 then +# return -1 +#endi ## ALTER TABLE AND INSERT BY COLUMNS sql create table mt (ts timestamp, c1 int, c2 int) tags(t1 int) diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim index f288288fb7..31acaad143 100644 --- a/tests/script/general/parser/testSuite.sim +++ b/tests/script/general/parser/testSuite.sim @@ -82,26 +82,22 @@ sleep 2000 run general/parser/groupby.sim sleep 2000 run general/parser/set_tag_vals.sim - sleep 2000 run general/parser/slimit_alter_tags.sim # persistent failed - sleep 2000 run general/parser/join.sim sleep 2000 run general/parser/join_multivnode.sim - sleep 2000 -#run general/parser/repeatAlter.sim -sleep 2000 -#run general/parser/repeatStream.sim - +run general/parser/repeatAlter.sim sleep 2000 run general/parser/binary_escapeCharacter.sim sleep 2000 run general/parser/bug.sim -sleep 2000 -run general/parser/stream_on_sys.sim -sleep 2000 -run general/parser/stream.sim \ No newline at end of file +#sleep 2000 +#run general/parser/repeatStream.sim +#sleep 2000 +#run general/parser/stream_on_sys.sim +#sleep 2000 +#run general/parser/stream.sim \ No newline at end of file diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 3e6d245af9..b33ee206d0 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -100,9 +100,9 @@ cd ../../../debug; make ./test.sh -f general/insert/query_multi_file.sim ./test.sh -f general/insert/tcp.sim -#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 +./test.sh -f general/parser/alter.sim +./test.sh -f general/parser/alter1.sim +./test.sh -f general/parser/alter_stable.sim ./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/col_arithmetic_operation.sim @@ -139,15 +139,15 @@ cd ../../../debug; make ./test.sh -f general/parser/fill_stb.sim ./test.sh -f general/parser/interp.sim ./test.sh -f general/parser/where.sim -#unsupport ./test.sh -f general/parser/join.sim -#unsupport ./test.sh -f general/parser/join_multivnode.sim +./test.sh -f general/parser/join.sim +./test.sh -f general/parser/join_multivnode.sim ./test.sh -f general/parser/select_with_tags.sim -#unsupport ./test.sh -f general/parser/groupby.sim -#unsupport ./test.sh -f general/parser/bug.sim -#unsupport ./test.sh -f general/parser/tags_dynamically_specifiy.sim -#unsupport ./test.sh -f general/parser/set_tag_vals.sim -#unsupport ./test.sh -f general/parser/repeatAlter.sim -#unsupport ./test.sh -f general/parser/slimit_alter_tags.sim +./test.sh -f general/parser/groupby.sim +./test.sh -f general/parser/bug.sim +./test.sh -f general/parser/tags_dynamically_specifiy.sim +./test.sh -f general/parser/set_tag_vals.sim +./test.sh -f general/parser/slimit_alter_tags.sim +./test.sh -f general/parser/repeatAlter.sim #unsupport ./test.sh -f general/parser/stream_on_sys.sim #unsupport ./test.sh -f general/parser/stream.sim #unsupport ./test.sh -f general/parser/repeatStream.sim -- GitLab