From a2f8a822dabd49052654ecfb925685543faef928 Mon Sep 17 00:00:00 2001 From: facetosea <25808407@qq.com> Date: Wed, 27 Nov 2024 19:51:27 +0800 Subject: [PATCH] remove some check --- source/libs/executor/inc/operator.h | 8 -------- source/libs/executor/src/anomalywindowoperator.c | 3 --- source/libs/executor/src/countwindowoperator.c | 3 --- source/libs/executor/src/eventwindowoperator.c | 3 --- source/libs/executor/src/executorInt.c | 1 - source/libs/executor/src/groupoperator.c | 7 ------- source/libs/executor/src/hashjoinoperator.c | 4 ---- source/libs/executor/src/projectoperator.c | 1 - 8 files changed, 30 deletions(-) diff --git a/source/libs/executor/inc/operator.h b/source/libs/executor/inc/operator.h index 5ceedbe542..f2e542e7cd 100644 --- a/source/libs/executor/inc/operator.h +++ b/source/libs/executor/inc/operator.h @@ -202,14 +202,6 @@ void * getOperatorParam(int32_t opType, SOperatorParam* param, int32_t i void doKeepTuple(SWindowRowsSup* pRowSup, int64_t ts, uint64_t groupId); void doKeepNewWindowStartInfo(SWindowRowsSup* pRowSup, const int64_t* tsList, int32_t rowIndex, uint64_t groupId); -#define CHECK_CONDITION_FAILED(c) \ - do { \ - if (!(c)) { \ - qError("function:%s condition failed, Line:%d", __FUNCTION__, __LINE__); \ - return TSDB_CODE_APP_ERROR; \ - } \ - } while (0) - #ifdef __cplusplus } #endif diff --git a/source/libs/executor/src/anomalywindowoperator.c b/source/libs/executor/src/anomalywindowoperator.c index 71a38c739d..94cc5d9129 100644 --- a/source/libs/executor/src/anomalywindowoperator.c +++ b/source/libs/executor/src/anomalywindowoperator.c @@ -171,8 +171,6 @@ _error: } static int32_t anomalyAggregateNext(SOperatorInfo* pOperator, SSDataBlock** ppRes) { - CHECK_CONDITION_FAILED(pOperator->info != NULL); - CHECK_CONDITION_FAILED(pOperator->pTaskInfo != NULL); int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; SAnomalyWindowOperatorInfo* pInfo = pOperator->info; @@ -183,7 +181,6 @@ static int32_t anomalyAggregateNext(SOperatorInfo* pOperator, SSDataBlock** ppRe int64_t st = taosGetTimestampUs(); int32_t numOfBlocks = taosArrayGetSize(pSupp->blocks); - CHECK_CONDITION_FAILED(pRes != NULL); blockDataCleanup(pRes); while (1) { diff --git a/source/libs/executor/src/countwindowoperator.c b/source/libs/executor/src/countwindowoperator.c index cb7459744f..542a7c89a9 100644 --- a/source/libs/executor/src/countwindowoperator.c +++ b/source/libs/executor/src/countwindowoperator.c @@ -225,8 +225,6 @@ _end: } static int32_t countWindowAggregateNext(SOperatorInfo* pOperator, SSDataBlock** ppRes) { - CHECK_CONDITION_FAILED(pOperator->info != NULL); - CHECK_CONDITION_FAILED(pOperator->pTaskInfo != NULL); int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; SCountWindowOperatorInfo* pInfo = pOperator->info; @@ -234,7 +232,6 @@ static int32_t countWindowAggregateNext(SOperatorInfo* pOperator, SSDataBlock** SExprSupp* pExprSup = &pOperator->exprSupp; int32_t order = pInfo->binfo.inputTsOrder; SSDataBlock* pRes = pInfo->binfo.pRes; - CHECK_CONDITION_FAILED(pRes != NULL); blockDataCleanup(pRes); diff --git a/source/libs/executor/src/eventwindowoperator.c b/source/libs/executor/src/eventwindowoperator.c index 83b202fed6..e68a91d97d 100644 --- a/source/libs/executor/src/eventwindowoperator.c +++ b/source/libs/executor/src/eventwindowoperator.c @@ -182,8 +182,6 @@ void destroyEWindowOperatorInfo(void* param) { } static int32_t eventWindowAggregateNext(SOperatorInfo* pOperator, SSDataBlock** ppRes) { - CHECK_CONDITION_FAILED(pOperator->info != NULL); - CHECK_CONDITION_FAILED(pOperator->pTaskInfo != NULL); int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; SEventWindowOperatorInfo* pInfo = pOperator->info; @@ -193,7 +191,6 @@ static int32_t eventWindowAggregateNext(SOperatorInfo* pOperator, SSDataBlock** int32_t order = pInfo->binfo.inputTsOrder; SSDataBlock* pRes = pInfo->binfo.pRes; - CHECK_CONDITION_FAILED(pRes != NULL); blockDataCleanup(pRes); diff --git a/source/libs/executor/src/executorInt.c b/source/libs/executor/src/executorInt.c index 4a1d26d875..1b823bf69d 100644 --- a/source/libs/executor/src/executorInt.c +++ b/source/libs/executor/src/executorInt.c @@ -255,7 +255,6 @@ static int32_t doSetInputDataBlockInfo(SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; SqlFunctionCtx* pCtx = pExprSup->pCtx; - CHECK_CONDITION_FAILED(pExprSup->numOfExprs <= 0 || pCtx != NULL); for (int32_t i = 0; i < pExprSup->numOfExprs; ++i) { pCtx[i].order = order; pCtx[i].input.numOfRows = pBlock->info.rows; diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c index c832cfbb4e..fec35c3371 100644 --- a/source/libs/executor/src/groupoperator.c +++ b/source/libs/executor/src/groupoperator.c @@ -444,8 +444,6 @@ _end: } static int32_t hashGroupbyAggregateNext(SOperatorInfo* pOperator, SSDataBlock** ppRes) { - CHECK_CONDITION_FAILED(pOperator->info != NULL); - CHECK_CONDITION_FAILED(pOperator->pTaskInfo != NULL); int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo; @@ -1005,14 +1003,11 @@ static int32_t hashPartitionNext(SOperatorInfo* pOperator, SSDataBlock** ppRes) return TSDB_CODE_SUCCESS; } - CHECK_CONDITION_FAILED(pOperator->info != NULL); - CHECK_CONDITION_FAILED(pOperator->pTaskInfo != NULL); int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo; SPartitionOperatorInfo* pInfo = pOperator->info; SSDataBlock* pRes = pInfo->binfo.pRes; - CHECK_CONDITION_FAILED(pRes != NULL); if (pOperator->status == OP_RES_TO_RETURN) { (*ppRes) = buildPartitionResult(pOperator); @@ -1464,8 +1459,6 @@ static int32_t doStreamHashPartitionNext(SOperatorInfo* pOperator, SSDataBlock** int32_t lino = 0; SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo; SStreamPartitionOperatorInfo* pInfo = pOperator->info; - CHECK_CONDITION_FAILED(pInfo != NULL); - CHECK_CONDITION_FAILED(pTaskInfo != NULL); if (pOperator->status == OP_EXEC_DONE) { (*ppRes) = NULL; diff --git a/source/libs/executor/src/hashjoinoperator.c b/source/libs/executor/src/hashjoinoperator.c index 12f90097c5..06498d73e7 100644 --- a/source/libs/executor/src/hashjoinoperator.c +++ b/source/libs/executor/src/hashjoinoperator.c @@ -906,7 +906,6 @@ static int32_t hJoinBuildHash(struct SOperatorInfo* pOperator, bool* queryDone) SHJoinOperatorInfo* pJoin = pOperator->info; SSDataBlock* pBlock = NULL; int32_t code = TSDB_CODE_SUCCESS; - CHECK_CONDITION_FAILED(pJoin != NULL); while (true) { pBlock = getNextBlockFromDownstream(pOperator, pJoin->pBuild->downStreamIdx); @@ -991,15 +990,12 @@ void hJoinSetDone(struct SOperatorInfo* pOperator) { } static int32_t hJoinMainProcess(struct SOperatorInfo* pOperator, SSDataBlock** pResBlock) { - CHECK_CONDITION_FAILED(pOperator->info != NULL); - CHECK_CONDITION_FAILED(pOperator->pTaskInfo != NULL); SHJoinOperatorInfo* pJoin = pOperator->info; SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo; int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; SSDataBlock* pRes = pJoin->finBlk; int64_t st = 0; - CHECK_CONDITION_FAILED(pRes != NULL); QRY_PARAM_CHECK(pResBlock); if (pOperator->cost.openCost == 0) { diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c index 5030b8a148..226cde059b 100644 --- a/source/libs/executor/src/projectoperator.c +++ b/source/libs/executor/src/projectoperator.c @@ -564,7 +564,6 @@ SSDataBlock* doApplyIndefinitFunction1(SOperatorInfo* pOperator) { int32_t doApplyIndefinitFunction(SOperatorInfo* pOperator, SSDataBlock** pResBlock) { QRY_PARAM_CHECK(pResBlock); - CHECK_CONDITION_FAILED(pOperator->info != NULL); SIndefOperatorInfo* pIndefInfo = pOperator->info; SOptrBasicInfo* pInfo = &pIndefInfo->binfo; SExprSupp* pSup = &pOperator->exprSupp;