Merge pull request #15909 from taosdata/fix/valgrind

test: adjust valgrind case

tests/script/jenkins/basic.txt

@@ -84,7 +84,7 @@
 ./test.sh -f tsim/insert/update0.sim
 ./test.sh -f tsim/insert/update1_sort_merge.sim
 
-# ---- parser
+# ---- parser ----
 ./test.sh -f tsim/parser/alter__for_community_version.sim
 ./test.sh -f tsim/parser/alter_column.sim
 ./test.sh -f tsim/parser/alter_stable.sim
@@ -106,7 +106,7 @@
 ./test.sh -f tsim/parser/commit.sim
 ./test.sh -f tsim/parser/condition.sim
 ./test.sh -f tsim/parser/constCol.sim
-#./test.sh -f tsim/parser/create_db.sim
+./test.sh -f tsim/parser/create_db.sim
 ./test.sh -f tsim/parser/create_mt.sim
 ./test.sh -f tsim/parser/create_tb_with_tag_name.sim
 ./test.sh -f tsim/parser/create_tb.sim
@@ -129,7 +129,7 @@
 ./test.sh -f tsim/parser/import.sim
 ./test.sh -f tsim/parser/insert_multiTbl.sim
 ./test.sh -f tsim/parser/insert_tb.sim
-# TD-17038 ./test.sh -f tsim/parser/interp.sim
+# TD-18293 ./test.sh -f tsim/parser/interp.sim
 ./test.sh -f tsim/parser/join_manyblocks.sim
 ./test.sh -f tsim/parser/join_multitables.sim
 ./test.sh -f tsim/parser/join_multivnode.sim
@@ -318,7 +318,7 @@
 ./test.sh -f tsim/valgrind/checkError7.sim
 ./test.sh -f tsim/valgrind/checkUdf.sim
 
-# --- vnode
+# --- vnode ----
 # unsupport ./test.sh -f tsim/vnode/replica3_basic.sim
 # unsupport ./test.sh -f tsim/vnode/replica3_repeat.sim
 # unsupport ./test.sh -f tsim/vnode/replica3_vgroup.sim

tests/script/tsim/parser/alter1.sim

@@ -129,3 +129,5 @@ endi
 #if $rows != 0 then
 #  return -1
 #endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_bigint.sim

@@ -425,3 +425,5 @@ sql insert into st_bigint_e25 using mt_bigint tags (033) values (now, 00062)
 #sql_error alter table st_bigint_e23 set tag tagname="abc"
 #sql_error alter table st_bigint_e24 set tag tagname=" "
 #sql_error alter table st_bigint_e25 set tag tagname=''
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_bool.sim

@@ -634,3 +634,4 @@ sql alter table st_bool_i4 set tag tagname="abc"
 sql alter table st_bool_i5 set tag tagname=" "     
 sql alter table st_bool_i6 set tag tagname=''      
 
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_double.sim

@@ -528,3 +528,5 @@ sql_error alter table st_double_e22 set tag tagname=abc
 sql alter table st_double_e23 set tag tagname="abc"   
 sql alter table st_double_e24 set tag tagname=" "     
 sql alter table st_double_e25 set tag tagname=''      
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_float.sim

@@ -558,3 +558,5 @@ sql_error alter table st_float_e22 set tag tagname=abc
 sql alter table st_float_e23 set tag tagname="abc"   
 sql alter table st_float_e24 set tag tagname=" "     
 sql alter table st_float_e25 set tag tagname=''      
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_int.sim

@@ -423,3 +423,5 @@ sql_error alter table st_int_e22 set tag tagname=abc
 sql_error alter table st_int_e23 set tag tagname="abc"   
 sql_error alter table st_int_e24 set tag tagname=" "     
 sql alter table st_int_e25 set tag tagname=''      
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_smallint.sim

@@ -426,3 +426,5 @@ sql_error alter table st_smallint_e22 set tag tagname=abc
 sql_error alter table st_smallint_e23 set tag tagname="abc"   
 sql_error alter table st_smallint_e24 set tag tagname=" "     
 sql alter table st_smallint_e25 set tag tagname=''      
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_tinyint.sim

@@ -424,3 +424,5 @@ sql_error alter table st_tinyint_e22 set tag tagname=abc
 sql_error alter table st_tinyint_e23 set tag tagname="abc"   
 sql_error alter table st_tinyint_e24 set tag tagname=" "     
 sql alter table st_tinyint_e25 set tag tagname=''      
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/columnValue_unsign.sim

@@ -130,3 +130,4 @@ if $rows != 1 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT

tests/script/tsim/parser/create_db.sim

@@ -237,8 +237,8 @@ if $rows != 3 then
   return -1
 endi
 sql show databases
-print wallevel $data13_testwal
-if $data13_testwal != 1 then 
+print wallevel $data20_testwal
+if $data20_testwal != 1 then 
   return -1
 endi
 sql drop database testwal

tests/script/tsim/valgrind/basic3.sim

@@ -50,11 +50,11 @@ while $i < $tbNum
 endw 
 
 print =============== step3: tb
-sql select tbcol5 - tbcol3 from tb1
 
-print =============== step4: stb
-sql select tbcol5 - tbcol3 from stb
+sql select sum(tbcol) from stb partition by tbname interval(1s) slimit 1 soffset 1;
+sql select sum(tbcol) from stb partition by tbname interval(1s) slimit 2 soffset 4 limit 10 offset 1;
 
+_OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 print =============== check
 $null=

tests/script/tsim/valgrind/basic4.sim

@@ -22,41 +22,35 @@ if $data(1)[4] != ready then
   goto step1
 endi
 
-print =============== step2: create db
-sql create database d1 vgroups 2 buffer 3
-sql show databases
-sql use d1
-sql show vgroups
+$tbPrefix = tb
+$tbNum = 5
+$rowNum = 10
 
-print =============== step3: create show stable
-sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
-sql show stables
-if $rows != 1 then 
-  return -1
-endi
+print =============== step2: prepare data
+sql create database db vgroups 2
+sql use db
+sql create table if not exists stb (ts timestamp, tbcol int, tbcol2 float, tbcol3 double, tbcol4 binary(30), tbcol5 binary(30)) tags (tgcol int unsigned)
 
-print =============== step4: create show table
-sql create table ct1 using stb tags(1000)
-sql create table ct2 using stb tags(2000)
-sql create table ct3 using stb tags(3000)
-sql show tables
-if $rows != 3 then 
-  return -1
-endi
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using stb tags( $i )
+  $x = 0
+  while $x < $rowNum
+    $cc = $x * 60000
+    $ms = 1601481600000 + $cc
+    sql insert into $tb values ($ms , $x , $x , $x , "abcd1234=-+*" , "123456 0" ) 
+    $x = $x + 1
+  endw 
 
-print =============== step5: insert data (null / update)
-sql insert into ct1 values(now+0s, 10, 2.0, 3.0)
-sql insert into ct1 values(now+1s, 11, 2.1, NULL)(now+2s, -12, -2.2, -3.2)(now+3s, -13, -2.3, -3.3)
-sql insert into ct2 values(now+0s, 10, 2.0, 3.0)
-sql insert into ct2 values(now+1s, 11, 2.1, 3.1)(now+2s, -12, -2.2, -3.2)(now+3s, -13, -2.3, -3.3)
-sql insert into ct3 values('2021-01-01 00:00:00.000', NULL, NULL, 3.0)
-sql insert into ct3 values('2022-03-02 16:59:00.010', 3  , 4, 5), ('2022-03-02 16:59:00.010', 33 , 4, 5), ('2022-04-01 16:59:00.011', 4,  4, 5), ('2022-04-01 16:59:00.011', 6,  4, 5), ('2022-03-06 16:59:00.013', 8,  4, 5);
-sql insert into ct3 values('2022-03-02 16:59:00.010', 103, 1, 2), ('2022-03-02 16:59:00.010', 303, 3, 4), ('2022-04-01 16:59:00.011', 40, 5, 6), ('2022-04-01 16:59:00.011', 60, 4, 5), ('2022-03-06 16:59:00.013', 80, 4, 5);
-
-print =============== step6: query data=
-
-sql select * from stb where t1 between 1000 and 2500
+  $cc = $x * 60000
+  $ms = 1601481600000 + $cc
+  sql insert into $tb values ($ms , NULL , NULL , NULL , NULL , NULL ) 
+  $i = $i + 1
+endw 
 
+print =============== step3: tb
+sql select distinct(tbname), tgcol from stb;
 
 _OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/valgrind/checkError6.sim

@@ -111,6 +111,9 @@ sql select _wstart, count(*) from tb1 session(ts, 1m)
 sql 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 select tbcol5 - tbcol3 from stb
 
+sql select spread( tbcol2 )/44, spread(tbcol2), 0.204545455 * 44 from stb;
+sql select min(tbcol) * max(tbcol) /4, sum(tbcol2) * apercentile(tbcol2, 20), apercentile(tbcol2, 33) + 52/9 from stb;
+
 print =============== step5: explain
 sql explain analyze select ts from stb where -2;
 sql explain analyze select ts from tb1;