Merge pull request #14702 from taosdata/test/count_partition

test: add test case for count about partition by and interval

tests/system-test/2-query/count_partition.py

+# author : wenzhouwww
+from util.log import *
+from util.sql import *
+from util.cases import *
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.row_nums = 10
+        self.tb_nums = 10
+        self.ts = 1537146000000
+    
+    def prepare_datas(self, stb_name , tb_nums , row_nums ):
+        tdSql.execute(" use db ")
+        tdSql.execute(f" create stable {stb_name} (ts timestamp , c1 int , c2 bigint , c3 float , c4 double , c5 smallint , c6 tinyint , c7 bool , c8 binary(36) , c9 nchar(36) , uc1 int unsigned,\
+            uc2 bigint unsigned ,uc3 smallint unsigned , uc4 tinyint unsigned ) tags(t1 timestamp , t2 int , t3 bigint , t4 float , t5 double , t6 smallint , t7 tinyint , t8 bool , t9 binary(36)\
+                , t10 nchar(36) , t11 int unsigned , t12 bigint unsigned ,t13 smallint unsigned , t14 tinyint unsigned ) ")
+        
+        for i in range(tb_nums):
+            tbname = f"sub_{stb_name}_{i}"
+            ts = self.ts + i*10000
+            tdSql.execute(f"create table {tbname} using {stb_name} tags ({ts} , {i} , {i}*10 ,{i}*1.0,{i}*1.0 , 1 , 2, 'true', 'binary_{i}' ,'nchar_{i}',{i},{i},10,20 )")
+
+            for row in range(row_nums):
+                ts = self.ts + row*1000
+                tdSql.execute(f"insert into {tbname} values({ts} , {row} , {row} , {row} , {row} , 1 , 2 , 'true' , 'binary_{row}' , 'nchar_{row}' , {row} , {row} , 1 ,2 )")
+
+            for null in range(5):
+                ts =  self.ts + row_nums*1000 + null*1000
+                tdSql.execute(f"insert into {tbname} values({ts} , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL )")
+            
+    def basic_query(self):
+        tdSql.query("select count(*) from stb")
+        tdSql.checkData(0,0,(self.row_nums + 5 )*self.tb_nums)
+        tdSql.query("select count(c1) from stb")
+        tdSql.checkData(0,0,(self.row_nums )*self.tb_nums)
+        tdSql.query(" select tbname , count(*) from stb partition by tbname ")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.query(" select count(c1) from stb group by t1 order by t1 ")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.error(" select count(c1) from stb group by c1 order by t1 ")
+        tdSql.error(" select count(t1) from stb group by c1 order by t1 ")
+        tdSql.query(" select count(c1) from stb group by tbname order by tbname ")
+        tdSql.checkRows(self.tb_nums)
+        # bug need fix 
+        # tdSql.query(" select count(t1) from stb group by t2 order by t2 ")
+        # tdSql.checkRows(self.tb_nums)
+        tdSql.query(" select count(c1) from stb group by c1 order by c1 ")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query(" select c1 , count(c1) from stb group by c1 order by c1 ")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query("select count(c1) from stb group by abs(c1) order by abs(c1)")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.query("select abs(c1+c3), count(c1+c3) from stb group by abs(c1+c3) order by abs(c1+c3)")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.query("select count(c1+c3)+max(c2) ,abs(c1) from stb group by abs(c1) order by abs(c1)")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.error("select count(c1+c3)+max(c2) ,abs(c1) ,abs(t1) from stb group by abs(c1) order by abs(t1)+c2")
+        tdSql.error("select count(c1+c3)+max(c2) ,abs(c1) from stb group by abs(c1) order by abs(c1)+c2")
+        tdSql.query("select abs(c1+c3)+abs(c2) , count(c1+c3)+count(c2) from stb group by abs(c1+c3)+abs(c2) order by abs(c1+c3)+abs(c2)")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query("select count(c1) , count(t2) from stb where abs(c1+t2)=1 partition by tbname")
+        tdSql.checkRows(2)
+        tdSql.query("select count(c1) from stb where abs(c1+t2)=1 partition by tbname")
+        tdSql.checkRows(2)
+        
+        tdSql.query("select tbname , count(c1) from stb partition by tbname order by tbname")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkData(0,1,self.row_nums)
+
+        tdSql.error("select tbname , count(c1) from stb partition by t1 order by t1")
+        tdSql.error("select tbname , count(t1) from stb partition by t1 order by t1")
+        tdSql.error("select tbname , count(t1) from stb partition by t2 order by t2")
+
+        # # bug need fix 
+        # tdSql.query("select t2 , count(t1) from stb partition by t2 order by t2")
+        # tdSql.checkRows(self.tb_nums)
+
+        tdSql.query("select tbname , count(c1) from stb partition by tbname order by tbname")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkData(0,1,self.row_nums)
+
+        
+        tdSql.error("select tbname , count(c1) from stb partition by t2 order by t2")
+
+        tdSql.query("select c2, count(c1) from stb partition by c2 order by c2 desc")
+        tdSql.checkRows(self.tb_nums+1)
+        tdSql.checkData(0,1,self.tb_nums)
+
+        tdSql.error("select tbname , count(c1) from stb partition by c1 order by c2")
+
+
+        tdSql.query("select tbname , abs(t2) from stb partition by c2 order by t2")
+        tdSql.checkRows(self.tb_nums*(self.row_nums+5))
+
+        tdSql.query("select count(c1) , count(t2) from stb partition by c2 ")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.checkData(0,1,self.row_nums)
+
+        tdSql.query("select count(c1) , count(t2) ,c2 from stb partition by c2 order by c2")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query("select count(c1) , count(t1) ,max(c2) ,tbname  from stb partition by tbname order by tbname")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkCols(4)
+
+        tdSql.query("select count(c1) , count(t2) ,t1  from stb partition by t1 order by t1")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkData(0,0,self.row_nums)
+
+        # bug need fix 
+        # tdSql.query("select count(c1) , count(t1) ,abs(c1) from stb partition by abs(c1) order by abs(c1)")
+        # tdSql.checkRows(self.row_nums+1)
+   
+
+        tdSql.query("select count(ceil(c2)) , count(floor(t2)) ,count(floor(c2)) from stb partition by abs(c2) order by abs(c2)")
+        tdSql.checkRows(self.row_nums+1)
+
+
+        tdSql.query("select count(ceil(c1-2)) , count(floor(t2+1)) ,max(c2-c1) from stb partition by abs(floor(c1)) order by abs(floor(c1))")
+        tdSql.checkRows(self.row_nums+1)
+     
+
+        # interval 
+        tdSql.query("select count(c1) from stb interval(2s) sliding(1s)")
+
+        # bug need fix
+
+        tdSql.query('select max(c1) from stb where ts>="2022-07-06 16:00:00.000 " and ts < "2022-07-06 17:00:00.000 " interval(50s) sliding(30s) fill(NULL)')
+
+        tdSql.query(" select tbname , count(c1) from stb partition by tbname interval(10s) slimit 5 soffset 1 ")
+
+        tdSql.query("select tbname , count(c1) from stb partition by tbname interval(10s)")
+
+        tdSql.query("select tbname , count(c1) from sub_stb_1 partition by tbname interval(10s)")
+        tdSql.checkData(0,0,'sub_stb_1')
+        tdSql.checkData(0,1,self.row_nums)
+
+        # tdSql.query(" select tbname , count(c1) from stb partition by tbname order by tbname slimit 5 soffset 0 ")  
+        # tdSql.checkRows(5)
+        
+        # tdSql.query(" select tbname , count(c1) from stb partition by tbname order by tbname slimit 5 soffset 1 ")
+        # tdSql.checkRows(5)     
+         
+        tdSql.query(" select tbname , count(c1) from sub_stb_1 partition by tbname interval(10s) sliding(5s) ")   
+       
+        tdSql.query(f'select max(c1) from stb where ts>={self.ts} and ts < {self.ts}+10000 partition by tbname interval(50s) sliding(30s)')
+        tdSql.query(f'select max(c1) from stb where ts>={self.ts} and ts < {self.ts}+10000 interval(50s) sliding(30s)')
+        tdSql.query(f'select tbname , count(c1) from stb where ts>={self.ts} and ts < {self.ts}+10000 partition by tbname interval(50s) sliding(30s)')
+
+
+    def run(self):
+        tdSql.prepare()
+        self.prepare_datas("stb",self.tb_nums,self.row_nums)
+        self.basic_query()
+
+        # # coverage case for taosd crash about bug fix 
+        tdSql.query(" select sum(c1) from stb where t2+10 >1 ")
+        tdSql.query(" select count(c1),count(t1) from stb where -t2<1 ")
+        tdSql.query(" select tbname ,max(ceil(c1)) from stb group by tbname ")
+        tdSql.query(" select avg(abs(c1)) , tbname from stb group by tbname ")
+        tdSql.query(" select t1,c1 from stb where abs(t2+c1)=1 ")
+
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/system-test/2-query/max_partition.py

+# author : wenzhouwww
+from util.log import *
+from util.sql import *
+from util.cases import *
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.row_nums = 10
+        self.tb_nums = 10
+        self.ts = 1537146000000
+    
+    def prepare_datas(self, stb_name , tb_nums , row_nums ):
+        tdSql.execute(" use db ")
+        tdSql.execute(f" create stable {stb_name} (ts timestamp , c1 int , c2 bigint , c3 float , c4 double , c5 smallint , c6 tinyint , c7 bool , c8 binary(36) , c9 nchar(36) , uc1 int unsigned,\
+            uc2 bigint unsigned ,uc3 smallint unsigned , uc4 tinyint unsigned ) tags(t1 timestamp , t2 int , t3 bigint , t4 float , t5 double , t6 smallint , t7 tinyint , t8 bool , t9 binary(36)\
+                , t10 nchar(36) , t11 int unsigned , t12 bigint unsigned ,t13 smallint unsigned , t14 tinyint unsigned ) ")
+        
+        for i in range(tb_nums):
+            tbname = f"sub_{stb_name}_{i}"
+            ts = self.ts + i*10000
+            tdSql.execute(f"create table {tbname} using {stb_name} tags ({ts} , {i} , {i}*10 ,{i}*1.0,{i}*1.0 , 1 , 2, 'true', 'binary_{i}' ,'nchar_{i}',{i},{i},10,20 )")
+
+            for row in range(row_nums):
+                ts = self.ts + row*1000
+                tdSql.execute(f"insert into {tbname} values({ts} , {row} , {row} , {row} , {row} , 1 , 2 , 'true' , 'binary_{row}' , 'nchar_{row}' , {row} , {row} , 1 ,2 )")
+
+            for null in range(5):
+                ts =  self.ts + row_nums*1000 + null*1000
+                tdSql.execute(f"insert into {tbname} values({ts} , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL )")
+            
+    def basic_query(self):
+        tdSql.query("select count(*) from stb")
+        tdSql.checkData(0,0,(self.row_nums + 5 )*self.tb_nums)
+        tdSql.query("select max(c1) from stb")
+        tdSql.checkData(0,0,(self.row_nums -1))
+        tdSql.query(" select tbname , max(c1) from stb partition by tbname ")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.query(" select max(c1) from stb group by t1 order by t1 ")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.query(" select max(c1) from stb group by c1 order by t1 ")
+        tdSql.query(" select max(t2) from stb group by c1 order by t1 ")
+        tdSql.query(" select max(c1) from stb group by tbname order by tbname ")
+        tdSql.checkRows(self.tb_nums)
+        # bug need fix 
+        # tdSql.query(" select max(t1) from stb group by t2 order by t2 ")
+        # tdSql.checkRows(self.tb_nums)
+        tdSql.query(" select max(c1) from stb group by c1 order by c1 ")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query(" select c1 , max(c1) from stb group by c1 order by c1 ")
+        tdSql.checkRows(self.row_nums+1)
+
+        # support selective functions
+        tdSql.query(" select c1 ,c2 ,c3 , max(c1)  ,c4 ,c5 ,t11 from stb group by c1 order by c1 desc ")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query(" select c1, tbname , max(c1)  ,c4 ,c5 ,t11 from stb group by c1 order by c1 desc ")
+        tdSql.checkRows(self.row_nums+1)
+
+        # bug need fix
+        # tdSql.query(" select tbname , max(c1)  from sub_stb_1 where c1 is null group by c1 order by c1 desc ")
+        # tdSql.checkRows(1)       
+        # tdSql.checkData(0,0,"sub_stb_1") 
+
+        tdSql.query("select max(c1) ,c2 ,t2,tbname from stb group by abs(c1) order by abs(c1)")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.query("select abs(c1+c3), count(c1+c3) ,max(c1+t2) from stb group by abs(c1+c3) order by abs(c1+c3)")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.query("select max(c1+c3)+min(c2) ,abs(c1) from stb group by abs(c1) order by abs(c1)")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.error("select count(c1+c3)+max(c2) ,abs(c1) ,abs(t1) from stb group by abs(c1) order by abs(t1)+c2")
+        tdSql.error("select count(c1+c3)+max(c2) ,abs(c1) from stb group by abs(c1) order by abs(c1)+c2")
+        tdSql.query("select abs(c1+c3)+abs(c2) , count(c1+c3)+max(c2) from stb group by abs(c1+c3)+abs(c2) order by abs(c1+c3)+abs(c2)")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query(" select max(c1) , max(t2) from stb where abs(c1+t2)=1 partition by tbname ")
+        tdSql.checkRows(2)
+        tdSql.query(" select max(c1) from stb where abs(c1+t2)=1 partition by tbname ")
+        tdSql.checkRows(2)
+        
+        tdSql.query(" select tbname , max(c1) from stb partition by tbname order by tbname ")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkData(0,1,self.row_nums-1)
+
+        tdSql.query("select tbname , max(c2) from stb partition by t1 order by t1")
+        tdSql.query("select tbname , max(t2) from stb partition by t1 order by t1")
+        tdSql.query("select tbname , max(t2) from stb partition by t2 order by t2")
+
+        # # bug need fix 
+        # tdSql.query("select t2 , max(t2) from stb partition by t2 order by t2")
+        # tdSql.checkRows(self.tb_nums)
+
+        tdSql.query("select tbname , max(c1) from stb partition by tbname order by tbname")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkData(0,1,self.row_nums-1)
+
+        
+        tdSql.query("select tbname , max(c1) from stb partition by t2 order by t2")
+
+        tdSql.query("select c2, max(c1) from stb partition by c2 order by c2 desc")
+        tdSql.checkRows(self.tb_nums+1)
+        tdSql.checkData(0,1,self.row_nums-1)
+
+        tdSql.query("select tbname , max(c1) from stb partition by c1 order by c2")
+
+
+        tdSql.query("select tbname , abs(t2) from stb partition by c2 order by t2")
+        tdSql.checkRows(self.tb_nums*(self.row_nums+5))
+
+        tdSql.query("select max(c1) , count(t2) from stb partition by c2 ")
+        tdSql.checkRows(self.row_nums+1)
+        tdSql.checkData(0,1,self.row_nums)
+
+        tdSql.query("select count(c1) , max(t2) ,c2 from stb partition by c2 order by c2")
+        tdSql.checkRows(self.row_nums+1)
+
+        tdSql.query("select count(c1) , count(t1) ,max(c2) ,tbname  from stb partition by tbname order by tbname")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkCols(4)
+
+        tdSql.query("select count(c1) , max(t2) ,t1  from stb partition by t1 order by t1")
+        tdSql.checkRows(self.tb_nums)
+        tdSql.checkData(0,0,self.row_nums)
+
+        # bug need fix 
+        # tdSql.query("select count(c1) , max(t1) ,abs(c1) from stb partition by abs(c1) order by abs(c1)")
+        # tdSql.checkRows(self.row_nums+1)
+   
+
+        tdSql.query("select max(ceil(c2)) , max(floor(t2)) ,max(floor(c2)) from stb partition by abs(c2) order by abs(c2)")
+        tdSql.checkRows(self.row_nums+1)
+
+
+        tdSql.query("select max(ceil(c1-2)) , max(floor(t2+1)) ,max(c2-c1) from stb partition by abs(floor(c1)) order by abs(floor(c1))")
+        tdSql.checkRows(self.row_nums+1)
+     
+
+        # interval 
+        tdSql.query("select max(c1) from stb interval(2s) sliding(1s)")
+
+        # bug need fix
+
+        tdSql.query('select max(c1) from stb where ts>="2022-07-06 16:00:00.000 " and ts < "2022-07-06 17:00:00.000 " interval(50s) sliding(30s) fill(NULL)')
+        
+        tdSql.query(" select tbname , count(c1) from stb partition by tbname interval(10s) slimit 5 soffset 1 ")
+
+        tdSql.query("select tbname , max(c1) from stb partition by tbname interval(10s)")
+        tdSql.checkRows(self.row_nums*2)
+
+        tdSql.query("select tbname , count(c1) from sub_stb_1 partition by tbname interval(10s)")
+        tdSql.checkData(0,0,'sub_stb_1')
+        tdSql.checkData(0,1,self.row_nums)
+
+        # bug need fix 
+        # tdSql.query(" select tbname , max(c1) from stb partition by tbname order by tbname slimit 5 soffset 0 ")  
+        # tdSql.checkRows(5)
+        
+        # tdSql.query(" select tbname , max(c1) from stb partition by tbname order by tbname slimit 5 soffset 1 ")
+        # tdSql.checkRows(5)     
+         
+        tdSql.query(" select tbname , max(c1) from sub_stb_1 partition by tbname interval(10s) sliding(5s) ")   
+       
+        tdSql.query(f'select max(c1) from stb where ts>={self.ts} and ts < {self.ts}+1000 interval(50s) sliding(30s)')
+        tdSql.query(f'select tbname , max(c1) from stb where ts>={self.ts} and ts < {self.ts}+1000 interval(50s) sliding(30s)')
+
+
+    def run(self):
+        tdSql.prepare()
+        self.prepare_datas("stb",self.tb_nums,self.row_nums)
+        self.basic_query()
+
+        # # coverage case for taosd crash about bug fix 
+        tdSql.query(" select sum(c1) from stb where t2+10 >1 ")
+        tdSql.query(" select count(c1),count(t1) from stb where -t2<1 ")
+        tdSql.query(" select tbname ,max(ceil(c1)) from stb group by tbname ")
+        tdSql.query(" select avg(abs(c1)) , tbname from stb group by tbname ")
+        tdSql.query(" select t1,c1 from stb where abs(t2+c1)=1 ")
+
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/system-test/fulltest.sh

@@ -118,9 +118,11 @@ python3 ./test.py -f 2-query/distribute_agg_stddev.py
 python3 ./test.py -f 2-query/twa.py
 python3 ./test.py -f 2-query/irate.py
 python3 ./test.py -f 2-query/and_or_for_byte.py
-
+python3 ./test.py -f 2-query/count_partition.py
 python3 ./test.py -f 2-query/function_null.py
-#python3 ./test.py -f 2-query/queryQnode.py
+python3 ./test.py -f 2-query/queryQnode.py
+python3 ./test.py -f 2-query/max_partition.py
+
 
 python3 ./test.py -f 6-cluster/5dnode1mnode.py
 #BUG python3 ./test.py -f 6-cluster/5dnode2mnode.py  -N 5 -M 3
@@ -263,6 +265,8 @@ python3 ./test.py -f 2-query/distribute_agg_stddev.py  -Q 2
 python3 ./test.py -f 2-query/twa.py  -Q 2
 python3 ./test.py -f 2-query/irate.py  -Q 2
 python3 ./test.py -f 2-query/function_null.py  -Q 2
+python3 ./test.py -f 2-query/count_partition.py -Q 2
+python3 ./test.py -f 2-query/max_partition.py -Q 2
 
 #------------querPolicy  3-----------
 
@@ -348,3 +352,5 @@ python3 ./test.py -f 2-query/distribute_agg_stddev.py -Q  3
 python3 ./test.py -f 2-query/twa.py -Q  3
 python3 ./test.py -f 2-query/irate.py -Q  3
 python3 ./test.py -f 2-query/function_null.py -Q  3
+python3 ./test.py -f 2-query/count_partition.py -Q 3
+python3 ./test.py -f 2-query/max_partition.py -Q 3
\ No newline at end of file