From 1ad7827fc19132b276d02e5bdc16ce990420d9a8 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 16 Oct 2020 18:47:02 +0800
Subject: [PATCH] TD-1530

---
 .../general/insert/query_block1_memory.sim    | 27 +++++++++++--------
 tests/script/general/parser/where.sim         | 10 ++++---
 tests/script/general/stream/table_n.sim       |  2 ++
 tests/script/unique/cluster/vgroup100.sim     |  9 ++++---
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim
index 83509ad5b0..b4b3ca384b 100644
--- a/tests/script/general/insert/query_block1_memory.sim
+++ b/tests/script/general/insert/query_block1_memory.sim
@@ -30,9 +30,12 @@ print =============== step 1
 $x = $N
 $y = $N / 2
 while $x > $y
+  $y = $x * 60000
+  $ms = 1601481600000 - $y
+
   $ms = $x . m 
   $xt = - . $x 
-  sql insert into $tb values (now - $ms , -$x ) 
+  sql insert into $tb values ($ms , -$x ) 
   $x = $x - 1
 endw 
 
@@ -45,8 +48,10 @@ endi
 $x = $N / 2
 $y = $N
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $y = $x * 60000
+  $ms = 1601481600000 + $y
+
+  sql insert into $tb values ($ms , $x ) 
   $x = $x + 1
 endw 
 sql select * from $tb
@@ -60,14 +65,14 @@ print =============== step 2
 $N1 = $N + 1
 $result1 = $N / 2
 $result2 = $N
-$step = $N1 . m
-
-$start1 = now- . $step
-$start2 = now
-$start3 = now+ . $step
-$end1 = now- . $step
-$end2 = now
-$end3 = now+ . $step
+$step = $N1 * 60000
+
+$start1 = 1601481600000 -  $step
+$start2 = 1601481600000
+$start3 = 1601481600000 + $step
+$end1 = 1601481600000 -  $step
+$end2 = 1601481600000
+$end3 = 1601481600000 +  $step
 
 sql select * from $tb where ts < $start1 and ts > $end1
 if $rows != 0 then 
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index e609dda652..5cac3f4723 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -33,7 +33,8 @@ while $i < $tbNum
 
   $x = 0
   while $x < $rowNum
-    $ms = $x . m
+    $y = $x * 60000
+    $ms = 1600099200000 + $y
     $c = $x / 100
     $c = $c * 100
     $c = $x - $c
@@ -41,7 +42,7 @@ while $i < $tbNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values (now + $ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    sql insert into $tb values ($ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
     $x = $x + 1
   endw
 
@@ -299,7 +300,8 @@ while $i < 1
 
   $x = 0
   while $x < 10000
-    $ms = $x . m
+    $y = $x * 60000
+    $ms = 1601481600000 + $y
     $c = $x / 100
     $c = $c * 100
     $c = $x - $c
@@ -307,7 +309,7 @@ while $i < 1
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values (now + $ms , null , null , null , null , null , null , null , null , null )
+    sql insert into $tb values ($ms , null , null , null , null , null , null , null , null , null )
     $x = $x + 1
   endw
 
diff --git a/tests/script/general/stream/table_n.sim b/tests/script/general/stream/table_n.sim
index d1b4a87a9e..a336772a98 100644
--- a/tests/script/general/stream/table_n.sim
+++ b/tests/script/general/stream/table_n.sim
@@ -289,3 +289,5 @@ endi
 if $data09 != 20 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/cluster/vgroup100.sim b/tests/script/unique/cluster/vgroup100.sim
index 7879c5529e..68a5bad6b3 100644
--- a/tests/script/unique/cluster/vgroup100.sim
+++ b/tests/script/unique/cluster/vgroup100.sim
@@ -29,6 +29,9 @@ system sh/exec.sh -n dnode3 -s start
 
 sleep 3000
 
+$maxNum = 102
+$maxNum = 12
+
 $x = 0
 show2: 
 	$x = $x + 1
@@ -58,7 +61,7 @@ endi
 
 print ============================== step3
 $count = 2
-while $count < 102
+while $count < $maxNum
   $db = d . $count
   $tb = $db . .t
   $tb2 = $db . .t2
@@ -73,7 +76,7 @@ endw
 print ============================== step4
 
 $count = 2
-while $count < 102
+while $count < $maxNum
   $db = d . $count
   $tb = $db . .t
   sql select * from $tb
@@ -131,7 +134,7 @@ show8:
 	endi
 
 $count = 2
-while $count < 102
+while $count < $maxNum
   $db = d . $count
   $tb = $db . .t
   sql select * from $tb
-- 
GitLab