From 3a6451d6fbcd9fa0c073c64dfb5928d2f19f2917 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 11 Mar 2021 23:21:38 +0800 Subject: [PATCH] [td-2895] refactor. --- src/query/src/qExecutor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 45cbe6b1b7..ffb6a316a6 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -215,7 +215,6 @@ static SSDataBlock* createOutputBuf(SExprInfo* pExpr, int32_t numOfOutput, int32 idata.info.colId = pExpr[i].base.resColId; idata.pData = calloc(1, MAX(idata.info.bytes * numOfRows, minSize)); // at least to hold a pointer on x64 platform - taosArrayPush(res->pDataBlock, &idata); } @@ -2504,7 +2503,7 @@ int32_t loadDataBlockOnDemand(SQueryRuntimeEnv* pRuntimeEnv, STableScanInfo* pTa pTableScanInfo->rowCellInfoOffset) != TSDB_CODE_SUCCESS) { longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY); } - } else if (pQuery->stableQuery) { // stable aggregate, not interval aggregate or normal column aggregate + } else if (pQuery->stableQuery && (!isTsCompQuery(pQuery))) { // stable aggregate, not interval aggregate or normal column aggregate doSetTableGroupOutputBuf(pRuntimeEnv, pTableScanInfo->pResultRowInfo, pTableScanInfo->pCtx, pTableScanInfo->rowCellInfoOffset, pTableScanInfo->numOfOutput, pQuery->current->groupIndex);