Merge pull request #11165 from taosdata/cpwu/3.0

fix interval case
2022-03-31 16:20:32 +08:00 · 2022-03-31 16:20:32 +08:00 · c4cdebb06e
parent 6df2b9b607 2858a705a8
commit c4cdebb06e
2 changed files with 116 additions and 94 deletions
--- a/tests/script/tsim/query/interval-offset.sim
+++ b/tests/script/tsim/query/interval-offset.sim
@ -7,7 +7,7 @@ sql connect
 print =============== create database
 sql create database d0
 sql show databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

@ -17,7 +17,7 @@ print =============== create super table and child table
 sql create table stb (ts timestamp, tbcol int) tags (t1 int)
 sql show stables
 print $rows $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -29,7 +29,7 @@ sql show tables
 print $rows $data00 $data10 $data20
 if $rows != 4 then
  return -1
-endi 
+endi

 print =============== insert data into child table ct1 (s)
 sql insert into ct1 values ( '2022-01-01 01:01:01.000', 1 )
@ -83,13 +83,13 @@ print ===> rows3: $data30 $data31 $data32 $data33 $data34
 print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 5 then
  return -1
-endi 
+endi
 if $data00 != 1 then
  return -1
-endi 
+endi
 if $data40 != 1 then
  return -1
-endi 
+endi

 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct1 interval(10s, 2s) sliding(10s)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct1 interval(10s, 2s) sliding(10s)
@ -101,13 +101,13 @@ print ===> rows3: $data30 $data31 $data32 $data33 $data34
 print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 5 then
  return -1
-endi 
+endi
 if $data00 != 1 then
  return -1
-endi 
+endi
 if $data40 != 1 then
  return -1
-endi 
+endi

 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct1 interval(10s, 2s) sliding(5s)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct1 interval(10s, 2s) sliding(5s)
@ -123,16 +123,16 @@ print ===> rows7: $data70 $data71 $data72 $data73 $data74
 print ===> rows8: $data80 $data81 $data82 $data83 $data84
 if $rows != 9 then
  return -1
-endi 
+endi
 if $data00 != 1 then
  return -1
-endi 
+endi
 if $data70 != 2 then
  return -1
-endi 
+endi
 if $data80 != 1 then
  return -1
-endi 
+endi

 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct2 interval(1d, 2h)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct2 interval(1d, 2h)
@ -144,10 +144,10 @@ print ===> rows3: $data30 $data31 $data32 $data33 $data34
 print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 4 then
  return -1
-endi 
+endi
 if $data00 != 1 then
  return -1
-endi 
+endi
 if $data10 != 2 then
  return -1
 endi
@ -155,27 +155,54 @@ endi
 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) 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 
+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 
+endi
 if $data00 != 1 then
  return -1
-endi  
+endi
 if $data10 != 2 then
  return -1
-endi   
+endi
 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
-#  return -1
-#endi 
-#if $data00 != 1 then
-#  return -1
-#endi 
-#if $data40 != 1 then
-#  return -1
-#endi 
+# if $rows != 5 then
+#   return -1
+# endi
+# f $data00 != 1 then
+#   return -1
+# endi
+# if $data40 != 1 then
+#   return -1
+# 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)
@ -204,13 +231,13 @@ print ===> rows3: $data30 $data31 $data32 $data33 $data34
 print ===> rows4: $data40 $data41 $data42 $data43 $data44
 #if $rows != 5 then
 #  return -1
-#endi 
+#endi
 #if $data00 != 1 then
 #  return -1
-#endi 
+#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(4w)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct3 interval(1n, 1w) sliding(4w)
@ -225,13 +252,13 @@ print ===> rows6: $data60 $data61 $data62 $data63 $data64
 print ===> rows7: $data70 $data71 $data72 $data73 $data74
 #if $rows != 8 then
 #  return -1
-#endi 
+#endi
 #if $data00 != 2 then
 #  return -1
-#endi 
+#endi
 #if $data70 != 1 then
 #  return -1
-#endi 
+#endi

 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct4 interval(1y, 6n)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct4 interval(1y, 6n)
@ -243,13 +270,13 @@ print ===> rows3: $data30 $data31 $data32 $data33 $data34
 print ===> rows4: $data40 $data41 $data42 $data43 $data44
 #if $rows != 5 then
 #  return -1
-#endi 
+#endi
 #if $data00 != 1 then
 #  return -1
-#endi 
+#endi
 #if $data40 != 1 then
 #  return -1
-#endi 
+#endi

 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct4 interval(1y, 6n) sliding(6n)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct4 interval(1y, 6n) sliding(6n)
@ -261,13 +288,13 @@ print ===> rows3: $data30 $data31 $data32 $data33 $data34
 print ===> rows4: $data40 $data41 $data42 $data43 $data44
 #if $rows != 5 then
 #  return -1
-#endi 
+#endi
 #if $data00 != 1 then
 #  return -1
-#endi 
+#endi
 #if $data40 != 1 then
 #  return -1
-#endi 
+#endi

 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct4 interval(1y, 6n) sliding(12n)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct4 interval(1y, 6n) sliding(12n)
@ -282,13 +309,13 @@ print ===> rows6: $data60 $data61 $data62 $data63 $data64
 print ===> rows7: $data70 $data71 $data72 $data73 $data74
 #if $rows != 8 then
 #  return -1
-#endi 
+#endi
 #if $data00 != 2 then
 #  return -1
-#endi 
+#endi
 #if $data70 != 1 then
 #  return -1
-#endi 
+#endi

 #=================================================
 print =============== stop and restart taosd
@ -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
--- a/tests/script/tsim/query/interval.sim
+++ b/tests/script/tsim/query/interval.sim
@ -29,18 +29,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
@ -49,51 +49,51 @@ $tb = $tbPrefix . $i
 sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
 print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
 print ===> $rows $data01 $data05
-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

-#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)
 #print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms interval(1m)
 #print ===> $rows $data01 $data05
-#if $rows != 5 then 
+#if $rows != 5 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

-#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
@ -105,13 +105,13 @@ endi
 #sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms and ts > $ms2 interval(1m) fill(value,0)
 #print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms and ts > $ms2 interval(1m) fill(value,0)
 #print ===> $rows $data21 $data25
-#if $rows != 42 then 
+#if $rows != 42 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

@ -119,10 +119,10 @@ endi
 #sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
 #print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
 #print ===> $rows $data11
-#if $rows != 20 then 
+#if $rows != 20 then
 #  return -1
 #endi
-#if $data11 != 10 then 
+#if $data11 != 10 then
 #  return -1
 #endi

@ -132,10 +132,10 @@ endi
 #sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms interval(1m)
 #print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms interval(1m)
 #print ===> $rows $data11
-#if $rows != 5 then 
+#if $rows != 5 then
 #  return -1
 #endi
-#if $data11 != 10 then 
+#if $data11 != 10 then
 #  return -1
 #endi

@ -149,10 +149,10 @@ endi
 #sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m)
 #print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m)
 #print ===> $rows $data11
-#if $rows != 20 then 
+#if $rows != 20 then
 #  return -1
 #endi
-#if $data11 != 10 then 
+#if $data11 != 10 then
 #  return -1
 #endi
 #
@ -166,18 +166,18 @@ endi
 #sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m) fill(value, 0)
 #print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m) fill(value, 0)
 #print ===> $rows $data11
-#if $rows != 42 then 
+#if $rows != 42 then
 #  return -1
 #endi
-#if $data11 != 10 then 
+#if $data11 != 10 then
 #  return -1
 #endi

 print =============== clear
 #sql drop database $db
 #sql show databases
-#if $rows != 0 then 
+#if $rows != 0 then
 #  return -1
 #endi

-#system sh/exec.sh -n dnode1 -s stop -x SIGINT
+#system sh/exec.sh -n dnode1 -s stop -x SIGINT