From 9d1998d7d2e80903ba9b754fbcf49cf9e2135977 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sun, 6 Nov 2022 11:53:07 +0800 Subject: [PATCH] fix(query): temporarily disable assert. --- source/common/src/tdatablock.c | 3 ++- source/libs/executor/src/groupoperator.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index df0b9d2bf7..9bb2552e68 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -1144,8 +1144,9 @@ void blockDataCleanup(SSDataBlock* pDataBlock) { } } +// todo temporarily disable it static int32_t doEnsureCapacity(SColumnInfoData* pColumn, const SDataBlockInfo* pBlockInfo, uint32_t numOfRows, bool clearPayload) { - ASSERT(numOfRows > 0 && pBlockInfo->capacity >= pBlockInfo->rows); + ASSERT(numOfRows > 0 /*&& pBlockInfo->capacity >= pBlockInfo->rows*/); if (numOfRows <= pBlockInfo->capacity) { return TSDB_CODE_SUCCESS; } diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c index 32fe1ba849..ecc9c7e7dd 100644 --- a/source/libs/executor/src/groupoperator.c +++ b/source/libs/executor/src/groupoperator.c @@ -1081,14 +1081,16 @@ SOperatorInfo* createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStr } pInfo->partitionSup.needCalc = true; - SSDataBlock* pResBlock = createResDataBlock(pPartNode->part.node.pOutputDataBlockDesc); - if (!pResBlock) { + pInfo->binfo.pRes = createResDataBlock(pPartNode->part.node.pOutputDataBlockDesc); + if (pInfo->binfo.pRes == NULL) { goto _error; } - blockDataEnsureCapacity(pResBlock, 4096); - pInfo->binfo.pRes = pResBlock; + + blockDataEnsureCapacity(pInfo->binfo.pRes, 4096); + pInfo->parIte = NULL; pInfo->pInputDataBlock = NULL; + _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY); pInfo->pPartitions = taosHashInit(1024, hashFn, false, HASH_NO_LOCK); pInfo->tsColIndex = 0;