From 7069670e1301475d73afa499b3213365845b3033 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Fri, 8 Jan 2021 10:25:47 +0000 Subject: [PATCH] more --- src/tsdb/src/tsdbCommit.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c index 6d031e0635..1f600d4920 100644 --- a/src/tsdb/src/tsdbCommit.c +++ b/src/tsdb/src/tsdbCommit.c @@ -483,16 +483,9 @@ static int tsdbCommitToTable(SCommitH *pch, int tid) { if ((nextKey == TSDB_DATA_TIMESTAMP_NULL || nextKey > pch->maxKey) || (pBlock && (!pBlock->last) && tsdbComparKeyBlock((void *)(&nextKey), pBlock) > 0)) { - // TODO: move the block - ASSERT(pBlock->numOfSubBlocks > 0); - if (pBlock->numOfSubBlocks == 1) { // move super block - if (taosArrayPush(pch->aSupBlk, (void *)pBlock) == NULL) { - terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; - TSDB_RUNLOCK_TABLE(pIter->pTable); - return -1; - } - } else { - + if (tsdbMoveBlock(pch, cidx) < 0) { + TSDB_RUNLOCK_TABLE(pIter->pTable); + return -1; } cidx++;