Merge pull request #9779 from taosdata/szhou/fix/12427

TD-12427: elapsed can not be used again stream query

src/query/src/qAggMain.c

@@ -5117,7 +5117,7 @@ SAggFunctionInfo aAggs[40] = {{
                               "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,
                               twa_function_finalizer,
@@ -5393,7 +5393,7 @@ SAggFunctionInfo aAggs[40] = {{
                               "elapsed",
                               TSDB_FUNC_ELAPSED,
                               TSDB_FUNC_ELAPSED,
-                              TSDB_BASE_FUNC_SO,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STABLE,
                               elapsedSetup,
                               elapsedFunction,
                               elapsedFinalizer,

tests/pytest/functions/function_elapsed_case.py

@@ -322,8 +322,8 @@ class ElapsedCase:
         if (self.restart):
             tdSql.execute("drop table elapsed_t")
             tdSql.execute("drop table elapsed_st")
-        tdSql.execute("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_t as select elapsed(ts) from t1 interval(1m) sliding(30s)")
+        tdSql.error("create table elapsed_st as select elapsed(ts) from st1 interval(1m) sliding(30s) group by tbname")
 
     def selectIllegalTest(self):
         tdSql.execute("use wxy_db")

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

@@ -1538,8 +1538,8 @@ class TDTestCase:
 
         
     def continuous_query(self):
-        tdSql.execute('create table elapsed_t as select elapsed(ts) from sub_table1_1  interval(1m) sliding(30s);')
-        tdSql.execute('create table elapsed_tb as select elapsed(ts) from stable_1  interval(1m) sliding(30s) group by tbname;')
+        tdSql.error('create table elapsed_t as select elapsed(ts) from sub_table1_1  interval(1m) sliding(30s);')
+        tdSql.error('create table elapsed_tb as select elapsed(ts) from stable_1  interval(1m) sliding(30s) group by tbname;')
         tdSql.error('create table elapsed_tc as select elapsed(ts) from stable_1  interval(10s) sliding(5s) interval(1m) sliding(30s) group by tbname;')
     
     def query_precision(self):

tests/system-test/fulltest-query.sh

@@ -4,7 +4,6 @@ python3 ./test.py -f 2-query/TD-11945_crash.py
 python3 ./test.py -f 2-query/TD-12340-12342.py
 python3 ./test.py -f 2-query/TD-11561.py
 python3 ./test.py -f 2-query/TD-12204.py
-python3 ./test.py -f 2-query/TD-11483.py
 python3 ./test.py -f 2-query/TD-11943.py
 python3 ./test.py -f 2-query/TD-11969.py
 python3 ./test.py -f 2-query/TD-11978.py
@@ -12,7 +11,6 @@ python3 ./test.py -f 2-query/TD-12014.py
 python3 ./test.py -f 2-query/TD-12145.py
 python3 ./test.py -f 2-query/TD-12164.py
 python3 ./test.py -f 2-query/TD-12165.py
-python3 ./test.py -f 2-query/TD-12191.py
 python3 ./test.py -f 2-query/TD-12228.py
 python3 ./test.py -f 2-query/TD-12229.py
 python3 ./test.py -f 2-query/TD-12276.py