update test case

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

@@ -24,78 +24,42 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
-
-    def run(self):
+        self.binary_str = 'taosdata'
+        self.nchar_str = '涛思数据'
+    def bottom_check_base(self):
         tdSql.prepare()
-
-        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) tags(loc nchar(20))''')
-        tdSql.execute("create table test1 using test tags('beijing')")
+        tdSql.execute('''create table stb(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 binary(20), col13 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table stb_1 using stb tags('beijing')")
+        column_list = ['col1','col2','col3','col4','col5','col6','col7','col8']
+        error_column_list = ['col11','col12','col13']
+        error_param_list = [0,101]
         for i in range(self.rowNum):
-            tdSql.execute("insert into test1 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))
-
-        # bottom verifacation
-        tdSql.error("select bottom(ts, 10) from test")
-        tdSql.error("select bottom(col1, 0) from test")
-        tdSql.error("select bottom(col1, 101) from test")
-        tdSql.error("select bottom(col2, 0) from test")
-        tdSql.error("select bottom(col2, 101) from test")
-        tdSql.error("select bottom(col3, 0) from test")
-        tdSql.error("select bottom(col3, 101) from test")
-        tdSql.error("select bottom(col4, 0) from test")
-        tdSql.error("select bottom(col4, 101) from test")
-        tdSql.error("select bottom(col5, 0) from test")
-        tdSql.error("select bottom(col5, 101) from test")
-        tdSql.error("select bottom(col6, 0) from test")
-        tdSql.error("select bottom(col6, 101) from test")
-        tdSql.error("select bottom(col7, 10) from test")
-        tdSql.error("select bottom(col8, 10) from test")
-        tdSql.error("select bottom(col9, 10) from test")
-
-        tdSql.query("select bottom(col1, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
-        tdSql.query("select bottom(col2, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
-
-        tdSql.query("select bottom(col3, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
-
-        tdSql.query("select bottom(col4, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
+            tdSql.execute(f"insert into stb_1 values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{self.binary_str}%d', '{self.nchar_str}%d')"
+                          % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
         
-        tdSql.query("select bottom(col11, 2) from test")
+        for i in column_list:
+            tdSql.query(f'select bottom({i},2) from stb_1')
             tdSql.checkRows(2)
             tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
+            for j in error_param_list:
+                tdSql.error(f'select bottom({i},{j}) from stb_1')
+        for i in error_column_list:
+            tdSql.error(f'select bottom({i},10) from stb_1')
+        # tdSql.query("select ts,bottom(col1, 2),ts from stb_1 group by tbname")
+        # tdSql.checkRows(2)
+        # tdSql.query('select bottom(col2,1) from stb_1 interval(1y) order by col2')
+        # tdSql.checkData(0,0,1)
 
-        tdSql.query("select bottom(col12, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
 
-        tdSql.query("select bottom(col13, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
+        tdSql.error('select * from stb_1 where bottom(col2,1)=1')
+        tdSql.execute('drop database db')
             
-        tdSql.query("select bottom(col13,50) from test")
-        tdSql.checkRows(10)
-
-        tdSql.query("select bottom(col14, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
-        tdSql.query("select ts,bottom(col1, 2) from test1")
-        tdSql.checkRows(2)
-        tdSql.query("select ts,bottom(col1, 2),ts from test group by tbname")
-        tdSql.checkRows(2)
-
-        tdSql.query('select bottom(col2,1) from test interval(1y) order by col2')
-        tdSql.checkData(0,0,1)
 
+        pass
+    def run(self):
 
-        tdSql.error('select * from test where bottom(col2,1)=1')
+        self.bottom_check_base()
         
 
     def stop(self):

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

@@ -11,258 +11,64 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
+        self.binary_str = 'taosdata'
+        self.nchar_str = '涛思数据'
 
-    def run(self):
+    def last_check_stb_tb_base(self):
         tdSql.prepare()
 
-        tdSql.execute('''create table stb(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) tags(loc nchar(20))''')
+        tdSql.execute('''create table stb(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 binary(20), col13 nchar(20)) tags(loc nchar(20))''')
         tdSql.execute("create table stb_1 using stb tags('beijing')")
         tdSql.execute("insert into stb_1(ts) values(%d)" % (self.ts - 1))
-
-        # last verifacation         
+        # last check for tb
+        for i in ['stb_1','db.stb_1','stb_1','db.stb_1']:
             tdSql.query("select last(*) from stb_1")
             tdSql.checkRows(1)
             tdSql.checkData(0, 1, None)
-        tdSql.query("select last(*) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, None)
-        tdSql.query("select last(col1) from stb_1")
-        tdSql.checkRows(0) 
-        tdSql.query("select last(col1) from db.stb_1")
-        tdSql.checkRows(0)       
-        tdSql.query("select last(col2) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col2) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col3) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col3) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col4) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col4) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col11) from stb_1")
-        tdSql.checkRows(0)    
-        tdSql.query("select last(col11) from db.stb_1")
-        tdSql.checkRows(0)      
-        tdSql.query("select last(col12) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col12) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col13) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col13) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col14) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col14) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col5) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col5) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col6) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col6) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col7) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col7) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col8) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col8) from db.stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col9) from stb_1")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col9) from db.stb_1")
+        for i in range(1, 14):
+            for j in ['stb_1','db.stb_1','stb_1','db.stb_1']:
+                tdSql.query(f"select last(col{i}) from {j}")
                 tdSql.checkRows(0)
         tdSql.query("select count(col1) from stb_1 group by col7")
         tdSql.checkRows(1)
-
         for i in range(self.rowNum):
-            tdSql.execute("insert into stb_1 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))            
-
-        tdSql.query("select last(*) from stb_1")
+            tdSql.execute(f"insert into stb_1 values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{self.binary_str}%d', '{self.nchar_str}%d')"
+                          % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+        for i in ['stb_1', 'db.stb_1', 'stb', 'db.stb']:
+            tdSql.query(f"select last(*) from {i}")
             tdSql.checkRows(1)
             tdSql.checkData(0, 1, 10)
-        tdSql.query("select last(*) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 10)
-        tdSql.query("select last(col1) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col1) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col2) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col2) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col3) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col3) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col4) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col4) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col11) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col11) from db.stb_1")
+        for i in range(1, 14):
+            for j in ['stb_1', 'db.stb_1', 'stb', 'db.stb']:
+                tdSql.query(f"select last(col{i}) from {j}")
                 tdSql.checkRows(1)
+                # tinyint,smallint,int,bigint,tinyint unsigned,smallint unsigned,int unsigned,bigint unsigned
+                if i >=1 and i<9:
                     tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col12) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col12) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col13) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col13) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col14) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col14) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col5) from stb_1")
-        tdSql.checkRows(1)
+                # float,double
+                elif i>=9 and i<11:
                     tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col5) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col6) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col6) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col7) from stb_1")
-        tdSql.checkRows(1)
+                # bool
+                elif i == 11:
                     tdSql.checkData(0, 0, True)
-        tdSql.query("select last(col7) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, True)
-        tdSql.query("select last(col8) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'taosdata10')
-        tdSql.query("select last(col8) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'taosdata10')
-        tdSql.query("select last(col9) from stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, '涛思数据10')
-        tdSql.query("select last(col9) from db.stb_1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, '涛思数据10')
+                # binary
+                elif i == 12:
+                    tdSql.checkData(0, 0, f'{self.binary_str}{self.rowNum}')
+                # nchar
+                elif i == 13:
+                    tdSql.checkData(0, 0, f'{self.nchar_str}{self.rowNum}')
         tdSql.query("select last(col1,col2,col3) from stb_1")
-        tdSql.checkData(0,2,10)
-
-        tdSql.query("select last(*) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 10)
-        tdSql.query("select last(*) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 10)
-        tdSql.query("select last(col1) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col1) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col2) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col2) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col3) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col3) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col4) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col4) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col11) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col11) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col12) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col12) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col13) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col13) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col14) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col14) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col5) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col5) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col6) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col6) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col7) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, True)
-        tdSql.query("select last(col7) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, True)
-        tdSql.query("select last(col8) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'taosdata10')
-        tdSql.query("select last(col8) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'taosdata10')
-        tdSql.query("select last(col9) from stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, '涛思数据10')
-        tdSql.query("select last(col9) from db.stb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, '涛思数据10')
-        tdSql.query("select last(col1,col2,col3) from stb")
-        tdSql.checkData(0,2,10)
+        tdSql.checkData(0, 2, 10)
 
+        tdSql.error("select col1 from stb where last(col13)='涛思数据10'")
+        tdSql.error("select col1 from stb_1 where last(col13)='涛思数据10'")
+        tdSql.execute('drop database db')
     
-        tdSql.execute('''create table ntb(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)''')
+    def last_check_ntb_base(self):
+        tdSql.prepare()
+        tdSql.execute('''create table ntb(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 binary(20), col13 nchar(20))''')
         tdSql.execute("insert into ntb(ts) values(%d)" % (self.ts - 1))  
         tdSql.query("select last(*) from ntb")
         tdSql.checkRows(1)
@@ -270,156 +76,50 @@ class TDTestCase:
         tdSql.query("select last(*) from db.ntb")
         tdSql.checkRows(1)
         tdSql.checkData(0, 1, None)
-        tdSql.query("select last(col1) from ntb")
-        tdSql.checkRows(0) 
-        tdSql.query("select last(col1) from db.ntb")
-        tdSql.checkRows(0)       
-        tdSql.query("select last(col2) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col2) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col3) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col3) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col4) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col4) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col11) from ntb")
-        tdSql.checkRows(0)    
-        tdSql.query("select last(col11) from db.ntb")
-        tdSql.checkRows(0)      
-        tdSql.query("select last(col12) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col12) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col13) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col13) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col14) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col14) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col5) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col5) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col6) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col6) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col7) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col7) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col8) from ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col8) from db.ntb")
-        tdSql.checkRows(0)
-        tdSql.query("select last(col9) from ntb")
+        for i in range(1,14):
+            for j in['ntb','db.ntb']:
+                tdSql.query(f"select last(col{i}) from {j}")
                 tdSql.checkRows(0)
-        tdSql.query("select last(col9) from db.ntb")
-        tdSql.checkRows(0)
-
         for i in range(self.rowNum):
-            tdSql.execute("insert into ntb 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))            
-
+            tdSql.execute(f"insert into ntb values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{self.binary_str}%d', '{self.nchar_str}%d')"
+                          % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
         tdSql.query("select last(*) from ntb")
         tdSql.checkRows(1)
         tdSql.checkData(0, 1, 10)
         tdSql.query("select last(*) from db.ntb")
         tdSql.checkRows(1)
         tdSql.checkData(0, 1, 10)
-        tdSql.query("select last(col1) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col1) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col2) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col2) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col3) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col3) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col4) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col4) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col11) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col11) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col12) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col12) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col13) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col13) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col14) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col14) from db.ntb")
+        for i in range(1, 9):
+            for j in ['ntb', 'db.ntb']:
+                tdSql.query(f"select last(col{i}) from {j}")
                 tdSql.checkRows(1)
+                # tinyint,smallint,int,bigint,tinyint unsigned,smallint unsigned,int unsigned,bigint unsigned
+                if i >=1 and i<9:
                     tdSql.checkData(0, 0, 10)
-        tdSql.query("select last(col5) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col5) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col6) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col6) from db.ntb")
-        tdSql.checkRows(1)
+                # float,double
+                elif i>=9 and i<11:
                     tdSql.checkData(0, 0, 9.1)
-        tdSql.query("select last(col7) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, True)
-        tdSql.query("select last(col7) from db.ntb")
-        tdSql.checkRows(1)
+                # bool
+                elif i == 11:
                     tdSql.checkData(0, 0, True)
-        tdSql.query("select last(col8) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'taosdata10')
-        tdSql.query("select last(col8) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'taosdata10')
-        tdSql.query("select last(col9) from ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, '涛思数据10')
-        tdSql.query("select last(col9) from db.ntb")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, '涛思数据10')
-        tdSql.query("select last(col1,col2,col3) from ntb")
-        tdSql.checkData(0,2,10)
+                # binary
+                elif i == 12:
+                    tdSql.checkData(0, 0, f'{self.binary_str}{self.rowNum}')
+                # nchar
+                elif i == 13:
+                    tdSql.checkData(0, 0, f'{self.nchar_str}{self.rowNum}')
 
-        tdSql.error("select col1 from stb where last(col9)='涛思数据10'")
         tdSql.error("select col1 from ntb where last(col9)='涛思数据10'")
-        tdSql.error("select col1 from stb_1 where last(col9)='涛思数据10'")
+
+    def run(self):
+        self.last_check_stb_tb_base()
+        self.last_check_ntb_base()
+
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)
 
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

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

@@ -11,192 +11,68 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
-
-    def prepare_data(self):
-        
-        pass    
-    def run(self):
+        self.binary_str = 'taosdata'
+        self.nchar_str = '涛思数据'
+    def max_check_stb_and_tb_base(self):
         tdSql.prepare()
-
         intData = []        
         floatData = []
-
-        tdSql.execute('''create table stb(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) tags(loc nchar(20))''')
+        tdSql.execute('''create table stb(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 binary(20), col13 nchar(20)) tags(loc nchar(20))''')
         tdSql.execute("create table stb_1 using stb tags('beijing')")
-        tdSql.execute('''create table ntb(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 ntb 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))
+            tdSql.execute(f"insert into stb_1 values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{self.binary_str}%d', '{self.nchar_str}%d')"
+                          % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
             intData.append(i + 1)            
             floatData.append(i + 0.1)
-        for i in range(self.rowNum):
-            tdSql.execute("insert into stb_1 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)                        
-
-        # max verifacation 
-        tdSql.error("select max(ts) from stb_1")
-        tdSql.error("select max(ts) from db.stb_1")
-        tdSql.error("select max(col7) from stb_1")
-        tdSql.error("select max(col7) from db.stb_1")
-        tdSql.error("select max(col8) from stb_1")
-        tdSql.error("select max(col8) from db.stb_1")
-        tdSql.error("select max(col9) from stb_1")
-        tdSql.error("select max(col9) from db.stb_1")
+        for i in ['ts','col11','col12','col13']:
+            for j in ['db.stb','stb','db.stb_1','stb_1']:
+                tdSql.error(f'select max({i} from {j} )')
 
-        tdSql.query("select max(col1) from stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col1) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col2) from stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col2) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col3) from stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col3) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col4) from stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col4) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col11) from stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col11) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col12) from stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col12) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col13) from stb_1")
+        for i in range(1,11):
+            for j in ['db.stb','stb','db.stb_1','stb_1']:
+                tdSql.query(f"select max(col{i}) from {j}")
+                if i<9:
                     tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col13) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col14) from stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col14) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col5) from stb_1")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col5) from db.stb_1")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col6) from stb_1")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col6) from db.stb_1")
+                elif i>=9:
                     tdSql.checkData(0, 0, np.max(floatData))
         tdSql.query("select max(col1) from stb_1 where col2<=5")
         tdSql.checkData(0,0,5)
+        tdSql.query("select max(col1) from stb where col2<=5")
+        tdSql.checkData(0,0,5)
+        tdSql.execute('drop database db')
         
-
-
-        tdSql.error("select max(ts) from stb")
-        tdSql.error("select max(ts) from db.stb")
-        tdSql.error("select max(col7) from stb")
-        tdSql.error("select max(col7) from db.stb")
-        tdSql.error("select max(col8) from stb")
-        tdSql.error("select max(col8) from db.stb")
-        tdSql.error("select max(col9) from stb")
-        tdSql.error("select max(col9) from db.stb")
-
-        tdSql.query("select max(col1) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col1) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col2) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col2) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col3) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col3) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col4) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col4) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col11) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col11) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col12) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col12) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col13) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col13) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col14) from stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col14) from db.stb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col5) from stb")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col5) from db.stb")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col6) from stb")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col6) from db.stb")
+    def max_check_ntb_base(self):
+        tdSql.prepare()
+        intData = []        
+        floatData = []
+        tdSql.execute('''create table ntb(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 binary(20), col13 nchar(20))''')
+        for i in range(self.rowNum):
+            tdSql.execute(f"insert into ntb values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{self.binary_str}%d', '{self.nchar_str}%d')"
+                          % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)
+        for i in ['ts','col11','col12','col13']:
+            for j in ['db.ntb','ntb']:
+                tdSql.error(f'select max({i} from {j} )')
+        for i in range(1,11):
+            for j in ['db.ntb','ntb']:
+                tdSql.query(f"select max(col{i}) from {j}")
+                if i<9:
+                    tdSql.checkData(0, 0, np.max(intData))
+                elif i>=9:
                     tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col1) from stb where col2<=5")
+        tdSql.query("select max(col1) from ntb where col2<=5")
         tdSql.checkData(0,0,5)
+        tdSql.execute('drop database db')
     
+    def run(self):
+        self.max_check_stb_and_tb_base()
+        self.max_check_ntb_base()
 
         
-        tdSql.error("select max(ts) from ntb")
-        tdSql.error("select max(ts) from db.ntb")
-        tdSql.error("select max(col7) from ntb")
-        tdSql.error("select max(col7) from db.ntb")
-        tdSql.error("select max(col8) from ntb")
-        tdSql.error("select max(col8) from db.ntb")
-        tdSql.error("select max(col9) from ntb")
-        tdSql.error("select max(col9) from db.ntb")
 
-        tdSql.query("select max(col1) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col1) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col2) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col2) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col3) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col3) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col4) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col4) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col11) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col11) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col12) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col12) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col13) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col13) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col14) from ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col14) from db.ntb")
-        tdSql.checkData(0, 0, np.max(intData))
-        tdSql.query("select max(col5) from ntb")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col5) from db.ntb")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col6) from ntb")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col6) from db.ntb")
-        tdSql.checkData(0, 0, np.max(floatData))
-        tdSql.query("select max(col1) from stb_1 where col2<=5")
-        tdSql.checkData(0,0,5)
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)