From 55ad03573122c3f85c219f47c74d1d6fd522d15c Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 15 Oct 2020 09:30:57 +0800 Subject: [PATCH] refactor more code --- src/tsdb/src/tsdbCommit.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c index c6fb64f004..3b63de3616 100644 --- a/src/tsdb/src/tsdbCommit.c +++ b/src/tsdb/src/tsdbCommit.c @@ -303,27 +303,28 @@ static int tsdbCommitToFileGroup(STsdbRepo *pRepo, SFileGroup *pOldGroup, SFileG for (int tid = 1; tid < pTSCh->maxIters; tid++) { if (tsdbCommitTableData(pTSCh, tid) < 0) { - tsdbHelperCloseFile(pWHelper, true /* hasError = false */); + tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */); return -1; } if (tsdbTryMoveLastBlock(pTSCh) < 0) { - tsdbHelperCloseFile(pWHelper, true /* hasError = false */); + tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */); return -1; } if (tsdbWriteBlockInfo(pWHelper) < 0) { - tsdbHelperCloseFile(pWHelper, true /* hasError = false */); + tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */); return -1; } } if (tsdbWriteBlockIdx(pWHelper) < 0) { - tsdbHelperCloseFile(pWHelper, true /* hasError = false */); - return -1; + tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */); + return -1; } - tsdbHelperCloseFile(pWHelper, false /* hasError = false */); + tsdbCloseAndUnsetCommitFGroup(pTSCh, false /* hasError = true */); + return 0; } -- GitLab