diff --git a/tests/system-test/2-query/csum.py b/tests/system-test/2-query/csum.py index 260528be0405c86aa6b92240ce4661fef5f27729..f38a99d80910713b892131f03fcc7fecdddf590a 100644 --- a/tests/system-test/2-query/csum.py +++ b/tests/system-test/2-query/csum.py @@ -279,14 +279,14 @@ class TDTestCase: tdSql.error(self.csum_query_form(alias=", diff(c1)")) # mix with calculation function 2 # tdSql.error(self.csum_query_form(alias=" + 2")) # mix with arithmetic 1 tdSql.error(self.csum_query_form(alias=" + avg(c1)")) # mix with arithmetic 2 - tdSql.error(self.csum_query_form(alias=", c2")) # mix with other 1 + # tdSql.error(self.csum_query_form(alias=", c2")) # mix with other 1 # tdSql.error(self.csum_query_form(table_expr="stb1")) # select stb directly - stb_join = { - "col": "stb1.c1", - "table_expr": "stb1, stb2", - "condition": "where stb1.ts=stb2.ts and stb1.st1=stb2.st2 order by stb1.ts" - } - tdSql.error(self.csum_query_form(**stb_join)) # stb join + #stb_join = { + # "col": "stb1.c1", + # "table_expr": "stb1, stb2", + # "condition": "where stb1.ts=stb2.ts and stb1.st1=stb2.st2 order by stb1.ts" + #} + #tdSql.error(self.csum_query_form(**stb_join)) # stb join interval_sql = { "condition": "where ts>0 and ts < now interval(1h) fill(next)" } @@ -421,6 +421,19 @@ class TDTestCase: tdSql.query("select csum(abs(c1))+2 from db.t1 ") tdSql.checkRows(4) + # support selectivity + tdSql.query("select ts, c1, csum(1) from db.t1") + tdSql.checkRows(7) + + tdSql.query("select csum(1), ts, c1 from db.t1") + tdSql.checkRows(7) + + tdSql.query("select ts, c1, c2, c3, csum(1), ts, c4, c5, c6 from db.t1") + tdSql.checkRows(7) + + tdSql.query("select ts, c1, csum(1), c4, c5, csum(1), c6 from db.t1") + tdSql.checkRows(7) + def csum_support_stable(self): tdSql.query(" select csum(1) from db.stb1 ") tdSql.checkRows(70) @@ -474,6 +487,7 @@ class TDTestCase: # tdSql.checkRows(4) + def run(self): import traceback try: diff --git a/tests/system-test/2-query/statecount.py b/tests/system-test/2-query/statecount.py index 91e2aa9e47d06ba86d0e56c167437fab05abf2c5..a88c4aef9fdad7580d4d10a642093c80750b1c57 100644 --- a/tests/system-test/2-query/statecount.py +++ b/tests/system-test/2-query/statecount.py @@ -105,8 +105,6 @@ class TDTestCase: "select statecount(c1 ,'GT',1) , min(c1) from t1", "select statecount(c1 ,'GT',1) , spread(c1) from t1", "select statecount(c1 ,'GT',1) , diff(c1) from t1", - "select statecount(c1 ,'GT',1) , abs(c1) from t1", - "select statecount(c1 ,'GT',1) , c1 from t1", ] for error_sql in error_sql_lists: tdSql.error(error_sql) @@ -227,17 +225,56 @@ class TDTestCase: tdSql.query("select statecount(c6,'GT',1) from ct4") tdSql.checkRows(12) - tdSql.error("select statecount(c6,'GT',1),tbname from ct1") - tdSql.error("select statecount(c6,'GT',1),t1 from ct1") + tdSql.query("select statecount(c6,'GT',1),tbname from ct1") + tdSql.checkRows(13) + tdSql.query("select statecount(c6,'GT',1),t1 from ct1") + tdSql.checkRows(13) # unique with common col - tdSql.error("select statecount(c6,'GT',1) ,ts from ct1") - tdSql.error("select statecount(c6,'GT',1) ,c1 from ct1") + tdSql.query("select statecount(c6,'GT',1) ,ts from ct1") + tdSql.checkRows(13) + tdSql.query("select ts, statecount(c6,'GT',1) from ct1") + tdSql.checkRows(13) + tdSql.query("select statecount(c6,'GT',1) ,c1 from ct1") + tdSql.checkRows(13) + tdSql.query("select c1, statecount(c6,'GT',1) from ct1") + tdSql.checkRows(13) + tdSql.query("select ts, c1, c2, c3, statecount(c6,'GT',1) from ct1") + tdSql.checkRows(13) + tdSql.query("select statecount(c6,'GT',1), ts, c1, c2, c3 from ct1") + tdSql.checkRows(13) + tdSql.query("select ts, c1, c2, c3, statecount(c6,'GT',1), ts, c4, c5, c6 from ct1") + tdSql.checkRows(13) + + tdSql.query("select stateduration(c6,'GT',1) ,ts from ct1") + tdSql.checkRows(13) + tdSql.query("select ts, stateduration(c6,'GT',1) from ct1") + tdSql.checkRows(13) + tdSql.query("select stateduration(c6,'GT',1) ,c1 from ct1") + tdSql.checkRows(13) + tdSql.query("select c1, stateduration(c6,'GT',1) from ct1") + tdSql.checkRows(13) + tdSql.query("select ts, c1, c2, c3, stateduration(c6,'GT',1) from ct1") + tdSql.checkRows(13) + tdSql.query("select stateduration(c6,'GT',1), ts, c1, c2, c3 from ct1") + tdSql.checkRows(13) + tdSql.query("select ts, c1, c2, c3, stateduration(c6,'GT',1), ts, c4, c5, c6 from ct1") + tdSql.checkRows(13) # unique with scalar function - tdSql.error("select statecount(c6,'GT',1) ,abs(c1) from ct1") + tdSql.query("select statecount(c6,'GT',1) , abs(c1) from ct1") + tdSql.checkRows(13) + tdSql.query("select statecount(c6,'GT',1) , abs(c2)+2 from ct1") + tdSql.checkRows(13) + tdSql.error("select statecount(c6,'GT',1) , unique(c2) from ct1") - tdSql.error("select statecount(c6,'GT',1) , abs(c2)+2 from ct1") + + tdSql.query("select stateduration(c6,'GT',1) , abs(c1) from ct1") + tdSql.checkRows(13) + tdSql.query("select stateduration(c6,'GT',1) , abs(c2)+2 from ct1") + tdSql.checkRows(13) + + tdSql.error("select stateduration(c6,'GT',1) , unique(c2) from ct1") # unique with aggregate function