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

fic comp issue

This commit is contained in:
54liuyao 2024-10-31 18:52:24 +08:00
parent 158eda13f9
commit e9b9ebeb6e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,8 @@ void destroyStreamFillInfo(SStreamFillInfo* pFillInfo) {
pFillInfo->type == TSDB_FILL_NULL || pFillInfo->type == TSDB_FILL_NULL_F) { pFillInfo->type == TSDB_FILL_NULL || pFillInfo->type == TSDB_FILL_NULL_F) {
taosMemoryFreeClear(pFillInfo->pResRow->pRowVal); taosMemoryFreeClear(pFillInfo->pResRow->pRowVal);
taosMemoryFreeClear(pFillInfo->pResRow); taosMemoryFreeClear(pFillInfo->pResRow);
taosMemoryFreeClear(pFillInfo->pNonFillRow->pRowVal);
taosMemoryFreeClear(pFillInfo->pNonFillRow);
} }
destroyStreamFillLinearInfo(pFillInfo->pLinearInfo); destroyStreamFillLinearInfo(pFillInfo->pLinearInfo);
pFillInfo->pLinearInfo = NULL; pFillInfo->pLinearInfo = NULL;

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

@ -991,9 +991,9 @@ static void setForceWindowCloseFillRule(SStreamFillSupporter* pFillSup, SStreamF
} else { } else {
pFillInfo->pos = FILL_POS_INVALID; pFillInfo->pos = FILL_POS_INVALID;
setFillKeyInfo(ts, ts + 1, &pFillSup->interval, pFillInfo); setFillKeyInfo(ts, ts + 1, &pFillSup->interval, pFillInfo);
if (pFillSup->cur.pRowVal != NULL) { }
copyNonFillValueInfo(pFillSup, pFillInfo); if (pFillSup->cur.pRowVal != NULL) {
} copyNonFillValueInfo(pFillSup, pFillInfo);
} }
} break; } break;
case TSDB_FILL_PREV: { case TSDB_FILL_PREV: {
@ -1021,6 +1021,9 @@ static void setForceWindowCloseFillRule(SStreamFillSupporter* pFillSup, SStreamF
static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo* pFillInfo, TSKEY ts) { static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo* pFillInfo, TSKEY ts) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
int32_t lino = 0; int32_t lino = 0;
if (IS_FILL_CONST_VALUE(pFillInfo->type)) {
copyNonFillValueInfo(pFillSup, pFillInfo);
}
if (!hasNextWindow(pFillSup) && !hasPrevWindow(pFillSup)) { if (!hasNextWindow(pFillSup) && !hasPrevWindow(pFillSup)) {
pFillInfo->needFill = false; pFillInfo->needFill = false;
pFillInfo->pos = FILL_POS_START; pFillInfo->pos = FILL_POS_START;
@ -1057,7 +1060,7 @@ static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo
setFillKeyInfo(startTs, nextWKey, &pFillSup->interval, pFillInfo); setFillKeyInfo(startTs, nextWKey, &pFillSup->interval, pFillInfo);
pFillInfo->pos = FILL_POS_START; pFillInfo->pos = FILL_POS_START;
} }
copyNonFillValueInfo(pFillSup, pFillInfo); // copyNonFillValueInfo(pFillSup, pFillInfo);
} break; } break;
case TSDB_FILL_PREV: { case TSDB_FILL_PREV: {
if (hasPrevWindow(pFillSup) && hasNextWindow(pFillSup) && pFillInfo->preRowKey != pFillInfo->prePointKey && if (hasPrevWindow(pFillSup) && hasNextWindow(pFillSup) && pFillInfo->preRowKey != pFillInfo->prePointKey &&