xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/3.0_bug16060' of github.com:taosdata/TDengine into feature/3.0_bug16060

This commit is contained in:
Xiaoyu Wang 2022-06-06 11:47:47 +08:00
parent 0b5c08edb9 7fc1e3a40f
commit f3fe945ca6
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/system-test/2-query/csum.py
View File

@ -240,7 +240,7 @@ class TDTestCase:
tdSql.error("select csum(c1) t1") # no from tdSql.error("select csum(c1) t1") # no from
tdSql.error("select csum( c1 ) from ") # no table_expr tdSql.error("select csum( c1 ) from ") # no table_expr
# tdSql.error(self.csum_query_form(col="st1")) # tag col # tdSql.error(self.csum_query_form(col="st1")) # tag col
tdSql.error(self.csum_query_form(col=1)) # col is a value # tdSql.error(self.csum_query_form(col=1)) # col is a value
tdSql.error(self.csum_query_form(col="'c1'")) # col is a string tdSql.error(self.csum_query_form(col="'c1'")) # col is a string
tdSql.error(self.csum_query_form(col=None)) # col is NULL 1 tdSql.error(self.csum_query_form(col=None)) # col is NULL 1
tdSql.error(self.csum_query_form(col="NULL")) # col is NULL 2 tdSql.error(self.csum_query_form(col="NULL")) # col is NULL 2
@ -407,6 +407,14 @@ class TDTestCase:
tdDnodes.start(index) tdDnodes.start(index)
self.csum_current_query() self.csum_current_query()
self.csum_error_query() self.csum_error_query()
tdSql.query("select csum(1) from t1 ")
tdSql.checkRows(7)
tdSql.checkData(0,0,1)
tdSql.checkData(1,0,2)
tdSql.checkData(2,0,3)
tdSql.checkData(3,0,4)
tdSql.query("select csum(abs(c1))+2 from t1 ")
tdSql.checkRows(4)
def run(self): def run(self):
import traceback import traceback

12
tests/system-test/2-query/mavg.py
View File

@ -417,8 +417,8 @@ class TDTestCase:
# err9 = {"col": "st1"} # err9 = {"col": "st1"}
# self.checkmavg(**err9) # col: tag # self.checkmavg(**err9) # col: tag
err10 = {"col": 1} # err10 = {"col": 1}
self.checkmavg(**err10) # col: value # self.checkmavg(**err10) # col: value
err11 = {"col": "NULL"} err11 = {"col": "NULL"}
self.checkmavg(**err11) # col: NULL self.checkmavg(**err11) # col: NULL
err12 = {"col": "%_"} err12 = {"col": "%_"}
@ -660,6 +660,14 @@ class TDTestCase:
tdDnodes.start(index) tdDnodes.start(index)
self.mavg_current_query() self.mavg_current_query()
self.mavg_error_query() self.mavg_error_query()
tdSql.query("select mavg(1,1) from t1")
tdSql.checkRows(7)
tdSql.checkData(0,0,1.000000000)
tdSql.checkData(1,0,1.000000000)
tdSql.checkData(5,0,1.000000000)
tdSql.query("select mavg(abs(c1),1) from t1")
tdSql.checkRows(4)
def run(self): def run(self):
import traceback import traceback