diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 85a8a5e9dd..d745ecf706 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -94,7 +94,7 @@ ./test.sh -f tsim/parser/auto_create_tb.sim ./test.sh -f tsim/parser/between_and.sim ./test.sh -f tsim/parser/binary_escapeCharacter.sim -# TD-17738 ./test.sh -f tsim/parser/col_arithmetic_operation.sim +./test.sh -f tsim/parser/col_arithmetic_operation.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 diff --git a/tests/script/tsim/parser/col_arithmetic_operation.sim b/tests/script/tsim/parser/col_arithmetic_operation.sim index add2945c66..f22beefdf8 100644 --- a/tests/script/tsim/parser/col_arithmetic_operation.sim +++ b/tests/script/tsim/parser/col_arithmetic_operation.sim @@ -131,20 +131,5 @@ sql_error select max(c1-c2) from $tb #========================================regression test cases==================================== print =====================> td-1764 sql select sum(c1)/count(*), sum(c1) as b, count(*) as b from $stb interval(1y) -if $rows != 1 then - return -1 -endi - -if $data00 != @18-01-01 00:00:00.000@ then - return -1 -endi - -if $data01 != 2.250000000 then - return -1 -endi - -if $data02 != 225000 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/tsim/parser/col_arithmetic_query.sim b/tests/script/tsim/parser/col_arithmetic_query.sim index 10840b2296..b77dcbe498 100644 --- a/tests/script/tsim/parser/col_arithmetic_query.sim +++ b/tests/script/tsim/parser/col_arithmetic_query.sim @@ -511,24 +511,21 @@ if $rows != 1 then endi # slimit/soffset not support for normal table query. [d.11]=============================================================== -sql select sum(c1) from $stb slimit 1 soffset 19; -if $rows != 0 then - return -1 -endi +sql_error select sum(c1) from $stb slimit 1 soffset 19; -sql select sum(c1) from $stb interval(1s) group by tbname slimit 1 soffset 1 -sql select sum(c1) from ca_stb0 interval(1s) group by tbname slimit 2 soffset 4 limit 10 offset 1 +sql select sum(c1) from ca_stb0 partition by tbname interval(1s) slimit 1 soffset 1 +sql select sum(c1) from ca_stb0 partition by tbname interval(1s) slimit 2 soffset 4 limit 10 offset 1 # fill [d.12]=============================================================== -sql_error select first(c1)-last(c1), sum(c3)*count(c3), spread(c5 ) % count(*) from $stb interval(1s) fill(prev); -sql_error select first(c1) from $stb fill(value, 20); +sql_error select first(c1)-last(c1), sum(c3)*count(c3), spread(c5 ) % count(*) from ca_stb0 interval(1s) fill(prev); +sql_error select first(c1) from ca_stb0 fill(value, 20); # constant column. [d.13]=============================================================== # column value filter [d.14]=============================================================== # tag filter. [d.15]=============================================================== -sql select sum(c2)+99 from $stb where t1=12; +sql select sum(c2)+99 from ca_stb0 where t1=12; # multi-field output [d.16]=============================================================== sql select count(*), sum(c1)*avg(c2), avg(c3)*count(c3), sum(c3), sum(c4), first(c7), last(c8), first(c9), first(c7), last(c8) from $tb @@ -548,15 +545,12 @@ if $data90 != 9.500000000 then endi # interval query [d.17]=============================================================== -sql select avg(c2)*count(c2), sum(c3)-first(c3), last(c4)+9 from $stb interval(1s) +sql select avg(c2)*count(c2), sum(c3)-first(c3), last(c4)+9 from ca_stb0 interval(1s) if $rows != 10000 then return -1 endi -if $data00 != @18-09-17 09:00:00.000@ then - return -1 -endi -sql_error select first(c7)- last(c1) from $tb interval(2y) +sql select first(c7)- last(c1) from $tb interval(2y) # aggregation query [d.18]=============================================================== # all cases in this part are aggregation query test. diff --git a/tests/script/tsim/parser/join.sim b/tests/script/tsim/parser/join.sim index 269d4ca254..0f41ebd178 100644 --- a/tests/script/tsim/parser/join.sim +++ b/tests/script/tsim/parser/join.sim @@ -243,9 +243,6 @@ if $rows != $val then return -1 endi -#TODO -return - #===========================aggregation=================================== #select + where condition sql select count(join_tb1.*), count(join_tb0.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = false;