From 7eadfb2188a641a2d74c5c6dff2d93cd48620987 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 1 Aug 2022 10:25:54 +0800
Subject: [PATCH 1/4] test: valgrind case

---
 tests/script/jenkins/basic.txt                 |  2 +-
 .../{query/udf.sim => valgrind/checkUdf.sim}   | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)
 rename tests/script/tsim/{query/udf.sim => valgrind/checkUdf.sim} (91%)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 462cf8cfc6..63742fa98b 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -179,7 +179,6 @@
 ./test.sh -f tsim/query/scalarFunction.sim
 ./test.sh -f tsim/query/scalarNull.sim
 ./test.sh -f tsim/query/session.sim
-./test.sh -f tsim/query/udf.sim
 
 # ---- qnode
 ./test.sh -f tsim/qnode/basic1.sim
@@ -316,6 +315,7 @@
 ./test.sh -f tsim/valgrind/checkError5.sim
 ./test.sh -f tsim/valgrind/checkError6.sim
 ./test.sh -f tsim/valgrind/checkError7.sim
+./test.sh -f tsim/valgrind/checkUdf.sim
 
 # --- vnode
 # unsupport ./test.sh -f tsim/vnode/replica3_basic.sim
diff --git a/tests/script/tsim/query/udf.sim b/tests/script/tsim/valgrind/checkUdf.sim
similarity index 91%
rename from tests/script/tsim/query/udf.sim
rename to tests/script/tsim/valgrind/checkUdf.sim
index 5d69887c86..1026bad3d0 100644
--- a/tests/script/tsim/query/udf.sim
+++ b/tests/script/tsim/valgrind/checkUdf.sim
@@ -1,8 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c udf -v 1
-
-print ========= start dnode1 as leader
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
@@ -149,4 +147,18 @@ if $rows != 0 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGTERM
+_OVER:
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+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 
+

From 5a0ce7f0337fdb6f7ff7450850d05d6c4d248f0a Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 1 Aug 2022 11:35:31 +0800
Subject: [PATCH 2/4] test: valgrind case

---
 tests/script/jenkins/basic.txt             | 4 ++--
 tests/script/tsim/valgrind/checkError6.sim | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 63742fa98b..0b47c0894c 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -339,7 +339,7 @@
 # --- catalog ----
 ./test.sh -f tsim/catalog/alterInCurrent.sim
 
-# --- scalar
+# --- scalar ----
 ./test.sh -f tsim/scalar/in.sim
 ./test.sh -f tsim/scalar/scalar.sim
 
@@ -384,7 +384,7 @@
 ./test.sh -f tsim/compute/sum.sim
 ./test.sh -f tsim/compute/top.sim
 
-# ---- field
+# ---- field ----
 ./test.sh -f tsim/field/2.sim
 ./test.sh -f tsim/field/3.sim
 ./test.sh -f tsim/field/4.sim
diff --git a/tests/script/tsim/valgrind/checkError6.sim b/tests/script/tsim/valgrind/checkError6.sim
index eccf5b31f3..96b84c331c 100644
--- a/tests/script/tsim/valgrind/checkError6.sim
+++ b/tests/script/tsim/valgrind/checkError6.sim
@@ -104,6 +104,7 @@ sql select length("abcd1234"), char_length("abcd1234=-+*") from stb
 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 stb
 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 $mt where tbcol = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol3 interval(1d) order by tgcol3 desc
 
 print =============== step5: explain
 sql explain analyze select ts from stb where -2;
@@ -118,6 +119,11 @@ sql explain analyze verbose true select * from information_schema.user_stables w
 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 =============== step6: in cast
+sql select 1+1n;
+sql select cast(1 as timestamp)+1n;
+sql select cast(1 as timestamp)+1y;
+
 print =============== check
 $null=
 

From 0f008389c51f538563006a0f82082c7a33a02fa7 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 1 Aug 2022 11:56:58 +0800
Subject: [PATCH 3/4] test: adjust case

---
 tests/script/tsim/db/basic3.sim | 98 ++++++++++++++-------------------
 1 file changed, 40 insertions(+), 58 deletions(-)

diff --git a/tests/script/tsim/db/basic3.sim b/tests/script/tsim/db/basic3.sim
index 1170406a5c..17faee993c 100644
--- a/tests/script/tsim/db/basic3.sim
+++ b/tests/script/tsim/db/basic3.sim
@@ -1,69 +1,51 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c debugflag -v 131
-system sh/exec.sh -n dnode1 -s start -v
+system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print =============== step1: create drop show dnodes
-$x = 0
-step1:
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-	  print ---> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ---> $data00 $data01 $data02 $data03 $data04 $data05
-if $rows != 1 then
+print =============== create database d1
+sql create database d1
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql create table d1.t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 3 then
   return -1
 endi
-if $data(1)[4] != ready then
-  goto step1
+
+if $data20 != d1 then
+  return -1
 endi
 
-$tbPrefix = tb
-$tbNum = 5
-$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, tbcol4 binary(30), tbcol5 binary(30)) tags (tgcol int unsigned)
-
-$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 
-
-  $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 tbcol5 - tbcol tbcol from tb1 
-sql select tbcol2 - tbcol tbcol from tb1 
-
-_OVER:
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-print =============== check
-$null=
-
-system_content sh/checkValgrind.sh -n dnode1 
-print cmd return result ----> [ $system_content ]
-if $system_content > 0 then
+if $data22 != 2 then
   return -1
-endi 
+endi
 
-if $system_content == $null then
+#if $data03 != 4 then 
+#  return -1
+#endi
+
+sql show d1.tables
+if $rows != 4 then 
   return -1
-endi 
+endi
+
+print =============== create database d2
+sql create database d2
+sql create table d2.t1 (ts timestamp, i int);
+sql create table d2.t2 (ts timestamp, i int);
+sql create table d2.t3 (ts timestamp, i int);
+
+sql show databases
+if $rows != 4 then
+  return -1
+endi
+
+sql show d2.tables
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

From 55ec129f0c8ac99a8e463c3de392bee955ba556f Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 1 Aug 2022 12:00:47 +0800
Subject: [PATCH 4/4] test: valgrind case

---
 tests/script/tsim/valgrind/checkError6.sim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/script/tsim/valgrind/checkError6.sim b/tests/script/tsim/valgrind/checkError6.sim
index 96b84c331c..df5e46da8b 100644
--- a/tests/script/tsim/valgrind/checkError6.sim
+++ b/tests/script/tsim/valgrind/checkError6.sim
@@ -104,7 +104,7 @@ sql select length("abcd1234"), char_length("abcd1234=-+*") from stb
 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 stb
 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 $mt where tbcol = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol3 interval(1d) order by tgcol3 desc
+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)
 
 print =============== step5: explain
 sql explain analyze select ts from stb where -2;