update test case

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

@@ -16,6 +16,7 @@ class TDTestCase:
         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)''')
@@ -23,71 +24,76 @@ class TDTestCase:
         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,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(*) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(ts) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(ts) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col1) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col1) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col2) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col2) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col3) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col3) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col4) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col4) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col5) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col5) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col6) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col6) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col7) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col7) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col8) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col8) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col9) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col9) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col11) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col11) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col12) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col12) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col13) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col13) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col14) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col14) from db.stb")
-        tdSql.checkData(0,0,10)
+        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")
@@ -144,6 +150,8 @@ class TDTestCase:
         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")
@@ -159,16 +167,22 @@ class TDTestCase:
         tdSql.checkData(0,1,11)
 
         tdSql.query("select count(col1) from stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col1),count(ts) from stb")
-        tdSql.checkData(0,0,10)
-        tdSql.checkData(0,1,11)
+        tdSql.checkData(0,0,20)
+        tdSql.checkData(0,1,21)
         
         tdSql.query("select count(col1) from db.stb")
-        tdSql.checkData(0,0,10)
+        tdSql.checkData(0,0,20)
         tdSql.query("select count(col1),count(ts) from db.stb")
-        tdSql.checkData(0,0,10)
-        tdSql.checkData(0,1,11)
+        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)
 
         
 

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

@@ -79,6 +79,8 @@ class TDTestCase:
         tdSql.checkRows(0)
         tdSql.query("select last(col9) from db.stb_1")
         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)" 
@@ -170,7 +172,6 @@ class TDTestCase:
         # tdSql.checkData(0, 0, '涛思数据10')
 
 
-
         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)''')
         tdSql.execute("insert into ntb(ts) values(%d)" % (self.ts - 1))