more
This commit is contained in:
parent
0253497214
commit
7069670e13
|
@ -483,16 +483,9 @@ static int tsdbCommitToTable(SCommitH *pch, int tid) {
|
||||||
|
|
||||||
if ((nextKey == TSDB_DATA_TIMESTAMP_NULL || nextKey > pch->maxKey) ||
|
if ((nextKey == TSDB_DATA_TIMESTAMP_NULL || nextKey > pch->maxKey) ||
|
||||||
(pBlock && (!pBlock->last) && tsdbComparKeyBlock((void *)(&nextKey), pBlock) > 0)) {
|
(pBlock && (!pBlock->last) && tsdbComparKeyBlock((void *)(&nextKey), pBlock) > 0)) {
|
||||||
// TODO: move the block
|
if (tsdbMoveBlock(pch, cidx) < 0) {
|
||||||
ASSERT(pBlock->numOfSubBlocks > 0);
|
TSDB_RUNLOCK_TABLE(pIter->pTable);
|
||||||
if (pBlock->numOfSubBlocks == 1) { // move super block
|
return -1;
|
||||||
if (taosArrayPush(pch->aSupBlk, (void *)pBlock) == NULL) {
|
|
||||||
terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
|
|
||||||
TSDB_RUNLOCK_TABLE(pIter->pTable);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cidx++;
|
cidx++;
|
||||||
|
|
Loading…
Reference in New Issue