From 7f3146203b52107ff263ee40a5247e2f0b0bdbfd 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/parser/alter1.sim                   | 2 +-
 tests/script/tsim/parser/binary_escapeCharacter.sim   | 2 +-
 tests/script/tsim/parser/col_arithmetic_operation.sim | 2 +-
 tests/script/tsim/parser/columnValue_unsign.sim       | 2 +-
 tests/script/tsim/parser/fill_stb.sim                 | 2 +-
 tests/script/tsim/parser/import_file.sim              | 2 +-
 tests/script/tsim/parser/repeatAlter.sim              | 2 +-
 tests/script/tsim/parser/select_from_cache_disk.sim   | 2 +-
 tests/script/tsim/parser/single_row_in_tb.sim         | 2 +-
 tests/script/tsim/parser/single_row_in_tb_query.sim   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/script/tsim/parser/alter1.sim b/tests/script/tsim/parser/alter1.sim
index 9d0049e45e..369419dcd9 100644
--- a/tests/script/tsim/parser/alter1.sim
+++ b/tests/script/tsim/parser/alter1.sim
@@ -130,4 +130,4 @@ endi
 #  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/parser/binary_escapeCharacter.sim b/tests/script/tsim/parser/binary_escapeCharacter.sim
index 0b437d8b04..5a9c0e7bb1 100644
--- a/tests/script/tsim/parser/binary_escapeCharacter.sim
+++ b/tests/script/tsim/parser/binary_escapeCharacter.sim
@@ -101,4 +101,4 @@ sql_error insert into tb values(now, '\');
 #sql_error insert into tb values(now, '\\\n');
 sql insert into tb values(now, '\n');
 
-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/parser/col_arithmetic_operation.sim b/tests/script/tsim/parser/col_arithmetic_operation.sim
index f22beefdf8..9a2ba34c85 100644
--- a/tests/script/tsim/parser/col_arithmetic_operation.sim
+++ b/tests/script/tsim/parser/col_arithmetic_operation.sim
@@ -132,4 +132,4 @@ sql_error select max(c1-c2) from $tb
 print =====================> td-1764
 sql select sum(c1)/count(*), sum(c1) as b, count(*) as b from $stb interval(1y)
 
-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/parser/columnValue_unsign.sim b/tests/script/tsim/parser/columnValue_unsign.sim
index 85ff490bf4..7ae1b20eca 100644
--- a/tests/script/tsim/parser/columnValue_unsign.sim
+++ b/tests/script/tsim/parser/columnValue_unsign.sim
@@ -129,4 +129,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/parser/fill_stb.sim b/tests/script/tsim/parser/fill_stb.sim
index 656b1ac94e..6c61631aa8 100644
--- a/tests/script/tsim/parser/fill_stb.sim
+++ b/tests/script/tsim/parser/fill_stb.sim
@@ -279,7 +279,7 @@ endi
 #endi
 
 ## linear fill
-sql select _wstart, max(c1), min(c2), avg(c3), sum(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(linear) 
+sql select _wstart, max(c1), min(c2), avg(c3), sum(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(linear)
 $val = $rowNum * 2
 $val = $val - 1
 $val = $val * $tbNum
diff --git a/tests/script/tsim/parser/import_file.sim b/tests/script/tsim/parser/import_file.sim
index e031e0249d..37dc0c4476 100644
--- a/tests/script/tsim/parser/import_file.sim
+++ b/tests/script/tsim/parser/import_file.sim
@@ -69,4 +69,4 @@ endi
 
 system rm -f $inFileName
 
-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/parser/repeatAlter.sim b/tests/script/tsim/parser/repeatAlter.sim
index d28a03e193..b4012048cc 100644
--- a/tests/script/tsim/parser/repeatAlter.sim
+++ b/tests/script/tsim/parser/repeatAlter.sim
@@ -6,4 +6,4 @@ while $i <= $loops
   $i = $i + 1
 endw
 
-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/parser/select_from_cache_disk.sim b/tests/script/tsim/parser/select_from_cache_disk.sim
index 0983e36a3a..3c0b13c638 100644
--- a/tests/script/tsim/parser/select_from_cache_disk.sim
+++ b/tests/script/tsim/parser/select_from_cache_disk.sim
@@ -60,4 +60,4 @@ if $data12 != 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/parser/single_row_in_tb.sim b/tests/script/tsim/parser/single_row_in_tb.sim
index 1bd53ad24e..e7b4c9a871 100644
--- a/tests/script/tsim/parser/single_row_in_tb.sim
+++ b/tests/script/tsim/parser/single_row_in_tb.sim
@@ -33,4 +33,4 @@ print ================== server restart completed
 
 run tsim/parser/single_row_in_tb_query.sim
 
-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/parser/single_row_in_tb_query.sim b/tests/script/tsim/parser/single_row_in_tb_query.sim
index 422756b798..37e193f9d2 100644
--- a/tests/script/tsim/parser/single_row_in_tb_query.sim
+++ b/tests/script/tsim/parser/single_row_in_tb_query.sim
@@ -195,4 +195,4 @@ endi
 
 print ===============>safty check TD-4927
 sql select first(ts, c1) from sr_stb where ts<1 group by t1;
-sql select first(ts, c1) from sr_stb where ts>0 and ts<1;
\ No newline at end of file
+sql select first(ts, c1) from sr_stb where ts>0 and ts<1;
-- 
GitLab