Merge branch '2.6' into fix/TS-2670-2.6

src/query/src/qFill.c

@@ -399,6 +399,8 @@ void taosResetFillInfo(SFillInfo* pFillInfo, TSKEY startTimestamp) {
   pFillInfo->numOfRows    = 0;
   pFillInfo->numOfCurrent = 0;
   pFillInfo->numOfTotal   = 0;
+  //free prevValues so that the new group has no prevValues then fill(linear) of new group won't use old group values.
+  tfree(pFillInfo->prevValues);
 }
 
 void* taosDestroyFillInfo(SFillInfo* pFillInfo) {

tests/parallel_test/cases.task

@@ -4,7 +4,7 @@
 290,,pytest,python3 test.py -f update/merge_commit_data.py
 241,,pytest,python3 test.py -f update/merge_commit_data2.py
 224,,pytest,python3 test.py -f query/queryNullValueTest.py
-221,,pytest,python3 test.py -f query/nestedQuery/nestedQuery.py
+#221,,pytest,python3 test.py -f query/nestedQuery/nestedQuery.py
 220,,pytest,python3 test.py -f update/merge_commit_data2_update0.py
 208,,pytest,python3 test.py -f update/merge_commit_last.py
 203,,pytest,python3 test.py -f update/merge_commit_last-0.py
@@ -198,7 +198,7 @@
 37,,script,./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim
 37,,script,./test.sh -f general/table/delete_reuse1.sim
 37,,script,./test.sh -f general/db/delete_reuse2.sim
-36,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_rust.sh; fi\"
+# 36,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_rust.sh; fi\"
 36,,script,./test.sh -f unique/stable/replica3_vnode3.sim
 36,,script,./test.sh -f unique/stable/dnode2_stop.sim
 36,,script,./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim

tests/script/general/parser/fill_stb.sim

@@ -430,6 +430,20 @@ if $data69 != 6 then
   return -1
 endi
 
+## TD-2679
+print ============== td2679
+sql create database td2679
+sql use td2679
+sql create table st(ts timestamp, f int) tags (t int)
+$ts = 1676768465000
+sql insert into ct1 using st tags(1) values($ts , null)($ts + 1s, 1)($ts + 2s, null)
+sql insert into ct2 using st tags(2) values($ts + 3s, null)($ts + 4s, 4)($ts + 5s, null)
+sql select max(f) from st  where ts>='2023-02-19 09:01:04.000' and ts <= '2023-02-19 09:01:10.000' interval(1s) fill(linear) group by tbname;
+print $rows , $data60 , $data61 , $data70 , $data71
+if $data71 != NULL then
+  return -1
+endi
+sql drop database td2679
 print =============== clear
 sql drop database $db
 sql show databases