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

Merge remote-tracking branch 'origin/main' into merge/mainto3.0

This commit is contained in:
Simon Guan 2025-02-28 09:16:43 +08:00
parent 9c6e424cd9 6d9e811693
commit 63992a3240
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/libs/executor/src/streameventwindowoperator.c
View File

@ -251,6 +251,11 @@ int32_t updateEventWindowInfo(SStreamAggSupporter* pAggSup, SEventWindowInfo* pW
pWin->ekey = pTsData[i]; pWin->ekey = pTsData[i];
pWinInfo->pWinFlag->endFlag = ends[i]; pWinInfo->pWinFlag->endFlag = ends[i];
} else if (pWin->ekey == pTsData[i]) { } else if (pWin->ekey == pTsData[i]) {
if (pWinInfo->pWinFlag->endFlag == true && ends[i] == false) {
(*pWinRow) = i + 1 - start;
*pRebuild = true;
goto _end;
}
pWinInfo->pWinFlag->endFlag |= ends[i]; pWinInfo->pWinFlag->endFlag |= ends[i];
} else if (ends[i] && !pWinInfo->pWinFlag->endFlag) { } else if (ends[i] && !pWinInfo->pWinFlag->endFlag) {
*pRebuild = true; *pRebuild = true;

2
source/libs/executor/src/streamtimewindowoperator.c
View File

@ -474,14 +474,12 @@ void destroyFlusedppPos(void* ppRes) {
} }
void clearGroupResInfo(SGroupResInfo* pGroupResInfo) { void clearGroupResInfo(SGroupResInfo* pGroupResInfo) {
if (pGroupResInfo->freeItem) {
int32_t size = taosArrayGetSize(pGroupResInfo->pRows); int32_t size = taosArrayGetSize(pGroupResInfo->pRows);
for (int32_t i = pGroupResInfo->index; i < size; i++) { for (int32_t i = pGroupResInfo->index; i < size; i++) {
void* pPos = taosArrayGetP(pGroupResInfo->pRows, i); void* pPos = taosArrayGetP(pGroupResInfo->pRows, i);
destroyFlusedPos(pPos); destroyFlusedPos(pPos);
} }
pGroupResInfo->freeItem = false; pGroupResInfo->freeItem = false;
}
taosArrayDestroy(pGroupResInfo->pRows); taosArrayDestroy(pGroupResInfo->pRows);
pGroupResInfo->pRows = NULL; pGroupResInfo->pRows = NULL;
pGroupResInfo->index = 0; pGroupResInfo->index = 0;