update count.py

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

 from util.log import *
 from util.sql import *
 from util.cases import *
-
+from util.sqlset import *
 class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor())
-
+        tdSql.init(conn.cursor(),logSql)
+        self.setsql = TDSetSql()
         self.rowNum = 10
         self.ts = 1537146000000
 
-    def run(self):
+        self.ntbname = 'ntb'
+        self.stbname = 'stb'
+        self.column_dict = {
+            'ts':'timestamp',
+            'c1':'int',
+            'c2':'float',
+            'c3':'double',
+            'c4':'timestamp'
+        }
+        self.tag_dict = {
+            't0':'int'
+        }
+        # The number of tag_values should be same as tbnum
+        self.tbnum = 2
+        self.tag_values = [
+            f'10',
+            f'100'
+        ]
+        self.values_list = [
+            f'now,1,2,3,4,5,6,7,8,9.9,10.1,true,"abcd","涛思数据"'
+        ]
+    # def count_query_stb(self,stbname,tbnum):
+    #     tdSql.query(f'select count(tbname) from {stbname}')
+    #     print(tdSql.queryResult)
+    #     tdSql.checkEqual(tdSql.queryResult[0],tbnum)
+
+    def check_ntb(self):
         tdSql.prepare()
+        tdSql.execute(self.setsql.set_create_normaltable_sql(self.ntbname,self.column_dict))
 
-        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_1 using stb tags('beijing')")
-        tdSql.execute("create table stb_2 using stb tags('shanghai')")
-
-        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 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.execute("insert into stb_2 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))
-
-        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.query("select count(*) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(*) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(ts) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(ts) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col1) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col1) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col2) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col2) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col3) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col3) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col4) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col4) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col5) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col5) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col6) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col6) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col7) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col7) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col8) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col8) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col9) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col9) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col11) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col11) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col12) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col12) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col13) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col13) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col14) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col14) from db.stb")
-        tdSql.checkData(0,0,20)
-
-
-
-        tdSql.query("select count(ts) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(ts) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col1) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col1) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col2) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col2) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col3) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col3) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col4) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col4) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col5) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col5) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col6) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col6) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col7) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col7) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col8) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col8) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col9) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col9) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col11) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col11) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col12) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col12) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col13) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col13) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col14) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col14) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col1) from stb_1 group by col7")
-        tdSql.checkRows(2)
-
-        tdSql.execute("insert into stb_1 values(now,null,null,null,null,null,null,null,null,null,null,null,null,null)")
-        tdSql.query("select count(col1) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col1),count(ts) from stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.checkData(0,1,11)
-
-        tdSql.query("select count(col1) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.query("select count(col1),count(ts) from db.stb_1")
-        tdSql.checkData(0,0,10)
-        tdSql.checkData(0,1,11)
-
-        tdSql.query("select count(col1) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col1),count(ts) from stb")
-        tdSql.checkData(0,0,20)
-        tdSql.checkData(0,1,21)
-
-        tdSql.query("select count(col1) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.query("select count(col1),count(ts) from db.stb")
-        tdSql.checkData(0,0,20)
-        tdSql.checkData(0,1,21)
-        tdSql.query("select count(col1) from stb_1 group by col7")
-        tdSql.checkRows(3)
-        tdSql.query("select count(col1) from stb_2 group by col7")
-        tdSql.checkRows(2)
-        tdSql.query("select count(col1) from stb group by col7")
-        tdSql.checkRows(3)
+    def check_stb(self):
+        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[i]})')
+        tdSql.query(f'select count(tbname) from {self.stbname}')
+        tdSql.checkRows(0)
+        tdSql.execute('flush database db')
+        tdSql.query(f'select count(tbname) from {self.stbname}')
+        tdSql.checkRows(0)
+        for i in range(self.tbnum):
+            for j in self.values_list:
+                tdSql.execute(f'insert into {self.stbname}_{i} values({j})')
+        tdSql.query(f'select count(tbname) from {self.stbname}')
+        tdSql.checkRows(0)
+        tdSql.execute('flush database db')
+        tdSql.query(f'select count(tbname) from {self.stbname}')
+        tdSql.checkRows(0)
+        
+    def run(self):
+        self.check_stb()
+        # 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_1 using stb tags('beijing')")
+        # tdSql.execute("create table stb_2 using stb tags('shanghai')")
+
+        # 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 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.execute("insert into stb_2 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))
+
+        # 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.query("select count(*) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(*) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(ts) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(ts) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col1) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col1) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col2) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col2) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col3) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col3) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col4) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col4) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col5) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col5) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col6) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col6) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col7) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col7) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col8) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col8) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col9) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col9) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col11) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col11) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col12) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col12) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col13) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col13) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col14) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col14) from db.stb")
+        # tdSql.checkData(0,0,20)
+
+
+
+        # tdSql.query("select count(ts) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(ts) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col1) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col1) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col2) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col2) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col3) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col3) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col4) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col4) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col5) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col5) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col6) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col6) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col7) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col7) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col8) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col8) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col9) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col9) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col11) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col11) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col12) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col12) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col13) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col13) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col14) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col14) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col1) from stb_1 group by col7")
+        # tdSql.checkRows(2)
+
+        # tdSql.execute("insert into stb_1 values(now,null,null,null,null,null,null,null,null,null,null,null,null,null)")
+        # tdSql.query("select count(col1) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col1),count(ts) from stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.checkData(0,1,11)
+
+        # tdSql.query("select count(col1) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.query("select count(col1),count(ts) from db.stb_1")
+        # tdSql.checkData(0,0,10)
+        # tdSql.checkData(0,1,11)
+
+        # tdSql.query("select count(col1) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col1),count(ts) from stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.checkData(0,1,21)
+
+        # tdSql.query("select count(col1) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.query("select count(col1),count(ts) from db.stb")
+        # tdSql.checkData(0,0,20)
+        # tdSql.checkData(0,1,21)
+        # tdSql.query("select count(col1) from stb_1 group by col7")
+        # tdSql.checkRows(3)
+        # tdSql.query("select count(col1) from stb_2 group by col7")
+        # tdSql.checkRows(2)
+        # tdSql.query("select count(col1) from stb group by col7")
+        # tdSql.checkRows(3)