update test case

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

@@ -184,20 +184,36 @@ class TDTestCase:
         for k,v in self.tag_dict.items():
             if v.lower() == 'tinyint':
                 self.tag_check(i,k,tag_tinyint)
+                for error in [constant.TINYINT_MIN-1,constant.TINYINT_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}')
             elif v.lower() == 'smallint':
                 self.tag_check(i,k,tag_smallint)
+                for error in [constant.SMALLINT_MIN-1,constant.SMALLINT_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}')
             elif v.lower() == 'int':
                 self.tag_check(i,k,tag_int)
+                for error in [constant.INT_MIN-1,constant.INT_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}')
             elif v.lower() == 'bigint':
                 self.tag_check(i,k,tag_bigint)
+                for error in [constant.BIGINT_MIN-1,constant.BIGINT_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}')
             elif v.lower() == 'tinyint unsigned':
                 self.tag_check(i,k,tag_untinyint)
+                for error in [constant.TINYINT_UN_MIN-1,constant.TINYINT_UN_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}')
             elif v.lower() == 'smallint unsigned':
                 self.tag_check(i,k,tag_unsmallint)
+                for error in [constant.SMALLINT_UN_MIN-1,constant.SMALLINT_UN_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}')
             elif v.lower() == 'int unsigned':
                 self.tag_check(i,k,tag_unint)
+                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}')  
             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':
@@ -207,6 +223,8 @@ class TDTestCase:
                     tdSql.checkEqual(tdSql.queryResult[0][0],tdSql.queryResult[0][0])
                 else:
                     tdLog.exit(f'select {k} from {self.stbname}_{i},data check failure')
+                for error in [constant.FLOAT_MIN-1,constant.FLOAT_MAX+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}')
@@ -214,12 +232,17 @@ class TDTestCase:
                     tdSql.checkEqual(tdSql.queryResult[0][0],tdSql.queryResult[0][0])
                 else:
                     tdLog.exit(f'select {k} from {self.stbname}_{i},data check failure')
+                for error in [constant.DOUBLE_MIN-1,constant.DOUBLE_MAX+1]:
+                    tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = {error}') 
             elif 'binary' in v.lower():
+                tag_binary_error = tdCom.getLongName(self.binary_length+1)
+                tdSql.error(f'alter table {self.stbname}_{i} set tag {k} = "{tag_binary_error}"')
                 tdSql.execute(f'alter table {self.stbname}_{i} set tag {k} = "{tag_binary}"')
                 tdSql.query(f'select {k} from {self.stbname}_{i}')
                 tdSql.checkData(0,0,tag_binary)
             elif 'nchar' in v.lower():
-                tdSql.execute(f'alter table {self.stbname}_{i} set tag {k} = "{tag_nchar}"')
+                tag_nchar_error = tdCom.getLongName(self.nchar_length+1)
+                tdSql.execute(f'alter table {self.stbname}_{i} set tag {k} = "{tag_nchar_error}"')
                 tdSql.query(f'select {k} from {self.stbname}_{i}')
                 tdSql.checkData(0,0,tag_nchar)
     

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

@@ -11,12 +11,14 @@
 
 # -*- coding: utf-8 -*-
 
-from platform import java_ver
+
 from util.log import *
 from util.cases import *
 from util.sql import *
 import numpy as np
 
+from util.sqlset import TDSetSql
+
 
 class TDTestCase:
     def init(self, conn, logSql):
@@ -25,53 +27,154 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
-        
-    def run(self):
-        tdSql.prepare()
-
+        self.setsql = TDSetSql()
+        self.ntbname = 'ntb'
+        self.stbname = 'stb'
+        self.binary_length = 20 # the length of binary for column_dict
+        self.nchar_length = 20  # the length of nchar for column_dict
+        self.column_dict = {
+            'ts'  : 'timestamp',
+            'col1': 'tinyint',
+            'col2': 'smallint',
+            'col3': 'int',
+            'col4': 'bigint',
+            'col5': 'tinyint unsigned',
+            'col6': 'smallint unsigned',
+            'col7': 'int unsigned',
+            'col8': 'bigint unsigned',
+            'col9': 'float',
+            'col10': 'double',
+            'col11': 'bool',
+            'col12': f'binary({self.binary_length})',
+            'col13': f'nchar({self.nchar_length})'
+        }
+        
+        self.tag_dict = {
+            'ts_tag'  : 'timestamp',
+            't1': 'tinyint',
+            't2': 'smallint',
+            't3': 'int',
+            't4': 'bigint',
+            't5': 'tinyint unsigned',
+            't6': 'smallint unsigned',
+            't7': 'int unsigned',
+            't8': 'bigint unsigned',
+            't9': 'float',
+            't10': 'double',
+            't11': 'bool',
+            't12': f'binary({self.binary_length})',
+            't13': f'nchar({self.nchar_length})'
+        }
+        self.binary_str = 'taosdata'
+        self.nchar_str = '涛思数据'
+        self.tbnum = 2
+        self.tag_values = [
+            f'1537146000000,1,2,3,4,5,6,7,8,9.1,10.1,"{self.binary_str}","{self.nchar_str}"'
+            
+        ]
+        
+        self.param = [1,50,100]
+    def insert_data(self,column_dict,tbname,row_num):
         intData = []        
         floatData = []
-
-        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
-                    col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned)''')
-        for i in range(self.rowNum):
-            tdSql.execute("insert into test values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" 
-                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+        sql = ''
+        for k, v in column_dict.items():
+            if v.lower() == 'timestamp' or v.lower() == 'tinyint' or v.lower() == 'smallint' or v.lower() == 'int' or v.lower() == 'bigint' or \
+            v.lower() == 'tinyint unsigned' or v.lower() == 'smallint unsigned' or v.lower() == 'int unsigned' or v.lower() == 'bigint unsigned' or v.lower() == 'bool':
+                sql += '%d,'
+            elif v.lower() == 'float' or v.lower() == 'double':
+                sql += '%f,'
+            elif 'binary' in v.lower():
+                sql += f'"{self.binary_str}%d",'
+            elif 'nchar' in v.lower():
+                sql += f'"{self.nchar_str}%d",'
+        insert_sql = f'insert into {tbname} values({sql[:-1]})'
+        for i in range(row_num):
+            insert_list = []
+            for k, v in column_dict.items():
+                if v.lower() in[ 'tinyint' , 'smallint' , 'int', 'bigint' , 'tinyint unsigned' , 'smallint unsigned' , 'int unsigned' , 'bigint unsigned'] or\
+                'binary' in v.lower() or 'nchar' in v.lower():
+                    insert_list.append(1 + i)
+                elif v.lower() == 'float' or v.lower() == 'double':
+                    insert_list.append(0.1 + i)
+                elif v.lower() == 'bool':
+                    insert_list.append(i % 2)
+                elif v.lower() == 'timestamp':
+                    insert_list.append(self.ts + i)
+            tdSql.execute(insert_sql%(tuple(insert_list)))
             intData.append(i + 1)            
             floatData.append(i + 0.1)
+        return intData,floatData
+    def function_check_ntb(self):
+        tdSql.prepare()
+        tdSql.execute(self.setsql.set_create_normaltable_sql(self.ntbname,self.column_dict))
+        intData,floatData = self.insert_data(self.column_dict,self.ntbname,self.rowNum)
+        for k,v in self.column_dict.items():
+            for param in self.param:
+                if v.lower() in ['timestamp','bool'] or 'binary' in v.lower() or 'nchar' in v.lower():
+                    tdSql.error(f'select percentile({k},{param}) from {self.ntbname}')
+                elif v.lower() in ['tinyint','smallint','int','bigint','tinyint unsigned','smallint unsigned','int unsigned','bigint unsigned']:
+                    tdSql.query(f'select percentile({k}, {param}) from {self.ntbname}')
+                    tdSql.checkData(0, 0, np.percentile(intData, param))
+                else:
+                    tdSql.query(f'select percentile({k}, {param}) from {self.ntbname}')
+                    tdSql.checkData(0, 0, np.percentile(floatData, param))
+    def function_check_ctb(self):
         
-        # percentile verifacation 
-        tdSql.error("select percentile(ts ,20) from test")
-        tdSql.error("select percentile(col7 ,20) from test")
-        tdSql.error("select percentile(col8 ,20) from test")        
-        tdSql.error("select percentile(col9 ,20) from test") 
-        column_list = [1,2,3,4,11,12,13,14]
-        percent_list = [0,50,100]  
-        for i in column_list:  
-            for j in percent_list:
-                tdSql.query(f"select percentile(col{i}, {j}) from test")        
-                tdSql.checkData(0, 0, np.percentile(intData, j)) 
-
-        for i in [5,6]:
-            for j in percent_list:
-                tdSql.query(f"select percentile(col{i}, {j}) from test")
-                tdSql.checkData(0, 0, np.percentile(floatData, j))
-        
-        tdSql.execute("create table meters (ts timestamp, voltage int) tags(loc nchar(20))")
-        tdSql.execute("create table t0 using meters tags('beijing')")
-        tdSql.execute("create table t1 using meters tags('shanghai')")
-        for i in range(self.rowNum):
-            tdSql.execute("insert into t0 values(%d, %d)" % (self.ts + i, i + 1))            
-            tdSql.execute("insert into t1 values(%d, %d)" % (self.ts + i, i + 1))            
-        
-        # tdSql.error("select percentile(voltage, 20) from meters")
-
-
- 
-        tdSql.execute("create table st(ts timestamp, k int)")
-        tdSql.execute("insert into st values(now, -100)(now+1a,-99)")
-        tdSql.query("select apercentile(k, 20) from st")
-        tdSql.checkData(0, 0, -100.00)
+        tdSql.prepare()
+        tdSql.execute(self.setsql.set_create_stable_sql(self.stbname,self.column_dict,self.tag_dict))
+        for i in range(self.tbnum):
+            tdSql.execute(f"create table {self.stbname}_{i} using {self.stbname} tags({self.tag_values[0]})")
+            tdSql.execute(self.insert_data(self.column_dict,f'{self.stbname}_{i}',self.rowNum))
+        
+    def run(self):
+        # self.function_check_ntb()
+        self.function_check_ctb()
+        # tdSql.prepare()
+
+        # intData = []        
+        # floatData = []
+
+        # tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+        #             col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned)''')
+        # for i in range(self.rowNum):
+        #     tdSql.execute("insert into test values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)" 
+        #                 % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
+        #     intData.append(i + 1)            
+        #     floatData.append(i + 0.1)                        
+
+        # # percentile verifacation 
+        # tdSql.error("select percentile(ts ,20) from test")
+        # tdSql.error("select percentile(col7 ,20) from test")
+        # tdSql.error("select percentile(col8 ,20) from test")        
+        # tdSql.error("select percentile(col9 ,20) from test") 
+        # column_list = [1,2,3,4,11,12,13,14]
+        # percent_list = [0,50,100]  
+        # for i in column_list:  
+        #     for j in percent_list:
+        #         tdSql.query(f"select percentile(col{i}, {j}) from test")        
+        #         tdSql.checkData(0, 0, np.percentile(intData, j)) 
+
+        # for i in [5,6]:
+        #     for j in percent_list:
+        #         tdSql.query(f"select percentile(col{i}, {j}) from test")
+        #         tdSql.checkData(0, 0, np.percentile(floatData, j))
+        
+        # tdSql.execute("create table meters (ts timestamp, voltage int) tags(loc nchar(20))")
+        # tdSql.execute("create table t0 using meters tags('beijing')")
+        # tdSql.execute("create table t1 using meters tags('shanghai')")
+        # for i in range(self.rowNum):
+        #     tdSql.execute("insert into t0 values(%d, %d)" % (self.ts + i, i + 1))            
+        #     tdSql.execute("insert into t1 values(%d, %d)" % (self.ts + i, i + 1))            
+        
+        # # tdSql.error("select percentile(voltage, 20) from meters")
+
+
+ 
+        # tdSql.execute("create table st(ts timestamp, k int)")
+        # tdSql.execute("insert into st values(now, -100)(now+1a,-99)")
+        # tdSql.query("select apercentile(k, 20) from st")
+        # tdSql.checkData(0, 0, -100.00)