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

fix: wrong start key for pFill when unit of sliding is y or n

This commit is contained in:
shenglian zhou 2023-08-25 14:59:39 +08:00
parent f805a49df2
commit 9fc75fb73d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/libs/executor/src/filloperator.c
View File

@ -166,18 +166,20 @@ static void revisedFillStartKey(SFillOperatorInfo* pInfo, SSDataBlock* pBlock, i
} else if (ekey < pInfo->pFillInfo->start) { } else if (ekey < pInfo->pFillInfo->start) {
int64_t t = ekey; int64_t t = ekey;
SInterval* pInterval = &pInfo->pFillInfo->interval; SInterval* pInterval = &pInfo->pFillInfo->interval;
int64_t prev = t;
while(1) { while(1) {
int64_t prev = taosTimeAdd(t, pInterval->sliding, pInterval->slidingUnit, pInterval->precision); int64_t next = taosTimeAdd(t, pInterval->sliding, pInterval->slidingUnit, pInterval->precision);
if (prev >= pInfo->pFillInfo->start) { if (next >= pInfo->pFillInfo->start) {
t = prev; prev = t;
t = next;
break; break;
} }
t = prev; prev = t;
t = next;
} }
// todo time window chosen problem: t or prev value? // todo time window chosen problem: t or next value?
if (t > pInfo->pFillInfo->start) t -= pInterval->sliding; if (t > pInfo->pFillInfo->start) t = prev;
taosFillUpdateStartTimestampInfo(pInfo->pFillInfo, t); taosFillUpdateStartTimestampInfo(pInfo->pFillInfo, t);
} }
} }