From 3660b6cede223a335d9cff8306f56ef71ecb94b5 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao> Date: Mon, 22 Jul 2024 13:55:00 +0800 Subject: [PATCH] adj operator res --- source/libs/executor/src/executor.c | 2 +- source/libs/executor/src/executorInt.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index c7259c464d..8cf44602f9 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -826,7 +826,7 @@ int32_t qAppendTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo* pInfo void* tmp = taosArrayPush(pTaskInfo->stopInfo.pStopInfo, pInfo); taosWUnLockLatch(&pTaskInfo->stopInfo.lock); - if (tmp != TSDB_CODE_SUCCESS) { + if (!tmp) { qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(TSDB_CODE_OUT_OF_MEMORY)); return TSDB_CODE_OUT_OF_MEMORY; } diff --git a/source/libs/executor/src/executorInt.c b/source/libs/executor/src/executorInt.c index dd6067da34..3b356f0ab4 100644 --- a/source/libs/executor/src/executorInt.c +++ b/source/libs/executor/src/executorInt.c @@ -649,10 +649,10 @@ void copyResultrowToDataBlock(SExprInfo* pExprInfo, int32_t numOfExprs, SResultR code = blockDataEnsureCapacity(pBlock, pBlock->info.rows + pCtx[j].resultInfo->numOfRes); QUERY_CHECK_CODE(code, lino, _end); - code = pCtx[j].fpSet.finalize(&pCtx[j], pBlock); - if (TAOS_FAILED(code)) { - qError("%s build result data block error, code %s", GET_TASKID(pTaskInfo), tstrerror(code)); - T_LONG_JMP(pTaskInfo->env, code); + int32_t winCode = pCtx[j].fpSet.finalize(&pCtx[j], pBlock); + if (TAOS_FAILED(winCode)) { + qError("%s build result data block error, code %s", GET_TASKID(pTaskInfo), tstrerror(winCode)); + T_LONG_JMP(pTaskInfo->env, winCode); } } else if (strcmp(pCtx[j].pExpr->pExpr->_function.functionName, "_select_value") == 0) { // do nothing