update

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

@@ -23,81 +23,36 @@ class TDTestCase:
 
         self.rowNum = 10
         self.ts = 1537146000000
-
-    def run(self):
+        self.binary_str = 'taosdata'
+        self.nchar_str = '涛思数据'
+    def top_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')")
         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))
-
-
-        # top verifacation
-        tdSql.error("select top(ts, 10) from test")
-        tdSql.error("select top(col1, 0) from test")
-        tdSql.error("select top(col1, 101) from test")
-        tdSql.error("select top(col2, 0) from test")
-        tdSql.error("select top(col2, 101) from test")
-        tdSql.error("select top(col3, 0) from test")
-        tdSql.error("select top(col3, 101) from test")
-        tdSql.error("select top(col4, 0) from test")
-        tdSql.error("select top(col4, 101) from test")
-        tdSql.error("select top(col5, 0) from test")
-        tdSql.error("select top(col5, 101) from test")
-        tdSql.error("select top(col6, 0) from test")
-        tdSql.error("select top(col6, 101) from test")
-        tdSql.error("select top(col7, 10) from test")
-        tdSql.error("select top(col8, 10) from test")
-        tdSql.error("select top(col9, 10) from test")
-        tdSql.error("select top(col11, 0) from test")
-        tdSql.error("select top(col11, 101) from test")
-        tdSql.error("select top(col12, 0) from test")
-        tdSql.error("select top(col12, 101) from test")
-        tdSql.error("select top(col13, 0) from test")
-        tdSql.error("select top(col13, 101) from test")
-        tdSql.error("select top(col14, 0) from test")
-        tdSql.error("select top(col14, 101) from test")
-
-        tdSql.query("select top(col1, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select top(col2, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select top(col3, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select top(col4, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select top(col11, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select top(col12, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select top(col13, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select top(col14, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
-        tdSql.query("select ts,top(col1, 2),ts from test1")
-        tdSql.checkRows(2)
-        tdSql.query("select top(col14, 100) from test")
-        tdSql.checkRows(10)
-        tdSql.query("select ts,top(col1, 2),ts from test group by tbname")
-        tdSql.checkRows(2)
-        tdSql.query('select top(col2,1) from test interval(1y) order by col2')
+            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))
+        column_list = ['col1','col2','col3','col4','col5','col6','col7','col8']
+        error_column_list = ['col11','col12','col13']
+        error_param_list = [0,101]
+        for i in column_list:
+            tdSql.query(f'select top({i},2) from stb_1')
+            tdSql.checkRows(2)
+            tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
+            for j in error_param_list:
+                tdSql.error(f'select top({i},{j}) from stb_1')
+        for i in error_column_list:
+            tdSql.error(f'select top({i},10) from stb_1')
+        tdSql.query("select ts,top(col1, 2),ts from stb_1 group by tbname")
+        tdSql.checkRows(2)
+        tdSql.query('select top(col2,1) from stb_1 interval(1y) order by col2')
         tdSql.checkData(0,0,10)
-
         tdSql.error("select * from test where bottom(col2,1)=1")
         tdSql.error("select top(col14, 0) from test;")
+        
+    def run(self):
+        self.top_check_base()
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)