Merge pull request #11165 from taosdata/cpwu/3.0

fix interval case

tests/script/tsim/query/interval-offset.sim

@@ -176,6 +176,33 @@ if $data70 != 1 then
   return -1
 endi
 
+sql select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(tbcol) from ct2 interval(1d, 2h) sliding(12h)
+print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct2 interval(1d, 2h) sliding(12h)
+print ===> rows: $rows
+print ===> rows0: $data00 $data01 $data02 $data03 $data04 $data05
+print ===> rows1: $data10 $data11 $data12 $data13 $data14 $data15
+print ===> rows2: $data20 $data21 $data22 $data23 $data24 $data25
+print ===> rows3: $data30 $data31 $data32 $data33 $data34 $data35
+print ===> rows4: $data40 $data41 $data42 $data43 $data44 $data45
+print ===> rows5: $data50 $data51 $data52 $data53 $data54 $data55
+print ===> rows6: $data60 $data61 $data62 $data63 $data64 $data65
+print ===> rows7: $data70 $data71 $data72 $data73 $data74 $data75
+if $rows != 8 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data15 != 2 then
+  return -1
+endi
+if $data75 != 1 then
+  return -1
+endi
+if $data02 != 86400000 then
+  return -1
+endi
+
 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct3 interval(1n, 1w)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct3 interval(1n, 1w)
 print ===> rows: $rows
@@ -184,15 +211,15 @@ print ===> rows1: $data10 $data11 $data12 $data13 $data14
 print ===> rows2: $data20 $data21 $data22 $data23 $data24
 print ===> rows3: $data30 $data31 $data32 $data33 $data34
 print ===> rows4: $data40 $data41 $data42 $data43 $data44
-#if $rows != 5 then
+# if $rows != 5 then
 #   return -1
-#endi 
-#if $data00 != 1 then
+# endi
+# f $data00 != 1 then
 #   return -1
-#endi 
-#if $data40 != 1 then
+# endi
+# if $data40 != 1 then
 #   return -1
-#endi 
+# endi
 
 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct3 interval(1n, 1w) sliding(2w)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct3 interval(1n, 1w) sliding(2w)
@@ -322,9 +349,4 @@ endi
 #sql select count(*) from car where ts > '2019-05-14 00:00:00' interval(1y, 5d)
 
 
-
-
-
-
-
 #system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/tsim/query/interval.sim

@@ -59,7 +59,7 @@ if $data04 != 1 then
   return -1
 endi
 
-#print =============== step3
+print =============== step3
 #$cc = 4 * 60000
 #$ms = 1601481600000 + $cc
 #sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms interval(1m)
@@ -75,25 +75,25 @@ endi
 #  return -1
 #endi
 
-#print =============== step4
+print =============== step4
 #$cc = 40 * 60000
 #$ms = 1601481600000 + $cc
 
 #$cc = 1 * 60000
 #$ms2 = 1601481600000 - $cc
 
-#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms and ts > $ms2 interval(1m)
-#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms and ts > $ms2 interval(1m)
-#print ===> $rows $data01 $data05
-#if $rows != 20 then 
-#  return -1
-#endi
-#if $data00 != 1 then 
-#  return -1
-#endi
-#if $data04 != 1 then 
-#  return -1
-#endi
+sql select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(tbcol) from $tb  interval(1m)
+print ===> select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(tbcol) from $tb  interval(1m)
+print ===> $rows $data01 $data05
+if $rows != $rowNum then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data02 != 60000 then
+  return -1
+endi
 
 #print =============== step5
 #$cc = 40 * 60000