From a9bcf45186551efde926f7a2bbc6dee0da432219 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Thu, 26 May 2022 10:14:50 +0800
Subject: [PATCH 1/9] add test case

---
 tests/system-test/2-query/bottom.py     | 142 ++++++++++++++++
 tests/system-test/2-query/first.py      | 152 +++++++++++++++++
 tests/system-test/2-query/last.py       |  96 ++++++++++-
 tests/system-test/2-query/percentile.py | 209 ++++++++++++++++++++++++
 tests/system-test/2-query/top.py        | 152 +++++++++++++++++
 5 files changed, 750 insertions(+), 1 deletion(-)
 create mode 100644 tests/system-test/2-query/bottom.py
 create mode 100644 tests/system-test/2-query/first.py
 create mode 100644 tests/system-test/2-query/percentile.py
 create mode 100644 tests/system-test/2-query/top.py

diff --git a/tests/system-test/2-query/bottom.py b/tests/system-test/2-query/bottom.py
new file mode 100644
index 0000000000..15e26dea0b
--- /dev/null
+++ b/tests/system-test/2-query/bottom.py
@@ -0,0 +1,142 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(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')")
+        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.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col2, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col3, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col4, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col5, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 0.1)
+        tdSql.checkData(1, 1, 1.1)
+
+        tdSql.query("select bottom(col6, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 0.1)
+        tdSql.checkData(1, 1, 1.1)
+
+        tdSql.query("select bottom(col11, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col12, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col13, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col14, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select ts,bottom(col1, 2),ts from test1")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
+        tdSql.checkData(0, 1, "2018-09-17 09:00:00.000")
+        tdSql.checkData(1, 0, "2018-09-17 09:00:00.001")
+        tdSql.checkData(1, 3, "2018-09-17 09:00:00.001")
+
+
+        tdSql.query("select ts,bottom(col1, 2),ts from test group by tbname")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
+        tdSql.checkData(0, 1, "2018-09-17 09:00:00.000")
+        tdSql.checkData(1, 0, "2018-09-17 09:00:00.001")
+        tdSql.checkData(1, 3, "2018-09-17 09:00:00.001")
+                   
+        #TD-2457 bottom + interval + order by
+        tdSql.error('select top(col2,1) from test interval(1y) order by col2;')
+
+        #TD-2563 top + super_table + interval 
+        tdSql.execute("create table meters(ts timestamp, c int) tags (d int)") 
+        tdSql.execute("create table t1 using meters tags (1)") 
+        sql = 'insert into t1 values '       
+        for i in range(20000):
+            sql = sql + '(%d, %d)' % (self.ts + i , i % 47)
+            if i % 2000 == 0:
+                tdSql.execute(sql)
+                sql = 'insert into t1 values ' 
+        tdSql.execute(sql)
+        tdSql.query('select bottom(c,1) from meters interval(10a)')
+        tdSql.checkData(0,1,0)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/2-query/first.py b/tests/system-test/2-query/first.py
new file mode 100644
index 0000000000..a538fdd474
--- /dev/null
+++ b/tests/system-test/2-query/first.py
@@ -0,0 +1,152 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(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)
+
+        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.query("select first(*),last(*) from test1 where ts < 23 interval(1s)")
+        tdSql.checkRows(0)
+                
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/2-query/last.py b/tests/system-test/2-query/last.py
index b491679c62..4ef13e9142 100644
--- a/tests/system-test/2-query/last.py
+++ b/tests/system-test/2-query/last.py
@@ -170,7 +170,96 @@ class TDTestCase:
         tdSql.query("select last(col9) from db.stb_1")
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, '涛思数据10')
+        tdSql.query("select last(col1,col2,col3) from stb_1")
+        tdSql.checkData(0,2,10)
 
+        tdSql.query("select last(*) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 10)
+        tdSql.query("select last(*) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 10)
+        tdSql.query("select last(col1) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col1) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col2) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col2) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col3) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col3) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col4) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col4) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col11) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col11) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col12) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col12) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col13) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col13) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col14) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col14) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select last(col5) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+        tdSql.query("select last(col5) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+        tdSql.query("select last(col6) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+        tdSql.query("select last(col6) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+        tdSql.query("select last(col7) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, True)
+        tdSql.query("select last(col7) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, True)
+        tdSql.query("select last(col8) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'taosdata10')
+        tdSql.query("select last(col8) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'taosdata10')
+        tdSql.query("select last(col9) from stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, '涛思数据10')
+        tdSql.query("select last(col9) from db.stb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, '涛思数据10')
+        tdSql.query("select last(col1,col2,col3) from stb")
+        tdSql.checkData(0,2,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)''')
@@ -322,7 +411,12 @@ class TDTestCase:
         tdSql.query("select last(col9) from db.ntb")
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, '涛思数据10')
- 
+        tdSql.query("select last(col1,col2,col3) from ntb")
+        tdSql.checkData(0,2,10)
+
+        tdSql.error("select col1 from stb where last(col9)='涛思数据10'")
+        tdSql.error("select col1 from ntb where last(col9)='涛思数据10'")
+        tdSql.error("select col1 from stb_1 where last(col9)='涛思数据10'")
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)
diff --git a/tests/system-test/2-query/percentile.py b/tests/system-test/2-query/percentile.py
new file mode 100644
index 0000000000..798aaea351
--- /dev/null
+++ b/tests/system-test/2-query/percentile.py
@@ -0,0 +1,209 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        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)''')
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test 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))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # percentile verifacation 
+        tdSql.error("select percentile(ts 20) from test")
+        tdSql.error("select apercentile(ts 20) from test")
+        tdSql.error("select percentile(col7 20) from test")
+        tdSql.error("select apercentile(col7 20) from test")
+        tdSql.error("select percentile(col8 20) from test")        
+        tdSql.error("select apercentile(col8 20) from test")
+        tdSql.error("select percentile(col9 20) from test")
+        tdSql.error("select apercentile(col9 20) from test")        
+
+        tdSql.query("select percentile(col1, 0) from test")        
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col1, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col1, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col1, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col1, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100))
+        tdSql.query("select apercentile(col1, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))  
+
+        tdSql.query("select percentile(col2, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col2, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col2, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col2, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col2, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100)) 
+        tdSql.query("select apercentile(col2, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col3, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col3, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col3, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col3, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col3, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100))
+        tdSql.query("select apercentile(col3, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col4, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col4, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col4, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col4, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col4, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100)) 
+        tdSql.query("select apercentile(col4, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col11, 0) from test")        
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col11, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col11, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col11, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col11, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100))
+        tdSql.query("select apercentile(col11, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))  
+
+        tdSql.query("select percentile(col12, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col12, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col12, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col12, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col12, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100)) 
+        tdSql.query("select apercentile(col12, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col13, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col13, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col13, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col13, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col13, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100))
+        tdSql.query("select apercentile(col13, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col14, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col14, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col14, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col14, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col14, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100)) 
+        tdSql.query("select apercentile(col14, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col5, 0) from test")        
+        print("query result: %s" % tdSql.getData(0, 0))
+        print("array result: %s" % np.percentile(floatData, 0))
+        tdSql.query("select apercentile(col5, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col5, 50) from test")
+        print("query result: %s" % tdSql.getData(0, 0))
+        print("array result: %s" % np.percentile(floatData, 50))
+        tdSql.query("select apercentile(col5, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))        
+        tdSql.query("select percentile(col5, 100) from test")
+        print("query result: %s" % tdSql.getData(0, 0))
+        print("array result: %s" % np.percentile(floatData, 100)) 
+        tdSql.query("select apercentile(col5, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))     
+
+        tdSql.query("select percentile(col6, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(floatData, 0))
+        tdSql.query("select apercentile(col6, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col6, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(floatData, 50))
+        tdSql.query("select apercentile(col6, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col6, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(floatData, 100)) 
+        tdSql.query("select apercentile(col6, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0)) 
+
+        tdSql.execute("create table meters (ts timestamp, voltage int) tags(loc nchar(20))")
+        tdSql.execute("create table t0 using meters tags('beijing')")
+        tdSql.execute("create table t1 using meters tags('shanghai')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into t0 values(%d, %d)" % (self.ts + i, i + 1))            
+            tdSql.execute("insert into t1 values(%d, %d)" % (self.ts + i, i + 1))            
+        
+        tdSql.error("select percentile(voltage, 20) from meters")
+        tdSql.query("select apercentile(voltage, 20) from meters")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+ 
+        tdSql.execute("create table st(ts timestamp, k int)")
+        tdSql.execute("insert into st values(now, -100)(now+1a,-99)")
+        tdSql.query("select apercentile(k, 20) from st")
+        tdSql.checkData(0, 0, -100.00)
+
+
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/2-query/top.py b/tests/system-test/2-query/top.py
new file mode 100644
index 0000000000..d1c6653a7b
--- /dev/null
+++ b/tests/system-test/2-query/top.py
@@ -0,0 +1,152 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        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')")
+        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))
+            intData.append(i + 1)            
+            floatData.append(i + 0.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.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col2, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col3, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col4, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col11, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col12, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col13, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col14, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col5, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 8.1)
+        tdSql.checkData(1, 1, 9.1)
+
+        tdSql.query("select top(col6, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 8.1)
+        tdSql.checkData(1, 1, 9.1)
+
+        tdSql.query("select ts,top(col1, 2),ts from test1")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, "2018-09-17 09:00:00.008")
+        tdSql.checkData(0, 1, "2018-09-17 09:00:00.008")
+        tdSql.checkData(1, 0, "2018-09-17 09:00:00.009")
+        tdSql.checkData(1, 3, "2018-09-17 09:00:00.009")
+
+
+        tdSql.query("select ts,top(col1, 2),ts from test group by tbname")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, "2018-09-17 09:00:00.008")
+        tdSql.checkData(0, 1, "2018-09-17 09:00:00.008")
+        tdSql.checkData(1, 0, "2018-09-17 09:00:00.009")
+        tdSql.checkData(1, 3, "2018-09-17 09:00:00.009")
+
+        #TD-2563 top + super_table + interval 
+        tdSql.execute("create table meters(ts timestamp, c int) tags (d int)") 
+        tdSql.execute("create table t1 using meters tags (1)") 
+        sql = 'insert into t1 values '       
+        for i in range(20000):
+            sql = sql + '(%d, %d)' % (self.ts + i , i % 47)
+            if i % 2000 == 0:
+                tdSql.execute(sql)
+                sql = 'insert into t1 values ' 
+        tdSql.execute(sql)
+        tdSql.query('select top(c,1) from meters interval(10a)')
+        tdSql.checkData(0,1,9)
+        
+                   
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

From a6ee0cd31525843458cf99c05b81e0c8aa2f3839 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Thu, 26 May 2022 11:30:38 +0800
Subject: [PATCH 2/9] update diff.py

---
 tests/system-test/2-query/diff.py | 108 ++++++++++++++----------------
 tests/system-test/fulltest.sh     |   2 +-
 2 files changed, 52 insertions(+), 58 deletions(-)

diff --git a/tests/system-test/2-query/diff.py b/tests/system-test/2-query/diff.py
index 03b3899dc6..0d8b0de3dc 100644
--- a/tests/system-test/2-query/diff.py
+++ b/tests/system-test/2-query/diff.py
@@ -15,59 +15,51 @@ class TDTestCase:
         self.perfix = 'dev'
         self.tables = 10
 
-    def insertData(self):
-        print("==============step1")
-        tdSql.execute(
-            "create table if not exists st (ts timestamp, col int) tags(dev nchar(50))")
-
-        for i in range(self.tables):
-            tdSql.execute("create table %s%d using st tags(%d)" % (self.perfix, i, i))
-            rows = 15 + i
-            for j in range(rows):
-                tdSql.execute("insert into %s%d values(%d, %d)" %(self.perfix, i, self.ts + i * 20 * 10000 + j * 10000, j))
 
     def run(self):
         tdSql.prepare()
-        tdSql.execute("create table ntb(ts timestamp,c1 int,c2 double,c3 float)")
-        tdSql.execute("insert into ntb values(now,1,1.0,10.5)(now+1s,10,-100.0,5.1)(now+10s,-1,15.1,5.0)")
+        tdSql.execute(
+            "create table ntb(ts timestamp,c1 int,c2 double,c3 float)")
+        tdSql.execute(
+            "insert into ntb values(now,1,1.0,10.5)(now+1s,10,-100.0,5.1)(now+10s,-1,15.1,5.0)")
 
         tdSql.query("select diff(c1,0) from ntb")
         tdSql.checkRows(2)
-        tdSql.checkData(0,0,9)
-        tdSql.checkData(1,0,-11)
+        tdSql.checkData(0, 0, 9)
+        tdSql.checkData(1, 0, -11)
         tdSql.query("select diff(c1,1) from ntb")
         tdSql.checkRows(2)
-        tdSql.checkData(0,0,9)
-        tdSql.checkData(1,0,None)
-        
+        tdSql.checkData(0, 0, 9)
+        tdSql.checkData(1, 0, None)
+
         tdSql.query("select diff(c2,0) from ntb")
         tdSql.checkRows(2)
-        tdSql.checkData(0,0,-101)
-        tdSql.checkData(1,0,115.1)
+        tdSql.checkData(0, 0, -101)
+        tdSql.checkData(1, 0, 115.1)
         tdSql.query("select diff(c2,1) from ntb")
         tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.checkData(1,0,115.1)
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(1, 0, 115.1)
 
         tdSql.query("select diff(c3,0) from ntb")
         tdSql.checkRows(2)
-        tdSql.checkData(0,0,-5.4)
-        tdSql.checkData(1,0,-0.1)
+        tdSql.checkData(0, 0, -5.4)
+        tdSql.checkData(1, 0, -0.1)
         tdSql.query("select diff(c3,1) from ntb")
         tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.checkData(1,0,None)
-
+        tdSql.checkData(0, 0, None)
+        tdSql.checkData(1, 0, None)
 
         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("insert into stb_1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ', 0, 0, 0, 0)" % (self.ts - 1))
-        
-        # diff verifacation 
+        tdSql.execute(
+            "insert into stb_1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ', 0, 0, 0, 0)" % (self.ts - 1))
+
+        # diff verifacation
         tdSql.query("select diff(col1) from stb_1")
         tdSql.checkRows(0)
-        
+
         tdSql.query("select diff(col2) from stb_1")
         tdSql.checkRows(0)
 
@@ -87,38 +79,23 @@ class TDTestCase:
         tdSql.checkRows(0)
 
         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.error("select diff(ts) from stb")
+            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.error("select diff(ts) from stb")
         tdSql.error("select diff(ts) from stb_1")
-        # tdSql.error("select diff(col7) from stb")     
-                       
-        # tdSql.error("select diff(col8) from stb") 
+
+        # tdSql.error("select diff(col7) from stb")
+
+        tdSql.error("select diff(col8) from stb")
         tdSql.error("select diff(col8) from stb_1")
-        # tdSql.error("select diff(col9) from stb")        
+        tdSql.error("select diff(col9) from stb")
         tdSql.error("select diff(col9) from stb_1")
         tdSql.error("select diff(col11) from stb_1")
         tdSql.error("select diff(col12) from stb_1")
         tdSql.error("select diff(col13) from stb_1")
         tdSql.error("select diff(col14) from stb_1")
-
-        tdSql.query("select ts,diff(col1),ts from stb_1")
-        tdSql.checkRows(11)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
-        tdSql.checkData(1, 0, "2018-09-17 09:00:00.000")
-        tdSql.checkData(1, 2, "2018-09-17 09:00:00.000")
-        tdSql.checkData(9, 0, "2018-09-17 09:00:00.009")
-        tdSql.checkData(9, 2, "2018-09-17 09:00:00.009")
-
-        # tdSql.query("select ts,diff(col1),ts from stb group by tbname")
-        # tdSql.checkRows(10)
-        # tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
-        # tdSql.checkData(0, 1, "2018-09-17 09:00:00.000")
-        # tdSql.checkData(0, 3, "2018-09-17 09:00:00.000")
-        # tdSql.checkData(9, 0, "2018-09-17 09:00:00.009")
-        # tdSql.checkData(9, 1, "2018-09-17 09:00:00.009")
-        # tdSql.checkData(9, 3, "2018-09-17 09:00:00.009")
+        tdSql.error("select ts,diff(col1),ts from stb_1")
 
         tdSql.query("select diff(col1) from stb_1")
         tdSql.checkRows(10)
@@ -137,10 +114,27 @@ class TDTestCase:
 
         tdSql.query("select diff(col6) from stb_1")
         tdSql.checkRows(10)
-        
+
+        tdSql.execute('''create table stb1(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 stb1_1 using stb tags('shanghai')")
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into stb1_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))
+        for i in range(self.rowNum):
+            tdSql.execute("insert into stb1_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
+                          % (self.ts - i-1, 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 diff(col1,0) from stb1_1")
+        tdSql.checkRows(19)
+        tdSql.query("select diff(col1,1) from stb1_1")
+        tdSql.checkRows(19)
+        tdSql.checkData(0,0,None)
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)
 
+
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh
index 01b8b56903..6fc10db59d 100755
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -43,7 +43,7 @@ python3 ./test.py -f 2-query/last.py
 #python3 ./test.py -f 2-query/To_iso8601.py
 python3 ./test.py -f 2-query/To_unixtimestamp.py
 python3 ./test.py -f 2-query/timetruncate.py
-# python3 ./test.py -f 2-query/diff.py
+python3 ./test.py -f 2-query/diff.py
 python3 ./test.py -f 2-query/Timediff.py
 #python3 ./test.py -f 2-query/cast.py
 

From 3eb9aa5c0552c2ab90d016decc32f25bb933b176 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Thu, 26 May 2022 11:34:48 +0800
Subject: [PATCH 3/9] update iso8601

---
 tests/system-test/2-query/To_iso8601.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/system-test/2-query/To_iso8601.py b/tests/system-test/2-query/To_iso8601.py
index cd22ffb90c..57bcca638c 100644
--- a/tests/system-test/2-query/To_iso8601.py
+++ b/tests/system-test/2-query/To_iso8601.py
@@ -95,7 +95,7 @@ class TDTestCase:
         # tdSql.query("select to_iso8601(-1) from ntb")
         tdSql.query("select to_iso8601(9223372036854775807) from ntb")
         tdSql.checkRows(3)
-
+        # bug TD-14896
         # tdSql.query("select to_iso8601(10000000000) from ntb")
         # tdSql.checkData(0,0,None)
         # tdSql.query("select to_iso8601(-1) from ntb")
@@ -106,11 +106,6 @@ class TDTestCase:
         tdSql.error("select to_iso8601(1.5) from db.ntb")
         tdSql.error("select to_iso8601('a') from ntb")
         tdSql.error("select to_iso8601(c2) from ntb")
-        
-
-
-
-
         tdSql.query("select to_iso8601(now) from stb")
         tdSql.query("select to_iso8601(now()) from stb")
         tdSql.checkRows(3)
@@ -126,7 +121,7 @@ class TDTestCase:
         tdSql.checkRows(3)
         tdSql.query("select to_iso8601(ts)+'a' from stb ")
         tdSql.checkRows(3)
-        # tdSql.query()
+        
         tdSql.query("select to_iso8601(today()) *null from stb")
         tdSql.checkRows(3)
         tdSql.checkData(0,0,None)
@@ -152,7 +147,9 @@ class TDTestCase:
         tdSql.checkRows(3)
         tdSql.checkData(0,0,None)
 
+        # bug TD-14896
         # tdSql.query("select to_iso8601(-1) from ntb")
+        # tdSql.checkRows(3)
 
 
 

From 6361e87755ccd14b65b8aedfc4575aaa91989a32 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Thu, 26 May 2022 11:38:46 +0800
Subject: [PATCH 4/9] add case to_iso8601 to ci

---
 tests/system-test/fulltest.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh
index 6fc10db59d..d6918e2f14 100755
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -40,7 +40,8 @@ python3 ./test.py -f 2-query/max.py
 python3 ./test.py -f 2-query/min.py
 python3 ./test.py -f 2-query/count.py
 python3 ./test.py -f 2-query/last.py
-#python3 ./test.py -f 2-query/To_iso8601.py
+
+python3 ./test.py -f 2-query/To_iso8601.py
 python3 ./test.py -f 2-query/To_unixtimestamp.py
 python3 ./test.py -f 2-query/timetruncate.py
 python3 ./test.py -f 2-query/diff.py

From dd0a6b0ac5dc996841fced7156c42b1b5cfc47f6 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Thu, 26 May 2022 12:45:05 +0800
Subject: [PATCH 5/9] add test case for bottom and top

---
 tests/system-test/2-query/bottom.py | 68 ++++++---------------------
 tests/system-test/2-query/top.py    | 73 +++++------------------------
 2 files changed, 27 insertions(+), 114 deletions(-)

diff --git a/tests/system-test/2-query/bottom.py b/tests/system-test/2-query/bottom.py
index 15e26dea0b..96ae73c6c4 100644
--- a/tests/system-test/2-query/bottom.py
+++ b/tests/system-test/2-query/bottom.py
@@ -55,84 +55,44 @@ class TDTestCase:
 
         tdSql.query("select bottom(col1, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
-
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
         tdSql.query("select bottom(col2, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
 
         tdSql.query("select bottom(col3, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
 
         tdSql.query("select bottom(col4, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
-
-        tdSql.query("select bottom(col5, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 0.1)
-        tdSql.checkData(1, 1, 1.1)
-
-        tdSql.query("select bottom(col6, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 0.1)
-        tdSql.checkData(1, 1, 1.1)
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
 
         tdSql.query("select bottom(col11, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
 
         tdSql.query("select bottom(col12, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
 
         tdSql.query("select bottom(col13, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
 
         tdSql.query("select bottom(col14, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 1)
-        tdSql.checkData(1, 1, 2)
-
-        tdSql.query("select ts,bottom(col1, 2),ts from test1")
+        tdSql.checkEqual(tdSql.queryResult,[(2,),(1,)])
+        tdSql.query("select ts,bottom(col1, 2) from test1")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
-        tdSql.checkData(0, 1, "2018-09-17 09:00:00.000")
-        tdSql.checkData(1, 0, "2018-09-17 09:00:00.001")
-        tdSql.checkData(1, 3, "2018-09-17 09:00:00.001")
-
-
         tdSql.query("select ts,bottom(col1, 2),ts from test group by tbname")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00.000")
-        tdSql.checkData(0, 1, "2018-09-17 09:00:00.000")
-        tdSql.checkData(1, 0, "2018-09-17 09:00:00.001")
-        tdSql.checkData(1, 3, "2018-09-17 09:00:00.001")
-                   
-        #TD-2457 bottom + interval + order by
-        tdSql.error('select top(col2,1) from test interval(1y) order by col2;')
+        
+        tdSql.query('select bottom(col2,1) from test interval(1y) order by col2')
+        tdSql.checkData(0,0,1)
 
-        #TD-2563 top + super_table + interval 
-        tdSql.execute("create table meters(ts timestamp, c int) tags (d int)") 
-        tdSql.execute("create table t1 using meters tags (1)") 
-        sql = 'insert into t1 values '       
-        for i in range(20000):
-            sql = sql + '(%d, %d)' % (self.ts + i , i % 47)
-            if i % 2000 == 0:
-                tdSql.execute(sql)
-                sql = 'insert into t1 values ' 
-        tdSql.execute(sql)
-        tdSql.query('select bottom(c,1) from meters interval(10a)')
-        tdSql.checkData(0,1,0)
+        tdSql.error('select * from test where bottom(col2,1)=1')
+        
 
     def stop(self):
         tdSql.close()
diff --git a/tests/system-test/2-query/top.py b/tests/system-test/2-query/top.py
index d1c6653a7b..12e81fa190 100644
--- a/tests/system-test/2-query/top.py
+++ b/tests/system-test/2-query/top.py
@@ -27,8 +27,7 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
 
-        intData = []        
-        floatData = []
+        
 
         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))''')
@@ -36,8 +35,7 @@ class TDTestCase:
         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))
-            intData.append(i + 1)            
-            floatData.append(i + 0.1)                        
+                                
 
         # top verifacation 
         tdSql.error("select top(ts, 10) from test")
@@ -67,82 +65,37 @@ class TDTestCase:
 
         tdSql.query("select top(col1, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select top(col2, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select top(col3, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select top(col4, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select top(col11, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select top(col12, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select top(col13, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select top(col14, 2) from test")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 9)
-        tdSql.checkData(1, 1, 10)
-
-        tdSql.query("select top(col5, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 8.1)
-        tdSql.checkData(1, 1, 9.1)
-
-        tdSql.query("select top(col6, 2) from test")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 8.1)
-        tdSql.checkData(1, 1, 9.1)
-
+        tdSql.checkEqual(tdSql.queryResult,[(9,),(10,)])
         tdSql.query("select ts,top(col1, 2),ts from test1")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00.008")
-        tdSql.checkData(0, 1, "2018-09-17 09:00:00.008")
-        tdSql.checkData(1, 0, "2018-09-17 09:00:00.009")
-        tdSql.checkData(1, 3, "2018-09-17 09:00:00.009")
-
 
         tdSql.query("select ts,top(col1, 2),ts from test group by tbname")
         tdSql.checkRows(2)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00.008")
-        tdSql.checkData(0, 1, "2018-09-17 09:00:00.008")
-        tdSql.checkData(1, 0, "2018-09-17 09:00:00.009")
-        tdSql.checkData(1, 3, "2018-09-17 09:00:00.009")
-
-        #TD-2563 top + super_table + interval 
-        tdSql.execute("create table meters(ts timestamp, c int) tags (d int)") 
-        tdSql.execute("create table t1 using meters tags (1)") 
-        sql = 'insert into t1 values '       
-        for i in range(20000):
-            sql = sql + '(%d, %d)' % (self.ts + i , i % 47)
-            if i % 2000 == 0:
-                tdSql.execute(sql)
-                sql = 'insert into t1 values ' 
-        tdSql.execute(sql)
-        tdSql.query('select top(c,1) from meters interval(10a)')
-        tdSql.checkData(0,1,9)
+        tdSql.query('select top(col2,1) from test interval(1y) order by col2')
+        tdSql.checkData(0,0,10)
         
+        tdSql.error('select * from test where bottom(col2,1)=1')
                    
     def stop(self):
         tdSql.close()

From 0d3042b0f9267e7295f01b8dadffefd4666d9845 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Thu, 26 May 2022 12:46:13 +0800
Subject: [PATCH 6/9] add case to ci

---
 tests/system-test/fulltest.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh
index d6918e2f14..37dbc3cc13 100755
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -40,14 +40,15 @@ python3 ./test.py -f 2-query/max.py
 python3 ./test.py -f 2-query/min.py
 python3 ./test.py -f 2-query/count.py
 python3 ./test.py -f 2-query/last.py
-
+# python3 ./test.py -f 2-query/first.py
 python3 ./test.py -f 2-query/To_iso8601.py
 python3 ./test.py -f 2-query/To_unixtimestamp.py
 python3 ./test.py -f 2-query/timetruncate.py
 python3 ./test.py -f 2-query/diff.py
 python3 ./test.py -f 2-query/Timediff.py
 #python3 ./test.py -f 2-query/cast.py
-
+python3 ./test.py -f 2-query/top.py
+python3 ./test.py -f 2-query/bottom.py
 
 python3 ./test.py -f 2-query/abs.py
 python3 ./test.py -f 2-query/ceil.py

From 6c634ff7a25ae8c9a38f7ce178beb3b8b604152d Mon Sep 17 00:00:00 2001
From: jiacy-jcy <cyjia@taosdata.com>
Date: Fri, 27 May 2022 10:27:11 +0800
Subject: [PATCH 7/9] add case for percentile

---
 tests/system-test/2-query/percentile.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/system-test/2-query/percentile.py b/tests/system-test/2-query/percentile.py
index 798aaea351..2122197ad2 100644
--- a/tests/system-test/2-query/percentile.py
+++ b/tests/system-test/2-query/percentile.py
@@ -40,14 +40,14 @@ class TDTestCase:
             floatData.append(i + 0.1)                        
 
         # percentile verifacation 
-        tdSql.error("select percentile(ts 20) from test")
-        tdSql.error("select apercentile(ts 20) from test")
-        tdSql.error("select percentile(col7 20) from test")
-        tdSql.error("select apercentile(col7 20) from test")
-        tdSql.error("select percentile(col8 20) from test")        
-        tdSql.error("select apercentile(col8 20) from test")
-        tdSql.error("select percentile(col9 20) from test")
-        tdSql.error("select apercentile(col9 20) from test")        
+        tdSql.error("select percentile(ts ,20) from test")
+        tdSql.error("select apercentile(ts ,20) from test")
+        tdSql.error("select percentile(col7 ,20) from test")
+        tdSql.error("select apercentile(col7 ,20) from test")
+        tdSql.error("select percentile(col8 ,20) from test")        
+        tdSql.error("select apercentile(col8 ,20) from test")
+        tdSql.error("select percentile(col9 ,20) from test")
+        tdSql.error("select apercentile(col9 ,20) from test")        
 
         tdSql.query("select percentile(col1, 0) from test")        
         tdSql.checkData(0, 0, np.percentile(intData, 0))

From c85d72e70e070fa2c18fce168bf8205c38775d1a Mon Sep 17 00:00:00 2001
From: jiacy-jcy <cyjia@taosdata.com>
Date: Fri, 27 May 2022 11:46:39 +0800
Subject: [PATCH 8/9] add first.py into ci

---
 tests/system-test/fulltest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh
index 4debf4cabd..7c4bdbcfdc 100755
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -40,7 +40,7 @@ python3 ./test.py -f 2-query/max.py
 python3 ./test.py -f 2-query/min.py
 python3 ./test.py -f 2-query/count.py
 python3 ./test.py -f 2-query/last.py
-# python3 ./test.py -f 2-query/first.py
+python3 ./test.py -f 2-query/first.py
 python3 ./test.py -f 2-query/To_iso8601.py
 python3 ./test.py -f 2-query/To_unixtimestamp.py
 python3 ./test.py -f 2-query/timetruncate.py

From 2adff3de65830201d38c45c53abbd373a1fa0403 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <cyjia@taosdata.com>
Date: Fri, 27 May 2022 11:47:43 +0800
Subject: [PATCH 9/9] update case first.py

---
 tests/system-test/2-query/first.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/system-test/2-query/first.py b/tests/system-test/2-query/first.py
index a538fdd474..7227d1afb5 100644
--- a/tests/system-test/2-query/first.py
+++ b/tests/system-test/2-query/first.py
@@ -37,9 +37,9 @@ class TDTestCase:
 
         # first verifacation        
         # bug TD-15957 
-        # tdSql.query("select first(*) from test1")
-        # tdSql.checkRows(1)
-        # tdSql.checkData(0, 1, None)
+        tdSql.query("select first(*) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, None)
 
         tdSql.query("select first(col1) from test1")
         tdSql.checkRows(0)