diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 2d889dd925e893c0684a3317c4fe2a6e3eb1d671..4ead1147e47e8777a422cd8f63a74d4017a368a5 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -642,7 +642,6 @@ static int32_t doTrimFunction(SScalarParam *pInput, int32_t inputNum, SScalarPar
     int32_t charLen = (type == TSDB_DATA_TYPE_VARCHAR) ? len : len / TSDB_NCHAR_SIZE;
     trimFn(input, output, type, charLen);
 
-    varDataSetLen(output, len);
     colDataAppend(pOutputData, i, output, false);
     output += varDataTLen(output);
   }
diff --git a/tests/script/tsim/column/commit.sim b/tests/script/tsim/column/commit.sim
index 43aebb490256b7ba28c2ed99c47a800d4ee2e102..899d51af87198f6bb83ed4bc9fa2fc2f6be553f8 100644
--- a/tests/script/tsim/column/commit.sim
+++ b/tests/script/tsim/column/commit.sim
@@ -10,12 +10,12 @@ sql create table d3.mt (ts timestamp, c000 int, c001 int, c002 int, c003 int, c0
 sql create table d3.t1 using d3.mt tags(1, 2, '3', 4, 5, 6)
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -33,50 +33,50 @@ sql insert into d3.t1 values (now+1d,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 ,
 
 print =============== step3
 sql select * from d3.mt
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 sql select * from d3.mt where c001 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select * from d3.mt where c002 = 2 and c003 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c235), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
   return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
   return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 then
   return -1
 endi
 
@@ -86,17 +86,17 @@ system sh/exec.sh -n dnode1 -s start
 
 print =============== step5
 sql select * from d3.mt
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 sql select * from d3.mt where c001 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select * from d3.mt where c002 = 2 and c003 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -107,35 +107,35 @@ endi
 
 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c128), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
   return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
   return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 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/column/metrics.sim b/tests/script/tsim/column/metrics.sim
index a492f5a2f9027aba1ce332367e92a18da657ce46..6a144a15d336cf2b46497441445486d87b809fd0 100644
--- a/tests/script/tsim/column/metrics.sim
+++ b/tests/script/tsim/column/metrics.sim
@@ -11,12 +11,12 @@ sql create table d2.t1 using d2.mt tags(1, 2, '3', 4, 5, 6)
 sql create table d2.t2 using d2.mt tags(6, 7, '8', 9, 10, 11)
 
 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -53,98 +53,98 @@ sql insert into d2.t2 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 ,
 
 print =============== step3
 sql select * from d2.mt
-if $rows != 20 then 
+if $rows != 20 then
   return -1
 endi
 
 sql select * from d2.mt where ts < now + 4m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 sql select * from d2.mt where c001 = 1
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 sql select * from d2.mt where c002 = 2 and c003 = 2
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 sql select * from d2.mt where c002 = 2 and c003 = 2 and ts < now + 4m
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 sql select count(*) from d2.mt
-if $data00 != 20 then 
+if $data00 != 20 then
   return -1
 endi
 
 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c235), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 20 then 
+if $data00 != 20 then
   return -1
 endi
-if $data01 != 20 then 
+if $data01 != 20 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 90 then 
+if $data04 != 90 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
   return -1
 endi
-if $data08 != 20 then 
+if $data08 != 20 then
   return -1
 endi
-if $data09 != 20 then 
+if $data09 != 20 then
   return -1
 endi
 
 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c238), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt where a = 1
-print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09 
-if $data00 != 10 then 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
   return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
   return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 then
   return -1
 endi
 
@@ -154,56 +154,56 @@ system sh/exec.sh -n dnode1 -s start
 
 print =============== step5
 sql select * from d2.mt
-if $rows != 20 then 
+if $rows != 20 then
   return -1
 endi
 
 sql select * from d2.mt where c001 = 1
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 sql select * from d2.mt where c002 = 2 and c003 = 2
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
 sql select count(*) from d2.mt
-if $data00 != 20 then 
+if $data00 != 20 then
   return -1
 endi
 
 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c128), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 20 then 
+if $data00 != 20 then
   return -1
 endi
-if $data01 != 20 then 
+if $data01 != 20 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 90 then 
+if $data04 != 90 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
   return -1
 endi
-if $data08 != 20 then 
+if $data08 != 20 then
   return -1
 endi
-if $data09 != 20 then 
+if $data09 != 20 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/column/table.sim b/tests/script/tsim/column/table.sim
index 07948ebce36f88ae5eef2de51fd11e352d9af86a..4f1d32c373e3712275deec14a54e7efa0e77de61 100644
--- a/tests/script/tsim/column/table.sim
+++ b/tests/script/tsim/column/table.sim
@@ -9,7 +9,7 @@ sql use d1
 sql create table d1.t1 (ts timestamp, c000 int, c001 int, c002 int, c003 int, c004 int, c005 int, c006 int, c007 int, c008 int, c009 int, c010 int, c011 int, c012 int, c013 int, c014 int, c015 int, c016 int, c017 int, c018 int, c019 int, c020 int, c021 int, c022 int, c023 int, c024 int, c025 int, c026 int, c027 int, c028 int, c029 int, c030 int, c031 int, c032 int, c033 int, c034 int, c035 int, c036 int, c037 int, c038 int, c039 int, c040 int, c041 int, c042 int, c043 int, c044 int, c045 int, c046 int, c047 int, c048 int, c049 int, c050 int, c051 int, c052 int, c053 int, c054 int, c055 int, c056 int, c057 int, c058 int, c059 int, c060 int, c061 int, c062 int, c063 int, c064 int, c065 int, c066 int, c067 int, c068 int, c069 int, c070 int, c071 int, c072 int, c073 int, c074 int, c075 int, c076 int, c077 int, c078 int, c079 int, c080 int, c081 int, c082 int, c083 int, c084 int, c085 int, c086 int, c087 int, c088 int, c089 int, c090 int, c091 int, c092 int, c093 int, c094 int, c095 int, c096 int, c097 int, c098 int, c099 int, c100 int, c101 int, c102 int, c103 int, c104 int, c105 int, c106 int, c107 int, c108 int, c109 int, c110 int, c111 int, c112 int, c113 int, c114 int, c115 int, c116 int, c117 int, c118 int, c119 int, c120 int, c121 int, c122 int, c123 int, c124 int, c125 int, c126 int, c127 int, c128 int, c129 int, c130 int, c131 int, c132 int, c133 int, c134 int, c135 int, c136 int, c137 int, c138 int, c139 int, c140 int, c141 int, c142 int, c143 int, c144 int, c145 int, c146 int, c147 int, c148 int, c149 int, c150 int, c151 int, c152 int, c153 int, c154 int, c155 int, c156 int, c157 int, c158 int, c159 int, c160 int, c161 int, c162 int, c163 int, c164 int, c165 int, c166 int, c167 int, c168 int, c169 int, c170 int, c171 int, c172 int, c173 int, c174 int, c175 int, c176 int, c177 int, c178 int, c179 int, c180 int, c181 int, c182 int, c183 int, c184 int, c185 int, c186 int, c187 int, c188 int, c189 int, c190 int, c191 int, c192 int, c193 int, c194 int, c195 int, c196 int, c197 int, c198 int, c199 int, c200 int, c201 int, c202 int, c203 int, c204 int, c205 int, c206 int, c207 int, c208 int, c209 int, c210 int, c211 int, c212 int, c213 int, c214 int, c215 int, c216 int, c217 int, c218 int, c219 int, c220 int, c221 int, c222 int, c223 int, c224 int, c225 int, c226 int, c227 int, c228 int, c229 int, c230 int, c231 int, c232 int, c233 int, c234 int, c235 int, c236 int, c237 int, c238 int, c239 int, c240 int, c241 int, c242 int, c243 int, c244 int, c245 int, c246 int, c247 int, c248 int, c249 int, c250 int)
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -32,91 +32,91 @@ sql insert into d1.t1 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 ,
 print ======= step3
 sql select * from d1.t1
 print select * from d1.t1 => rows $rows
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 sql select * from d1.t1 where ts < now + 4m
 print select * from d1.t1 where ts < now + 4m => rows $rows
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 sql select * from d1.t1 where c001 = 1
 print select * from d1.t1 where c001 = 1 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select * from d1.t1 where c002 = 2 and c003 = 2
 print select * from d1.t1 where c002 = 2 and c003 = 2 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select * from d1.t1 where c002 = 2 and c003 = 2 and ts < now + 4m
 print select * from d1.t1 where c002 = 2 and c003 = 2 and ts < now + 4m => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select count(*) from d1.t1
 print select count(*) from d1.t1 => $data00
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
 
 sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250) from d1.t1
-print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07 
-if $data00 != 10 then 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 then
   return -1
 endi
 
-sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1 
+sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1
 
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 then
   return -1
 endi
 
@@ -128,79 +128,79 @@ print ==============  step5
 
 sql select * from d1.t1
 print select * from d1.t1 => rows $rows
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 sql select * from d1.t1 where c001 = 1
 print select * from d1.t1 where c001 = 1 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select * from d1.t1 where c002 = 2 and c003 = 2
 print select * from d1.t1 where c002 = 2 and c003 = 2 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select count(*) from d1.t1
 print select count(*) from d1.t1 => $data00
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
 
 sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250) from d1.t1
-print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07 
-if $data00 != 10 then 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 then
   return -1
 endi
 
 sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 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/compute/avg.sim b/tests/script/tsim/compute/avg.sim
index 41a3a4825165d0c92c6215cdfd15c646c4204dc3..2f7e9b83b09287067a61fc1c1cd2cac889543648 100644
--- a/tests/script/tsim/compute/avg.sim
+++ b/tests/script/tsim/compute/avg.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select avg(tbcol) from $tb
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -53,27 +53,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
   return -1
 endi
 
 print =============== step4
 sql select avg(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
 print =============== step5
 sql select avg(tbcol) as b from $tb interval(1m)
 print ===> $data01
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
 sql select avg(tbcol) as b from $tb interval(1d)
 print ===> $data01
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -82,17 +82,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data01
-if $data40 != 4.000000000 then 
+if $data40 != 4.000000000 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select avg(tbcol) from $mt
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -101,13 +101,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
   return -1
 endi
 
 sql select avg(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -115,31 +115,31 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
   return -1
 endi
 
 print =============== step9
 sql select avg(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
 sql select avg(tbcol) as b from $mt interval(1d)
 print ===> $data01
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
 print =============== step10
 sql select avg(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -148,18 +148,18 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/block_dist.sim b/tests/script/tsim/compute/block_dist.sim
index ad3357515302eec632f21a99ca8e7768d702441b..2d0a4e890267af3520e8c99f21a4d87c5bc1ceef 100644
--- a/tests/script/tsim/compute/block_dist.sim
+++ b/tests/script/tsim/compute/block_dist.sim
@@ -27,25 +27,25 @@ $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
 
 sql create table $nt (ts timestamp, tbcol int)
 $x = 0
 while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
-    sql insert into $nt values ($ms , $x ) 
-    $x = $x + 1  
+    sql insert into $nt values ($ms , $x )
+    $x = $x + 1
 endw
 
 sql flush database $db
@@ -94,7 +94,7 @@ sql_error select _block_dist() from (select * from $mt)
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
diff --git a/tests/script/tsim/compute/bottom.sim b/tests/script/tsim/compute/bottom.sim
index 141d7f314bb6347a5fae974be84df0c4e912a523..4ccaaf84129af40114d7b024b267d9d03f829782 100644
--- a/tests/script/tsim/compute/bottom.sim
+++ b/tests/script/tsim/compute/bottom.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select bottom(tbcol, 1) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -53,24 +53,24 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 1) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5 then 
+if $data00 != 5 then
   return -1
 endi
 
 print =============== step4
 sql select bottom(tbcol, 1) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step5
-sql select bottom(tbcol, 2) as b from $tb 
+sql select bottom(tbcol, 2) as b from $tb
 print ===> $data00  $data10
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data10 != 0 then 
+if $data10 != 0 then
   return -1
 endi
 
@@ -79,10 +79,10 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 2) as b from $tb where ts > $ms
 print ===> $data00  $data10
-if $data00 != 6 then 
+if $data00 != 6 then
   return -1
 endi
-if $data10 != 5 then 
+if $data10 != 5 then
   return -1
 endi
 
@@ -93,8 +93,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/count.sim b/tests/script/tsim/compute/count.sim
index ae8a85155931c85b78ad21d0248c7d789ed0f647..44038d5195100912b75b323d38163ae54429c1d4 100644
--- a/tests/script/tsim/compute/count.sim
+++ b/tests/script/tsim/compute/count.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,19 +44,19 @@ $tb = $tbPrefix . $i
 
 sql select count(*) from $tb
 print ===> select count(*) from $tb => $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
   return -1
 endi
 
 sql select count(1) from $tb
 print ===> select count(1) from $tb => $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
   return -1
 endi
 
 sql select count(tbcol) from $tb
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
   return -1
 endi
 
@@ -65,27 +65,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 5 then 
+if $data00 != 5 then
   return -1
 endi
 
 print =============== step4
 sql select count(tbcol) as b from $tb
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
   return -1
 endi
 
 print =============== step5
 sql select count(tbcol) as b from $tb interval(1m)
 print ===> $data00
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
 
 sql select count(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
   return -1
 endi
 
@@ -94,30 +94,30 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data00
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select count(*) from $mt
 print ===> $data00
-if $data00 != $totalNum then 
+if $data00 != $totalNum then
   return -1
 endi
 
 print =============== step8
 sql select count(1) from $mt
 print ===> $data00
-if $data00 != $totalNum then 
+if $data00 != $totalNum then
   return -1
 endi
 
 sql select count(tbcol) from $mt
 print ===> $data00
-if $data00 != $totalNum then 
+if $data00 != $totalNum then
   return -1
 endi
 
@@ -126,13 +126,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 sql select count(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
@@ -140,34 +140,34 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol) as b from $mt interval(1m)
 print ===> $data00
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data10 != 10 then 
+if $data10 != 10 then
   return -1
 endi
 
 sql select count(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -176,17 +176,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data01
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
diff --git a/tests/script/tsim/compute/diff.sim b/tests/script/tsim/compute/diff.sim
index 0882b835c8ff7be7a58d160fc7871b64a3b6c091..7e69f40b9722bc015b354fb35bdeceb8affbf807 100644
--- a/tests/script/tsim/compute/diff.sim
+++ b/tests/script/tsim/compute/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
 
 print =============== step2
 $i = 1
@@ -43,7 +43,7 @@ $tb = $tbPrefix . $i
 
 sql select diff(tbcol) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
@@ -52,7 +52,7 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts > $ms
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
@@ -60,14 +60,14 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts <= $ms
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 print =============== step4
 sql select diff(tbcol) as b from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
@@ -86,8 +86,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/diff2.sim b/tests/script/tsim/compute/diff2.sim
index bd8a1223be438eb3c8da6c1d9d9861cdc9cb28e9..1cc2a87839f84f2b742fbb0667c373ad1923ea15 100644
--- a/tests/script/tsim/compute/diff2.sim
+++ b/tests/script/tsim/compute/diff2.sim
@@ -26,19 +26,19 @@ $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
 
     $tinyint = $x / 128
-    sql insert into $tb values ($ms , $x , $x , $x , $x , $tinyint , $x , $x , $x , $x ) 
+    sql insert into $tb values ($ms , $x , $x , $x , $x , $tinyint , $x , $x , $x , $x )
     $x = $x + 1
-  endw 
- 
+  endw
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -46,7 +46,7 @@ $tb = $tbPrefix . $i
 
 sql select diff(c1) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c2) from $tb
@@ -56,22 +56,22 @@ if $data10 != 1.000000000 then
 endi
 sql select diff(c3) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c4) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c5) from $tb
 print ===> $data10
-if $data10 != 0 then 
+if $data10 != 0 then
   return -1
 endi
 sql select diff(c6) from $tb
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
@@ -90,7 +90,7 @@ sql_error select diff(c1) from m_di_tb1 where c2 like '2%'
 print =============== step3
 sql select diff(c1) from $tb where c1 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c2) from $tb where c2 > 5
@@ -100,38 +100,38 @@ if $data10 != 1.000000000 then
 endi
 sql select diff(c3) from $tb where c3 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c4) from $tb where c4 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c5) from $tb where c5 > 5
 print ===> $data10
-if $data10 != 0 then 
+if $data10 != 0 then
   return -1
 endi
 sql select diff(c6) from $tb where c6 > 5
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
 print =============== step4
 sql select diff(c1) from $tb where c1 > 5 and c2 < $rowNum
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select diff(c1) from $tb where c9 like '%9' and c1 <= 20
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 print ===> $data10
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
 
@@ -148,8 +148,8 @@ step6:
 print =============== clear
 #sql drop database $db
 #sql select * from information_schema.ins_databases
-#if $rows != 2 then 
+#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/compute/first.sim b/tests/script/tsim/compute/first.sim
index 8595416c0740b31c34ac176d0b022b485d8c9515..954664a4c683e0a10a0e8cd6de799514cb34ba44 100644
--- a/tests/script/tsim/compute/first.sim
+++ b/tests/script/tsim/compute/first.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select first(tbcol) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -53,27 +53,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step4
 sql select first(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step5
 sql select first(tbcol) as b from $tb interval(1m)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 sql select first(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -82,17 +82,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data00
-if $data40 != 4 then 
+if $data40 != 4 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select first(tbcol) from $mt
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -101,13 +101,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 sql select first(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -115,7 +115,7 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -123,24 +123,24 @@ print =============== step9
 sql select first(tbcol) as b from $mt interval(1m)
 print select first(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select first(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step10
 sql select first(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -149,19 +149,19 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/interval.sim b/tests/script/tsim/compute/interval.sim
index 903e80769b84c723ae21a9d20e6174a1fc54f97a..4e7960ac4ae958f2e594fbad3bb6f7b50b13ed94 100644
--- a/tests/script/tsim/compute/interval.sim
+++ b/tests/script/tsim/compute/interval.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,13 +44,13 @@ $tb = $tbPrefix . $i
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
 print ===> $rows
-if $rows < $rowNum then 
+if $rows < $rowNum then
   return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
   return -1
 endi
 
@@ -59,16 +59,16 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms interval(1m)
 print ===> $rows
-if $rows > 10 then 
+if $rows > 10 then
   return -1
 endi
-if $rows < 3 then 
+if $rows < 3 then
   return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
   return -1
 endi
 
@@ -81,16 +81,16 @@ $ms2 = 1601481600000 - $cc
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms and ts > $ms2 interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
   return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
   return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
   return -1
 endi
 
@@ -107,29 +107,29 @@ if $rows < 30 then
   print expect greater than 30, actual: $rows
   return -1
 endi
-if $rows > 50 then 
+if $rows > 50 then
   return -1
 endi
-if $data20 != 1 then 
+if $data20 != 1 then
   return -1
 endi
-if $data24 != 1 then 
+if $data24 != 1 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
   return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
@@ -138,16 +138,16 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms interval(1m)
 print ===> $rows
-if $rows < 3 then 
+if $rows < 3 then
   return -1
 endi
-if $rows > 7 then 
+if $rows > 7 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
@@ -160,16 +160,16 @@ $ms2 = 1601481600000 - $cc
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
   return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
@@ -181,24 +181,24 @@ $cc = 1 * 60000
 $ms2 = 1601481600000 - $cc
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m) fill(value, 0)
-if $rows < 30 then 
+if $rows < 30 then
   return -1
 endi
-if $rows > 50 then 
+if $rows > 50 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/last.sim b/tests/script/tsim/compute/last.sim
index be2ee47733564bbbbb056dc28d8fc69eaa886ae6..e57236e57c4c0bc5ebccacfd2ccd9bb309b6bb8f 100644
--- a/tests/script/tsim/compute/last.sim
+++ b/tests/script/tsim/compute/last.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select last(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step4
 sql select last(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step5
 sql select last(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select last(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select last(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 sql select last(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step9
 sql select last(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select last(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step10
 sql select last(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/last_row.sim b/tests/script/tsim/compute/last_row.sim
index 57bdc36f6db66a1709a76a76d3e577c5d0f6d134..2e060dc28526dba7f0a692046b9d987be861cebb 100644
--- a/tests/script/tsim/compute/last_row.sim
+++ b/tests/script/tsim/compute/last_row.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select last_row(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -54,21 +54,21 @@ $ms = 1601481600000 + $cc
 print select last_row(tbcol) from $tb where ts <= $ms
 sql select last_row(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step4
 sql select last_row(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step7
 sql select last_row(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -77,13 +77,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select last_row(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 sql select last_row(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -91,18 +91,18 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select last_row(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step10
 sql select last_row(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -110,28 +110,28 @@ print =============== step11
 
 $cc = 1 * 3600000
 $ms = 1601481600000 + $cc
-sql insert into $tb values( $ms , 10) 
+sql insert into $tb values( $ms , 10)
 
 $cc = 3 * 3600000
 $ms = 1601481600000 + $cc
-sql insert into $tb values( $ms , null) 
+sql insert into $tb values( $ms , null)
 
 $cc = 5 * 3600000
 $ms = 1601481600000 + $cc
 
-sql insert into $tb values( $ms , -1) 
+sql insert into $tb values( $ms , -1)
 
 $cc = 7 * 3600000
 $ms = 1601481600000 + $cc
 
-sql insert into $tb values( $ms , null) 
+sql insert into $tb values( $ms , null)
 
 ## for super table
 $cc = 6 * 3600000
 $ms = 1601481600000 + $cc
 
 sql select last_row(*) from $mt where ts < $ms
-if $data01 != -1 then 
+if $data01 != -1 then
   return -1
 endi
 
@@ -139,12 +139,12 @@ $cc = 8 * 3600000
 $ms = 1601481600000 + $cc
 
 sql select last_row(*) from $mt where ts < $ms
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
 sql select last_row(*) from $mt
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
@@ -152,7 +152,7 @@ $cc = 4 * 3600000
 $ms = 1601481600000 + $cc
 
 sql select last_row(*) from $mt where ts < $ms
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
@@ -162,7 +162,7 @@ $cc = 4 * 3600000
 $ms2 = 1601481600000 + $cc
 
 sql select last_row(*) from $mt where ts > $ms1 and ts <= $ms2
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
@@ -171,7 +171,7 @@ $cc = 6 * 3600000
 $ms = 1601481600000 + $cc
 
 sql select last_row(*) from $tb where ts <= $ms
-if $data01 != -1 then 
+if $data01 != -1 then
   return -1
 endi
 
@@ -179,12 +179,12 @@ $cc = 8 * 3600000
 $ms = 1601481600000 + $cc
 
 sql select last_row(*) from $tb where ts <= $ms
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
 sql select last_row(*) from $tb
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
@@ -192,7 +192,7 @@ $cc = 4 * 3600000
 $ms = 1601481600000 + $cc
 
 sql select last_row(*) from $tb where ts <= $ms
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
@@ -202,14 +202,14 @@ $cc = 4 * 3600000
 $ms2 = 1601481600000 + $cc
 
 sql select last_row(*) from $tb where ts > $ms1 and ts <= $ms2
-if $data01 != NULL then 
+if $data01 != NULL then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
diff --git a/tests/script/tsim/compute/leastsquare.sim b/tests/script/tsim/compute/leastsquare.sim
index 0ead02da56570807fbfcdaa96c12aabbcbc26049..cde3c01214f3ee405578fb9961f8ae02cd8e4483 100644
--- a/tests/script/tsim/compute/leastsquare.sim
+++ b/tests/script/tsim/compute/leastsquare.sim
@@ -25,17 +25,17 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 2
   $ms = 1000
   while $x < $rowNum
     $ms = $ms + 1000
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
- 
+  endw
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -63,7 +63,7 @@ endi
 
 print =============== step5
 sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1m)
-print ===> $data00 
+print ===> $data00
 if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
@@ -81,15 +81,15 @@ if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 print ===> $rows
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/max.sim b/tests/script/tsim/compute/max.sim
index 21bca6be089f94924fc357ba89cfee05640e4b3e..451eeaacd81bf576ae4dd43d2aed5bd203cafc71 100644
--- a/tests/script/tsim/compute/max.sim
+++ b/tests/script/tsim/compute/max.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select max(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step4
 sql select max(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step5
 sql select max(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select max(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select max(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 sql select max(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step9
 sql select max(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select max(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step10
 sql select max(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/min.sim b/tests/script/tsim/compute/min.sim
index cf22b6f2be25799b99f81634d4d0f5ae0aec9532..e8ec3232ba01fe0e1ddcf9acba695cab63504bc2 100644
--- a/tests/script/tsim/compute/min.sim
+++ b/tests/script/tsim/compute/min.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select min(tbcol) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select min(tbcol) from $tb where ts < $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step4
 sql select min(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step5
 sql select min(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select min(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -85,17 +85,17 @@ $ms = 1601481600000 + $cc
 sql select min(tbcol) as b from $tb where ts <= $ms interval(1m)
 print select min(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select min(tbcol) from $mt
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -104,13 +104,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as c from $mt where ts < $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 sql select min(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -118,31 +118,31 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step9
 sql select min(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select min(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step10
 sql select min(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -151,19 +151,19 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/null.sim b/tests/script/tsim/compute/null.sim
index 2dbf61bb079a52388a028368385f9c3e303cacf0..d841f25265c1e569539731808a22acbf88d83140 100644
--- a/tests/script/tsim/compute/null.sim
+++ b/tests/script/tsim/compute/null.sim
@@ -25,24 +25,24 @@ $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
-	
-    $v1 = $x 
+
+    $v1 = $x
     $v2 = $x
     if $x == 0 then
       $v1 = NULL
     endi
-    
-    sql insert into $tb values ($ms , $v1 , $v2 ) 
+
+    sql insert into $tb values ($ms , $v1 , $v2 )
     $x = $x + 1
-  endw 
- 
+  endw
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -61,47 +61,47 @@ if $rows != 20 then
 endi
 
 print =============== step3
-sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $tb 
-print ===> $data00 $data01 $data02 $data03 $data04 $data05 
-if $data00 != 19 then 
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $tb
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+if $data00 != 19 then
   return -1
 endi
-if $data01 != 20 then 
+if $data01 != 20 then
   return -1
 endi
-if $data02 != 10.000000000 then 
+if $data02 != 10.000000000 then
   return -1
 endi
-if $data03 != 9.500000000 then 
+if $data03 != 9.500000000 then
   return -1
 endi
-if $data04 != 190 then 
+if $data04 != 190 then
   return -1
 endi
-if $data05 != 190 then 
+if $data05 != 190 then
   return -1
 endi
 
 print =============== step4
 sql select * from $tb  where tbcol2 = 19
 print ===> $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 19 then 
+if $data01 != 19 then
   return -1
 endi
-if $data02 != 19 then 
+if $data02 != 19 then
   return -1
 endi
 
-sql select * from $tb  where tbcol is NULL 
-if $rows != 1 then 
+sql select * from $tb  where tbcol is NULL
+if $rows != 1 then
   return -1
 endi
 
-sql select * from $tb  where tbcol = NULL 
-if $rows != 0 then 
+sql select * from $tb  where tbcol = NULL
+if $rows != 0 then
   return -1
 endi
 
@@ -113,29 +113,29 @@ sql create table tt using $mt tags( NULL )
 #step52:
 
 sql select * from $mt  where tgcol is NULL
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 print =============== step6
-sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $mt 
-print ===> $data00 $data01 $data02 $data03 $data04 $data05 
-if $data00 != 190 then 
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $mt
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+if $data00 != 190 then
   return -1
 endi
-if $data01 != 200 then 
+if $data01 != 200 then
   return -1
 endi
-if $data02 != 10.000000000 then 
+if $data02 != 10.000000000 then
   return -1
 endi
-if $data03 != 9.500000000 then 
+if $data03 != 9.500000000 then
   return -1
 endi
-if $data04 != 1900 then 
+if $data04 != 1900 then
   return -1
 endi
-if $data05 != 1900 then 
+if $data05 != 1900 then
   return -1
 endi
 
@@ -158,15 +158,15 @@ sql insert into t7 values(now, NULL)
 #sql insert into t8 values(now, NULL)
 
 #sql select * from t1
-#if $rows != 1 then 
+#if $rows != 1 then
 #  return -1
 #endi
-#if $data01 != NULL then 
+#if $data01 != NULL then
 #  return -1
 #endi
 
 sql select * from t2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 if $data01 != NULL then
@@ -174,7 +174,7 @@ if $data01 != NULL then
 endi
 
 sql select * from t3
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 if $data01 != NULL then
@@ -182,7 +182,7 @@ if $data01 != NULL then
 endi
 
 sql select * from t4
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 if $data01 != NULL then
@@ -190,7 +190,7 @@ if $data01 != NULL then
 endi
 
 sql select * from t5
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 if $data01 != NULL then
@@ -198,7 +198,7 @@ if $data01 != NULL then
 endi
 
 sql select * from t6
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 if $data01 != NULL then
@@ -206,7 +206,7 @@ if $data01 != NULL then
 endi
 
 sql select * from t7
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 if $data01 != NULL then
@@ -214,7 +214,7 @@ if $data01 != NULL then
 endi
 
 #sql select * from t8
-#if $rows != 1 then 
+#if $rows != 1 then
 #  return -1
 #endi
 #if $data01 != NULL then
@@ -224,8 +224,8 @@ endi
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/percentile.sim b/tests/script/tsim/compute/percentile.sim
index 1ea82a998bcd9c1d4ede0db815c4bebd948a3ea6..836a6baed5c2e3551c50eddb2ca01bca831a1a5c 100644
--- a/tests/script/tsim/compute/percentile.sim
+++ b/tests/script/tsim/compute/percentile.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,19 +44,19 @@ $tb = $tbPrefix . $i
 
 sql select percentile(tbcol, 10) from $tb
 print ===> $data00
-if $data00 != 1.900000000 then 
+if $data00 != 1.900000000 then
   return -1
 endi
 
 sql select percentile(tbcol, 20) from $tb
 print ===> $data00
-if $data00 != 3.800000000 then 
+if $data00 != 3.800000000 then
   return -1
 endi
 
 sql select percentile(tbcol, 100) from $tb
 print ===> $data00
-if $data00 != 19.000000000 then 
+if $data00 != 19.000000000 then
   return -1
 endi
 
@@ -70,7 +70,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 1) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.140000000 then 
+if $data00 != 5.140000000 then
   return -1
 endi
 
@@ -79,7 +79,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 5) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.700000000 then 
+if $data00 != 5.700000000 then
   return -1
 endi
 
@@ -88,7 +88,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 0) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.000000000 then 
+if $data00 != 5.000000000 then
   return -1
 endi
 
@@ -98,7 +98,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 1) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.140000000 then 
+if $data00 != 5.140000000 then
   return -1
 endi
 
@@ -107,7 +107,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 5) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.700000000 then 
+if $data00 != 5.700000000 then
   return -1
 endi
 
@@ -116,15 +116,15 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 0) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.000000000 then 
+if $data00 != 5.000000000 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/stddev.sim b/tests/script/tsim/compute/stddev.sim
index 9e7a52a774c418c84d1c3ab7b4d7b8c19efba223..db3af3e207129e4f103410298422cbcd6419c8ea 100644
--- a/tests/script/tsim/compute/stddev.sim
+++ b/tests/script/tsim/compute/stddev.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select stddev(tbcol) from $tb
 print ===> $data00
-if $data00 != 5.766281297 then 
+if $data00 != 5.766281297 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select stddev(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 1.414213562 then 
+if $data00 != 1.414213562 then
   return -1
 endi
 
 print =============== step4
 sql select stddev(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 5.766281297 then 
+if $data00 != 5.766281297 then
   return -1
 endi
 
 print =============== step5
 sql select stddev(tbcol) as b from $tb interval(1m)
-print ===> $data00 
-if $data00 != 0.000000000 then 
+print ===> $data00
+if $data00 != 0.000000000 then
   return -1
 endi
 
 sql select stddev(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 5.766281297 then 
+if $data00 != 5.766281297 then
   return -1
 endi
 
@@ -84,18 +84,18 @@ $ms = 1601481600000 + $cc
 
 sql select stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data00
-if $data00 != 0.000000000 then 
+if $data00 != 0.000000000 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/sum.sim b/tests/script/tsim/compute/sum.sim
index 717389e061eefe53be667e4bffec53222963d716..7bb000817e510c74afd89ed564365a43b7d8b505 100644
--- a/tests/script/tsim/compute/sum.sim
+++ b/tests/script/tsim/compute/sum.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select sum(tbcol) from $tb
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select sum(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
 
 print =============== step4
 sql select sum(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
   return -1
 endi
 
 print =============== step5
 sql select sum(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select sum(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
   return -1
 endi
 
@@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc
 
 sql select sum(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select sum(tbcol) from $mt
 print ===> $data00
-if $data00 != 1900 then 
+if $data00 != 1900 then
   return -1
 endi
 
@@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc
 
 sql select sum(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select sum(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 950 then 
+if $data00 != 950 then
   return -1
 endi
 
@@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc
 
 sql select sum(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select sum(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
 sql select sum(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 1900 then 
+if $data00 != 1900 then
   return -1
 endi
 
 print =============== step10
 sql select sum(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc
 
 sql select sum(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1d)
 print select sum(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1d)
-print ===> $data00 $rows 
-if $data00 != 10 then 
+print ===> $data00 $rows
+if $data00 != 10 then
   return -1
 endi
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/compute/top.sim b/tests/script/tsim/compute/top.sim
index 75445762d063e749069a64d5471d9cc6d1870904..8caf6038962f0c6672b695d0cf33406a2a0e2a15 100644
--- a/tests/script/tsim/compute/top.sim
+++ b/tests/script/tsim/compute/top.sim
@@ -25,18 +25,18 @@ $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
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select top(tbcol, 1) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -54,24 +54,24 @@ $ms = 1601481600000 + $cc
 
 sql select top(tbcol, 1) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step4
 sql select top(tbcol, 1) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step5
-sql select top(tbcol, 2) as b from $tb 
+sql select top(tbcol, 2) as b from $tb
 print ===> $data00  $data10
-if $data00 != 18 then 
+if $data00 != 18 then
   return -1
 endi
-if $data10 != 19 then 
+if $data10 != 19 then
   return -1
 endi
 
@@ -81,10 +81,10 @@ $ms = 1601481600000 + $cc
 
 sql select top(tbcol, 2) as b from $tb where ts <= $ms
 print ===> $data00  $data10
-if $data00 != 3 then 
+if $data00 != 3 then
   return -1
 endi
-if $data10 != 4 then 
+if $data10 != 4 then
   return -1
 endi
 
@@ -95,8 +95,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/insert/backquote.sim b/tests/script/tsim/insert/backquote.sim
index fc8aa29c4ef40ad0c2d24b91e99a0d6a8590cbe1..f1b1c97e7d7de0b37c633c5db6ecc326970cf89f 100644
--- a/tests/script/tsim/insert/backquote.sim
+++ b/tests/script/tsim/insert/backquote.sim
@@ -8,9 +8,9 @@ print =============== create database
 sql create database `database`
 sql create database `DataBase`
 sql select * from information_schema.ins_databases
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 if $rows != 4 then
   return -1
@@ -27,12 +27,12 @@ endi
 
 $dbCnt = 0
 while $dbCnt < 2
-    if $dbCnt == 0 then 
+    if $dbCnt == 0 then
         sql use `database`
-    else 
+    else
         sql use `DataBase`
     endi
-    
+
     $dbCnt = $dbCnt + 1
 
     print =============== create super table, include all type
@@ -41,13 +41,13 @@ while $dbCnt < 2
     sql create table `Stable` (`timestamp` timestamp, `int` int, `Binary` binary(32), `Nchar` nchar(32)) tags (`float` float, `binary` binary(16), `nchar` nchar(16))
 
     sql show stables
-    print rows: $rows 
+    print rows: $rows
     print $data00  $data01
     print $data10  $data11
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
     endi
-    if $data00 != Stable then 
+    if $data00 != Stable then
         if $data00 != stable then
           return -1
         endi
@@ -57,24 +57,24 @@ while $dbCnt < 2
           return -1
         endi
     endi
-    
+
     print =============== create child table
     sql create table `table` using `stable` tags(100.0, 'stable+table', 'stable+table')
     sql create table `Table` using `stable` tags(100.1, 'stable+Table', 'stable+Table')
-    
+
     sql create table `TAble` using `Stable` tags(100.0, 'Stable+TAble', 'Stable+TAble')
-    sql create table `TABle` using `Stable` tags(100.1, 'Stable+TABle', 'Stable+TABle')    
-   
+    sql create table `TABle` using `Stable` tags(100.1, 'Stable+TABle', 'Stable+TABle')
+
     sql show tables
-    print rows: $rows 
+    print rows: $rows
     print $data00  $data01
     print $data10  $data11
     print $data20  $data21
     print $data30  $data31
-    if $rows != 4 then 
+    if $rows != 4 then
       return -1
     endi
-    
+
     print =============== insert data
     sql insert into `table` values(now+0s, 10, 'table', 'table')(now+1s, 11, 'table', 'table')
     sql insert into `Table` values(now+0s, 20, 'Table', 'Table')(now+1s, 21, 'Table', 'Table')
@@ -86,15 +86,15 @@ while $dbCnt < 2
     print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 10 then 
+    endi
+    if $data01 != 10 then
       return -1
-    endi    
-    if $data02 != table then 
+    endi
+    if $data02 != table then
       return -1
-    endi    
+    endi
     if $data03 != table then
       print expect table, actual $data03
       return -1
@@ -103,57 +103,57 @@ while $dbCnt < 2
 
     print =================> 1
     sql select * from `Table`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 20 then 
+    endi
+    if $data01 != 20 then
       return -1
-    endi    
-    if $data02 != Table then 
+    endi
+    if $data02 != Table then
       return -1
-    endi    
-    if $data03 != Table then 
+    endi
+    if $data03 != Table then
       return -1
     endi
 
     print ================>2
     sql select * from `TAble`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 30 then 
+    endi
+    if $data01 != 30 then
       return -1
-    endi    
-    if $data02 != TAble then 
+    endi
+    if $data02 != TAble then
       return -1
-    endi    
-    if $data03 != TAble then 
+    endi
+    if $data03 != TAble then
       return -1
     endi
-    
+
     sql select * from `TABle`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 40 then 
+    endi
+    if $data01 != 40 then
       return -1
-    endi    
-    if $data02 != TABle then 
+    endi
+    if $data02 != TABle then
       return -1
-    endi    
-    if $data03 != TABle then 
+    endi
+    if $data03 != TABle then
       return -1
     endi
-    
+
     #print =============== query data from st, but not support select * from super table, waiting fix
     #sql select count(*) from `stable`
     #print rows: $rows
@@ -174,7 +174,7 @@ while $dbCnt < 2
     #  return -1
     #endi
     #sql select * from `stable`
-    #if $rows != 4 then 
+    #if $rows != 4 then
     #  return -1
     #endi
 
@@ -185,9 +185,9 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 
 sql select * from information_schema.ins_databases
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 if $rows != 4 then
   return -1
@@ -204,22 +204,22 @@ endi
 
 $dbCnt = 0
 while $dbCnt < 2
-    if $dbCnt == 0 then 
+    if $dbCnt == 0 then
         sql use `database`
-    else 
+    else
         sql use `DataBase`
     endi
-    
+
     $dbCnt = $dbCnt + 1
 
     sql show stables
-    print rows: $rows 
+    print rows: $rows
     print $data00  $data01
     print $data10  $data11
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
     endi
-    if $data00 != Stable then 
+    if $data00 != Stable then
         if $data00 != stable then
           return -1
         endi
@@ -229,86 +229,86 @@ while $dbCnt < 2
           return -1
         endi
     endi
-  
+
     sql show tables
-    print rows: $rows 
+    print rows: $rows
     print $data00  $data01
     print $data10  $data11
     print $data20  $data21
     print $data30  $data31
-    if $rows != 4 then 
+    if $rows != 4 then
       return -1
     endi
-    
+
     print =============== query data
     sql select * from `table`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 10 then 
+    endi
+    if $data01 != 10 then
       return -1
-    endi    
-    if $data02 != table then 
+    endi
+    if $data02 != table then
       return -1
-    endi    
-    if $data03 != table then 
+    endi
+    if $data03 != table then
       return -1
     endi
-    
+
     sql select * from `Table`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 20 then 
+    endi
+    if $data01 != 20 then
       return -1
-    endi    
-    if $data02 != Table then 
+    endi
+    if $data02 != Table then
       return -1
-    endi    
-    if $data03 != Table then 
+    endi
+    if $data03 != Table then
       return -1
     endi
-    
+
     sql select * from `TAble`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 30 then 
+    endi
+    if $data01 != 30 then
       return -1
-    endi    
-    if $data02 != TAble then 
+    endi
+    if $data02 != TAble then
       return -1
-    endi    
-    if $data03 != TAble then 
+    endi
+    if $data03 != TAble then
       return -1
     endi
-    
+
     sql select * from `TABle`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
-    endi    
-    if $data01 != 40 then 
+    endi
+    if $data01 != 40 then
       return -1
-    endi    
-    if $data02 != TABle then 
+    endi
+    if $data02 != TABle then
       return -1
-    endi    
-    if $data03 != TABle then 
+    endi
+    if $data03 != TABle then
       return -1
     endi
-    
+
     #print =============== query data from st, but not support select * from super table, waiting fix
     #sql select count(*) from `stable`
     #print rows: $rows
@@ -329,7 +329,7 @@ while $dbCnt < 2
     #  return -1
     #endi
     #sql select * from `stable`
-    #if $rows != 4 then 
+    #if $rows != 4 then
     #  return -1
     #endi
 
diff --git a/tests/script/tsim/insert/basic.sim b/tests/script/tsim/insert/basic.sim
index 20b39c8f0099605120882214b6e0fb478ae43e23..c4ef3e39dab9f09028ecfd401fb6444a0fe0ecd4 100644
--- a/tests/script/tsim/insert/basic.sim
+++ b/tests/script/tsim/insert/basic.sim
@@ -20,26 +20,26 @@ $x = 0
 while $x < 10
   $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
 
 print =============== step 2
 $x = 0
 while $x < 5
   $cc = $x * 60000
   $ms = 1551481600000 + $cc
-  
-  sql insert into $tb values ($ms , $x ) 
+
+  sql insert into $tb values ($ms , $x )
   $x = $x + 1
-endw 
+endw
 
 sql select * from $tb
 
 print $rows points data are retrieved
-if $rows != 15 then 
+if $rows != 15 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/insert/basic0.sim b/tests/script/tsim/insert/basic0.sim
index 5b506de01f85f2dcce21fc890cb73927fda6ac76..be023352f98e7c61e92c01090e686eb74e6dc8e8 100644
--- a/tests/script/tsim/insert/basic0.sim
+++ b/tests/script/tsim/insert/basic0.sim
@@ -18,7 +18,7 @@ print =============== create super table, include column type for count/sum/min/
 sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -28,7 +28,7 @@ sql create table ct2 using stb tags(2000)
 sql create table ct3 using stb tags(3000)
 
 sql show tables
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
@@ -46,7 +46,7 @@ sql insert into ct3 values('2021-01-01 00:00:00.000', 10, 2.0, 3.0)
 #===================================================================
 print =============== query data from child table
 sql select * from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 print $data10  $data11 $data12 $data13
 print $data20  $data21 $data22 $data23
@@ -58,111 +58,111 @@ if $data01 != 10 then
   print expect 10, actual: $data01
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select count(*) from child table
 sql select count(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== select count(column) from child table
 sql select count(ts), count(c1), count(c2), count(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
-if $data01 != 4 then 
+if $data01 != 4 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 #print =============== select first(*)/first(column) from child table
 sql select first(*) from ct1
 print ====> select first(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 
 sql select first(ts), first(c1), first(c2), first(c3) from ct1
 print ====> select first(ts), first(c1), first(c2), first(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select min(column) from child table
 sql select min(c1), min(c2), min(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -13 then 
+if $data00 != -13 then
   return -1
 endi
 if $data01 != -2.30000 then
   print expect -2.30000, actual: $data01
   return -1
 endi
-if $data02 != -3.300000000 then 
+if $data02 != -3.300000000 then
   return -1
 endi
 
 print =============== select max(column) from child table
 sql select max(c1), max(c2), max(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 11 then 
+if $data00 != 11 then
   return -1
 endi
-if $data01 != 2.10000 then 
+if $data01 != 2.10000 then
   return -1
 endi
-if $data02 != 3.100000000 then 
+if $data02 != 3.100000000 then
   return -1
 endi
 
 print =============== select sum(column) from child table
 sql select sum(c1), sum(c2), sum(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -4 then 
+if $data00 != -4 then
   return -1
 endi
-if $data01 != -0.400000095 then 
+if $data01 != -0.400000095 then
   return -1
 endi
-if $data02 != -0.400000000 then 
+if $data02 != -0.400000000 then
   return -1
 endi
 
@@ -173,34 +173,34 @@ print $data00 $data01 $data02
 print $data10 $data11 $data12
 print $data20 $data21 $data22
 print $data30 $data31 $data32
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != 11 then 
+if $data10 != 11 then
   return -1
 endi
-if $data11 != 2.10000 then 
+if $data11 != 2.10000 then
   return -1
 endi
-if $data12 != 3.100000000 then 
+if $data12 != 3.100000000 then
   return -1
 endi
-if $data30 != -13 then 
+if $data30 != -13 then
   return -1
 endi
-if $data31 != -2.30000 then 
+if $data31 != -2.30000 then
   return -1
 endi
-if $data32 != -3.300000000 then 
+if $data32 != -3.300000000 then
   return -1
 endi
 #===================================================================
@@ -208,17 +208,17 @@ endi
 #print =============== query data from stb
 sql select * from stb
 print $rows
-if $rows != 9 then 
+if $rows != 9 then
   return -1
 endi
 
 #print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
 
@@ -234,19 +234,19 @@ print $data50 $data51 $data52  $data53
 print $data60 $data61 $data62  $data63
 print $data70 $data71 $data72  $data73
 print $data80 $data81 $data82  $data83
-if $rows != 9 then 
+if $rows != 9 then
   return -1
 endi
 
-# The order of data from different sub tables in the super table is random, 
+# The order of data from different sub tables in the super table is random,
 # so this detection may fail randomly
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
@@ -254,16 +254,16 @@ endi
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print rows: $rows
 print $data00 $data01 $data02  $data03
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
-if $data01 != 9 then 
+if $data01 != 9 then
   return -1
 endi
-if $data02 != 9 then 
+if $data02 != 9 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
   return -1
 endi
 
@@ -274,7 +274,7 @@ system sh/exec.sh -n dnode1 -s start
 
 print =============== query data from child table
 sql select * from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 print $data10  $data11 $data12 $data13
 print $data20  $data21 $data22 $data23
@@ -282,113 +282,113 @@ print $data30  $data31 $data32 $data33
 if $rows != 4 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select count(*) from child table
 sql select count(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== select count(column) from child table
 sql select count(ts), count(c1), count(c2), count(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
-if $data01 != 4 then 
+if $data01 != 4 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 #print =============== select first(*)/first(column) from child table
 sql select first(*) from ct1
 print ====> select first(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 
 sql select first(ts), first(c1), first(c2), first(c3) from ct1
 print ====> select first(ts), first(c1), first(c2), first(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select min(column) from child table
 sql select min(c1), min(c2), min(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -13 then 
+if $data00 != -13 then
   return -1
 endi
-if $data01 != -2.30000 then 
+if $data01 != -2.30000 then
   return -1
 endi
-if $data02 != -3.300000000 then 
+if $data02 != -3.300000000 then
   return -1
 endi
 
 print =============== select max(column) from child table
 sql select max(c1), max(c2), max(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 11 then 
+if $data00 != 11 then
   return -1
 endi
-if $data01 != 2.10000 then 
+if $data01 != 2.10000 then
   return -1
 endi
-if $data02 != 3.100000000 then 
+if $data02 != 3.100000000 then
   return -1
 endi
 
 print =============== select sum(column) from child table
 sql select sum(c1), sum(c2), sum(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -4 then 
+if $data00 != -4 then
   return -1
 endi
-if $data01 != -0.400000095 then 
+if $data01 != -0.400000095 then
   return -1
 endi
-if $data02 != -0.400000000 then 
+if $data02 != -0.400000000 then
   return -1
 endi
 
@@ -399,51 +399,51 @@ print $data00 $data01 $data02
 print $data10 $data11 $data12
 print $data20 $data21 $data22
 print $data30 $data31 $data32
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != 11 then 
+if $data10 != 11 then
   return -1
 endi
-if $data11 != 2.10000 then 
+if $data11 != 2.10000 then
   return -1
 endi
-if $data12 != 3.100000000 then 
+if $data12 != 3.100000000 then
   return -1
 endi
-if $data30 != -13 then 
+if $data30 != -13 then
   return -1
 endi
-if $data31 != -2.30000 then 
+if $data31 != -2.30000 then
   return -1
 endi
-if $data32 != -3.300000000 then 
+if $data32 != -3.300000000 then
   return -1
 endi
 
 #===================================================================
 print =============== query data from stb
 sql select * from stb
-if $rows != 9 then 
+if $rows != 9 then
   return -1
-endi      
+endi
 
 print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
 
@@ -459,35 +459,35 @@ print $data50 $data51 $data52  $data53
 print $data60 $data61 $data62  $data63
 print $data70 $data71 $data72  $data73
 print $data80 $data81 $data82  $data83
-if $rows != 9 then 
+if $rows != 9 then
   return -1
 endi
-# The order of data from different sub tables in the super table is random, 
+# The order of data from different sub tables in the super table is random,
 # so this detection may fail randomly
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 #print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
-if $data01 != 9 then 
+if $data01 != 9 then
   return -1
 endi
-if $data02 != 9 then 
+if $data02 != 9 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 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/insert/basic1.sim b/tests/script/tsim/insert/basic1.sim
index 72a883bedf615d57e16ab32589c9c804de599c75..2e3d6fa513147174329297726e0727ab8e4d6c3e 100644
--- a/tests/script/tsim/insert/basic1.sim
+++ b/tests/script/tsim/insert/basic1.sim
@@ -21,7 +21,7 @@ sql create table stb_2 (ts timestamp, i int) tags (j int)
 sql create stable stb_3 (ts timestamp, i int) tags (j int)
 
 sql show stables
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
@@ -30,7 +30,7 @@ sql create table c1 using stb tags(true, -1, -2, -3, -4, -6.0, -7.0, 'child tbl
 sql create table c2 using stb tags(false, -1, -2, -3, -4, -6.0, -7.0, 'child tbl 2', 'child tbl 2', '2022-02-25 18:00:00.000', 10, 20, 30, 40)
 
 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -39,12 +39,12 @@ sql insert into c1 values(now+0s, true, -1, -2, -3, -4, -6.0, -7.0, 'child tbl 1
 
 print =============== query data
 sql select * from c1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 print $data30  $data31
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
@@ -53,17 +53,17 @@ if $data01 != 1 then
   return -1
 endi
 
-if $data02 != -1 then 
+if $data02 != -1 then
   return -1
 endi
 
-if $data03 != -2 then 
+if $data03 != -2 then
   return -1
 endi
 
 print =============== query data from st, but not support select * from super table, waiting fix
 sql select * from stb
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
@@ -73,12 +73,12 @@ system sh/exec.sh -n dnode1 -s start
 
 print =============== query data
 sql select * from c1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 print $data30  $data31
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
@@ -86,17 +86,17 @@ if $data01 != 1 then
   return -1
 endi
 
-if $data02 != -1 then 
+if $data02 != -1 then
   return -1
 endi
 
-if $data03 != -2 then 
+if $data03 != -2 then
   return -1
 endi
 
 print =============== query data from st, but not support select * from super table, waiting fix
 sql select * from stb
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
diff --git a/tests/script/tsim/insert/basic2.sim b/tests/script/tsim/insert/basic2.sim
index eca46697f5bfdca223d922583f98f85838fe25c9..1794bb54f8dad2d250a192c24895ed6c5da28c7c 100644
--- a/tests/script/tsim/insert/basic2.sim
+++ b/tests/script/tsim/insert/basic2.sim
@@ -11,7 +11,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int unsigned, c2 double, c3 binary(10), c4 nchar(10), c5 double) tags (city binary(20),district binary(20));
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -20,7 +20,7 @@ sql create table ct1 using stb tags("BeiJing", "ChaoYang")
 sql create table ct2 using stb tags("BeiJing", "HaiDian")
 
 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -47,7 +47,7 @@ print $data20 $data21 $data22  $data23  $data24  $data25
 print $data30 $data31 $data32  $data33  $data34  $data35
 print $data40 $data41 $data42  $data43  $data44  $data45
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -189,7 +189,7 @@ print $data20 $data21 $data22  $data23  $data24  $data25
 print $data30 $data31 $data32  $data33  $data34  $data35
 print $data40 $data41 $data42  $data43  $data44  $data45
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -319,4 +319,4 @@ if $data45 != 30.000000000 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/insert/commit-merge0.sim b/tests/script/tsim/insert/commit-merge0.sim
index dfc22354d2272d824b1d85691dfa57a502f4522e..da66560cbd90b87c5c170c5a15c119489b86a7e7 100644
--- a/tests/script/tsim/insert/commit-merge0.sim
+++ b/tests/script/tsim/insert/commit-merge0.sim
@@ -63,7 +63,7 @@ reboot_and_check:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 
-print =============== insert duplicated records to memory - loop $reboot_max - $reboot_cnt 
+print =============== insert duplicated records to memory - loop $reboot_max - $reboot_cnt
 sql use db
 sql insert into ct1 values ('2022-05-01 18:30:27.001', 0.0);
 sql insert into ct4 values ('2022-04-28 18:30:27.002', 0.0);
@@ -91,7 +91,7 @@ sql insert into ct4 values ('2018-05-01 18:30:27.023', NULL) ;
 sql insert into ct4 values ('2021-03-01 18:30:27.024', NULL) ;
 sql insert into ct4 values ('2022-08-01 18:30:27.025', NULL) ;
 
-print =============== select * from ct1 - merge memory and file - loop $reboot_max - $reboot_cnt 
+print =============== select * from ct1 - merge memory and file - loop $reboot_max - $reboot_cnt
 sql select * from ct1;
 if $rows != 13 then
   print rows = $rows != 13
@@ -163,8 +163,8 @@ if $data[12][1] != -99.990000000 then
     print $data[12][1] != -99.990000000
     return -1
 endi
- 
-print =============== select * from ct4 - merge memory and file - loop $reboot_max - $reboot_cnt 
+
+print =============== select * from ct4 - merge memory and file - loop $reboot_max - $reboot_cnt
 sql select * from ct4;
 if $rows != 12 then
   print rows = $rows != 12
diff --git a/tests/script/tsim/insert/insert_drop.sim b/tests/script/tsim/insert/insert_drop.sim
index 020fd367ae0b1d5146862a8c4a634f29887b8516..467eb3a702198f9c3097e4e66870c344d48fa4d0 100644
--- a/tests/script/tsim/insert/insert_drop.sim
+++ b/tests/script/tsim/insert/insert_drop.sim
@@ -25,16 +25,16 @@ $ts = $ts0
 while $i < 10
   $tb = tb . $i
   sql create table $tb using $stb tags( $i )
- 
+
   $x = 0
   while $x < $rowNum
     $xs = $x * $delta
     $ts = $ts0 + $xs
-    sql insert into $tb values ( $ts , $x ) 
+    sql insert into $tb values ( $ts , $x )
     $x = $x + 1
-  endw 
+  endw
   $i = $i + 1
-endw 
+endw
 print ====== tables created
 
 print ================== restart server to commit data into disk
@@ -46,18 +46,18 @@ sql use $db
 sql drop table tb5
 $i = 0
 while $i < 4
-  
+
   $tb = tb . $i
   $x = 0
   while $x < $rowNum
     $xs = $x * $delta
     $ts = $ts0 + $xs
-    sql insert into $tb values ( $ts , $x ) 
+    sql insert into $tb values ( $ts , $x )
     $x = $x + 1
-  endw 
+  endw
 
   $i = $i + 1
-endw 
+endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ if $rows != 0 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/insert/insert_select.sim b/tests/script/tsim/insert/insert_select.sim
index c44197d7d41b34544fe17f0b1ed8ee226eaaca24..e3374ee277ae982d2df476b981ca7fc58f76199d 100644
--- a/tests/script/tsim/insert/insert_select.sim
+++ b/tests/script/tsim/insert/insert_select.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 drop database if exists db1;
 sql create database db1 vgroups 3;
 sql use db1;
diff --git a/tests/script/tsim/insert/null.sim b/tests/script/tsim/insert/null.sim
index 49adb8ebe04d962ac7bdb6312ec288aed0843808..57aef3f6a54bfb2910f77ffe38018825b6e34e7c 100644
--- a/tests/script/tsim/insert/null.sim
+++ b/tests/script/tsim/insert/null.sim
@@ -18,7 +18,7 @@ print =============== create super table, include column type for count/sum/min/
 sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double, c4 bigint) tags (t1 int unsigned)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -28,7 +28,7 @@ sql create table ct2 using stb tags(2000)
 sql create table ct3 using stb tags(3000)
 
 sql show tables
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
@@ -55,22 +55,22 @@ print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 12 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
-#if $data41 != -14 then 
+#if $data41 != -14 then
 #  return -1
 #endi
-#if $data42 != -2.40000 then 
+#if $data42 != -2.40000 then
 #  return -1
 #endi
-#if $data43 != -3.400000000 then 
+#if $data43 != -3.400000000 then
 #  return -1
 #endi
 
@@ -79,10 +79,10 @@ sql select count(*) from ct1
 print ===> select count(*) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
@@ -91,16 +91,16 @@ sql select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 
@@ -113,16 +113,16 @@ sql select min(c1), min(c2), min(c3) from ct1
 print ===> select min(c1), min(c2), min(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483647 then 
+if $data00 != -2147483647 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
 
@@ -131,16 +131,16 @@ sql select max(c1), max(c2), max(c3) from ct1
 print ===> select max(c1), max(c2), max(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 16 then 
+if $data00 != 16 then
   return -1
 endi
-if $data01 != 2.70000 then 
+if $data01 != 2.70000 then
   return -1
 endi
-if $data02 != 3.700000000 then 
+if $data02 != 3.700000000 then
   return -1
 endi
 
@@ -149,16 +149,16 @@ sql select sum(c1), sum(c2), sum(c3) from ct1
 print ===> select sum(c1), sum(c2), sum(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483556  then 
+if $data00 != -2147483556  then
   return -1
 endi
-if $data01 != 18.799999952 then 
+if $data01 != 18.799999952 then
   return -1
 endi
-if $data02 != 26.800000000 then 
+if $data02 != 26.800000000 then
   return -1
 endi
 
@@ -167,43 +167,43 @@ sql select c1, c2, c3 from ct1
 print ===> select c1, c2, c3 from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != NULL then 
+if $data10 != NULL then
   return -1
 endi
-if $data11 != NULL then 
+if $data11 != NULL then
   return -1
 endi
-if $data12 != NULL then 
+if $data12 != NULL then
   return -1
 endi
-if $data30 != 11 then 
+if $data30 != 11 then
   return -1
 endi
-if $data31 != NULL then 
+if $data31 != NULL then
   return -1
 endi
-if $data32 != 3.200000000 then 
+if $data32 != 3.200000000 then
   return -1
 endi
-if $data90 != 16 then 
+if $data90 != 16 then
   return -1
 endi
-if $data91 != 2.60000 then 
+if $data91 != 2.60000 then
   return -1
 endi
-if $data92 != 3.600000000 then 
+if $data92 != 3.600000000 then
   return -1
 endi
 #===================================================================
@@ -211,36 +211,36 @@ endi
 
 #print =============== query data from stb
 sql select * from stb
-print ===> 
+print ===>
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
 
 #print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
 #print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 
@@ -264,22 +264,22 @@ print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 12 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
-if $data41 != 12 then 
+if $data41 != 12 then
   return -1
 endi
-if $data42 != 2.20000 then 
+if $data42 != 2.20000 then
   return -1
 endi
-if $data43 != NULL then 
+if $data43 != NULL then
   return -1
 endi
 
@@ -288,10 +288,10 @@ sql select count(*) from ct1
 print ===> select count(*) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
@@ -300,16 +300,16 @@ sql select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 
@@ -322,16 +322,16 @@ sql select min(c1), min(c2), min(c3) from ct1
 print ===> select min(c1), min(c2), min(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483647 then 
+if $data00 != -2147483647 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
 
@@ -340,16 +340,16 @@ sql select max(c1), max(c2), max(c3) from ct1
 print ===> select max(c1), max(c2), max(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 16 then 
+if $data00 != 16 then
   return -1
 endi
-if $data01 != 2.70000 then 
+if $data01 != 2.70000 then
   return -1
 endi
-if $data02 != 3.700000000 then 
+if $data02 != 3.700000000 then
   return -1
 endi
 
@@ -358,16 +358,16 @@ sql select sum(c1), sum(c2), sum(c3) from ct1
 print ===> select sum(c1), sum(c2), sum(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483556  then 
+if $data00 != -2147483556  then
   return -1
 endi
-if $data01 != 18.799999952 then 
+if $data01 != 18.799999952 then
   return -1
 endi
-if $data02 != 26.800000000 then 
+if $data02 != 26.800000000 then
   return -1
 endi
 
@@ -376,78 +376,78 @@ sql select c1, c2, c3 from ct1
 print ===> select c1, c2, c3 from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != NULL then 
+if $data10 != NULL then
   return -1
 endi
-if $data11 != NULL then 
+if $data11 != NULL then
   return -1
 endi
-if $data12 != NULL then 
+if $data12 != NULL then
   return -1
 endi
-if $data30 != 11 then 
+if $data30 != 11 then
   return -1
 endi
-if $data31 != NULL then 
+if $data31 != NULL then
   return -1
 endi
-if $data32 != 3.200000000 then 
+if $data32 != 3.200000000 then
   return -1
 endi
-if $data90 != 16 then 
+if $data90 != 16 then
   return -1
 endi
-if $data91 != 2.60000 then 
+if $data91 != 2.60000 then
   return -1
 endi
-if $data92 != 3.600000000 then 
+if $data92 != 3.600000000 then
   return -1
 endi
 #===================================================================
 
 print =============== query data from stb
 sql select * from stb
-print ===> 
+print ===>
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
 print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
 print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 
diff --git a/tests/script/tsim/insert/query_block1_file.sim b/tests/script/tsim/insert/query_block1_file.sim
index c6bda6d0610f377ae11dc45b757f97216e3ded70..8d2d2664d7ec83a685d856577054d0ce4c78a527 100644
--- a/tests/script/tsim/insert/query_block1_file.sim
+++ b/tests/script/tsim/insert/query_block1_file.sim
@@ -16,36 +16,36 @@ sql create database $db
 sql use $db
 sql create table $tb (ts timestamp, speed int)
 
-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows
 
-$N = 82 
+$N = 82
 
 print =============== step 1
 $x = $N
 $y = $N / 2
 while $x > $y
   $ms = $x . m
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , -$x ) 
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , -$x )
   $x = $x - 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $y then 
+print sql select * from $tb -> $rows points
+if $rows != $y then
   return -1
 endi
 
 $x = $N / 2
 $y = $N
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
   $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $N then 
+print sql select * from $tb -> $rows points
+if $rows != $N then
   return -1
 endi
 
@@ -53,18 +53,18 @@ print =============== step 2
 
 $R = 4
 $x = $N * 2
-$y = $N * $R 
+$y = $N * $R
 $expect = $y + $N
 $y = $y + $x
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
   $x = $x + 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
 
@@ -100,7 +100,7 @@ endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -115,23 +115,23 @@ if $rows != 0 then
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end3 
+sql select * from $tb where ts < $start3 and ts > $end3
 if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@@ -148,9 +148,9 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -164,15 +164,15 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
@@ -185,8 +185,8 @@ clear:
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/insert/query_block1_memory.sim b/tests/script/tsim/insert/query_block1_memory.sim
index 110255bd90c4c9e4e361b14dfd09497baf352653..168f0e19c9bd94f66a0ed1dcdcb18fcedd35becf 100644
--- a/tests/script/tsim/insert/query_block1_memory.sim
+++ b/tests/script/tsim/insert/query_block1_memory.sim
@@ -17,9 +17,9 @@ sql use $db
 
 sql create table $tb (ts timestamp, speed int)
 
-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows
 
-$N = 82 
+$N = 82
 
 print =============== step 1
 $x = $N
@@ -28,14 +28,14 @@ while $x > $y
   $z = $x * 60000
   $ms = 1601481600000 - $z
 
-  $xt = - . $x 
-  sql insert into $tb values ($ms , -$x ) 
+  $xt = - . $x
+  sql insert into $tb values ($ms , -$x )
   $x = $x - 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $y then 
+print sql select * from $tb -> $rows points
+if $rows != $y then
   return -1
 endi
 
@@ -45,12 +45,12 @@ while $x < $y
   $z = $x * 60000
   $ms = 1601481600000 + $z
 
-  sql insert into $tb values ($ms , $x ) 
+  sql insert into $tb values ($ms , $x )
   $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $N then 
+print sql select * from $tb -> $rows points
+if $rows != $N then
   return -1
 endi
 
@@ -69,100 +69,100 @@ $end2 = 1601481600000
 $end3 = 1601481600000 +  $step
 
 sql select * from $tb where ts < $start1 and ts > $end1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -170,8 +170,8 @@ clear:
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/insert/query_block2_file.sim b/tests/script/tsim/insert/query_block2_file.sim
index c87262ab143b3cac842196576f14dcce6fd84c2c..804051c44ac4adc7be3fea896a017d6ebb513b56 100644
--- a/tests/script/tsim/insert/query_block2_file.sim
+++ b/tests/script/tsim/insert/query_block2_file.sim
@@ -16,23 +16,23 @@ sql create database $db
 sql use $db
 sql create table $tb (ts timestamp, speed int)
 
-#commit to file will trigger if insert 82 rows 
-$N = 82 
+#commit to file will trigger if insert 82 rows
+$N = 82
 
 print =============== step 1
 $x = $N * 2
 $y = $N
 $expect = $N
 while $x > $y
-  $ms = $x . m 
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , $xt ) 
+  $ms = $x . m
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , $xt )
   $x = $x - 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
 
@@ -40,20 +40,20 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
   $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
 
 print =============== step 2
 
 $R = 4
-$y = $N * $R 
+$y = $N * $R
 
 $expect = $y + $N
 $expect = $expect + $N
@@ -62,17 +62,17 @@ $x = $N * 3
 $y = $y + $x
 
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
   $x = $x + 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
- 
+
 
 print =============== step 2
 
@@ -106,7 +106,7 @@ endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -121,14 +121,14 @@ if $rows != 0 then
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
@@ -137,7 +137,7 @@ if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@@ -154,9 +154,9 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -170,15 +170,15 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
@@ -191,8 +191,8 @@ clear:
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/insert/query_block2_memory.sim b/tests/script/tsim/insert/query_block2_memory.sim
index f919a2a61f2c03c344e7fe53cf90d43ba43881cd..2504e905b79bd53b87ac245bb2f8d4d1f46d7d4c 100644
--- a/tests/script/tsim/insert/query_block2_memory.sim
+++ b/tests/script/tsim/insert/query_block2_memory.sim
@@ -14,22 +14,22 @@ sql drop database -x step1
 step1:
 sql create database $db
 sql use $db
-sql create table $tb (ts timestamp, speed int) 
+sql create table $tb (ts timestamp, speed int)
 
-$N = 82 
+$N = 82
 
 $x = $N * 2
 $y = $N
 while $x > $y
-  $ms = $x . m 
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , $xt ) 
+  $ms = $x . m
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , $xt )
   $x = $x - 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $y then 
+print sql select * from $tb -> $rows points
+if $rows != $y then
   return -1
 endi
 
@@ -37,13 +37,13 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
   $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
 
@@ -63,107 +63,107 @@ $end2 = now
 $end3 = now+ . $step
 
 sql select * from $tb where ts < $start1 and ts > $end1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
 print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
-if $rows != $result2 then 
+if $rows != $result2 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/insert/query_file_memory.sim b/tests/script/tsim/insert/query_file_memory.sim
index 0d37484494e9dadc98b4f2aea1e2956d09b5c7de..325d7977b65173190718365c2f753a69fb52ebbe 100644
--- a/tests/script/tsim/insert/query_file_memory.sim
+++ b/tests/script/tsim/insert/query_file_memory.sim
@@ -17,23 +17,23 @@ sql use $db
 
 sql create table $tb (ts timestamp, speed int)
 
-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows
 
-$N = 82 
+$N = 82
 
 $x = $N * 2
 $y = $N
 $expect = $y
 while $x > $y
-  $ms = $x . m 
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , $xt ) 
+  $ms = $x . m
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , $xt )
   $x = $x - 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
 
@@ -41,37 +41,37 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
   $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
 
 $R = 4
 $R = $R - 1
 
-$y = $N * $R 
+$y = $N * $R
 $expect = $y + $N
 $expect = $expect + $N
 
 $x = $N * 3
 $y = $y + $x
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
   $x = $x + 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
   return -1
 endi
- 
+
 
 print =============== step 2
 
@@ -105,7 +105,7 @@ endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -120,14 +120,14 @@ if $rows != 0 then
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
@@ -136,7 +136,7 @@ if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@@ -153,9 +153,9 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -169,15 +169,15 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
   return -1
 endi
 
@@ -190,8 +190,8 @@ clear:
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/insert/query_multi_file.sim b/tests/script/tsim/insert/query_multi_file.sim
index 750eb040293b381cc98cd38da76931d93a1c7617..1b3ad57c8e47c0eaf702be6e3c2f4a10c5d6f1a0 100644
--- a/tests/script/tsim/insert/query_multi_file.sim
+++ b/tests/script/tsim/insert/query_multi_file.sim
@@ -15,18 +15,18 @@ step1:
 sql create database $db
 sql use $db
 
-sql create table $tb (ts timestamp, speed int) 
+sql create table $tb (ts timestamp, speed int)
 
 $N = 20000
 
 $x = 0
 
 while $x < $N
-  $ms = $x . s 
+  $ms = $x . s
   #print insert into $tb values (now + $ms , $x )
   sql insert into $tb values (now + $ms , $x ) -x error_insert
   $x = $x + 1
-endw 
+endw
 error_insert:
 
 sql select * from $tb
@@ -37,8 +37,8 @@ endi
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/insert/tcp.sim b/tests/script/tsim/insert/tcp.sim
index 2dc720a0d455840831e70966515096bc9471e039..7eb06e82fb9921450e684813210c514387a3e3bf 100644
--- a/tests/script/tsim/insert/tcp.sim
+++ b/tests/script/tsim/insert/tcp.sim
@@ -21,8 +21,8 @@ while $x < 10000
   $ms = $x . s
   sql insert into tb values (now + $ms , '1' )
   $x = $x + 1
-endw 
+endw
 
 sql select * from tb
 
-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/insert/update0.sim b/tests/script/tsim/insert/update0.sim
index c4bd29615bd7b0ca14d8b0d67588618ad29fd945..6384b5a21f060796d68de57dcf4f65da6ae74cd9 100644
--- a/tests/script/tsim/insert/update0.sim
+++ b/tests/script/tsim/insert/update0.sim
@@ -11,7 +11,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int) tags (city binary(20),district binary(20));
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -20,7 +20,7 @@ sql create table ct1 using stb tags("BeiJing", "ChaoYang")
 sql create table ct2 using stb tags("BeiJing", "HaiDian")
 
 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -43,7 +43,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -74,7 +74,7 @@ print $data00 $data01
 print $data10 $data11
 print $data20 $data21
 
-if $rows != 3 then 
+if $rows != 3 then
   print rows $rows != 3
   return -1
 endi
@@ -107,7 +107,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -133,7 +133,7 @@ print $data00 $data01
 print $data10 $data11
 print $data20 $data21
 
-if $rows != 3 then 
+if $rows != 3 then
   print rows $rows != 3
   return -1
 endi
@@ -166,7 +166,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -198,7 +198,7 @@ print $data20 $data21
 print $data30 $data31
 print $data40 $data41
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -228,4 +228,4 @@ if $data41 != NULL 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/insert/update1_sort_merge.sim b/tests/script/tsim/insert/update1_sort_merge.sim
index 13462520eaf173e5df0badcb6430152ea1a05321..5a69a01acbd96707ee917ac49d67c5c2376796fe 100644
--- a/tests/script/tsim/insert/update1_sort_merge.sim
+++ b/tests/script/tsim/insert/update1_sort_merge.sim
@@ -13,7 +13,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int unsigned, c2 double, c3 binary(10), c4 nchar(10), c5 double) tags (city binary(20),district binary(20));
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -24,7 +24,7 @@ sql create table ct3 using stb tags("BeiJing", "PingGu")
 sql create table ct4 using stb tags("BeiJing", "YanQing")
 
 sql show tables
-if $rows != 4 then 
+if $rows != 4 then
   print rows $rows != 4
   return -1
 endi
@@ -69,7 +69,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 print $data50 $data51 $data52 $data53 $data54 $data55
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -154,7 +154,7 @@ print =============== step 6 query records of ct2 from memory(taosc and taosd me
 sql select * from ct2;
 print $data00 $data01 $data02 $data03 $data04 $data05
 
-if $rows != 1 then 
+if $rows != 1 then
   print rows $rows != 1
   return -1
 endi
@@ -196,12 +196,12 @@ print $data60 $data61 $data62 $data63 $data64 $data65
 print $data70 $data71 $data72 $data73 $data74 $data75
 print $data80 $data81 $data82 $data83 $data84 $data85
 print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
+print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5]
+print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5]
+print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5]
+print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5]
 
-if $rows != 14 then 
+if $rows != 14 then
   print rows $rows != 14
   return -1
 endi
@@ -356,7 +356,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -451,7 +451,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 print $data50 $data51 $data52 $data53 $data54 $data55
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -536,7 +536,7 @@ print =============== step 10 query records of ct2 from file
 sql select * from ct2;
 print $data00 $data01 $data02 $data03 $data04 $data05
 
-if $rows != 1 then 
+if $rows != 1 then
   print rows $rows != 1
   return -1
 endi
@@ -578,12 +578,12 @@ print $data60 $data61 $data62 $data63 $data64 $data65
 print $data70 $data71 $data72 $data73 $data74 $data75
 print $data80 $data81 $data82 $data83 $data84 $data85
 print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
+print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5]
+print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5]
+print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5]
+print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5]
 
-if $rows != 14 then 
+if $rows != 14 then
   print rows $rows != 14
   return -1
 endi
@@ -738,7 +738,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -818,4 +818,4 @@ if $data44 != n8 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/scalar/in.sim b/tests/script/tsim/scalar/in.sim
index 60c12a00c2a2ddbbe4210700b976970b767c03c4..75e1face88a9d837f9f668599f92496aedfaf410 100644
--- a/tests/script/tsim/scalar/in.sim
+++ b/tests/script/tsim/scalar/in.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 drop database if exists db1;
 sql create database db1 vgroups 3;
 sql use db1;
@@ -11,24 +11,24 @@ sql create stable st1 (fts timestamp, fbool bool, ftiny tinyint, fsmall smallint
 sql create table tb1 using st1 tags('2022-07-10 16:31:00', true, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql create table tb2 using st1 tags('2022-07-10 16:32:00', false, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql create table tb3 using st1 tags('2022-07-10 16:33:00', true, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
- 
+
 sql insert into tb1 values ('2022-07-10 16:31:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql insert into tb1 values ('2022-07-10 16:31:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb1 values ('2022-07-10 16:31:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
 sql insert into tb1 values ('2022-07-10 16:31:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb1 values ('2022-07-10 16:31:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb2 values ('2022-07-10 16:32:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb2 values ('2022-07-10 16:32:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
+sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb2 values ('2022-07-10 16:32:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb3 values ('2022-07-10 16:33:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb3 values ('2022-07-10 16:33:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
-sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); 
+sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
+sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
 
 sql select * from tb1 where fts in ('2022-07-10 16:31:01', '2022-07-10 16:31:03', 1657441865000);
 if $rows != 3 then
diff --git a/tests/script/tsim/scalar/scalar.sim b/tests/script/tsim/scalar/scalar.sim
index 29cc67ec248b16018b508a3714290c53593d14f1..900f7c0904ce9db00133e694782bf11c1e6bf45a 100644
--- a/tests/script/tsim/scalar/scalar.sim
+++ b/tests/script/tsim/scalar/scalar.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 drop database if exists db1;
 sql create database db1 vgroups 3;
 sql use db1;
@@ -11,24 +11,24 @@ sql create stable st1 (fts timestamp, fbool bool, ftiny tinyint, fsmall smallint
 sql create table tb1 using st1 tags('2022-07-10 16:31:00', true, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql create table tb2 using st1 tags('2022-07-10 16:32:00', false, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql create table tb3 using st1 tags('2022-07-10 16:33:00', true, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
- 
+
 sql insert into tb1 values ('2022-07-10 16:31:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql insert into tb1 values ('2022-07-10 16:31:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb1 values ('2022-07-10 16:31:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
 sql insert into tb1 values ('2022-07-10 16:31:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb1 values ('2022-07-10 16:31:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb2 values ('2022-07-10 16:32:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb2 values ('2022-07-10 16:32:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
+sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb2 values ('2022-07-10 16:32:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb3 values ('2022-07-10 16:33:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb3 values ('2022-07-10 16:33:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
-sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); 
+sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
+sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
 
 sql select 1+1n;
 if $rows != 1 then
diff --git a/tests/script/tsim/tag/3.sim b/tests/script/tsim/tag/3.sim
index ee794d6fc7bdc4f0aaf03ac55b36337033605dbf..1b8a9769805422b6da9669397886e825e8be73ec 100644
--- a/tests/script/tsim/tag/3.sim
+++ b/tests/script/tsim/tag/3.sim
@@ -24,496 +24,496 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgc
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step15
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step16
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step17
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step18
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step19
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/4.sim b/tests/script/tsim/tag/4.sim
index 7ad253bf14ac92bd6bb301f3f33dab87da013eb2..9ffe9703c6ce8e5bba4b7dd5918237d7c2d106ef 100644
--- a/tests/script/tsim/tag/4.sim
+++ b/tests/script/tsim/tag/4.sim
@@ -24,686 +24,686 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 bigi
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0, 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0, 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1, 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1, 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where tgcol4 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step13
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step14
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step15
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step16
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step17
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step18
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step19
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step20
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step21
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step22
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step23
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step24
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d) 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 partition by tgcol4 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/5.sim b/tests/script/tsim/tag/5.sim
index eaf613e9d1c50961e1fb5419356fcfe4e6c93a7e..e1ac606dfe529a46ba48c5a1abe4bce0136626a6 100644
--- a/tests/script/tsim/tag/5.sim
+++ b/tests/script/tsim/tag/5.sim
@@ -24,809 +24,809 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 tinyint, tgcol2 int,
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0, 0, 0, '0' )  
+  sql create table $tb using $mt tags( 0, 0, 0, 0, '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1, 1, 1, '1' )  
+  sql create table $tb using $mt tags( 1, 1, 1, 1, '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where tgcol4 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where tgcol5 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol5 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol5 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol5 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step8
 sql select * from $mt where ts > now + 4m and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol5 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step13
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step14
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step15
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step16
 sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step17
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step18
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step19
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step20
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step21
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step22
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step23
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step24
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step25
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step26
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 
 print =============== step27
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 partition by tgcol4 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 partition by tgcol5 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/6.sim b/tests/script/tsim/tag/6.sim
index 31aa5b1747347b05ba13df06488cd8365c28a599..655129255d2c6cec7e6543e8e3f728c294d3f6b4 100644
--- a/tests/script/tsim/tag/6.sim
+++ b/tests/script/tsim/tag/6.sim
@@ -24,964 +24,964 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 bi
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0', 0, 0, 0, '0', '0' )  
+  sql create table $tb using $mt tags( '0', 0, 0, 0, '0', '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1', 1, 1, 1, '1', '1' )  
+  sql create table $tb using $mt tags( '1', 1, 1, 1, '1', '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where tgcol4 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where tgcol5 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol5 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol5 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol5 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step8
 sql select * from $mt where tgcol6 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol6 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol6 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol6 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step13
 sql select * from $mt where ts > now + 4m and tgcol5 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step14
 sql select * from $mt where ts > now + 4m and tgcol6 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol6 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol6 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol6 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol6 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol6 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol6 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol6 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step15
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step16
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step17
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step18
 sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step19
 sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol6 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol6 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol6 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol6 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol6 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol6 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol6 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol6 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step20
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step21
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step22
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step23
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step24
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step25
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step26
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step27
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step28
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol6
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step29
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1  and tgcol6 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step30
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step31
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 partition by tgcol4 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 partition by tgcol5 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1  and tgcol6 = 1 partition by tgcol6 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/add.sim b/tests/script/tsim/tag/add.sim
index 78244d74c3f8664c7cb66ed8e484663a30696481..2b528c02552150b8a5dbe5a5115de3fe96144eb5 100644
--- a/tests/script/tsim/tag/add.sim
+++ b/tests/script/tsim/tag/add.sim
@@ -25,39 +25,39 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 int
 sql reset query cache
-sql alter table $tb set tag tgcol4 =4 
+sql alter table $tb set tag tgcol4 =4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
@@ -71,61 +71,61 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 tinyint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 1 -x step3
   return -1
 step3:
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -134,34 +134,34 @@ endi
 
 sql describe $tb
 print sql describe $tb
-if $data21 != BIGINT then 
+if $data21 != BIGINT then
   return -1
 endi
-if $data31 != FLOAT then 
+if $data31 != FLOAT then
   return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
   return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 float
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 4.00000 then
@@ -171,184 +171,184 @@ endi
 sql select * from $mt where tgcol2 = 1 -x step4
   return -1
 step4:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 smallint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol3 = '1' -x step5
   return -1
 step5:
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
 sql create table $tb using $mt tags( 1, 2, 3 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(10)
 sql alter table $mt add tag tgcol6 binary(10)
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=false 
-sql alter table $tb set tag tgcol5='5' 
-sql alter table $tb set tag tgcol6='6' 
+sql alter table $tb set tag tgcol4=false
+sql alter table $tb set tag tgcol5='5'
+sql alter table $tb set tag tgcol6='6'
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol6 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1 -x step52
   return -1
 step52:
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bigint
 sql alter table $mt add tag tgcol6 tinyint
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
-sql alter table $tb set tag tgcol5=5 
-sql alter table $tb set tag tgcol6=6 
+sql alter table $tb set tag tgcol4=4
+sql alter table $tb set tag tgcol5=5
+sql alter table $tb set tag tgcol6=6
 sql reset query cache
 
 sql select * from $mt where tgcol6 = 6
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
@@ -358,55 +358,55 @@ step71:
 sql select * from $mt where tgcol3 = 1 -x step72
   return -1
 step72:
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(17)
 sql alter table $mt add tag tgcol6 bool
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
-sql alter table $tb set tag tgcol5='5' 
+sql alter table $tb set tag tgcol4=4
+sql alter table $tb set tag tgcol5='5'
 sql alter table $tb set tag tgcol6='1'
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
 print select * from $mt where tgcol5 = 5
 print $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
 if $data04 != 0 then
@@ -426,45 +426,45 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, '2', '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bool
 sql alter table $mt add tag tgcol6 float
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql alter table $tb set tag tgcol5=1
 sql alter table $tb set tag tgcol6=6
 sql reset query cache
 
 sql select * from $mt where tgcol5 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4.000000000 then 
+if $data02 != 4.000000000 then
   return -1
 endi
 if $data03 != 1 then
@@ -487,24 +487,24 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol4 = '4'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
 
@@ -512,7 +512,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step103
   return -1
 step103:
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql reset query cache
@@ -520,28 +520,28 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bool
 
 sql reset query cache
-sql alter table $tb set tag tgcol4='4' 
+sql alter table $tb set tag tgcol4='4'
 sql alter table $tb set tag tgcol5=false
 sql reset query cache
 
 sql select * from $mt where tgcol4 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
 
@@ -558,27 +558,27 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 if $data05 != 4.00000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
 
@@ -586,7 +586,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step114
   return -1
 step114:
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@@ -598,7 +598,7 @@ sql alter table $mt add tag tgcol7 bigint
 sql alter table $mt add tag tgcol8 smallint
 
 sql reset query cache
-sql alter table $tb set tag tgcol4='4' 
+sql alter table $tb set tag tgcol4='4'
 sql alter table $tb set tag tgcol5=5
 sql alter table $tb set tag tgcol6='6'
 sql alter table $tb set tag tgcol7=7
@@ -607,28 +607,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol5 =5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 6 then 
+if $data05 != 6 then
   return -1
 endi
-if $data06 != 7 then 
+if $data06 != 7 then
   return -1
 endi
-if $data07 != 8 then 
+if $data07 != 8 then
   return -1
 endi
 
@@ -648,34 +648,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 if $data04 != 3.00000 then
   return -1
 endi
-if $data05 != 4.000000000 then 
+if $data05 != 4.000000000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@@ -686,8 +686,8 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bigint
 
 sql reset query cache
-sql alter table $tb set tag tgcol1=false 
-sql alter table $tb set tag tgcol2='5' 
+sql alter table $tb set tag tgcol1=false
+sql alter table $tb set tag tgcol2='5'
 sql alter table $tb set tag tgcol3=4
 sql alter table $tb set tag tgcol4='3'
 sql alter table $tb set tag tgcol5=2
@@ -696,28 +696,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol4 = '3'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 1 then 
+if $data03 != 1 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 3 then 
+if $data06 != 3 then
   return -1
 endi
-if $data07 != 2 then 
+if $data07 != 2 then
   return -1
 endi
 
@@ -747,34 +747,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol6
 sql reset query cache
@@ -783,8 +783,8 @@ sql alter table $mt add tag tgcol4 int
 sql alter table $mt add tag tgcol6 bigint
 
 sql reset query cache
-sql alter table $tb set tag tgcol1='7' 
-sql alter table $tb set tag tgcol2='8' 
+sql alter table $tb set tag tgcol1='7'
+sql alter table $tb set tag tgcol2='8'
 sql alter table $tb set tag tgcol3=9
 sql alter table $tb set tag tgcol4=10
 sql alter table $tb set tag tgcol5=11
@@ -793,28 +793,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol2 = '8'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
   return -1
 endi
-if $data04 != 11.000000000 then 
+if $data04 != 11.000000000 then
   return -1
 endi
-if $data05 != 8 then 
+if $data05 != 8 then
   return -1
 endi
-if $data06 != 10 then 
+if $data06 != 10 then
   return -1
 endi
-if $data07 != 12 then 
+if $data07 != 12 then
   return -1
 endi
 
@@ -824,7 +824,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 
 sql alter table $mt add tag tgcol3 binary(10)
 sql alter table $mt add tag tgcol4 int
@@ -834,13 +834,13 @@ sql alter table $mt add tag tgcol6 bigint
  sql reset query cache
 sql alter table $mt drop tag tgcol6
 sql alter table $mt add tag tgcol7 bigint
-sql alter table $mt add tag tgcol8 bigint 
+sql alter table $mt add tag tgcol8 bigint
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/bigint.sim b/tests/script/tsim/tag/bigint.sim
index dc5a03152bdceb17c21ea5ed8652e6acaa09a646..26a5addf6a3f9d5e717b21b5003ac719d8b4d04d 100644
--- a/tests/script/tsim/tag/bigint.sim
+++ b/tests/script/tsim/tag/bigint.sim
@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,155 +83,155 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/binary.sim b/tests/script/tsim/tag/binary.sim
index b3f243b8c014c419e05634e2db2845295fc527d4..e0c02b4823ca43f8ee783628776079ca1f57a3fa 100644
--- a/tests/script/tsim/tag/binary.sim
+++ b/tests/script/tsim/tag/binary.sim
@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0' )  
+  sql create table $tb using $mt tags( '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1' )  
+  sql create table $tb using $mt tags( '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,155 +83,155 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/binary_binary.sim b/tests/script/tsim/tag/binary_binary.sim
index ad6c0ca1cbb2101d43a5c08c2fb14e10e5da1bee..b5ba3562acd244116dd79d25a58adebb41f03474 100644
--- a/tests/script/tsim/tag/binary_binary.sim
+++ b/tests/script/tsim/tag/binary_binary.sim
@@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5), tgcol2 bina
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0', '0' )  
+  sql create table $tb using $mt tags( '0', '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1', '1' )  
+  sql create table $tb using $mt tags( '1', '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/bool.sim b/tests/script/tsim/tag/bool.sim
index c0f4c1ccdda2651d8d21add6573a2ff399b2f2ef..1473556841ddcf3ef08d0a11a651fb0571095385 100644
--- a/tests/script/tsim/tag/bool.sim
+++ b/tests/script/tsim/tag/bool.sim
@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -79,40 +79,40 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
@@ -121,115 +121,115 @@ if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
 print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/bool_binary.sim b/tests/script/tsim/tag/bool_binary.sim
index 627aea4495d42e294e4a24b5a55620e68f4c22ce..7fb15ec2cf541a553460014ed7eeabd7a9becede 100644
--- a/tests/script/tsim/tag/bool_binary.sim
+++ b/tests/script/tsim/tag/bool_binary.sim
@@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(5)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, '0' )  
+  sql create table $tb using $mt tags( 0, '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, '1' )  
+  sql create table $tb using $mt tags( 1, '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/bool_int.sim b/tests/script/tsim/tag/bool_int.sim
index 1e291573ef5c22a6c477cdb23d01cb4788fe43cf..f18da59d9cd94f650166bea938312a471907f322 100644
--- a/tests/script/tsim/tag/bool_int.sim
+++ b/tests/script/tsim/tag/bool_int.sim
@@ -24,299 +24,299 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/change.sim b/tests/script/tsim/tag/change.sim
index 53f9f493966986f00fa5cf5defb7b9f10f24d2bd..d44877c99a244ffd2c1060950f004c5a967d8406 100644
--- a/tests/script/tsim/tag/change.sim
+++ b/tests/script/tsim/tag/change.sim
@@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -62,18 +62,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -86,15 +86,15 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -103,61 +103,61 @@ endi
 
 sql alter table $mt rename tag tgcol1 tgcol3
 sql alter table $mt rename tag tgcol2 tgcol4
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol3
 sql alter table $mt rename tag tgcol2 tgcol4
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -187,31 +187,31 @@ step25:
 
 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -229,34 +229,34 @@ step32:
 
 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
@@ -271,13 +271,13 @@ step42:
 
 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -298,7 +298,7 @@ endi
 if $data03 != 2.00000 then
   return -1
 endi
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
@@ -313,34 +313,34 @@ step52:
 
 sql select * from $mt where tgcol3 < 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = '2'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
@@ -367,144 +367,144 @@ step66:
 
 sql select * from $mt where tgcol7 = '1'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol8 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol9 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol10 = 5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol11 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/column.sim b/tests/script/tsim/tag/column.sim
index cc692900ce625317ead828310117abdc65cce598..041bc0a117856551a40f09d8961a7ca3e0e7d9ec 100644
--- a/tests/script/tsim/tag/column.sim
+++ b/tests/script/tsim/tag/column.sim
@@ -31,7 +31,7 @@ sql create table $tb using $mt tags(  0,  '0' )
 
 $i = 1
 $tb = $tbPrefix . $i
-sql create table $tb using $mt tags(  1,   '1'  )  
+sql create table $tb using $mt tags(  1,   '1'  )
 
 $i = 2
 $tb = $tbPrefix . $i
@@ -66,26 +66,26 @@ sql insert into $tb values(now, '3',  '3')
 
 print =============== step4
 sql select * from $mt where tgcol2 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/commit.sim b/tests/script/tsim/tag/commit.sim
index cc63e1670014e907ca3a0a832b7a34d1630c311f..e4f839e613472ec319980c19ca47e790d668baf1 100644
--- a/tests/script/tsim/tag/commit.sim
+++ b/tests/script/tsim/tag/commit.sim
@@ -25,39 +25,39 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 int
 sql reset query cache
-sql alter table $tb set tag tgcol4 =4 
+sql alter table $tb set tag tgcol4 =4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
@@ -71,61 +71,61 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 tinyint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 1 -x step3
   return -1
 step3:
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -133,34 +133,34 @@ if $data03 != 2.00000 then
 endi
 
 sql describe $tb
-if $data21 != BIGINT then 
+if $data21 != BIGINT then
   return -1
 endi
-if $data31 != FLOAT then 
+if $data31 != FLOAT then
   return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
   return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 float
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 4.00000 then
@@ -170,184 +170,184 @@ endi
 sql select * from $mt where tgcol2 = 1 -x step4
   return -1
 step4:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 smallint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol3 = '1' -x step5
   return -1
 step5:
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
 sql create table $tb using $mt tags( 1, 2, 3 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(10)
 sql alter table $mt add tag tgcol6 binary(10)
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=false 
-sql alter table $tb set tag tgcol5='5' 
-sql alter table $tb set tag tgcol6='6' 
+sql alter table $tb set tag tgcol4=false
+sql alter table $tb set tag tgcol5='5'
+sql alter table $tb set tag tgcol6='6'
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol6 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1 -x step52
   return -1
 step52:
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bigint
 sql alter table $mt add tag tgcol6 tinyint
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
-sql alter table $tb set tag tgcol5=5 
-sql alter table $tb set tag tgcol6=6 
+sql alter table $tb set tag tgcol4=4
+sql alter table $tb set tag tgcol5=5
+sql alter table $tb set tag tgcol6=6
 sql reset query cache
 
 sql select * from $mt where tgcol6 = 6
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
@@ -357,54 +357,54 @@ step71:
 sql select * from $mt where tgcol3 = 1 -x step72
   return -1
 step72:
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(17)
 sql alter table $mt add tag tgcol6 bool
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
-sql alter table $tb set tag tgcol5='5' 
+sql alter table $tb set tag tgcol4=4
+sql alter table $tb set tag tgcol5='5'
 sql alter table $tb set tag tgcol6=1
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
 if $data04 != 1 then
@@ -424,45 +424,45 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, '2', '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bool
 sql alter table $mt add tag tgcol6 float
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql alter table $tb set tag tgcol5=1
 sql alter table $tb set tag tgcol6=6
 sql reset query cache
 
 sql select * from $mt where tgcol5 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4.000000000 then 
+if $data02 != 4.000000000 then
   return -1
 endi
 if $data03 != 1 then
@@ -485,24 +485,24 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol4 = '4'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
 
@@ -510,7 +510,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step103
   return -1
 step103:
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql reset query cache
@@ -524,22 +524,22 @@ sql reset query cache
 
 sql select * from $mt where tgcol4 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
 
@@ -556,27 +556,27 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 if $data05 != 4.00000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
 
@@ -584,7 +584,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step114
   return -1
 step114:
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@@ -596,7 +596,7 @@ sql alter table $mt add tag tgcol7 bigint
 sql alter table $mt add tag tgcol8 smallint
 
 sql reset query cache
-sql alter table $tb set tag tgcol4='4' 
+sql alter table $tb set tag tgcol4='4'
 sql alter table $tb set tag tgcol5=5
 sql alter table $tb set tag tgcol6='6'
 sql alter table $tb set tag tgcol7=7
@@ -605,28 +605,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol5 =5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 6 then 
+if $data05 != 6 then
   return -1
 endi
-if $data06 != 7 then 
+if $data06 != 7 then
   return -1
 endi
-if $data07 != 8 then 
+if $data07 != 8 then
   return -1
 endi
 
@@ -646,34 +646,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 if $data04 != 3.00000 then
   return -1
 endi
-if $data05 != 4.000000000 then 
+if $data05 != 4.000000000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@@ -684,8 +684,8 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bigint
 
 sql reset query cache
-sql alter table $tb set tag tgcol1=false 
-sql alter table $tb set tag tgcol2='5' 
+sql alter table $tb set tag tgcol1=false
+sql alter table $tb set tag tgcol2='5'
 sql alter table $tb set tag tgcol3=4
 sql alter table $tb set tag tgcol4='3'
 sql alter table $tb set tag tgcol5=2
@@ -694,28 +694,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol4 = '3'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 1 then 
+if $data03 != 1 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 3 then 
+if $data06 != 3 then
   return -1
 endi
-if $data07 != 2 then 
+if $data07 != 2 then
   return -1
 endi
 
@@ -745,34 +745,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol6
 sql reset query cache
@@ -781,8 +781,8 @@ sql alter table $mt add tag tgcol4 int
 sql alter table $mt add tag tgcol6 bigint
 
 sql reset query cache
-sql alter table $tb set tag tgcol1='7' 
-sql alter table $tb set tag tgcol2='8' 
+sql alter table $tb set tag tgcol1='7'
+sql alter table $tb set tag tgcol2='8'
 sql alter table $tb set tag tgcol3=9
 sql alter table $tb set tag tgcol4=10
 sql alter table $tb set tag tgcol5=11
@@ -791,28 +791,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol2 = '8'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
   return -1
 endi
-if $data04 != 11.000000000 then 
+if $data04 != 11.000000000 then
   return -1
 endi
-if $data05 != 8 then 
+if $data05 != 8 then
   return -1
 endi
-if $data06 != 10 then 
+if $data06 != 10 then
   return -1
 endi
-if $data07 != 12 then 
+if $data07 != 12 then
   return -1
 endi
 
@@ -832,16 +832,16 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
@@ -852,19 +852,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
@@ -872,20 +872,20 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 4.00000 then
   return -1
 endi
 
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
@@ -893,20 +893,20 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
@@ -914,45 +914,45 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol5 = '5'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol6 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
@@ -960,23 +960,23 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol6 = 6
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
@@ -984,16 +984,16 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol5 = '5'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
 if $data04 != 1 then
@@ -1008,13 +1008,13 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol5 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4.000000000 then 
+if $data02 != 4.000000000 then
   return -1
 endi
 if $data03 != 1 then
@@ -1032,22 +1032,22 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
 
@@ -1058,28 +1058,28 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol5 =5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 6 then 
+if $data05 != 6 then
   return -1
 endi
-if $data06 != 7 then 
+if $data06 != 7 then
   return -1
 endi
-if $data07 != 8 then 
+if $data07 != 8 then
   return -1
 endi
 
@@ -1091,28 +1091,28 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = '3'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 1 then 
+if $data03 != 1 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 3 then 
+if $data06 != 3 then
   return -1
 endi
-if $data07 != 2 then 
+if $data07 != 2 then
   return -1
 endi
 
@@ -1143,36 +1143,36 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol2 = '8'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
   return -1
 endi
-if $data04 != 11.000000000 then 
+if $data04 != 11.000000000 then
   return -1
 endi
-if $data05 != 8 then 
+if $data05 != 8 then
   return -1
 endi
-if $data06 != 10 then 
+if $data06 != 10 then
   return -1
 endi
-if $data07 != 12 then 
+if $data07 != 12 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/create.sim b/tests/script/tsim/tag/create.sim
index da683389cb5b30f3f0d8ff520fb5b92ecddf63d8..1db2251da03891031f082322afb2f2d4628ae959 100644
--- a/tests/script/tsim/tag/create.sim
+++ b/tests/script/tsim/tag/create.sim
@@ -25,107 +25,107 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step3
 $i = 3
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
@@ -133,62 +133,62 @@ if $rows != 0 then
   print expect 0, actual: $rows
   return -1
 endi
-  
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step9
 $i = 9
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 sql create table $tb using $mt tags( '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step10
 $i = 10
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 1
 if $rows != 1 then
   print expect 1, actual: $rows
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -198,16 +198,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 smallint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -217,16 +217,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -236,16 +236,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -255,17 +255,17 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 print =============== step15
@@ -274,16 +274,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -293,16 +293,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 double)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -312,16 +312,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = true
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -331,16 +331,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -350,16 +350,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -369,16 +369,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -388,16 +388,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -407,16 +407,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float, tgcol2 double)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -426,16 +426,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -445,51 +445,51 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 3
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol4 = 4
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol5 = 5
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol6 = '6'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol6 = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -499,16 +499,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol6 = '6'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol6 = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -518,16 +518,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10), tgcol5 binary(10), tgcol6 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4', '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol3 = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -545,12 +545,12 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250))
 sql create table $tb using $mt tags('1', '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -560,12 +560,12 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(25), tgcol2 binary(250))
 sql create table $tb using $mt tags('1', '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -575,7 +575,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30
 #  return -1
-step30: 
+step30:
 
 print =============== step31
 $i = 31
@@ -584,16 +584,16 @@ $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5))
 sql_error create table $tb using $mt tags('1234567')
 sql create table $tb using $mt tags('12345')
-sql insert into $tb values(now, 1) 
-sql select * from $mt 
+sql insert into $tb values(now, 1)
+sql select * from $mt
 print sql select * from $mt
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print $data00 $data01 $data02
-if $data02 != 12345 then 
+if $data02 != 12345 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/tag/delete.sim b/tests/script/tsim/tag/delete.sim
index 36ef1110f8093228f1643b15547d4f96b67ea787..acf99cc874c90170c53a393ae511c340a77d18fc 100644
--- a/tests/script/tsim/tag/delete.sim
+++ b/tests/script/tsim/tag/delete.sim
@@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -48,38 +48,38 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 < 3
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -87,13 +87,13 @@ if $data03 != 2.00000 then
 endi
 
 sql describe $tb
-if $data21 != BIGINT then 
+if $data21 != BIGINT then
   return -1
 endi
-if $data31 != FLOAT then 
+if $data31 != FLOAT then
   return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
   return -1
 endi
 
@@ -101,25 +101,25 @@ sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol1 -x step40
   return -1
 step40:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -127,111 +127,111 @@ sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol1 -x step50
   return -1
 step50:
- 
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
 sql create table $tb using $mt tags( 1, 2, 3 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql describe $tb
-if $data21 != SMALLINT then 
+if $data21 != SMALLINT then
   return -1
 endi
-if $data31 != TINYINT then 
+if $data31 != TINYINT then
   return -1
 endi
-if $data41 != VARCHAR then 
+if $data41 != VARCHAR then
   return -1
 endi
-if $data22 != 2 then 
+if $data22 != 2 then
   return -1
 endi
-if $data32 != 1 then 
+if $data32 != 1 then
   return -1
 endi
-if $data42 != 10 then 
+if $data42 != 10 then
   return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
   return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
   return -1
 endi
-if $data43 != TAG then 
+if $data43 != TAG then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
@@ -244,21 +244,21 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, '2', '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
@@ -271,24 +271,24 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol4 = '4'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
 
@@ -302,27 +302,27 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 if $data05 != 4.00000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
 
@@ -336,30 +336,30 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 if $data04 != 3.00000 then
   return -1
 endi
-if $data05 != 4.000000000 then 
+if $data05 != 4.000000000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -374,30 +374,30 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -412,16 +412,16 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
@@ -436,23 +436,23 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 1 -x step3
   return -1
 step3:
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
@@ -460,23 +460,23 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 1 -x step4
   return -1
 step4:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
@@ -484,23 +484,23 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = '1' -x step5
   return -1
 step5:
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
@@ -508,19 +508,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -530,7 +530,7 @@ step51:
 sql select * from $mt where tgcol3 = 1 -x step52
   return -1
 step52:
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
@@ -538,19 +538,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -560,7 +560,7 @@ step71:
 sql select * from $mt where tgcol3 = 1 -x step72
   return -1
 step72:
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
@@ -568,19 +568,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -598,19 +598,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -628,22 +628,22 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = '1'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
 
@@ -664,10 +664,10 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4=4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
@@ -676,13 +676,13 @@ endi
 if $data03 != 4.00000 then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
-if $data06 != null then 
+if $data06 != null then
   return -1
 endi
 
@@ -703,28 +703,28 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4.000000000 then 
+if $data03 != 4.000000000 then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
-if $data06 != null then 
+if $data06 != null then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
@@ -749,28 +749,28 @@ $tb = $tbPrefix . $i
 sql reset query cache
 sql select * from $mt where tgcol2 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 5.000000000 then 
+if $data04 != 5.000000000 then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
-if $data06 != null then 
+if $data06 != null then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
@@ -790,7 +790,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 
 sql alter table xxmt drop tag tag1 -x step141
   return -1
@@ -814,8 +814,8 @@ step145:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/double.sim b/tests/script/tsim/tag/double.sim
index 7af2f19c597b6acc1860a9d9f11b14a64a3ebfda..fbdf9733370b19eb2506801aaf61490e05ae6ed0 100644
--- a/tests/script/tsim/tag/double.sim
+++ b/tests/script/tsim/tag/double.sim
@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,156 +83,156 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/filter.sim b/tests/script/tsim/tag/filter.sim
index 9fb5f66c36e5c36ef94b3320306cf71de4958d4e..4f116cb58d1f8d2f35fbf9b7a4f58e18525fb9cc 100644
--- a/tests/script/tsim/tag/filter.sim
+++ b/tests/script/tsim/tag/filter.sim
@@ -24,31 +24,31 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0' )  
+  sql create table $tb using $mt tags( '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1' )  
+  sql create table $tb using $mt tags( '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
@@ -62,18 +62,18 @@ sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(t
 step3:
 
 print =============== step4
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'  
-if $rows != 1 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
+if $rows != 1 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
 
 print =============== step5
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
@@ -96,9 +96,9 @@ sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(t
 step9:
 
 print =============== step10
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
@@ -112,14 +112,14 @@ step12:
 
 print =============== step13
 sql select count(tbcol) as c from $mt group by tgcol
-print $data00 
-if $data00 != 100 then 
+print $data00
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol) as c from $mt where ts > 1000 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
 if $data00 != 100 then
   print expect 100, actual $data00
   return -1
@@ -132,16 +132,16 @@ step15:
 
 print =============== step16
 sql select count(tbcol) as c from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/float.sim b/tests/script/tsim/tag/float.sim
index d1761883292c91a3e3264cb35238da896bd4239f..10fac93d5d547fb2232a26abb9c68e5baa5cd77a 100644
--- a/tests/script/tsim/tag/float.sim
+++ b/tests/script/tsim/tag/float.sim
@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,156 +83,156 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/int.sim b/tests/script/tsim/tag/int.sim
index 5a35695cbe31546629bc6d10b558fc4a0ca2d376..ac8d31db3bb181489311c9bec7b31abf1a39b305 100644
--- a/tests/script/tsim/tag/int.sim
+++ b/tests/script/tsim/tag/int.sim
@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -78,160 +78,160 @@ sql select * from $tb where ts > 100000 and ts < 100000
 if $rows != 0 then
   return -1
 endi
-sql select * from $tb where ts > now + 4m and ts < now + 3m 
+sql select * from $tb where ts > now + 4m and ts < now + 3m
 if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/int_binary.sim b/tests/script/tsim/tag/int_binary.sim
index 53058ee331b26ac7eef46d8ed2272ae90dcc686e..83a830f64a53a458dcda87209e91cab3e0d0f18f 100644
--- a/tests/script/tsim/tag/int_binary.sim
+++ b/tests/script/tsim/tag/int_binary.sim
@@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 binary(5))
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, '0' )  
+  sql create table $tb using $mt tags( 0, '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, '1' )  
+  sql create table $tb using $mt tags( 1, '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/int_float.sim b/tests/script/tsim/tag/int_float.sim
index 826e1f5c084b8689f481185219e1c4ccc0c59673..009629aac97fbfb0c7dc9fe26acb848ea0ec3a49 100644
--- a/tests/script/tsim/tag/int_float.sim
+++ b/tests/script/tsim/tag/int_float.sim
@@ -24,299 +24,299 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 float)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 > 0.5
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 < 0.5
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 > 0.5 and tgcol2 < 1.5
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/set.sim b/tests/script/tsim/tag/set.sim
index ebca50a3be13311fa46672012d26d30385d2ec4a..c66ae65903b324b823f1572d42c3e3aabd7bf30b 100644
--- a/tests/script/tsim/tag/set.sim
+++ b/tests/script/tsim/tag/set.sim
@@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -50,46 +50,46 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = false
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql describe $tb
 print $data21 $data23 $data32 $data33
-if $data21 != BOOL then 
+if $data21 != BOOL then
   return -1
 endi
-if $data31 != INT then 
+if $data31 != INT then
   return -1
 endi
 if $data23 != TAG then
   return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
   return -1
 endi
 
@@ -99,18 +99,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -121,58 +121,58 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = 3
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
-  
+
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2.00000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 
@@ -183,53 +183,53 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = 3
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4.00000 then 
+if $data03 != 4.00000 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4.00000 then 
+if $data03 != 4.00000 then
   return -1
 endi
-  
-  
+
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -240,64 +240,64 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = 3
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -309,146 +309,146 @@ sql alter table $tb set tag tgcol5=10
 sql alter table $tb set tag tgcol6='11'
 
 sql reset query cache
-  
+
 sql select * from $mt where tgcol1 = '7'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 8
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = '9'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol5 = 10
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol6 = '11'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
diff --git a/tests/script/tsim/tag/smallint.sim b/tests/script/tsim/tag/smallint.sim
index 9fb3ca142646f2ea4de7c7892f2e38987d155596..e3a819c837761a2ffddbc8d3cfb7f77c2d785d06 100644
--- a/tests/script/tsim/tag/smallint.sim
+++ b/tests/script/tsim/tag/smallint.sim
@@ -24,214 +24,214 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > 100000 and ts < 100000
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 3m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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/tag/tinyint.sim b/tests/script/tsim/tag/tinyint.sim
index 11cd6ee3b2b8ec5e5defbc65e4abed6fe0fc32c7..8560def34cc22cc73a592ac062d5bb8f9867b8c0 100644
--- a/tests/script/tsim/tag/tinyint.sim
+++ b/tests/script/tsim/tag/tinyint.sim
@@ -24,214 +24,214 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
 if $rows != 0 then
   return -1
 endi
-sql select * from $tb where ts > 100000 and ts < 100000 
+sql select * from $tb where ts > 100000 and ts < 100000
 if $rows != 0 then
   return -1
 endi
-sql select * from $tb where ts > now + 4m and ts < now + 3m 
+sql select * from $tb where ts > now + 4m and ts < now + 3m
 if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+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