Merge pull request #13941 from taosdata/test/jcy

test：add test case for functions

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

@@ -77,6 +77,7 @@ class TDTestCase:
         tdSql.error(f'alter stable {stbname} modify column c9 double')
         tdSql.error(f'alter stable {stbname} modify column c10 float')
         tdSql.error(f'alter stable {stbname} modify column c11 int')
+        tdSql.error(f'alter stable {stbname} drop tag t0')
         tdSql.execute(f'drop database {dbname}')
 
     def alter_stable_tag_check(self,dbname,stbname,tbname):
@@ -126,6 +127,11 @@ class TDTestCase:
         for i in ['int','unsigned int','float','binary(10)','nchar(10)']:
             tdSql.error(f'alter stable {stbname} modify tag t8 {i}')
         tdSql.error(f'alter stable {stbname} modify tag t4 int')
+        tdSql.error(f'alter stable {stbname} drop column t0')
+        #!bug TD-16410
+        # tdSql.error(f'alter stable {tbname} set tag t1=100 ')
+        # tdSql.execute(f'create table ntb (ts timestamp,c0 int)')
+        tdSql.error(f'alter stable ntb add column c2 ')
         tdSql.execute(f'drop database {dbname}')
 
     def run(self):

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

@@ -52,8 +52,6 @@ class TDTestCase:
         tdSql.execute(f'create database if not exists {dbname}')
         stbname = self.get_long_name(length=3, mode="letters")
         tbname = self.get_long_name(length=3, mode="letters")
-        tdLog.info('--------------------------child table tag check--------------------------------------')
-        tdLog.info(f'-----------------create stable {stbname} and child table {tbname}-------------------')
         tdSql.execute(f'create stable if not exists {dbname}.{stbname} (col_ts timestamp, c1 int) tags (tag_ts 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 binary(20),t13 nchar(20))')
         tdSql.execute(f'create table if not exists {dbname}.{tbname} using {dbname}.{stbname} tags(now, 1, 2, 3, 4, 5, 6, 7, 8, 9.9, 10.1, True,"abc123","涛思数据")')
@@ -90,13 +88,16 @@ class TDTestCase:
         tdSql.checkData(0,15,tag_nchar)
 
         # bug TD-16211 insert length more than setting binary and nchar
-        # tag_binary = self.get_long_name(length=21, mode="letters")
-        # tag_nchar = self.get_long_name(length=21, mode="letters")
-        # tdSql.error(f'alter table {dbname}.{tbname} set tag t12 = "{tag_binary}"')
-        # tdSql.error(f'alter table {dbname}.{tbname} set tag t13 = "{tag_nchar}"')
-
+        # error_tag_binary = self.get_long_name(length=21, mode="letters")
+        # error_tag_nchar = self.get_long_name(length=21, mode="letters")
+        # tdSql.error(f'alter table {dbname}.{tbname} set tag t12 = "{error_tag_binary}"')
+        # tdSql.error(f'alter table {dbname}.{tbname} set tag t13 = "{error_tag_nchar}"')
+        error_tag_binary = self.get_long_name(length=25, mode="letters")
+        error_tag_nchar = self.get_long_name(length=25, mode="letters")
+        tdSql.error(f'alter table {dbname}.{tbname} set tag t12 = "{error_tag_binary}"')
+        tdSql.error(f'alter table {dbname}.{tbname} set tag t13 = "{error_tag_nchar}"')
         # bug TD-16210 modify binary to nchar
-        # tdSql.error(f'alter table {dbname}.{tbname} modify tag t12 nchar(10)')
+        tdSql.error(f'alter table {dbname}.{tbname} modify tag t12 nchar(10)')
         tdSql.execute(f"drop database {dbname}")
     def alter_ntb_column_check(self):
         '''
@@ -125,6 +126,20 @@ class TDTestCase:
         tdSql.execute(f'alter table {dbname}.{tbname} drop column `c15`')
         tdSql.query(f'describe {dbname}.{tbname}')
         tdSql.checkRows(14)
+        #! TD-16422
+        # tdSql.execute(f'alter table {dbname}.{tbname} add column c16 binary(10)')
+        # tdSql.query(f'describe {dbname}.{tbname}')
+        # tdSql.checkRows(15)
+        # tdSql.checkEqual(tdSql.queryResult[14][2],10)
+        # tdSql.execute(f'alter table {dbname}.{tbname} drop column c16')
+
+        # tdSql.execute(f'alter table {dbname}.{tbname} add column c16 nchar(10)')
+        # tdSql.query(f'describe {dbname}.{tbname}')
+        # tdSql.checkRows(15)
+        # tdSql.checkEqual(tdSql.queryResult[14][2],10)
+        # tdSql.execute(f'alter table {dbname}.{tbname} drop column c16')
+
+
         tdSql.execute(f'alter table {dbname}.{tbname} modify column c12 binary(30)')
         tdSql.query(f'describe {dbname}.{tbname}')
         tdSql.checkData(12,2,30)

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

@@ -11,9 +11,12 @@
 
 # -*- coding: utf-8 -*-
 
+import random
+import string
 from util.log import *
 from util.cases import *
 from util.sql import *
+from util.common import *
 
 
 
@@ -23,79 +26,89 @@ class TDTestCase:
         tdSql.init(conn.cursor())
 
         self.rowNum = 10
+        self.tbnum = 20
         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.query("select bottom(col11, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkEqual(tdSql.queryResult,[(2,),(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.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.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 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 test interval(1y) order by col2')
+        tdSql.query('select bottom(col2,1) from stb_1 interval(1y) order by col2')
         tdSql.checkData(0,0,1)
 
+        tdSql.error('select * from stb_1 where bottom(col2,1)=1')
+        tdSql.execute('drop database db')
+    def bottom_check_distribute(self):
+        # prepare data for vgroup 4
+        dbname = tdCom.getLongName(5, "letters")
+        stbname = tdCom.getLongName(5, "letters")
+        vgroup_num = 2
+        child_table_num = 20
+        tdSql.execute(f"create database if not exists {dbname} vgroups {vgroup_num}")
+        tdSql.execute(f'use {dbname}')
+        # build 20 child tables,every table insert 10 rows
+        tdSql.execute(f'''create table {stbname}(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))''')
+        for i in range(child_table_num):
+            tdSql.execute(f"create table {stbname}_{i} using {stbname} tags('beijing')")
+            tdSql.execute(f"insert into {stbname}_{i}(ts) values(%d)" % (self.ts - 1-i))
+        column_list = ['col1','col2','col3','col4','col5','col6','col7','col8']
+        error_column_list = ['col11','col12','col13']
+        error_param_list = [0,101]
+        for i in [f'{stbname}', f'{dbname}.{stbname}']:
+            for j in column_list:
+                tdSql.query(f"select bottom({j},1) from {i}")
+                tdSql.checkRows(0)
+        tdSql.query('show tables')
+        vgroup_list = []
+        for i in range(len(tdSql.queryResult)):
+            vgroup_list.append(tdSql.queryResult[i][6])
+        vgroup_list_set = set(vgroup_list)
+
+        for i in vgroup_list_set:
+            vgroups_num = vgroup_list.count(i)
+            if vgroups_num >=2:
+                tdLog.info(f'This scene with {vgroups_num} vgroups is ok!')
+                continue
+            else:
+                tdLog.exit(f'This scene does not meet the requirements with {vgroups_num} vgroup!\n')
+        for i in range(self.rowNum):
+            for j in range(child_table_num):
+                tdSql.execute(f"insert into {stbname}_{j} 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 column_list:
+            tdSql.query(f'select bottom({i},2) from {stbname}')
+            tdSql.checkRows(2)
+            tdSql.checkEqual(tdSql.queryResult,[(1,),(1,)])
+            for j in error_param_list:
+                tdSql.error(f'select bottom({i},{j}) from {stbname}')
+        for i in error_column_list:
+            tdSql.error(f'select bottom({i},10) from {stbname}')
+        
+        tdSql.execute(f'drop database {dbname}')
+    def run(self):
 
-        tdSql.error('select * from test where bottom(col2,1)=1')
+        self.bottom_check_base()
+        self.bottom_check_distribute()
         
 
     def stop(self):

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

@@ -11,8 +11,11 @@
 
 # -*- coding: utf-8 -*-
 
+import random
+import string
 import sys
 import taos
+from util.common import *
 from util.log import *
 from util.cases import *
 from util.sql import *
@@ -25,124 +28,159 @@ class TDTestCase:
         tdSql.init(conn.cursor())
 
         self.rowNum = 10
+        self.tbnum = 20
         self.ts = 1537146000000
-        
-    def run(self):
+        self.binary_str = 'taosdata'
+        self.nchar_str = '涛思数据'
+    
+    def first_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("insert into test1(ts) values(%d)" % (self.ts - 1))
-
-        # first verifacation        
-        # bug TD-15957 
-        tdSql.query("select first(*) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, None)
-
-        tdSql.query("select first(col1) from test1")
-        tdSql.checkRows(0)        
-
-        tdSql.query("select first(col2) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col3) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col4) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col11) from test1")
-        tdSql.checkRows(0)        
-
-        tdSql.query("select first(col12) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col13) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col14) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col5) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col6) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col7) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col8) from test1")
-        tdSql.checkRows(0)
-
-        tdSql.query("select first(col9) from test1")
-        tdSql.checkRows(0)
-
+        column_dict = {
+            '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('''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))
+        column_list = ['col1','col2','col3','col4','col5','col6','col7','col8','col9','col10','col11','col12','col13']
+        for i in ['stb_1','db.stb_1','stb_1','db.stb_1']:
+            tdSql.query(f"select first(*) from {i}")
+            tdSql.checkRows(1)
+            tdSql.checkData(0, 1, None)
+        #!bug TD-16561
+        # for i in ['stb','db.stb']:
+        #     tdSql.query(f"select first(*) from {i}")
+        #     tdSql.checkRows(1)
+        #     tdSql.checkData(0, 1, None)
+        for i in column_list:
+            for j in ['stb_1','db.stb_1','stb_1','db.stb_1']:
+                tdSql.query(f"select first({i}) from {j}")
+                tdSql.checkRows(0)
         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))            
-
-        tdSql.query("select first(*) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 1, 1)
-
-        tdSql.query("select first(col1) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col2) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col3) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col4) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col11) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col12) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col13) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col14) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 1)
-
-        tdSql.query("select first(col5) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 0.1)
-
-        tdSql.query("select first(col6) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 0.1)
-
-        tdSql.query("select first(col7) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, False)
-
-        tdSql.query("select first(col8) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, 'taosdata1')
-
-        tdSql.query("select first(col9) from test1")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, '涛思数据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 k, v in column_dict.items():
+            for j in ['stb_1', 'db.stb_1', 'stb', 'db.stb']:
+                tdSql.query(f"select first({k}) from {j}")
+                tdSql.checkRows(1)
+                # tinyint,smallint,int,bigint,tinyint unsigned,smallint unsigned,int unsigned,bigint unsigned
+                if v == 'tinyint' or v == 'smallint' or v == 'int' or v == 'bigint' or v == 'tinyint unsigned' or v == 'smallint unsigned'\
+                        or v == 'int unsigned' or v == 'bigint unsigned':
+                    tdSql.checkData(0, 0, 1)
+                # float,double
+                elif v == 'float' or v == 'double':
+                    tdSql.checkData(0, 0, 0.1)
+                # bool
+                elif v == 'bool':
+                    tdSql.checkData(0, 0, False)
+                # binary
+                elif 'binary' in v:
+                    tdSql.checkData(0, 0, f'{self.binary_str}1')
+                # nchar
+                elif 'nchar' in v:
+                    tdSql.checkData(0, 0, f'{self.nchar_str}1')
+        #!bug TD-16569
+        tdSql.query("select first(*),last(*) from stb where ts < 23 interval(1s)")
+        tdSql.checkRows(0)
+        tdSql.execute('drop database db')
+    def first_check_stb_distribute(self):
+        # prepare data for vgroup 4
+        dbname = tdCom.getLongName(10, "letters")
+        stbname = tdCom.getLongName(5, "letters")
+        child_table_num = 20
+        vgroup = 2
+        column_dict = {
+            '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(f"create database if not exists {dbname} vgroups {vgroup}")
+        tdSql.execute(f'use {dbname}')
+        # build 20 child tables,every table insert 10 rows
+        tdSql.execute(f'''create table {stbname}(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))''')
+        for i in range(child_table_num):
+            tdSql.execute(f"create table {stbname}_{i} using {stbname} tags('beijing')")
+            tdSql.execute(f"insert into {stbname}_{i}(ts) values(%d)" % (self.ts - 1-i))
+        #!bug TD-16561
+        # for i in [f'{stbname}', f'{dbname}.{stbname}']:
+        #     tdSql.query(f"select first(*) from {i}")
+        #     tdSql.checkRows(1)
+        #     tdSql.checkData(0, 1, None)
+        tdSql.query('show tables')
+        vgroup_list = []
+        for i in range(len(tdSql.queryResult)):
+            vgroup_list.append(tdSql.queryResult[i][6])
+        vgroup_list_set = set(vgroup_list)
+        # print(vgroup_list_set)
+        # print(vgroup_list)
+        for i in vgroup_list_set:
+            vgroups_num = vgroup_list.count(i)
+            if vgroups_num >=2:
+                tdLog.info(f'This scene with {vgroups_num} vgroups is ok!')
+                continue
+            else:
+                tdLog.exit('This scene does not meet the requirements with {vgroups_num} vgroup!\n')
         
+        for i in range(child_table_num):
+            for j in range(self.rowNum):
+                tdSql.execute(f"insert into {stbname}_{i} values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{self.binary_str}%d', '{self.nchar_str}%d')"
+                          % (self.ts + j + i, j + 1, j + 1, j + 1, j + 1, j + 1, j + 1, j + 1, j + 1, j + 0.1, j + 0.1, j % 2, j + 1, j + 1))
+        
+        for k, v in column_dict.items():
+            for j in [f'{stbname}_{i}', f'{dbname}.{stbname}_{i}', f'{stbname}', f'{dbname}.{stbname}']:
+                tdSql.query(f"select first({k}) from {j}")
+                tdSql.checkRows(1)
+                # tinyint,smallint,int,bigint,tinyint unsigned,smallint unsigned,int unsigned,bigint unsigned
+                if v == 'tinyint' or v == 'smallint' or v == 'int' or v == 'bigint' or v == 'tinyint unsigned' or v == 'smallint unsigned'\
+                        or v == 'int unsigned' or v == 'bigint unsigned':
+                    tdSql.checkData(0, 0, 1)
+                # float,double
+                elif v == 'float' or v == 'double':
+                    tdSql.checkData(0, 0, 0.1)
+                # bool
+                elif v == 'bool':
+                    tdSql.checkData(0, 0, False)
+                # binary
+                elif 'binary' in v:
+                    tdSql.checkData(0, 0, f'{self.binary_str}1')
+                # nchar
+                elif 'nchar' in v:
+                    tdSql.checkData(0, 0, f'{self.nchar_str}1')
+        #!bug TD-16569
+        # tdSql.query(f"select first(*),last(*) from {stbname} where ts < 23 interval(1s)")
+        # tdSql.checkRows(0)
+        tdSql.execute(f'drop database {dbname}')
+        
+        
+        
+        pass
+    def run(self):
+        self.first_check_base()
+        self.first_check_stb_distribute()
         
-        tdSql.query("select first(*),last(*) from test1 where ts < 23 interval(1s)")
-        tdSql.checkRows(0)
                 
     def stop(self):
         tdSql.close()

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

@@ -44,8 +44,7 @@ class TDTestCase:
                     buildPath = root[:len(root) - len("/build/bin")]
                     break
         return buildPath
-
-    def run(self):
+    def histogram_check_base(self):
         print("running {}".format(__file__))
         tdSql.execute("drop database if exists db")
         tdSql.execute("create database if not exists db")
@@ -3183,6 +3182,72 @@ class TDTestCase:
 
 
         tdSql.execute('drop database db')
+
+    def histogram_check_distribute(self):
+        dbname = "db"
+        stbname = "stb"
+        row_num = 10
+        child_table_num = 20
+        vgroups = 2
+        user_input_json = "[1,3,5,7]"
+        ts = 1537146000000
+        binary_str = 'taosdata'
+        nchar_str = '涛思数据'
+        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': 'binary(20)',
+            'col13': 'nchar(20)'
+        }
+        tdSql.execute(f"create database if not exists {dbname} vgroups {vgroups}")
+        tdSql.execute(f'use {dbname}')
+        # build 20 child tables,every table insert 10 rows
+        tdSql.execute(f'''create table {stbname}(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))''')
+        for i in range(child_table_num):
+            tdSql.execute(f"create table {stbname}_{i} using {stbname} tags('beijing')")
+        tdSql.query('show tables')
+        vgroup_list = []
+        for i in range(len(tdSql.queryResult)):
+            vgroup_list.append(tdSql.queryResult[i][6])
+        vgroup_list_set = set(vgroup_list)
+        for i in vgroup_list_set:
+            vgroups_num = vgroup_list.count(i)
+            if vgroups_num >=2:
+                tdLog.info(f'This scene with {vgroups_num} vgroups is ok!')
+                continue
+            else:
+                tdLog.exit(f'This scene does not meet the requirements with {vgroups_num} vgroup!\n')
+        for i in range(child_table_num):
+            for j in range(row_num):
+                tdSql.execute(f"insert into {stbname}_{i} values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{binary_str}%d', '{nchar_str}%d')"
+                          % (ts + j + i, j + 1, j + 1, j + 1, j + 1, j + 1, j + 1, j + 1, j + 1, j + 0.1, j + 0.1, j % 2, j + 1, j + 1))
+        # user_input
+        for k,v in column_dict.items():
+            if v.lower() == 'tinyint' or v.lower() == 'smallint' or v.lower() == 'int' or v.lower() == 'bigint' or v.lower() =='float' or v.lower() =='double'\
+                or v.lower() =='tinyint unsigned' or v.lower() =='smallint unsigned' or v.lower() =='int unsigned' or v.lower() =='bigint unsigned':
+                tdSql.query(f'select histogram({k}, "user_input", "{user_input_json}", 0) from {stbname}')
+                tdSql.checkRows(len(user_input_json[1:-1].split(','))-1)
+            elif 'binary' in v.lower() or 'nchar' in v.lower() or 'bool' == v.lower():
+                tdSql.error(f'select histogram({k}, "user_input", "{user_input_json}", 0) from {stbname}')
+
+        tdSql.execute(f'drop database {dbname}')
+
+        
+    def run(self):
+        self.histogram_check_base()
+        self.histogram_check_distribute()
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

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

@@ -214,6 +214,79 @@ class TDTestCase:
         for i in range(4):
             tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )')
             { i % 32767 }, { i % 127}, { i * 1.11111 }, { i * 1000.1111 }, { i % 2}
+    def __create_stable(self,stbname='stb',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': 'binary(20)','col13': 'nchar(20)'},
+                                            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': 'binary(20)','t13': 'nchar(20)'}):
+        column_sql = ''
+        tag_sql = ''
+        for k,v in column_dict.items():
+            column_sql += f"{k} {v},"
+        for k,v in tag_dict.items():
+            tag_sql += f"{k} {v},"
+        tdSql.execute(f'create table if not exists {stbname} ({column_sql[:-1]}) tags({tag_sql[:-1]})')
+
+    def __insert_data(self): 
+
+        pass
+    
+    def __hyperloglog_check_distribute(self):
+        dbname = "dbtest"
+        stbname = "stb"
+        childtable_num = 20
+        vgroups_num = 4
+        row_num = 10
+        ts = 1537146000000
+        binary_str = 'taosdata'
+        nchar_str = '涛思数据'
+        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': 'binary(20)',
+            'col13': 'nchar(20)'
+        }
+        tag_dict = {
+            'loc':'nchar(20)'
+        }
+        tdSql.execute(f"create database if not exists {dbname} vgroups {vgroups_num}")
+        tdSql.execute(f'use {dbname}')
+        self.__create_stable(stbname,column_dict,tag_dict)
+        for i in range(childtable_num):
+            tdSql.execute(f"create table {stbname}_{i} using {stbname} tags('beijing')")
+        tdSql.query('show tables')
+        vgroup_list = []
+        for i in range(len(tdSql.queryResult)):
+            vgroup_list.append(tdSql.queryResult[i][6])
+        vgroup_list_set = set(vgroup_list)
+        for i in vgroup_list_set:
+            vgroups_num = vgroup_list.count(i)
+            if vgroups_num >=2:
+                tdLog.info(f'This scene with {vgroups_num} vgroups is ok!')
+                continue
+            else:
+                tdLog.exit('This scene does not meet the requirements with {vgroups_num} vgroup!\n')
+        for i in range(row_num):
+            tdSql.execute(f"insert into stb_1 values(%d, %d, %d, %d, %d, %d, %d, %d, %d, %f, %f, %d, '{binary_str}%d', '{nchar_str}%d')"
+                          % (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 k in column_dict.keys():
+            tdSql.query(f"select hyperloglog({k}) from {stbname}")
+            tdSql.checkRows(1)
+            tdSql.query(f"select hyperloglog({k}) from {stbname} group by {k}")
+
+        tdSql.execute(f'drop database {dbname}')
+        
 
     def __insert_data(self, rows):
         now_time = int(datetime.datetime.timestamp(datetime.datetime.now()) * 1000)
@@ -311,6 +384,10 @@ class TDTestCase:
         tdLog.printNoPrefix("==========step4:after wal, all check again ")
         self.all_test()
 
+        tdLog.printNoPrefix("==========step5: distribute scene check")
+        self.__hyperloglog_check_distribute()
+
+
     def stop(self):
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")

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

@@ -204,7 +204,6 @@ class TDTestCase:
         print(vnode_tables)
 
 
-
     def run(self):                 
 
         # max verifacation 
@@ -213,7 +212,6 @@ class TDTestCase:
 
         self.support_distributed_aggregate()
 
-    
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

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

@@ -11,6 +11,9 @@
 
 # -*- coding: utf-8 -*-
 
+import random
+import string
+from util.common import *
 from util.log import *
 from util.cases import *
 from util.sql import *
@@ -22,82 +25,89 @@ class TDTestCase:
         tdSql.init(conn.cursor())
 
         self.rowNum = 10
+        self.tbnum = 20
         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.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.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.query('select top(col2,1) from stb_1 interval(1y) order by col2')
         tdSql.checkData(0,0,10)
+        tdSql.error("select * from stb_1 where top(col2,1)=1")
+        tdSql.execute('drop database db')
+    def top_check_stb_distribute(self):
+        # prepare data for vgroup 4
+        dbname = tdCom.getLongName(10, "letters")
+        stbname = tdCom.getLongName(5, "letters")
+        tdSql.execute(f"create database if not exists {dbname} vgroups 2")
+        tdSql.execute(f'use {dbname}')
+        # build 20 child tables,every table insert 10 rows
+        tdSql.execute(f'''create table {stbname}(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))''')
+        for i in range(self.tbnum):
+            tdSql.execute(f"create table {stbname}_{i} using {stbname} tags('beijing')")
+            tdSql.execute(f"insert into {stbname}_{i}(ts) values(%d)" % (self.ts - 1-i))
+        column_list = ['col1','col2','col3','col4','col5','col6','col7','col8']
+        for i in [f'{stbname}', f'{dbname}.{stbname}']:
+            for j in column_list:
+                tdSql.query(f"select top({j},1) from {i}")
+                tdSql.checkRows(0)
+        tdSql.query('show tables')
+        vgroup_list = []
+        for i in range(len(tdSql.queryResult)):
+            vgroup_list.append(tdSql.queryResult[i][6])
+        vgroup_list_set = set(vgroup_list)
+
+        for i in vgroup_list_set:
+            vgroups_num = vgroup_list.count(i)
+            if vgroups_num >=2:
+                tdLog.info(f'This scene with {vgroups_num} vgroups is ok!')
+                continue
+            else:
+                tdLog.exit(f'This scene does not meet the requirements with {vgroups_num} vgroup!\n')
+        for i in range(self.rowNum):
+            for j in range(self.tbnum):
+                tdSql.execute(f"insert into {stbname}_{j} 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))
+        
+        error_column_list = ['col11','col12','col13']
+        error_param_list = [0,101]
+        for i in column_list:
+            tdSql.query(f'select top({i},2) from {stbname}')
+            tdSql.checkRows(2)
+            tdSql.checkEqual(tdSql.queryResult,[(10,),(10,)])
+            for j in error_param_list:
+                tdSql.error(f'select top({i},{j}) from {stbname}')
+        for i in error_column_list:
+            tdSql.error(f'select top({i},10) from {stbname}')
 
-        tdSql.error("select * from test where bottom(col2,1)=1")
-        tdSql.error("select top(col14, 0) from test;")
+        tdSql.query(f"select ts,top(col1, 2),ts from {stbname} group by tbname")
+        tdSql.checkRows(2*self.tbnum)
+        tdSql.query(f'select top(col2,1) from {stbname} interval(1y) order by col2')
+        tdSql.checkData(0,0,10)
+        tdSql.error(f"select * from {stbname} where top(col2,1)=1")
+    def run(self):
+        self.top_check_base()
+        self.top_check_stb_distribute()
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)