From 167673e5091d510898f47ec9d94ead98b3321515 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 25 Aug 2022 11:08:14 +0800
Subject: [PATCH] Merge branch '3.0' into fix/TD-18617

---
 tests/script/tsim/query/complex_group.sim  |  2 +-
 tests/script/tsim/query/complex_having.sim |  2 +-
 tests/script/tsim/query/complex_limit.sim  |  2 +-
 tests/script/tsim/query/complex_select.sim |  2 +-
 tests/script/tsim/query/complex_where.sim  |  2 +-
 tests/script/tsim/query/crash_sql.sim      |  2 +-
 tests/script/tsim/query/diff.sim           | 18 +++++++++---------
 tests/script/tsim/query/explain.sim        | 16 ++++++++--------
 tests/script/tsim/query/interval.sim       |  2 +-
 tests/script/tsim/query/scalarFunction.sim |  6 +++---
 tests/script/tsim/query/scalarNull.sim     |  2 +-
 tests/script/tsim/query/session.sim        | 12 ++++++------
 tests/script/tsim/query/stddev.sim         |  2 +-
 tests/script/tsim/query/time_process.sim   |  2 +-
 tests/script/tsim/query/udf.sim            |  2 +-
 15 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/tests/script/tsim/query/complex_group.sim b/tests/script/tsim/query/complex_group.sim
index 3dad8059cd..d7d14c0ee8 100644
--- a/tests/script/tsim/query/complex_group.sim
+++ b/tests/script/tsim/query/complex_group.sim
@@ -454,4 +454,4 @@ if $rows != 1 then
     return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/complex_having.sim b/tests/script/tsim/query/complex_having.sim
index 9e28c3803e..4c0af6d10c 100644
--- a/tests/script/tsim/query/complex_having.sim
+++ b/tests/script/tsim/query/complex_having.sim
@@ -365,4 +365,4 @@ if $rows != 1 then
     return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/complex_limit.sim b/tests/script/tsim/query/complex_limit.sim
index 2a90e7ff1d..acb133f650 100644
--- a/tests/script/tsim/query/complex_limit.sim
+++ b/tests/script/tsim/query/complex_limit.sim
@@ -508,4 +508,4 @@ if $rows != 1 then
     return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/complex_select.sim b/tests/script/tsim/query/complex_select.sim
index f4c9877bfd..b7697e5cab 100644
--- a/tests/script/tsim/query/complex_select.sim
+++ b/tests/script/tsim/query/complex_select.sim
@@ -558,4 +558,4 @@ if $data00 != 33 then
 endi
 
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/complex_where.sim b/tests/script/tsim/query/complex_where.sim
index bda1c036f0..847f67ed34 100644
--- a/tests/script/tsim/query/complex_where.sim
+++ b/tests/script/tsim/query/complex_where.sim
@@ -669,4 +669,4 @@ if $rows != 1 then
     return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/crash_sql.sim b/tests/script/tsim/query/crash_sql.sim
index 1d20491869..169f2e7272 100644
--- a/tests/script/tsim/query/crash_sql.sim
+++ b/tests/script/tsim/query/crash_sql.sim
@@ -79,4 +79,4 @@ print ================ start query ======================
 print ================ SQL used to cause taosd or taos shell  crash
 sql_error select sum(c1) ,count(c1) from ct4 group by c1 having  sum(c10)  between 0 and 1 ;
 
-#system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+#system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/diff.sim b/tests/script/tsim/query/diff.sim
index f0d82b01e9..badd139a9f 100644
--- a/tests/script/tsim/query/diff.sim
+++ b/tests/script/tsim/query/diff.sim
@@ -25,17 +25,17 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
- 
+  endw
+
   $i = $i + 1
-endw 
+endw
 
 sleep 100
 
@@ -61,7 +61,7 @@ sql select _rowts, diff(tbcol) from $tb where ts > $ms
 print ===> rows: $rows
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 print ===> $data10 $data11 $data12 $data13 $data14 $data15
-if $data11 != 1 then 
+if $data11 != 1 then
   return -1
 endi
 
@@ -72,7 +72,7 @@ sql select _rowts, diff(tbcol) from $tb where ts <= $ms
 print ===> rows: $rows
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 print ===> $data10 $data11 $data12 $data13 $data14 $data15
-if $data11 != 1 then 
+if $data11 != 1 then
   return -1
 endi
 
@@ -82,7 +82,7 @@ sql select _rowts, diff(tbcol) as b from $tb
 print ===> rows: $rows
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 print ===> $data10 $data11 $data12 $data13 $data14 $data15
-if $data11 != 1 then 
+if $data11 != 1 then
   return -1
 endi
 
@@ -107,4 +107,4 @@ if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/explain.sim b/tests/script/tsim/query/explain.sim
index 30a857815c..2871252d91 100644
--- a/tests/script/tsim/query/explain.sim
+++ b/tests/script/tsim/query/explain.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database db1 vgroups 3;
 sql use db1;
 sql select * from information_schema.ins_databases;
@@ -30,7 +30,7 @@ sql insert into tb4 values (now, 4, "Bitmap Heap Scan on tenk1 t1  (cost=5.07..2
 #sql insert into tb4 values (now, 4, "Bitmap Heap Scan on tenk1 t1  (cost=5.07..229.20 rows=101 width=244) (actual time=0.080..0.526 rows=100 loops=1)");
 
 
-print ======== step2 
+print ======== step2
 sql explain select * from st1 where -2;
 sql explain select ts from tb1;
 sql explain select * from st1;
@@ -41,14 +41,14 @@ sql explain select count(*),sum(f1) from st1;
 sql explain select count(*),sum(f1) from st1 group by f1;
 #sql explain select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev);
 
-print ======== step3 
+print ======== step3
 sql explain verbose true select * from st1 where -2;
 sql explain verbose true select ts from tb1 where f1 > 0;
 sql explain verbose true select * from st1 where f1 > 0 and ts > '2020-10-31 00:00:00' and ts < '2021-10-31 00:00:00';
 sql explain verbose true select count(*) from st1 partition by tbname slimit 1 soffset 2 limit 2 offset 1;
 sql explain verbose true select * from information_schema.ins_stables where db_name='db2';
 
-print ======== step4 
+print ======== step4
 sql explain analyze select ts from st1 where -2;
 sql explain analyze select ts from tb1;
 sql explain analyze select ts from st1;
@@ -59,7 +59,7 @@ sql explain analyze select count(*),sum(f1) from tb1;
 sql explain analyze select count(*),sum(f1) from st1;
 sql explain analyze select count(*),sum(f1) from st1 group by f1;
 
-print ======== step5 
+print ======== step5
 sql explain analyze verbose true select ts from st1 where -2;
 sql explain analyze verbose true select ts from tb1;
 sql explain analyze verbose true select ts from st1;
@@ -87,12 +87,12 @@ sql explain analyze verbose true select count(f1) from st1 group by tbname;
 #sql explain select * from tb1, tb2 where tb1.ts=tb2.ts;
 #sql explain select * from st1, st2 where tb1.ts=tb2.ts;
 #sql explain analyze verbose true select sum(a+b) from (select _rowts, min(f1) b,count(*) a from st1 where f1 > 0 interval(1a)) where a < 0 interval(1s);
-#sql explain select min(f1) from st1 interval(1m, 2a) sliding(30s); 
+#sql explain select min(f1) from st1 interval(1m, 2a) sliding(30s);
 #sql explain verbose true select count(*),sum(f1) from st1 where f1 > 0 and ts > '2021-10-31 00:00:00' group by f1 having sum(f1) > 0;
-#sql explain analyze select min(f1) from st1 interval(3m, 2a) sliding(1m); 
+#sql explain analyze select min(f1) from st1 interval(3m, 2a) sliding(1m);
 #sql explain analyze select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev);
 #sql explain analyze verbose true select count(*),sum(f1) from st1 where f1 > 0 and ts > '2021-10-31 00:00:00' group by f1 having sum(f1) > 0;
-#sql explain analyze verbose true select min(f1) from st1 interval(3m, 2a) sliding(1m); 
+#sql explain analyze verbose true select min(f1) from st1 interval(3m, 2a) sliding(1m);
 
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/interval.sim b/tests/script/tsim/query/interval.sim
index cc8a73daec..833da4a8ba 100644
--- a/tests/script/tsim/query/interval.sim
+++ b/tests/script/tsim/query/interval.sim
@@ -177,4 +177,4 @@ print =============== clear
 #  return -1
 #endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/scalarFunction.sim b/tests/script/tsim/query/scalarFunction.sim
index 103e66e54e..1b8115fec6 100644
--- a/tests/script/tsim/query/scalarFunction.sim
+++ b/tests/script/tsim/query/scalarFunction.sim
@@ -33,7 +33,7 @@ print =============== create normal table
 sql create table ntb (ts timestamp, c1 int, c2 float, c3 double)
 
 sql show tables
-if $rows != 101 then 
+if $rows != 101 then
   return -1
 endi
 
@@ -444,7 +444,7 @@ if $loop_test == 0 then
   print =============== stop and restart taosd
   system sh/exec.sh -n dnode1 -s stop -x SIGINT
   system sh/exec.sh -n dnode1 -s start
-  
+
   $loop_cnt = 0
   check_dnode_ready_0:
   	$loop_cnt = $loop_cnt + 1
@@ -462,7 +462,7 @@ if $loop_test == 0 then
     goto check_dnode_ready_0
   endi
 
-  $loop_test = 1  
+  $loop_test = 1
   goto loop_test_pos
 endi
 
diff --git a/tests/script/tsim/query/scalarNull.sim b/tests/script/tsim/query/scalarNull.sim
index ec95c94f23..6abe3d62d9 100644
--- a/tests/script/tsim/query/scalarNull.sim
+++ b/tests/script/tsim/query/scalarNull.sim
@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql create database db1 vgroups 3;
 sql use db1;
 sql select * from information_schema.ins_databases;
diff --git a/tests/script/tsim/query/session.sim b/tests/script/tsim/query/session.sim
index 158448d765..b6eb4ed3aa 100644
--- a/tests/script/tsim/query/session.sim
+++ b/tests/script/tsim/query/session.sim
@@ -35,8 +35,8 @@ sql INSERT INTO dev_001 VALUES('2020-05-13 13:00:00.001', 12)
 sql INSERT INTO dev_001 VALUES('2020-05-14 13:00:00.001', 13)
 sql INSERT INTO dev_001 VALUES('2020-05-15 14:00:00.000', 14)
 sql INSERT INTO dev_001 VALUES('2020-05-20 10:00:00.000', 15)
-sql INSERT INTO dev_001 VALUES('2020-05-27 10:00:00.001', 16) 
-           
+sql INSERT INTO dev_001 VALUES('2020-05-27 10:00:00.001', 16)
+
 sql INSERT INTO dev_002 VALUES('2020-05-13 10:00:00.000', 1)
 sql INSERT INTO dev_002 VALUES('2020-05-13 10:00:00.005', 2)
 sql INSERT INTO dev_002 VALUES('2020-05-13 10:00:00.009', 3)
@@ -46,7 +46,7 @@ sql INSERT INTO dev_002 VALUES('2020-05-13 10:00:00.036', 6)
 sql INSERT INTO dev_002 VALUES('2020-05-13 10:00:00.51', 7)
 
 # vnode does not return the precision of the table
-print ====> create database d1 precision 'us' 
+print ====> create database d1 precision 'us'
 sql create database d1 precision 'us'
 sql use d1
 sql create table dev_001 (ts timestamp ,i timestamp ,j int)
@@ -54,7 +54,7 @@ sql insert into dev_001 values(1623046993681000,now,1)(1623046993681001,now+1s,2
 sql create table secondts(ts timestamp,t2 timestamp,i int)
 sql insert into secondts values(1623046993681000,now,1)(1623046993681001,now+1s,2)(1623046993681002,now+2s,3)(1623046993681004,now+5s,4)
 
-$loop_test = 0  
+$loop_test = 0
 loop_test_pos:
 
 sql use $dbNamme
@@ -299,7 +299,7 @@ if $loop_test == 0 then
   print =============== stop and restart taosd
   system sh/exec.sh -n dnode1 -s stop -x SIGINT
   system sh/exec.sh -n dnode1 -s start
-  
+
   $loop_cnt = 0
   check_dnode_ready_0:
   	$loop_cnt = $loop_cnt + 1
@@ -317,7 +317,7 @@ if $loop_test == 0 then
     goto check_dnode_ready_0
   endi
 
-  $loop_test = 1  
+  $loop_test = 1
   goto loop_test_pos
 endi
 
diff --git a/tests/script/tsim/query/stddev.sim b/tests/script/tsim/query/stddev.sim
index d61c7273e1..b45c7d80a3 100644
--- a/tests/script/tsim/query/stddev.sim
+++ b/tests/script/tsim/query/stddev.sim
@@ -409,4 +409,4 @@ if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/time_process.sim b/tests/script/tsim/query/time_process.sim
index b3c0e9561f..83a6445846 100644
--- a/tests/script/tsim/query/time_process.sim
+++ b/tests/script/tsim/query/time_process.sim
@@ -111,4 +111,4 @@ if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/query/udf.sim b/tests/script/tsim/query/udf.sim
index 7cc1403bcb..7f8b1044ef 100644
--- a/tests/script/tsim/query/udf.sim
+++ b/tests/script/tsim/query/udf.sim
@@ -9,7 +9,7 @@ system sh/cfg.sh -n dnode1 -c udf -v 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 udf 
+print ======== step1 udf
 system sh/compile_udf.sh
 sql create database udf vgroups 3;
 sql use udf;