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

fix issue

This commit is contained in:
54liuyao 2024-10-28 11:09:56 +08:00
parent 13086bc66e
commit 424e574e94
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/executor/src/executor.c
View File

@ -1099,6 +1099,7 @@ static int32_t getOpratorIntervalInfo(SOperatorInfo* pOperator, int64_t* pWaterM
SStreamScanInfo* pScanOp = (SStreamScanInfo*) pOperator->info; SStreamScanInfo* pScanOp = (SStreamScanInfo*) pOperator->info;
*pWaterMark = pScanOp->twAggSup.waterMark; *pWaterMark = pScanOp->twAggSup.waterMark;
*pInterval = pScanOp->interval; *pInterval = pScanOp->interval;
*pLastWindow = pScanOp->lastScanRange;
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }

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

@ -1315,8 +1315,9 @@ static void doStreamTimeSliceImpl(SOperatorInfo* pOperator, SSDataBlock* pBlock)
pkLen = colDataGetRowLength(pPkColDataInfo, startPos); pkLen = colDataGetRowLength(pPkColDataInfo, startPos);
} }
if (pInfo->ignoreExpiredData && checkExpiredData(&pAggSup->stateStore, pAggSup->pUpdateInfo, &pInfo->twAggSup, if (pInfo->twAggSup.calTrigger != STREAM_TRIGGER_FORCE_WINDOW_CLOSE && pInfo->ignoreExpiredData &&
pBlock->info.id.uid, tsCols[startPos], pPkVal, pkLen)) { checkExpiredData(&pAggSup->stateStore, pAggSup->pUpdateInfo, &pInfo->twAggSup, pBlock->info.id.uid,
tsCols[startPos], pPkVal, pkLen)) {
qDebug("===stream===ignore expired data, window end ts:%" PRId64 ", maxts - wartermak:%" PRId64, tsCols[startPos], qDebug("===stream===ignore expired data, window end ts:%" PRId64 ", maxts - wartermak:%" PRId64, tsCols[startPos],
pInfo->twAggSup.maxTs - pInfo->twAggSup.waterMark); pInfo->twAggSup.maxTs - pInfo->twAggSup.waterMark);
continue; continue;