From 9eb4f16792089bed159f07f26a4eb3394d6a4f84 Mon Sep 17 00:00:00 2001 From: slzhou Date: Thu, 7 Jul 2022 14:59:52 +0800 Subject: [PATCH] feat: add filter to fill operator --- source/libs/executor/src/executorimpl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c index 8742b5830b..181ec499ec 100644 --- a/source/libs/executor/src/executorimpl.c +++ b/source/libs/executor/src/executorimpl.c @@ -3371,6 +3371,8 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) { SResultInfo* pResultInfo = &pOperator->resultInfo; SSDataBlock* pResBlock = pInfo->pRes; + blockDataCleanup(pResBlock); + // todo handle different group data interpolation bool n = false; bool* newgroup = &n; @@ -3439,16 +3441,13 @@ static SSDataBlock* doFill(SOperatorInfo* pOperator) { SFillOperatorInfo* pInfo = pOperator->info; SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo; - SResultInfo* pResultInfo = &pOperator->resultInfo; - SSDataBlock* pResBlock = pInfo->pRes; - - blockDataCleanup(pResBlock); if (pOperator->status == OP_EXEC_DONE) { return NULL; } + SSDataBlock* fillResult = NULL; while (true) { - SSDataBlock* fillResult = doFillImpl(pOperator); + fillResult = doFillImpl(pOperator); if (fillResult != NULL) { doFilter(pInfo->pCondition, fillResult); } @@ -3463,10 +3462,12 @@ static SSDataBlock* doFill(SOperatorInfo* pOperator) { } } - size_t rows = pResBlock->info.rows; - pOperator->resultInfo.totalRows += rows; + if (fillResult != NULL) { + size_t rows = fillResult->info.rows; + pOperator->resultInfo.totalRows += rows; + } - return (rows == 0)? NULL:pResBlock; + return fillResult; } static void destroyExprInfo(SExprInfo* pExpr, int32_t numOfExprs) {