未验证 提交 a31f2e4f 编写于 作者: S shenglian-zhou 提交者: GitHub

Merge pull request #9780 from taosdata/szhou/fix/2.4/12427

TD-12427: elapsed can not be used in stream query
...@@ -5117,7 +5117,7 @@ SAggFunctionInfo aAggs[40] = {{ ...@@ -5117,7 +5117,7 @@ SAggFunctionInfo aAggs[40] = {{
"twa", "twa",
TSDB_FUNC_TWA, TSDB_FUNC_TWA,
TSDB_FUNC_TWA, TSDB_FUNC_TWA,
TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS, TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_NEED_TS,
twa_function_setup, twa_function_setup,
twa_function, twa_function,
twa_function_finalizer, twa_function_finalizer,
...@@ -5393,7 +5393,7 @@ SAggFunctionInfo aAggs[40] = {{ ...@@ -5393,7 +5393,7 @@ SAggFunctionInfo aAggs[40] = {{
"elapsed", "elapsed",
TSDB_FUNC_ELAPSED, TSDB_FUNC_ELAPSED,
TSDB_FUNC_ELAPSED, TSDB_FUNC_ELAPSED,
TSDB_BASE_FUNC_SO, TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STABLE,
elapsedSetup, elapsedSetup,
elapsedFunction, elapsedFunction,
elapsedFinalizer, elapsedFinalizer,
......
...@@ -322,8 +322,8 @@ class ElapsedCase: ...@@ -322,8 +322,8 @@ class ElapsedCase:
if (self.restart): if (self.restart):
tdSql.execute("drop table elapsed_t") tdSql.execute("drop table elapsed_t")
tdSql.execute("drop table elapsed_st") tdSql.execute("drop table elapsed_st")
tdSql.execute("create table elapsed_t as select elapsed(ts) from t1 interval(1m) sliding(30s)") tdSql.error("create table elapsed_t as select elapsed(ts) from t1 interval(1m) sliding(30s)")
tdSql.execute("create table elapsed_st as select elapsed(ts) from st1 interval(1m) sliding(30s) group by tbname") tdSql.error("create table elapsed_st as select elapsed(ts) from st1 interval(1m) sliding(30s) group by tbname")
def selectIllegalTest(self): def selectIllegalTest(self):
tdSql.execute("use wxy_db") tdSql.execute("use wxy_db")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册