From 4ea58e5682241b43af718ccb933c2bfa3edb64f1 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 16 Aug 2023 11:44:05 +0800 Subject: [PATCH] refactor: do some internal refactor. --- source/dnode/vnode/src/tsdb/tsdbMergeTree.c | 28 +++++++++++++++------ source/dnode/vnode/src/tsdb/tsdbRead2.c | 8 +++--- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c index 4357e5b99e..b6e18bec8c 100644 --- a/source/dnode/vnode/src/tsdb/tsdbMergeTree.c +++ b/source/dnode/vnode/src/tsdb/tsdbMergeTree.c @@ -116,16 +116,17 @@ void *destroyLastBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) { return NULL; } - for (int32_t i = 0; i < 1; ++i) { - pLoadInfo[i].currentLoadBlockIndex = 1; - pLoadInfo[i].blockIndex[0] = -1; - pLoadInfo[i].blockIndex[1] = -1; + pLoadInfo->currentLoadBlockIndex = 1; + pLoadInfo->blockIndex[0] = -1; + pLoadInfo->blockIndex[1] = -1; - tBlockDataDestroy(&pLoadInfo[i].blockData[0]); - tBlockDataDestroy(&pLoadInfo[i].blockData[1]); + tStatisBlockDestroy(pLoadInfo->statisBlock); + TARRAY2_DESTROY((TStatisBlkArray*)pLoadInfo->pSttStatisBlkArray, NULL); - taosArrayDestroy(pLoadInfo[i].aSttBlk); - } + tBlockDataDestroy(&pLoadInfo->blockData[0]); + tBlockDataDestroy(&pLoadInfo->blockData[1]); + + taosArrayDestroy(pLoadInfo->aSttBlk); taosMemoryFree(pLoadInfo); return NULL; @@ -396,14 +397,25 @@ static bool existsFromSttBlkStatis(SSttBlockLoadInfo *pBlockLoadInfo, uint64_t s if (pBlockLoadInfo->statisBlock == NULL) { pBlockLoadInfo->statisBlock = taosMemoryCalloc(1, sizeof(STbStatisBlock)); + + int64_t st = taosGetTimestampMs(); tsdbSttFileReadStatisBlock(pReader, p, pBlockLoadInfo->statisBlock); pBlockLoadInfo->statisBlockIndex = i; + + double el = (taosGetTimestampMs() - st) / 1000.0; pBlockLoadInfo->cost.loadStatisBlocks += 1; + pBlockLoadInfo->cost.statisElapsedTime += el; } else if (pBlockLoadInfo->statisBlockIndex != i) { tStatisBlockDestroy(pBlockLoadInfo->statisBlock); + + int64_t st = taosGetTimestampMs(); tsdbSttFileReadStatisBlock(pReader, p, pBlockLoadInfo->statisBlock); pBlockLoadInfo->statisBlockIndex = i; + + + double el = (taosGetTimestampMs() - st) / 1000.0; pBlockLoadInfo->cost.loadStatisBlocks += 1; + pBlockLoadInfo->cost.statisElapsedTime += el; } STbStatisBlock* pBlock = pBlockLoadInfo->statisBlock; diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index 12c6ac8fb7..04cc0c3bf7 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -4072,13 +4072,13 @@ void tsdbReaderClose2(STsdbReader* pReader) { "%p :io-cost summary: head-file:%" PRIu64 ", head-file time:%.2f ms, SMA:%" PRId64 " SMA-time:%.2f ms, fileBlocks:%" PRId64 ", fileBlocks-load-time:%.2f ms, " - "build in-memory-block-time:%.2f ms, sttBlocks:%" PRId64 ", sttStatisBlock:%" PRId64 - ", sttBlocks-time:%.2f ms, stt-statis-Block-time:%.2f ms, composed-blocks:%" PRId64 + "build in-memory-block-time:%.2f ms, sttBlocks:%" PRId64 ", sttBlocks-time:%.2f ms, sttStatisBlock:%" PRId64 + ", stt-statis-Block-time:%.2f ms, composed-blocks:%" PRId64 ", composed-blocks-time:%.2fms, STableBlockScanInfo size:%.2f Kb, createTime:%.2f ms,createSkylineIterTime:%.2f " "ms, initLastBlockReader:%.2fms, %s", pReader, pCost->headFileLoad, pCost->headFileLoadTime, pCost->smaDataLoad, pCost->smaLoadTime, pCost->numOfBlocks, - pCost->blockLoadTime, pCost->buildmemBlock, pCost->sttCost.loadBlocks, pCost->sttCost.loadStatisBlocks, - pCost->sttCost.blockElapsedTime, pCost->sttCost.statisElapsedTime, pCost->composedBlocks, + pCost->blockLoadTime, pCost->buildmemBlock, pCost->sttCost.loadBlocks, pCost->sttCost.blockElapsedTime, + pCost->sttCost.loadStatisBlocks, pCost->sttCost.statisElapsedTime, pCost->composedBlocks, pCost->buildComposedBlockTime, numOfTables * sizeof(STableBlockScanInfo) / 1000.0, pCost->createScanInfoList, pCost->createSkylineIterTime, pCost->initLastBlockReader, pReader->idStr);