Merge pull request #15618 from taosdata/fix/valgrind

test: adjust case

tests/script/jenkins/basic.txt

@@ -27,7 +27,7 @@
 ./test.sh -f tsim/db/delete_writing2.sim
 # unsupport ./test.sh -f tsim/db/dropdnodes.sim
 ./test.sh -f tsim/db/error1.sim
-# TD-17592 ./test.sh -f tsim/db/keep.sim
+./test.sh -f tsim/db/keep.sim
 ./test.sh -f tsim/db/len.sim
 ./test.sh -f tsim/db/repeat.sim
 ./test.sh -f tsim/db/show_create_db.sim
@@ -89,7 +89,7 @@
 ./test.sh -f tsim/parser/alter_column.sim
 ./test.sh -f tsim/parser/alter_stable.sim
 ./test.sh -f tsim/parser/alter.sim
-# TD-17959 ./test.sh -f tsim/parser/alter1.sim
+./test.sh -f tsim/parser/alter1.sim
 ./test.sh -f tsim/parser/auto_create_tb_drop_tb.sim
 ./test.sh -f tsim/parser/auto_create_tb.sim
 ./test.sh -f tsim/parser/between_and.sim
@@ -131,8 +131,8 @@
 ./test.sh -f tsim/parser/insert_tb.sim
 # TD-17038 ./test.sh -f tsim/parser/interp.sim
 ./test.sh -f tsim/parser/join_manyblocks.sim
-# TD-17713 ./test.sh -f tsim/parser/join_multitables.sim
-# TD-17713 ./test.sh -f tsim/parser/join_multivnode.sim
+# TD-18018 ./test.sh -f tsim/parser/join_multitables.sim
+./test.sh -f tsim/parser/join_multivnode.sim
 # TD-17707 ./test.sh -f tsim/parser/join.sim
 ./test.sh -f tsim/parser/last_cache.sim
 ./test.sh -f tsim/parser/last_groupby.sim
@@ -421,7 +421,7 @@
 ./test.sh -f tsim/tag/3.sim
 ./test.sh -f tsim/tag/4.sim
 ./test.sh -f tsim/tag/5.sim
-# TD-17382 ./test.sh -f tsim/tag/6.sim
+./test.sh -f tsim/tag/6.sim
 ./test.sh -f tsim/tag/add.sim
 ./test.sh -f tsim/tag/bigint.sim
 ./test.sh -f tsim/tag/binary_binary.sim
@@ -429,18 +429,18 @@
 ./test.sh -f tsim/tag/bool_binary.sim
 ./test.sh -f tsim/tag/bool_int.sim
 ./test.sh -f tsim/tag/bool.sim
-# TD-17407 ./test.sh -f tsim/tag/change.sim
+./test.sh -f tsim/tag/change.sim
 ./test.sh -f tsim/tag/column.sim
 ./test.sh -f tsim/tag/commit.sim
-# TD-17407 ./test.sh -f tsim/tag/create.sim
-# TD-17407 ./test.sh -f tsim/tag/delete.sim
-# TD-17407 ./test.sh -f tsim/tag/double.sim
+./test.sh -f tsim/tag/create.sim
+./test.sh -f tsim/tag/delete.sim
+./test.sh -f tsim/tag/double.sim
 ./test.sh -f tsim/tag/filter.sim
-# TD-17407 ./test.sh -f tsim/tag/float.sim
+./test.sh -f tsim/tag/float.sim
 ./test.sh -f tsim/tag/int_binary.sim
 ./test.sh -f tsim/tag/int_float.sim
 ./test.sh -f tsim/tag/int.sim
-# TD-17959 ./test.sh -f tsim/tag/set.sim
+./test.sh -f tsim/tag/set.sim
 ./test.sh -f tsim/tag/smallint.sim
 ./test.sh -f tsim/tag/tinyint.sim
 

tests/script/tsim/db/keep.sim

@@ -63,12 +63,10 @@ print ===> rows $rows last $data01
 if $rows >= 80 then
 	return -1
 endi
-if $rows <= 50 then
+if $rows <= 45 then
 	return -1
 endi
 
-return
-
 print ======== step5 stop dnode
 system sh/exec.sh -n dnode2 -s stop -x SIGKILL
 system sh/exec.sh -n dnode2 -s start
@@ -78,7 +76,7 @@ print ===> rows $rows last $data01
 if $rows >= 80 then
 	return -1
 endi
-if $rows <= 50 then
+if $rows <= 45 then
 	return -1
 endi
 
@@ -109,8 +107,8 @@ print ======== step8 insert data
 $x = 81
 while $x < 121
   $time = $x . d
-  sql insert into tb values (now - $time , $x ) -x step4
-  step4:
+  sql insert into tb values (now - $time , $x ) -x step8
+  step8:
   $x = $x + 1
 endw 
 

tests/script/tsim/tag/create.sim

@@ -179,7 +179,7 @@ $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)
 sql create table $tb using $mt tags( 1, 2 )
 sql insert into $tb values(now, 1)  
-sql select * from $mt where tgcol2 = 2
+sql select * from $mt where tgcol2 = 1
 if $rows != 1 then
   print expect 1, actual: $rows
   return -1
@@ -453,7 +453,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-sql select * from $mt where tgcol2 = 2
+sql select * from $mt where tgcol2 = 1
 if $rows != 1 then 
   return -1
 endi

tests/script/tsim/valgrind/checkError6.sim

@@ -106,7 +106,17 @@ sql select * from stb where tbcol not in (1,2,3,null);
 sql select * from stb where tbcol + 3 <> null;
 
 print =============== step5: explain
-
+sql explain analyze select ts from stb where -2;
+sql explain analyze select ts from tb1;
+sql explain analyze select ts from stb order by ts;
+sql explain analyze select * from information_schema.user_stables;
+sql explain analyze select count(*),sum(tbcol) from tb1;
+sql explain analyze select count(*),sum(tbcol) from stb;
+sql explain analyze select count(*),sum(tbcol) from stb group by tbcol;
+sql explain analyze select * from information_schema.user_stables;
+sql explain analyze verbose true select * from information_schema.user_stables where db_name='db2';
+sql explain analyze verbose true select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from stb where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
+sql explain select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from stb where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
 
 print =============== check
 $null=