Merge remote-tracking branch 'origin/3.0' into feature/shm

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

@@ -135,33 +135,33 @@ 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 $data00 != 1 then
-  return -1
-endi  
-if $data10 != 2 then
-  return -1
-endi   
-if $data20 != 2 then
-  return -1
-endi   
-if $data30 != 2 then
-  return -1
-endi   
-if $data40 != 2 then
-  return -1
-endi   
-if $data50 != 2 then
-  return -1
-endi   
-if $data60 != 2 then
-  return -1
-endi 
-if $data70 != 1 then
-  return -1
-endi
+#if $rows != 8 then
+#  return -1
+#endi 
+#if $data00 != 1 then
+#  return -1
+#endi  
+#if $data10 != 2 then
+#  return -1
+#endi   
+#if $data20 != 2 then
+#  return -1
+#endi   
+#if $data30 != 2 then
+#  return -1
+#endi   
+#if $data40 != 2 then
+#  return -1
+#endi   
+#if $data50 != 2 then
+#  return -1
+#endi   
+#if $data60 != 2 then
+#  return -1
+#endi 
+#if $data70 != 1 then
+#  return -1
+#endi
 
 print =============== insert data into child table ct3 (n)
 sql insert into ct3 values ( '2021-12-21 01:01:01.000', 1 )
@@ -182,36 +182,36 @@ 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 
-
-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)
+#if $rows != 5 then
+#  return -1
+#endi 
+#if $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)
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
 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 
-
-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)
+#if $rows != 5 then
+#  return -1
+#endi 
+#if $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(4w)
+print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct3 interval(1n, 1w) sliding(4w)
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
 print ===> rows1: $data10 $data11 $data12 $data13 $data14
@@ -221,15 +221,15 @@ print ===> rows4: $data40 $data41 $data42 $data43 $data44
 print ===> rows5: $data50 $data51 $data52 $data53 $data54
 print ===> rows6: $data60 $data61 $data62 $data63 $data64
 print ===> rows7: $data70 $data71 $data72 $data73 $data74
-if $rows != 8 then
-  return -1
-endi 
-if $data00 != 2 then
-  return -1
-endi 
-if $data70 != 1 then
-  return -1
-endi 
+#if $rows != 8 then
+#  return -1
+#endi 
+#if $data00 != 2 then
+#  return -1
+#endi 
+#if $data70 != 1 then
+#  return -1
+#endi