fix case

tests/pytest/util/sql.py

@@ -13,6 +13,7 @@
 
 import sys
 import os
+from tabnanny import check
 import time
 import datetime
 import inspect
@@ -301,13 +302,32 @@ class TDSql:
             args = (caller.filename, caller.lineno, self.sql, col_name_list, expect_col_name_list)
             tdLog.exit("%s(%d) failed: sql:%s, col_name_list:%s != expect_col_name_list:%s" % args)
 
+    def __check_equal(self, elm, expect_elm):
+        if not type(elm) in(list, tuple) and elm == expect_elm:
+            return True
+        if type(elm) in(list, tuple) and type(expect_elm) in(list, tuple):
+            if len(elm) != len(expect_elm):
+                return False
+            if len(elm) == 0:
+                return True
+            for i in range(len(elm)):
+                flag = self.__check_equal(elm[i], expect_elm[i])
+                if not flag:
+                    return False
+            return True
+        return False
+
     def checkEqual(self, elm, expect_elm):
         if elm == expect_elm:
             tdLog.info("sql:%s, elm:%s == expect_elm:%s" % (self.sql, elm, expect_elm))
-        else:
-            caller = inspect.getframeinfo(inspect.stack()[1][0])
-            args = (caller.filename, caller.lineno, self.sql, elm, expect_elm)
-            tdLog.exit("%s(%d) failed: sql:%s, elm:%s != expect_elm:%s" % args)
+            return
+        if self.__check_equal(elm, expect_elm):
+            tdLog.info("sql:%s, elm:%s == expect_elm:%s" % (self.sql, elm, expect_elm))
+            return
+
+        caller = inspect.getframeinfo(inspect.stack()[1][0])
+        args = (caller.filename, caller.lineno, self.sql, elm, expect_elm)
+        tdLog.exit("%s(%d) failed: sql:%s, elm:%s != expect_elm:%s" % args)
 
     def checkNotEqual(self, elm, expect_elm):
         if elm != expect_elm:

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

@@ -15,7 +15,6 @@ class TDTestCase:
     def init(self, conn, powSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
-        self.PI =3.1415926
 
     def prepare_datas(self, dbname="db"):
         tdSql.execute(

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

@@ -13,190 +13,195 @@ class TDTestCase:
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
 
-    def run(self):  # sourcery skip: extract-duplicate-method
+    def run(self):
+        dbname = "db"
+        stb = f"{dbname}.stb1"
+        rows = 10
+
         tdSql.prepare()
 
         tdLog.printNoPrefix("==========step1:create table")
         tdSql.execute(
-            '''create table if not exists supt
+            f'''create table if not exists {stb}
             (ts timestamp, c1 int, c2 float, c3 bigint, c4 double, c5 smallint, c6 tinyint)
             tags(location binary(64), type int, isused bool , family nchar(64))'''
         )
-        tdSql.execute("create table t1 using supt tags('beijing', 1, 1, 'nchar1')")
-        tdSql.execute("create table t2 using supt tags('shanghai', 2, 0, 'nchar2')")
+        tdSql.execute(f"create table {dbname}.t1 using {stb} tags('beijing', 1, 1, 'nchar1')")
+        tdSql.execute(f"create table {dbname}.t2 using {stb} tags('shanghai', 2, 0, 'nchar2')")
 
         tdLog.printNoPrefix("==========step2:insert data")
-        for i in range(10):
+        for i in range(rows):
             tdSql.execute(
-                f"insert into t1 values (now()+{i}m, {32767+i}, {20.0+i/10}, {2**31+i}, {3.4*10**38+i/10}, {127+i}, {i})"
+                f"insert into {dbname}.t1 values (now()+{i}m, {32767+i}, {20.0+i/10}, {2**31+i}, {3.4*10**38+i/10}, {127+i}, {i})"
             )
             tdSql.execute(
-                f"insert into t2 values (now()-{i}m, {-32767-i}, {20.0-i/10}, {-i-2**31}, {-i/10-3.4*10**38}, {-127-i}, {-i})"
+                f"insert into {dbname}.t2 values (now()-{i}m, {-32767-i}, {20.0-i/10}, {-i-2**31}, {-i/10-3.4*10**38}, {-127-i}, {-i})"
             )
         tdSql.execute(
-            f"insert into t1 values (now()+11m, {2**31-1}, {pow(10,37)*34}, {pow(2,63)-1}, {1.7*10**308}, 32767, 127)"
+            f"insert into {dbname}.t1 values (now()+11m, {2**31-1}, {pow(10,37)*34}, {pow(2,63)-1}, {1.7*10**308}, 32767, 127)"
         )
         tdSql.execute(
-            f"insert into t2 values (now()-11m, {1-2**31}, {-3.4*10**38}, {1-2**63}, {-1.7*10**308}, -32767, -127)"
+            f"insert into {dbname}.t2 values (now()-11m, {1-2**31}, {-3.4*10**38}, {1-2**63}, {-1.7*10**308}, -32767, -127)"
         )
         tdSql.execute(
-            f"insert into t2 values (now()-12m, null , {-3.4*10**38}, null , {-1.7*10**308}, null , null)"
+            f"insert into {dbname}.t2 values (now()-12m, null , {-3.4*10**38}, null , {-1.7*10**308}, null , null)"
         )
 
         tdLog.printNoPrefix("==========step3:query timestamp type")
 
-        tdSql.query("select * from t1 where ts between now()-1m and now()+10m")
-        tdSql.checkRows(10)
-        tdSql.query("select * from t1 where ts between '2021-01-01 00:00:00.000' and '2121-01-01 00:00:00.000'")
+        tdSql.query(f"select * from {dbname}.t1 where ts between now()-1m and now()+10m")
+        tdSql.checkRows(rows)
+        tdSql.query(f"select * from {dbname}.t1 where ts between '2021-01-01 00:00:00.000' and '2121-01-01 00:00:00.000'")
         # tdSql.checkRows(11)
-        tdSql.query("select * from t1 where ts between '1969-01-01 00:00:00.000' and '1969-12-31 23:59:59.999'")
+        tdSql.query(f"select * from {dbname}.t1 where ts between '1969-01-01 00:00:00.000' and '1969-12-31 23:59:59.999'")
         # tdSql.checkRows(0)
-        tdSql.query("select * from t1 where ts between -2793600 and 31507199")
+        tdSql.query(f"select * from {dbname}.t1 where ts between -2793600 and 31507199")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where ts between 1609430400000 and 4765104000000")
-        tdSql.checkRows(11)
+        tdSql.query(f"select * from {dbname}.t1 where ts between 1609430400000 and 4765104000000")
+        tdSql.checkRows(rows+1)
 
         tdLog.printNoPrefix("==========step4:query int type")
 
-        tdSql.query("select * from t1 where c1 between 32767 and 32776")
-        tdSql.checkRows(10)
-        tdSql.query("select * from t1 where c1 between 32766.9 and 32776.1")
-        tdSql.checkRows(10)
-        tdSql.query("select * from t1 where c1 between 32776 and 32767")
+        tdSql.query(f"select * from {dbname}.t1 where c1 between 32767 and 32776")
+        tdSql.checkRows(rows)
+        tdSql.query(f"select * from {dbname}.t1 where c1 between 32766.9 and 32776.1")
+        tdSql.checkRows(rows)
+        tdSql.query(f"select * from {dbname}.t1 where c1 between 32776 and 32767")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c1 between 'a' and 'e'")
+        tdSql.query(f"select * from {dbname}.t1 where c1 between 'a' and 'e'")
         tdSql.checkRows(0)
-        # tdSql.query("select * from t1 where c1 between 0x64 and 0x69")
+        # tdSql.query("select * from {dbname}.t1 where c1 between 0x64 and 0x69")
         # tdSql.checkRows(6)
-        tdSql.query("select * from t1 where c1 not between 100 and 106")
-        tdSql.checkRows(11)
-        tdSql.query(f"select * from t1 where c1 between {2**31-2} and {2**31+1}")
+        tdSql.query(f"select * from {dbname}.t1 where c1 not between 100 and 106")
+        tdSql.checkRows(rows+1)
+        tdSql.query(f"select * from {dbname}.t1 where c1 between {2**31-2} and {2**31+1}")
         tdSql.checkRows(1)
-        tdSql.query(f"select * from t2 where c1 between null and {1-2**31}")
+        tdSql.query(f"select * from {dbname}.t2 where c1 between null and {1-2**31}")
         # tdSql.checkRows(3)
-        tdSql.query(f"select * from t2 where c1 between {-2**31} and {1-2**31}")
+        tdSql.query(f"select * from {dbname}.t2 where c1 between {-2**31} and {1-2**31}")
         tdSql.checkRows(1)
 
         tdLog.printNoPrefix("==========step5:query float type")
 
-        tdSql.query("select * from t1 where c2 between 20.0 and 21.0")
+        tdSql.query(f"select * from {dbname}.t1 where c2 between 20.0 and 21.0")
         tdSql.checkRows(10)
-        tdSql.query(f"select * from t1 where c2 between {-3.4*10**38-1} and {3.4*10**38+1}")
-        tdSql.checkRows(11)
-        tdSql.query("select * from t1 where c2 between 21.0 and 20.0")
+        tdSql.query(f"select * from {dbname}.t1 where c2 between {-3.4*10**38-1} and {3.4*10**38+1}")
+        tdSql.checkRows(rows+1)
+        tdSql.query(f"select * from {dbname}.t1 where c2 between 21.0 and 20.0")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c2 between 'DC3' and 'SYN'")
+        tdSql.query(f"select * from {dbname}.t1 where c2 between 'DC3' and 'SYN'")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c2 not between 0.1 and 0.2")
-        tdSql.checkRows(11)
-        tdSql.query(f"select * from t1 where c2 between {pow(10,38)*3.4} and {pow(10,38)*3.4+1}")
+        tdSql.query(f"select * from {dbname}.t1 where c2 not between 0.1 and 0.2")
+        tdSql.checkRows(rows+1)
+        tdSql.query(f"select * from {dbname}.t1 where c2 between {pow(10,38)*3.4} and {pow(10,38)*3.4+1}")
         # tdSql.checkRows(1)
-        tdSql.query(f"select * from t2 where c2 between {-3.4*10**38-1} and {-3.4*10**38}")
+        tdSql.query(f"select * from {dbname}.t2 where c2 between {-3.4*10**38-1} and {-3.4*10**38}")
         # tdSql.checkRows(2)
-        tdSql.query(f"select * from t2 where c2 between null and {-3.4*10**38}")
+        tdSql.query(f"select * from {dbname}.t2 where c2 between null and {-3.4*10**38}")
         # tdSql.checkRows(3)
 
         tdLog.printNoPrefix("==========step6:query bigint type")
 
-        tdSql.query(f"select * from t1 where c3 between {2**31} and {2**31+10}")
-        tdSql.checkRows(10)
-        tdSql.query(f"select * from t1 where c3 between {-2**63} and {2**63}")
-        tdSql.checkRows(11)
-        tdSql.query(f"select * from t1 where c3 between {2**31+10} and {2**31}")
+        tdSql.query(f"select * from {dbname}.t1 where c3 between {2**31} and {2**31+10}")
+        tdSql.checkRows(rows)
+        tdSql.query(f"select * from {dbname}.t1 where c3 between {-2**63} and {2**63}")
+        tdSql.checkRows(rows+1)
+        tdSql.query(f"select * from {dbname}.t1 where c3 between {2**31+10} and {2**31}")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c3 between 'a' and 'z'")
+        tdSql.query(f"select * from {dbname}.t1 where c3 between 'a' and 'z'")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c3 not between 1 and 2")
+        tdSql.query(f"select * from {dbname}.t1 where c3 not between 1 and 2")
         # tdSql.checkRows(0)
-        tdSql.query(f"select * from t1 where c3 between {2**63-2} and {2**63-1}")
+        tdSql.query(f"select * from {dbname}.t1 where c3 between {2**63-2} and {2**63-1}")
         tdSql.checkRows(1)
-        tdSql.query(f"select * from t2 where c3 between {-2**63} and {1-2**63}")
+        tdSql.query(f"select * from {dbname}.t2 where c3 between {-2**63} and {1-2**63}")
         # tdSql.checkRows(3)
-        tdSql.query(f"select * from t2 where c3 between null and {1-2**63}")
+        tdSql.query(f"select * from {dbname}.t2 where c3 between null and {1-2**63}")
         # tdSql.checkRows(2)
 
         tdLog.printNoPrefix("==========step7:query double type")
 
-        tdSql.query(f"select * from t1 where c4 between {3.4*10**38} and {3.4*10**38+10}")
-        tdSql.checkRows(10)
-        tdSql.query(f"select * from t1 where c4 between {1.7*10**308+1} and {1.7*10**308+2}")
+        tdSql.query(f"select * from {dbname}.t1 where c4 between {3.4*10**38} and {3.4*10**38+10}")
+        tdSql.checkRows(rows)
+        tdSql.query(f"select * from {dbname}.t1 where c4 between {1.7*10**308+1} and {1.7*10**308+2}")
         # 因为精度原因，在超出bigint边界后，数值不能进行准确的判断
         # tdSql.checkRows(0)
-        tdSql.query(f"select * from t1 where c4 between {3.4*10**38+10} and {3.4*10**38}")
+        tdSql.query(f"select * from {dbname}.t1 where c4 between {3.4*10**38+10} and {3.4*10**38}")
         # tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c4 between 'a' and 'z'")
+        tdSql.query(f"select * from {dbname}.t1 where c4 between 'a' and 'z'")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c4 not between 1 and 2")
+        tdSql.query(f"select * from {dbname}.t1 where c4 not between 1 and 2")
         # tdSql.checkRows(0)
-        tdSql.query(f"select * from t1 where c4 between {1.7*10**308} and {1.7*10**308+1}")
+        tdSql.query(f"select * from {dbname}.t1 where c4 between {1.7*10**308} and {1.7*10**308+1}")
         tdSql.checkRows(1)
-        tdSql.query(f"select * from t2 where c4 between {-1.7*10**308-1} and {-1.7*10**308}")
+        tdSql.query(f"select * from {dbname}.t2 where c4 between {-1.7*10**308-1} and {-1.7*10**308}")
         # tdSql.checkRows(3)
-        tdSql.query(f"select * from t2 where c4 between null and {-1.7*10**308}")
+        tdSql.query(f"select * from {dbname}.t2 where c4 between null and {-1.7*10**308}")
         # tdSql.checkRows(3)
 
         tdLog.printNoPrefix("==========step8:query smallint type")
 
-        tdSql.query("select * from t1 where c5 between 127 and 136")
-        tdSql.checkRows(10)
-        tdSql.query("select * from t1 where c5 between 126.9 and 135.9")
-        tdSql.checkRows(9)
-        tdSql.query("select * from t1 where c5 between 136 and 127")
+        tdSql.query(f"select * from {dbname}.t1 where c5 between 127 and 136")
+        tdSql.checkRows(rows)
+        tdSql.query(f"select * from {dbname}.t1 where c5 between 126.9 and 135.9")
+        tdSql.checkRows(rows-1)
+        tdSql.query(f"select * from {dbname}.t1 where c5 between 136 and 127")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c5 between '~' and '^'")
+        tdSql.query(f"select * from {dbname}.t1 where c5 between '~' and '^'")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c5 not between 1 and 2")
+        tdSql.query(f"select * from {dbname}.t1 where c5 not between 1 and 2")
         # tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c5 between 32767 and 32768")
+        tdSql.query(f"select * from {dbname}.t1 where c5 between 32767 and 32768")
         tdSql.checkRows(1)
-        tdSql.query("select * from t2 where c5 between -32768 and -32767")
+        tdSql.query(f"select * from {dbname}.t2 where c5 between -32768 and -32767")
         tdSql.checkRows(1)
-        tdSql.query("select * from t2 where c5 between null and -32767")
+        tdSql.query(f"select * from {dbname}.t2 where c5 between null and -32767")
         # tdSql.checkRows(1)
 
         tdLog.printNoPrefix("==========step9:query tinyint type")
 
-        tdSql.query("select * from t1 where c6 between 0 and 9")
-        tdSql.checkRows(10)
-        tdSql.query("select * from t1 where c6 between -1.1 and 8.9")
-        tdSql.checkRows(9)
-        tdSql.query("select * from t1 where c6 between 9 and 0")
+        tdSql.query(f"select * from {dbname}.t1 where c6 between 0 and 9")
+        tdSql.checkRows(rows)
+        tdSql.query(f"select * from {dbname}.t1 where c6 between -1.1 and 8.9")
+        tdSql.checkRows(rows-1)
+        tdSql.query(f"select * from {dbname}.t1 where c6 between 9 and 0")
         tdSql.checkRows(0)
-        tdSql.query("select * from t1 where c6 between 'NUL' and 'HT'")
+        tdSql.query(f"select * from {dbname}.t1 where c6 between 'NUL' and 'HT'")
         tdSql.checkRows(1)
-        tdSql.query("select * from t1 where c6 not between 1 and 2")
+        tdSql.query(f"select * from {dbname}.t1 where c6 not between 1 and 2")
         # tdSql.checkRows(1)
-        tdSql.query("select * from t1 where c6 between 127 and 128")
+        tdSql.query(f"select * from {dbname}.t1 where c6 between 127 and 128")
         tdSql.checkRows(1)
-        tdSql.query("select * from t2 where c6 between -128 and -127")
+        tdSql.query(f"select * from {dbname}.t2 where c6 between -128 and -127")
         tdSql.checkRows(1)
-        tdSql.query("select * from t2 where c6 between null and -127")
+        tdSql.query(f"select * from {dbname}.t2 where c6 between null and -127")
         # tdSql.checkRows(3)
 
         tdLog.printNoPrefix("==========step10:invalid query type")
 
         # TODO tag is not finished
-        # tdSql.query("select * from supt where location between 'beijing' and 'shanghai'")
-        # tdSql.checkRows(23)
-        # # 非0值均解析为1，因此"between 负值 and o"解析为"between 1 and 0"
-        # tdSql.query("select * from supt where isused between 0 and 1")
-        # tdSql.checkRows(23)
-        # tdSql.query("select * from supt where isused between -1 and 0")
-        # tdSql.checkRows(0)
-        # tdSql.error("select * from supt where isused between false and true")
-        # tdSql.query("select * from supt where family between '拖拉机' and '自行车'")
-        # tdSql.checkRows(23)
+        tdSql.query(f"select * from {stb} where location between 'beijing' and 'shanghai'")
+        tdSql.checkRows(rows * 2 + 3)
+        # 非0值均解析为1，因此"between 负值 and o"解析为"between 1 and 0"
+        tdSql.query(f"select * from {stb} where isused between 0 and 1")
+        tdSql.checkRows(rows * 2 + 3)
+        tdSql.query(f"select * from {stb} where isused between -1 and 0")
+        tdSql.checkRows(rows + 2)
+        tdSql.query(f"select * from {stb} where isused between false and true")
+        tdSql.checkRows(rows * 2 + 3)
+        tdSql.query(f"select * from {stb} where family between '拖拉机' and '自行车'")
+        tdSql.checkRows(0)
 
         tdLog.printNoPrefix("==========step11:query HEX/OCT/BIN type")
 
-        tdSql.error("select * from t1 where c6 between 0x7f and 0x80")      # check filter HEX
-        tdSql.error("select * from t1 where c6 between 0b1 and 0b11111")    # check filter BIN
-        tdSql.error("select * from t1 where c6 between 0b1 and 0x80")
-        tdSql.error("select * from t1 where c6=0b1")
-        tdSql.error("select * from t1 where c6=0x1")
+        tdSql.error(f"select * from {dbname}.t1 where c6 between 0x7f and 0x80")      # check filter HEX
+        tdSql.error(f"select * from {dbname}.t1 where c6 between 0b1 and 0b11111")    # check filter BIN
+        tdSql.error(f"select * from {dbname}.t1 where c6 between 0b1 and 0x80")
+        tdSql.error(f"select * from {dbname}.t1 where c6=0b1")
+        tdSql.error(f"select * from {dbname}.t1 where c6=0x1")
         # 八进制数据会按照十进制数据进行判定
-        tdSql.query("select * from t1 where c6 between 01 and 0200")        # check filter OCT
-        tdSql.checkRows(10)
+        tdSql.query(f"select * from {dbname}.t1 where c6 between 01 and 0200")        # check filter OCT
+        tdSql.checkRows(rows)
 
     def stop(self):
         tdSql.close()

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

@@ -26,7 +26,7 @@ class TDTestCase:
         tdSql.init(conn.cursor())
         self.dbname = 'db_test'
         self.setsql = TDSetSql()
-        self.ntbname = 'ntb'
+        self.ntbname = f'{self.dbname}.ntb'
         self.rowNum = 10
         self.tbnum = 20
         self.ts = 1537146000000
@@ -96,7 +96,7 @@ class TDTestCase:
         self.bottom_check_data(self.ntbname,'normal_table')
         tdSql.execute(f'drop database {self.dbname}')
     def bottom_check_stb(self):
-        stbname = tdCom.getLongName(5, "letters")
+        stbname = f'{self.dbname}.{tdCom.getLongName(5, "letters")}'
         tag_dict = {
             't0':'int'
         }
@@ -109,7 +109,7 @@ class TDTestCase:
         for i in range(self.tbnum):
             tdSql.execute(f"create table {stbname}_{i} using {stbname} tags({tag_values[0]})")
             self.insert_data(self.column_dict,f'{stbname}_{i}',self.rowNum)
-        tdSql.query('show tables')
+        tdSql.query(f'show {self.dbname}.tables')
         vgroup_list = []
         for i in range(len(tdSql.queryResult)):
             vgroup_list.append(tdSql.queryResult[i][6])

tests/system-test/fulltest.sh

@@ -37,10 +37,21 @@ python3 ./test.py -f 2-query/apercentile.py
 python3 ./test.py -f 2-query/apercentile.py -R
 python3 ./test.py -f 2-query/arccos.py
 python3 ./test.py -f 2-query/arccos.py -R
+python3 ./test.py -f 2-query/arcsin.py
+python3 ./test.py -f 2-query/arcsin.py -R
+python3 ./test.py -f 2-query/arctan.py
+python3 ./test.py -f 2-query/arctan.py -R
+python3 ./test.py -f 2-query/avg.py
+python3 ./test.py -f 2-query/avg.py -R
+python3 ./test.py -f 2-query/between.py
+python3 ./test.py -f 2-query/between.py -R
+python3 ./test.py -f 2-query/bottom.py
+python3 ./test.py -f 2-query/bottom.py -R
+python3 ./test.py -f 2-query/cast.py
+python3 ./test.py -f 2-query/cast.py -R
 
 
 
-python3 ./test.py -f 2-query/between.py
 python3 ./test.py -f 2-query/distinct.py
 python3 ./test.py -f 2-query/varchar.py
 python3 ./test.py -f 2-query/ltrim.py
@@ -51,7 +62,6 @@ python3 ./test.py -f 2-query/upper.py
 python3 ./test.py -f 2-query/lower.py
 python3 ./test.py -f 2-query/join.py
 python3 ./test.py -f 2-query/join2.py
-python3 ./test.py -f 2-query/cast.py
 python3 ./test.py -f 2-query/substr.py
 python3 ./test.py -f 2-query/union.py
 python3 ./test.py -f 2-query/union1.py
@@ -83,7 +93,6 @@ python3 ./test.py -f 2-query/Timediff.py
 python3 ./test.py -f 2-query/json_tag.py
 
 python3 ./test.py -f 2-query/top.py
-python3 ./test.py -f 2-query/bottom.py
 python3 ./test.py -f 2-query/percentile.py
 python3 ./test.py -f 2-query/ceil.py
 python3 ./test.py -f 2-query/floor.py
@@ -94,15 +103,12 @@ python3 ./test.py -f 2-query/sqrt.py
 python3 ./test.py -f 2-query/sin.py
 python3 ./test.py -f 2-query/cos.py
 python3 ./test.py -f 2-query/tan.py
-python3 ./test.py -f 2-query/arcsin.py
-python3 ./test.py -f 2-query/arctan.py
 python3 ./test.py -f 2-query/query_cols_tags_and_or.py
 # python3 ./test.py -f 2-query/nestedQuery.py
 # TD-15983 subquery output duplicate name column.
 # Please Xiangyang Guo modify the following script
 # python3 ./test.py -f 2-query/nestedQuery_str.py
 
-python3 ./test.py -f 2-query/avg.py
 python3 ./test.py -f 2-query/elapsed.py
 python3 ./test.py -f 2-query/csum.py
 python3 ./test.py -f 2-query/mavg.py