Merge pull request #15174 from taosdata/3.0test/jcy

test：add test case for delete IoTdata

tests/system-test/1-insert/alter_table.py

@@ -211,10 +211,10 @@ class TDTestCase:
                 for error in [constant.INT_UN_MIN-1,constant.INT_UN_MAX+1]:
                     tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}')  
             #! bug TD-17106
-            # elif v.lower() == 'bigint unsigned':
-                # self.tag_check(i,k,tag_unbigint)
-                # for error in [constant.BIGINT_UN_MIN-1,constant.BIGINT_UN_MAX+1]:
-                #     tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}') 
+            elif v.lower() == 'bigint unsigned':
+                self.tag_check(i,k,tag_unbigint)
+                for error in [constant.BIGINT_UN_MIN-1,constant.BIGINT_UN_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}') 
             elif v.lower() == 'bool':     
                 self.tag_check(i,k,tag_bool)
             elif v.lower() == 'float':
@@ -225,8 +225,8 @@ class TDTestCase:
                 else:
                     tdLog.exit(f'select {k} from {self.stbname}_{i},data check failure')
             #! bug TD-17106    
-                # for error in [constant.FLOAT_MIN*1.1,constant.FLOAT_MAX*1.1]:
-                #     tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}') 
+                for error in [constant.FLOAT_MIN*1.1,constant.FLOAT_MAX*1.1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}') 
             elif v.lower() == 'double':
                 tdSql.execute(f'alter table {self.stbname}_{i} set tag {k} = {tag_double}')
                 tdSql.query(f'select {k} from {self.stbname}_{i}')

tests/system-test/1-insert/delete_data.py

@@ -25,12 +25,13 @@ from util.sqlset import TDSetSql
 class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(),logSql)
+        tdSql.init(conn.cursor())
         self.dbname = 'db_test'
         self.setsql = TDSetSql()
+        self.stbname = 'stb'
         self.ntbname = 'ntb'
-        self.rowNum = 10
-        self.tbnum = 20
+        self.rowNum = 5
+        self.tbnum = 2
         self.ts = 1537146000000
         self.binary_str = 'taosdata'
         self.nchar_str = '涛思数据'
@@ -51,6 +52,7 @@ class TDTestCase:
             'col13': f'nchar({self.str_length})',
             
         }
+        
         self.tinyint_val = random.randint(constant.TINYINT_MIN,constant.TINYINT_MAX)
         self.smallint_val = random.randint(constant.SMALLINT_MIN,constant.SMALLINT_MAX)
         self.int_val = random.randint(constant.INT_MIN,constant.INT_MAX)
@@ -107,32 +109,50 @@ class TDTestCase:
                 tdSql.execute(f'''insert into {tbname} values({self.ts+i},"{base_data['binary']}")''')
             elif 'nchar' in col_type.lower():
                 tdSql.execute(f'''insert into {tbname} values({self.ts+i},"{base_data['nchar']}")''')        
-
-    def delete_all_data(self,tbname,col_type,row_num,base_data,dbname):
+    def delete_all_data(self,tbname,col_type,row_num,base_data,dbname,tb_type,tb_num=1):
         tdSql.execute(f'delete from {tbname}')
         tdSql.execute(f'flush database {dbname}')
         tdSql.execute('reset query cache')
         tdSql.query(f'select * from {tbname}')
         tdSql.checkRows(0)
-        self.insert_base_data(col_type,tbname,row_num,base_data)
+        if tb_type == 'ntb' or tb_type == 'ctb':
+            self.insert_base_data(col_type,tbname,row_num,base_data)
+        elif tb_type == 'stb':
+            for i in range(tb_num):
+                self.insert_base_data(col_type,f'{tbname}_{i}',row_num,base_data)
         tdSql.execute(f'flush database {dbname}')
         tdSql.execute('reset query cache')
         tdSql.query(f'select * from {tbname}')
-        tdSql.checkRows(row_num)
-    def delete_one_row(self,tbname,column_type,column_name,base_data,dbname):
+        if tb_type == 'ntb' or tb_type == 'ctb':
+            tdSql.checkRows(row_num)
+        elif tb_type =='stb':
+            tdSql.checkRows(row_num*tb_num)
+    def delete_one_row(self,tbname,column_type,column_name,base_data,row_num,dbname,tb_type,tb_num=1):
         tdSql.execute(f'delete from {tbname} where ts={self.ts}')
         tdSql.execute(f'flush database {dbname}')
         tdSql.execute('reset query cache')
         tdSql.query(f'select {column_name} from {tbname}')
-        tdSql.checkRows(self.rowNum-1)
+        if tb_type == 'ntb' or tb_type == 'ctb':
+            tdSql.checkRows(row_num-1)
+        elif tb_type == 'stb':
+            tdSql.checkRows((row_num-1)*tb_num)
         tdSql.query(f'select {column_name} from {tbname} where ts={self.ts}')
         tdSql.checkRows(0)
-        if 'binary' in column_type.lower():
-            tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['binary']}")''')
-        elif 'nchar' in column_type.lower():
-            tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['nchar']}")''')
-        else:
-            tdSql.execute(f'insert into {tbname} values({self.ts},{base_data[column_type]})')
+        if tb_type == 'ntb' or tb_type == 'ctb':
+            if 'binary' in column_type.lower():
+                tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['binary']}")''')
+            elif 'nchar' in column_type.lower():
+                tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['nchar']}")''')
+            else:
+                tdSql.execute(f'insert into {tbname} values({self.ts},{base_data[column_type]})')
+        elif tb_type == 'stb':
+            for i in range(tb_num):
+                if 'binary' in column_type.lower():
+                    tdSql.execute(f'''insert into {tbname}_{i} values({self.ts},"{base_data['binary']}")''')
+                elif 'nchar' in column_type.lower():
+                    tdSql.execute(f'''insert into {tbname}_{i} values({self.ts},"{base_data['nchar']}")''')
+                else:
+                    tdSql.execute(f'insert into {tbname}_{i} values({self.ts},{base_data[column_type]})')
         tdSql.query(f'select {column_name} from {tbname} where ts={self.ts}')
         if column_type.lower() == 'float' or column_type.lower() == 'double':
             if abs(tdSql.queryResult[0][0] - base_data[column_type]) / base_data[column_type] <= 0.0001:
@@ -144,12 +164,56 @@ class TDTestCase:
         elif 'nchar' in column_type.lower():
             tdSql.checkEqual(tdSql.queryResult[0][0],base_data['nchar'])
         else:
-            tdSql.checkEqual(tdSql.queryResult[0][0],base_data[column_type])
-    
-    def delete_rows(self):
-
-
-        pass
+            tdSql.checkEqual(tdSql.queryResult[0][0],base_data[column_type])  
+    def delete_rows(self,dbname,tbname,col_name,col_type,base_data,row_num,tb_type,tb_num=1):
+        for i in range(row_num):
+            tdSql.execute(f'delete from {tbname} where ts>{self.ts+i}')
+            tdSql.execute(f'flush database {dbname}')
+            tdSql.execute('reset query cache')
+            tdSql.query(f'select {col_name} from {tbname}')
+            if tb_type == 'ntb' or tb_type == 'ctb':
+                tdSql.checkRows(i+1)
+                self.insert_base_data(col_type,tbname,row_num,base_data)
+            elif tb_type == 'stb':
+                tdSql.checkRows((i+1)*tb_num)
+                for j in range(tb_num):
+                    self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
+        for i in range(row_num):
+            tdSql.execute(f'delete from {tbname} where ts>={self.ts+i}')
+            tdSql.execute(f'flush database {dbname}')
+            tdSql.execute('reset query cache')
+            tdSql.query(f'select {col_name} from {tbname}')
+            if tb_type == 'ntb' or tb_type == 'ctb':
+                tdSql.checkRows(i)
+                self.insert_base_data(col_type,tbname,row_num,base_data)
+            elif tb_type == 'stb':
+                tdSql.checkRows(i*tb_num)
+                for j in range(tb_num):
+                    self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)    
+        for i in range(row_num):
+            tdSql.execute(f'delete from {tbname} where ts<={self.ts+i}')
+            tdSql.execute(f'flush database {dbname}')
+            tdSql.execute('reset query cache')
+            tdSql.query(f'select {col_name} from {tbname}')
+            if tb_type == 'ntb' or tb_type == 'ctb':
+                tdSql.checkRows(row_num-i-1)
+                self.insert_base_data(col_type,tbname,row_num,base_data)
+            elif tb_type == 'stb':
+                tdSql.checkRows((row_num-i-1)*tb_num)
+                for j in range(tb_num):
+                    self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
+        for i in range(row_num):
+            tdSql.execute(f'delete from {tbname} where ts<{self.ts+i}')
+            tdSql.execute(f'flush database {dbname}')
+            tdSql.execute('reset query cache')
+            tdSql.query(f'select {col_name} from {tbname}')
+            if tb_type == 'ntb' or tb_type == 'ctb':
+                tdSql.checkRows(row_num-i)
+                self.insert_base_data(col_type,tbname,row_num,base_data)
+            elif tb_type == 'stb':
+                tdSql.checkRows((row_num-i)*tb_num)
+                for j in range(tb_num):
+                    self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
     def delete_error(self,tbname,column_name,column_type,base_data):
         for error_list in ['',f'ts = {self.ts} and',f'ts = {self.ts} or']:
             if 'binary' in column_type.lower():
@@ -157,31 +221,56 @@ class TDTestCase:
             elif 'nchar' in column_type.lower():
                 tdSql.error(f'''delete from {tbname} where {error_list} {column_name} ="{base_data['nchar']}"''')
             else:
-                tdSql.error('delete from {tbname} where {error_list} {column_name} = {base_data[column_type]}')
-                
+                tdSql.error(f'delete from {tbname} where {error_list} {column_name} = {base_data[column_type]}')   
     def delete_data_ntb(self):
         tdSql.execute(f'create database if not exists {self.dbname}')
         tdSql.execute(f'use {self.dbname}')
         for col_name,col_type in self.column_dict.items():
             tdSql.execute(f'create table {self.ntbname} (ts timestamp,{col_name} {col_type})')
             self.insert_base_data(col_type,self.ntbname,self.rowNum,self.base_data)
-            self.delete_one_row(self.ntbname,col_type,col_name,self.base_data,self.dbname)
-            self.delete_all_data(self.ntbname,col_type,self.rowNum,self.base_data,self.dbname)
+            self.delete_one_row(self.ntbname,col_type,col_name,self.base_data,self.rowNum,self.dbname,'ntb')
+            self.delete_all_data(self.ntbname,col_type,self.rowNum,self.base_data,self.dbname,'ntb')
             self.delete_error(self.ntbname,col_name,col_type,self.base_data)
-            for i in range(self.rowNum):
-                tdSql.execute(f'delete from {self.ntbname} where ts>{self.ts+i}')
-                tdSql.execute(f'flush database {self.dbname}')
-                tdSql.execute('reset query cache')
-                tdSql.query(f'select {col_name} from {self.ntbname}')
-                tdSql.checkRows(i+1)
-                self.insert_base_data(col_type,self.ntbname,self.rowNum,self.base_data)
-            
+            self.delete_rows(self.dbname,self.ntbname,col_name,col_type,self.base_data,self.rowNum,'ntb')
+            for func in ['first','last']:
+                tdSql.query(f'select {func}(*) from {self.ntbname}')
             tdSql.execute(f'drop table {self.ntbname}')
-        
+        tdSql.execute(f'drop database {self.dbname}')
+    def delete_data_ctb(self):
+        tdSql.execute(f'create database if not exists {self.dbname}')
+        tdSql.execute(f'use {self.dbname}')
+        for col_name,col_type in self.column_dict.items():
+            tdSql.execute(f'create table {self.stbname} (ts timestamp,{col_name} {col_type}) tags(t1 int)')
+            for i in range(self.tbnum):
+                tdSql.execute(f'create table {self.stbname}_{i} using {self.stbname} tags(1)')
+                self.insert_base_data(col_type,f'{self.stbname}_{i}',self.rowNum,self.base_data)
+                self.delete_one_row(f'{self.stbname}_{i}',col_type,col_name,self.base_data,self.rowNum,self.dbname,'ctb')
+                self.delete_all_data(f'{self.stbname}_{i}',col_type,self.rowNum,self.base_data,self.dbname,'ctb')
+                self.delete_error(f'{self.stbname}_{i}',col_name,col_type,self.base_data)
+                self.delete_rows(self.dbname,f'{self.stbname}_{i}',col_name,col_type,self.base_data,self.rowNum,'ctb')
+                for func in ['first','last']:
+                    tdSql.query(f'select {func}(*) from {self.stbname}_{i}')
+            tdSql.execute(f'drop table {self.stbname}')
+    def delete_data_stb(self):
+        tdSql.execute(f'create database if not exists {self.dbname}')
+        tdSql.execute(f'use {self.dbname}')
+        for col_name,col_type in self.column_dict.items():
+            tdSql.execute(f'create table {self.stbname} (ts timestamp,{col_name} {col_type}) tags(t1 int)')
+            for i in range(self.tbnum):
+                tdSql.execute(f'create table {self.stbname}_{i} using {self.stbname} tags(1)')
+                self.insert_base_data(col_type,f'{self.stbname}_{i}',self.rowNum,self.base_data)
+            self.delete_error(self.stbname,col_name,col_type,self.base_data)
+            self.delete_one_row(self.stbname,col_type,col_name,self.base_data,self.rowNum,self.dbname,'stb',self.tbnum)
+            self.delete_all_data(self.stbname,col_type,self.rowNum,self.base_data,self.dbname,'stb',self.tbnum)
+            self.delete_rows(self.dbname,self.stbname,col_name,col_type,self.base_data,self.rowNum,'stb',self.tbnum)
+            for func in ['first','last']:
+                tdSql.query(f'select {func}(*) from {self.stbname}')
+            tdSql.execute(f'drop table {self.stbname}')
+        tdSql.execute(f'drop database {self.dbname}')
     def run(self):
         self.delete_data_ntb()
-        
-
+        self.delete_data_ctb()
+        self.delete_data_stb()
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/system-test/fulltest.sh

@@ -33,7 +33,7 @@ python3 ./test.py -f 1-insert/create_retentions.py
 python3 ./test.py -f 1-insert/table_param_ttl.py
 
 python3 ./test.py -f 1-insert/update_data.py
-
+python3 ./test.py -f 1-insert/delete_data.py
 python3 ./test.py -f 2-query/db.py
 
 python3 ./test.py -f 2-query/between.py