From b1351da7cd3f22b23b6890705c8b49227f89a3b5 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Fri, 7 Jan 2022 02:05:51 +0000 Subject: [PATCH] refact --- include/os/os.h | 1 + source/dnode/vnode/tsdb2/src/tsdbCommit.c | 43 +++++++++++----------- source/dnode/vnode/tsdb2/src/tsdbCompact.c | 6 +-- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/include/os/os.h b/include/os/os.h index 2e6d6afcb0..9112b4922f 100644 --- a/include/os/os.h +++ b/include/os/os.h @@ -48,6 +48,7 @@ extern "C" { #include #include #include +#include #include diff --git a/source/dnode/vnode/tsdb2/src/tsdbCommit.c b/source/dnode/vnode/tsdb2/src/tsdbCommit.c index 21d755614a..7603332973 100644 --- a/source/dnode/vnode/tsdb2/src/tsdbCommit.c +++ b/source/dnode/vnode/tsdb2/src/tsdbCommit.c @@ -13,6 +13,7 @@ * along with this program. If not, see . */ #include "tsdbint.h" +#include "ttime.h" extern int32_t tsTsdbMetaCompactRatio; @@ -721,8 +722,8 @@ static bool tsdbHasDataToCommit(SCommitIter *iters, int nIters, TSKEY minKey, TS #endif static int tsdbCommitToFile(SCommitH *pCommith, SDFileSet *pSet, int fid) { - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); - STsdbCfg * pCfg = REPO_CFG(pRepo); + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); + STsdbCfg *pCfg = REPO_CFG(pRepo); ASSERT(pSet == NULL || pSet->fid == fid); @@ -776,7 +777,7 @@ static int tsdbCommitToFile(SCommitH *pCommith, SDFileSet *pSet, int fid) { } static int tsdbCreateCommitIters(SCommitH *pCommith) { - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); SMemTable *pMem = pRepo->imem; STsdbMeta *pMeta = pRepo->tsdbMeta; @@ -893,18 +894,18 @@ static int tsdbInitCommitH(SCommitH *pCommith, STsdb *pRepo) { static void tsdbDestroyCommitH(SCommitH *pCommith) { pCommith->pDataCols = tdFreeDataCols(pCommith->pDataCols); - pCommith->aSubBlk = taosArrayDestroy(&pCommith->aSubBlk); - pCommith->aSupBlk = taosArrayDestroy(&pCommith->aSupBlk); - pCommith->aBlkIdx = taosArrayDestroy(&pCommith->aBlkIdx); + pCommith->aSubBlk = taosArrayDestroy(pCommith->aSubBlk); + pCommith->aSupBlk = taosArrayDestroy(pCommith->aSupBlk); + pCommith->aBlkIdx = taosArrayDestroy(pCommith->aBlkIdx); tsdbDestroyCommitIters(pCommith); tsdbDestroyReadH(&(pCommith->readh)); tsdbCloseDFileSet(TSDB_COMMIT_WRITE_FSET(pCommith)); } static int tsdbNextCommitFid(SCommitH *pCommith) { - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); - STsdbCfg * pCfg = REPO_CFG(pRepo); - int fid = TSDB_IVLD_FID; + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); + STsdbCfg *pCfg = REPO_CFG(pRepo); + int fid = TSDB_IVLD_FID; for (int i = 0; i < pCommith->niters; i++) { SCommitIter *pIter = pCommith->iters + i; @@ -1252,7 +1253,7 @@ static int tsdbWriteBlockInfo(SCommitH *pCommih) { } static int tsdbCommitMemData(SCommitH *pCommith, SCommitIter *pIter, TSKEY keyLimit, bool toData) { - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); STsdbCfg * pCfg = REPO_CFG(pRepo); SMergeInfo mInfo; int32_t defaultRows = TSDB_COMMIT_DEFAULT_ROWS(pCommith); @@ -1285,7 +1286,7 @@ static int tsdbCommitMemData(SCommitH *pCommith, SCommitIter *pIter, TSKEY keyLi } static int tsdbMergeMemData(SCommitH *pCommith, SCommitIter *pIter, int bidx) { - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); STsdbCfg * pCfg = REPO_CFG(pRepo); int nBlocks = pCommith->readh.pBlkIdx->numOfBlocks; SBlock * pBlock = pCommith->readh.pBlkInfo->blocks + bidx; @@ -1410,12 +1411,12 @@ static int tsdbCommitAddBlock(SCommitH *pCommith, const SBlock *pSupBlock, const static int tsdbMergeBlockData(SCommitH *pCommith, SCommitIter *pIter, SDataCols *pDataCols, TSKEY keyLimit, bool isLastOneBlock) { - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); - STsdbCfg * pCfg = REPO_CFG(pRepo); - SBlock block; - SDFile * pDFile; - bool isLast; - int32_t defaultRows = TSDB_COMMIT_DEFAULT_ROWS(pCommith); + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); + STsdbCfg *pCfg = REPO_CFG(pRepo); + SBlock block; + SDFile * pDFile; + bool isLast; + int32_t defaultRows = TSDB_COMMIT_DEFAULT_ROWS(pCommith); int biter = 0; while (true) { @@ -1527,7 +1528,7 @@ static void tsdbResetCommitTable(SCommitH *pCommith) { static int tsdbSetAndOpenCommitFile(SCommitH *pCommith, SDFileSet *pSet, int fid) { SDiskID did; - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); SDFileSet *pWSet = TSDB_COMMIT_WRITE_FSET(pCommith); tfsAllocDisk(tsdbGetFidLevel(fid, &(pCommith->rtn)), &(did.level), &(did.id)); @@ -1732,9 +1733,9 @@ static void tsdbCloseCommitFile(SCommitH *pCommith, bool hasError) { } static bool tsdbCanAddSubBlock(SCommitH *pCommith, SBlock *pBlock, SMergeInfo *pInfo) { - STsdb *pRepo = TSDB_COMMIT_REPO(pCommith); - STsdbCfg * pCfg = REPO_CFG(pRepo); - int mergeRows = pBlock->numOfRows + pInfo->rowsInserted - pInfo->rowsDeleteSucceed; + STsdb * pRepo = TSDB_COMMIT_REPO(pCommith); + STsdbCfg *pCfg = REPO_CFG(pRepo); + int mergeRows = pBlock->numOfRows + pInfo->rowsInserted - pInfo->rowsDeleteSucceed; ASSERT(mergeRows > 0); diff --git a/source/dnode/vnode/tsdb2/src/tsdbCompact.c b/source/dnode/vnode/tsdb2/src/tsdbCompact.c index cf966b8229..753e610574 100644 --- a/source/dnode/vnode/tsdb2/src/tsdbCompact.c +++ b/source/dnode/vnode/tsdb2/src/tsdbCompact.c @@ -316,8 +316,8 @@ static int tsdbCompactMeta(STsdb *pRepo) { static void tsdbDestroyCompactH(SCompactH *pComph) { pComph->pDataCols = tdFreeDataCols(pComph->pDataCols); - pComph->aSupBlk = taosArrayDestroy(&pComph->aSupBlk); - pComph->aBlkIdx = taosArrayDestroy(&pComph->aBlkIdx); + pComph->aSupBlk = taosArrayDestroy(pComph->aSupBlk); + pComph->aBlkIdx = taosArrayDestroy(pComph->aBlkIdx); tsdbDestroyCompTbArray(pComph); tsdbDestroyReadH(&(pComph->readh)); tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph)); @@ -370,7 +370,7 @@ static int tsdbCompactMeta(STsdb *pRepo) { tfree(pTh->pInfo); } - pComph->tbArray = taosArrayDestroy(&pComph->tbArray); + pComph->tbArray = taosArrayDestroy(pComph->tbArray); } static int tsdbCacheFSetIndex(SCompactH *pComph) {