From 961ac26f92d850d73c8a6cccbd4ccd017c7cd8d5 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 22 Feb 2023 10:04:35 +0800 Subject: [PATCH] Revert "add perf logs" This reverts commit f7a8393c4761e19e990e05407eff4458ec25b2f6. --- source/libs/executor/inc/executorimpl.h | 4 ---- source/libs/executor/src/executorimpl.c | 21 --------------------- 2 files changed, 25 deletions(-) diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index e63c00af1e..999a7965fb 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -228,10 +228,6 @@ typedef struct SOperatorInfo { struct SOperatorInfo** pDownstream; // downstram pointer list int32_t numOfDownstream; // number of downstream. The value is always ONE expect for join operator SOperatorFpSet fpSet; - int64_t downstreamTime; - int64_t funcInitTime; - int64_t funcExecTime; - int64_t funcFinTime; } SOperatorInfo; typedef enum { diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c index e38cfb5285..9de48e1a6e 100644 --- a/source/libs/executor/src/executorimpl.c +++ b/source/libs/executor/src/executorimpl.c @@ -518,9 +518,7 @@ static int32_t doAggregateImpl(SOperatorInfo* pOperator, SqlFunctionCtx* pCtx) { continue; } - int64_t st = taosGetTimestampUs(); int32_t code = pCtx[k].fpSet.process(&pCtx[k]); - pOperator->funcExecTime += taosGetTimestampUs() - st; if (code != TSDB_CODE_SUCCESS) { qError("%s aggregate function error happens, code: %s", GET_TASKID(pOperator->pTaskInfo), tstrerror(code)); return code; @@ -1038,10 +1036,7 @@ void doSetTableGroupOutputBuf(SOperatorInfo* pOperator, int32_t numOfOutput, uin } } - - int64_t st = taosGetTimestampUs(); setResultRowInitCtx(pResultRow, pCtx, numOfOutput, rowEntryInfoOffset); - pOperator->funcInitTime += taosGetTimestampUs() - st; } static void setExecutionContext(SOperatorInfo* pOperator, int32_t numOfOutput, uint64_t groupId) { @@ -1258,9 +1253,7 @@ void doBuildResultDatablock(SOperatorInfo* pOperator, SOptrBasicInfo* pbInfo, SG doCopyToSDataBlock(pTaskInfo, pBlock, &pOperator->exprSupp, pBuf, pGroupResInfo); } else { while (hasRemainResults(pGroupResInfo)) { - int64_t st = taosGetTimestampUs(); doCopyToSDataBlock(pTaskInfo, pBlock, &pOperator->exprSupp, pBuf, pGroupResInfo); - pOperator->funcFinTime += taosGetTimestampUs() - st; if (pBlock->info.rows >= pOperator->resultInfo.threshold) { break; } @@ -1585,7 +1578,6 @@ static int32_t doOpenAggregateOptr(SOperatorInfo* pOperator) { while (1) { st = taosGetTimestampUs(); SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream); - pOperator->downstreamTime += taosGetTimestampUs() - st; if (pBlock == NULL) { if (!hasValidBlock) { createDataBlockForEmptyInput(pOperator, &pBlock); @@ -1703,15 +1695,6 @@ void destroyOperatorInfo(SOperatorInfo* pOperator) { return; } - if (pOperator->operatorType == QUERY_NODE_PHYSICAL_PLAN_HASH_AGG) { - double downstream = (double)pOperator->downstreamTime / 1000000; - double init = (double)pOperator->funcInitTime / 1000000; - double exec = (double)pOperator->funcExecTime / 1000000; - double fin = (double)pOperator->funcFinTime / 1000000; - qError("operator: %s, downstream time:%lf, init time:%lf, exec time:%lf, fin time:%lf", - pOperator->name, downstream, init, exec, fin); - } - if (pOperator->fpSet.closeFn != NULL) { pOperator->fpSet.closeFn(pOperator->info); } @@ -1928,10 +1911,6 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SAggPhysiN pTaskInfo); pOperator->fpSet = createOperatorFpSet(doOpenAggregateOptr, getAggregateResult, NULL, destroyAggOperatorInfo, optrDefaultBufFn, NULL); - pOperator->downstreamTime = 0; - pOperator->funcInitTime = 0; - pOperator->funcExecTime = 0; - pOperator->funcFinTime = 0; if (downstream->operatorType == QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN) { STableScanInfo* pTableScanInfo = downstream->info;