From 31b3c61b9f26c612e91728dc70328a4fddda95dc Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Aug 2022 09:53:04 +0800
Subject: [PATCH 1/3] test: adjust case

---
 tests/script/jenkins/basic.txt             | 8 ++++----
 tests/script/tsim/table/delete_writing.sim | 4 ----
 tests/script/tsim/table/smallint.sim       | 1 -
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 910b99ace3..82e9c1e14d 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -183,7 +183,7 @@
 # ---- qnode
 ./test.sh -f tsim/qnode/basic1.sim
 
-# ---- snode
+# ---- snode ----
 # unsupport ./test.sh -f tsim/snode/basic1.sim
 
 # ---- bnode
@@ -199,7 +199,7 @@
 # ---- show ----
 ./test.sh -f tsim/show/basic.sim
 
-# ---- table
+# ---- table ----
 ./test.sh -f tsim/table/autocreate.sim
 ./test.sh -f tsim/table/basic1.sim
 ./test.sh -f tsim/table/basic2.sim
@@ -248,7 +248,7 @@
 ./test.sh -f tsim/stream/ignoreExpiredData.sim
 ./test.sh -f tsim/stream/sliding.sim
 
-# ---- transaction
+# ---- transaction ----
 ./test.sh -f tsim/trans/lossdata1.sim
 ./test.sh -f tsim/trans/create_db.sim
 
@@ -307,7 +307,7 @@
 ./test.sh -f tsim/sma/rsmaCreateInsertQuery.sim
 ./test.sh -f tsim/sma/rsmaPersistenceRecovery.sim
 
-# --- valgrind
+# --- valgrind ----
 ./test.sh -f tsim/valgrind/checkError1.sim
 ./test.sh -f tsim/valgrind/checkError2.sim
 ./test.sh -f tsim/valgrind/checkError3.sim
diff --git a/tests/script/tsim/table/delete_writing.sim b/tests/script/tsim/table/delete_writing.sim
index df7c7f47e8..2f11424e8a 100644
--- a/tests/script/tsim/table/delete_writing.sim
+++ b/tests/script/tsim/table/delete_writing.sim
@@ -3,10 +3,6 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ========= start dnodes
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
 sql create database db 
 sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
diff --git a/tests/script/tsim/table/smallint.sim b/tests/script/tsim/table/smallint.sim
index 87140c561a..a7547c7282 100644
--- a/tests/script/tsim/table/smallint.sim
+++ b/tests/script/tsim/table/smallint.sim
@@ -90,7 +90,6 @@ endi
 if $data01 != 2 then 
   return -1
 endi
-return
 sql drop database $db
 sql show databases
 if $rows != 2 then 

From d0487750c03f847418e309e98c621514a348b6ae Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Aug 2022 13:57:01 +0800
Subject: [PATCH 2/3] test: valgrind case

---
 tests/script/tsim/valgrind/basic3.sim      | 30 +++++++++++++++++++---
 tests/script/tsim/valgrind/checkError6.sim |  5 ++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/tests/script/tsim/valgrind/basic3.sim b/tests/script/tsim/valgrind/basic3.sim
index b9ed1641c8..d1877776b3 100644
--- a/tests/script/tsim/valgrind/basic3.sim
+++ b/tests/script/tsim/valgrind/basic3.sim
@@ -29,7 +29,7 @@ $rowNum = 10
 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) tags (tgcol int unsigned)
+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)
 
 $i = 0
 while $i < $tbNum
@@ -39,17 +39,39 @@ while $i < $tbNum
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
-    sql insert into $tb values ($ms , $x , $x , $x ) 
+    sql insert into $tb values ($ms , $x , $x , $x , "abcd1234=-+*" , "123456 0" ) 
     $x = $x + 1
   endw 
+
+  $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 count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from tb1 where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
+sql select tbcol5 - tbcol3 from tb1
 
 print =============== step4: stb
-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
+
+print =============== check
+$null=
+
+system_content sh/checkValgrind.sh -n dnode1 
+print cmd return result ----> [ $system_content ]
+if $system_content > 0 then
+  return -1
+endi 
+
+if $system_content == $null then
+  return -1
+endi 
+
+print =============== restart
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start -v
+sql select last_row(tbcol), stddev(tbcol) from stb where tbcol > 5 and tbcol < 20 group by tgcol
 
 _OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/valgrind/checkError6.sim b/tests/script/tsim/valgrind/checkError6.sim
index 7a16f5668a..2682d7450b 100644
--- a/tests/script/tsim/valgrind/checkError6.sim
+++ b/tests/script/tsim/valgrind/checkError6.sim
@@ -77,6 +77,8 @@ sql select length("abcd1234"), char_length("abcd1234=-+*") from tb1
 sql select tbcol4, length(tbcol4), lower(tbcol4), upper(tbcol4), ltrim(tbcol4), rtrim(tbcol4), concat(tbcol4, tbcol5), concat_ws('_', tbcol4, tbcol5), substr(tbcol4, 1, 4)  from tb1
 sql select * from tb1 where tbcol not in (1,2,3,null);
 sql select * from tb1 where tbcol + 3 <> null;
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from tb1 where ts <= 1601481840000 and ts >= 1601481800000 partition by tgcol interval(1m) fill(value, 0)
+#sql select tbcol5 - tbcol3 from tb1
 
 print =============== step4: stb
 sql select avg(tbcol) as c from stb
@@ -105,6 +107,9 @@ sql select tbcol4, length(tbcol4), lower(tbcol4), upper(tbcol4), ltrim(tbcol4),
 sql select * from stb where tbcol not in (1,2,3,null);
 sql select * from stb where tbcol + 3 <> null;
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from stb where tbcol = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol interval(1d)
+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
 
 print =============== step5: explain
 sql explain analyze select ts from stb where -2;

From 3852aa7498f298942d280f5966342342e29d2a7b Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Aug 2022 14:04:49 +0800
Subject: [PATCH 3/3] test: valgrind case

---
 tests/script/tsim/valgrind/basic3.sim | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/tests/script/tsim/valgrind/basic3.sim b/tests/script/tsim/valgrind/basic3.sim
index d1877776b3..0913691a11 100644
--- a/tests/script/tsim/valgrind/basic3.sim
+++ b/tests/script/tsim/valgrind/basic3.sim
@@ -55,25 +55,6 @@ sql select tbcol5 - tbcol3 from tb1
 print =============== step4: stb
 sql select tbcol5 - tbcol3 from stb
 
-print =============== check
-$null=
-
-system_content sh/checkValgrind.sh -n dnode1 
-print cmd return result ----> [ $system_content ]
-if $system_content > 0 then
-  return -1
-endi 
-
-if $system_content == $null then
-  return -1
-endi 
-
-print =============== restart
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode1 -s start -v
-sql select last_row(tbcol), stddev(tbcol) from stb where tbcol > 5 and tbcol < 20 group by tgcol
-
-_OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 print =============== check
 $null=