Merge branch '3.0' into fix/TD-18617

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

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

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

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

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

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

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

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

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

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;