xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: infinite loop

This commit is contained in:
Hongze Cheng 2023-06-21 15:08:16 +08:00
parent 0e97340e50
commit 5e9d263e19
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/dnode/vnode/src/tsdb/tsdbCommit2.c
View File

@ -142,10 +142,10 @@ static int32_t tsdbCommitTombData(SCommitter2 *committer) {
for (STombRecord *record; (record = tsdbIterMergerGetTombRecord(committer->tombIterMerger));) { for (STombRecord *record; (record = tsdbIterMergerGetTombRecord(committer->tombIterMerger));) {
if (record->ekey < committer->ctx->minKey) { if (record->ekey < committer->ctx->minKey) {
continue; goto _next;
} else if (record->skey > committer->ctx->maxKey) { } else if (record->skey > committer->ctx->maxKey) {
committer->ctx->maxKey = TMIN(record->skey, committer->ctx->maxKey); committer->ctx->maxKey = TMIN(record->skey, committer->ctx->maxKey);
continue; goto _next;
} }
if (record->ekey > committer->ctx->maxKey) { if (record->ekey > committer->ctx->maxKey) {
@ -158,6 +158,7 @@ static int32_t tsdbCommitTombData(SCommitter2 *committer) {
code = tsdbFSetWriteTombRecord(committer->writer, record); code = tsdbFSetWriteTombRecord(committer->writer, record);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
_next:
code = tsdbIterMergerNext(committer->tombIterMerger); code = tsdbIterMergerNext(committer->tombIterMerger);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }