From 5b96fee400e5d5f6a495e1974605211944f9bad3 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 27 Jul 2022 14:41:05 +0800
Subject: [PATCH] test: recover case

---
 tests/script/jenkins/basic.txt        |  4 +--
 tests/script/tsim/parser/function.sim | 46 ++++++---------------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 4ec3a14cc8..99beabe9ee 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -110,7 +110,7 @@
 ./test.sh -f tsim/parser/fill.sim
 ./test.sh -f tsim/parser/first_last.sim
 ./test.sh -f tsim/parser/fourArithmetic-basic.sim
-# TD-17659 ./test.sh -f tsim/parser/function.sim
+./test.sh -f tsim/parser/function.sim
 ./test.sh -f tsim/parser/groupby-basic.sim
 ./test.sh -f tsim/parser/groupby.sim
 ./test.sh -f tsim/parser/having_child.sim
@@ -145,7 +145,7 @@
 ./test.sh -f tsim/parser/select_across_vnodes.sim
 ./test.sh -f tsim/parser/select_distinct_tag.sim
 ./test.sh -f tsim/parser/select_from_cache_disk.sim
-# TD-17659 ./test.sh -f tsim/parser/select_with_tags.sim
+# TD-17832 ./test.sh -f tsim/parser/select_with_tags.sim
 ./test.sh -f tsim/parser/selectResNum.sim
 ./test.sh -f tsim/parser/set_tag_vals.sim
 ./test.sh -f tsim/parser/single_row_in_tb.sim
diff --git a/tests/script/tsim/parser/function.sim b/tests/script/tsim/parser/function.sim
index 7927715988..80512b9b3e 100644
--- a/tests/script/tsim/parser/function.sim
+++ b/tests/script/tsim/parser/function.sim
@@ -826,7 +826,7 @@ sql select derivative(k, 200a, 0) from tm0;
 sql select derivative(k, 999a, 0) from tm0;
 sql_error select derivative(k, 20s, -12) from tm0;
 
-sql select derivative(k, 1s, 0) from tm0
+sql select ts, derivative(k, 1s, 0) from tm0
 if $rows != 5 then
   return -1
 endi
@@ -858,7 +858,7 @@ if $data31 != -0.000236111 then
   return -1
 endi
 
-sql select derivative(k, 6m, 0) from tm0;
+sql select ts ,derivative(k, 6m, 0) from tm0;
 if $rows != 5 then
   return -1
 endi
@@ -888,7 +888,7 @@ if $data31 != -0.085000000 then
   return -1
 endi
 
-sql select derivative(k, 12m, 0) from tm0;
+sql select ts, derivative(k, 12m, 0) from tm0;
 if $rows != 5 then
   return -1
 endi
@@ -938,44 +938,17 @@ sql insert into t1 values('2020-1-1 1:1:6', 200);
 sql insert into t1 values('2020-1-1 1:1:8', 2000);
 sql insert into t1 values('2020-1-1 1:1:10', 20000);
 
-sql_error select derivative(k, 1s, 0) from m1;
+sql select derivative(k, 1s, 0) from m1;
 sql_error select derivative(k, 1s, 0) from m1 group by a;
 sql_error select derivative(f1, 1s, 0) from (select k from t1);
 
-sql select derivative(k, 1s, 0) from m1 group by tbname
-if $rows != 12 then
-  return -1
-endi
-if $data00 != @20-01-01 01:01:03.000@ then
-  return -1
-endi
-if $data01 != 1.000000000 then
-  return -1
-endi
-if $data02 != @t0@ then
-  return -1
-endi
-if $data10 != @20-01-01 01:02:04.000@ then
-  return -1
-endi
-if $data11 != 0.016393443 then
-  return -1
-endi
-if $data12 != t0 then
-  return -1
-endi
-if $data90 != @20-01-01 01:01:06.000@ then
-  return -1
-endi
-if $data91 != 90.000000000 then
-  return -1
-endi
-if $data92 != t1 then
+sql select ts, derivative(k, 1s, 0) from m1
+if $rows != 13 then
   return -1
 endi
 
 print =========================>TD-5190
-sql select stddev(f1) from st1 where ts>'2021-07-01 1:1:1' and ts<'2021-07-30 00:00:00' interval(1d) fill(NULL);
+sql select _wstart, stddev(f1) from st1 where ts>'2021-07-01 1:1:1' and ts<'2021-07-30 00:00:00' interval(1d) fill(NULL);
 if $rows != 29 then
   return -1
 endi
@@ -986,7 +959,7 @@ if $data01 != NULL then
   return -1
 endi
 
-sql select derivative(test_column_alias_name, 1s, 0) from (select avg(k) test_column_alias_name from t1 interval(1s));
+sql_error select derivative(test_column_alias_name, 1s, 0) from (select avg(k) test_column_alias_name from t1 interval(1s));
 
 sql create table smeters (ts timestamp, current float, voltage int) tags (t1 int);
 sql create table smeter1 using smeters tags (1);
@@ -994,7 +967,7 @@ sql insert into smeter1 values ('2021-08-08 10:10:10', 10, 2);
 sql insert into smeter1 values ('2021-08-08 10:10:12', 10, 2);
 sql insert into smeter1 values ('2021-08-08 10:10:14', 20, 1);
 
-sql select stddev(voltage) from smeters where ts>='2021-08-08 10:10:10.000' and ts < '2021-08-08 10:10:20.000'  and current=10 interval(1000a);
+sql select _wstart, stddev(voltage) from smeters where ts>='2021-08-08 10:10:10.000' and ts < '2021-08-08 10:10:20.000'  and current=10 interval(1000a);
 if $rows != 2 then
   return -1
 endi
@@ -1019,3 +992,4 @@ if $data00 != 0.000000000 then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file