Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(tsdb/cache): check stt data with empty brin index #22247

Merged
merged 1 commit into from
Jul 31, 2023
Merged

fix(tsdb/cache): check stt data with empty brin index #22247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions source/dnode/vnode/src/tsdb/tsdbCache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,10 +1667,6 @@ static int32_t loadTombFromBlk(const TTombBlkArray *pTombBlkArray, SCacheRowsRea
}

if (record.version <= pReader->info.verRange.maxVer) {
/*
tsdbError("tomb xx load/cache: vgId:%d fid:%d commit %" PRId64 "~%" PRId64 "~%" PRId64 " tomb records",
TD_VID(pReader->pTsdb->pVnode), pReader->pCurFileSet->fid, record.skey, record.ekey, uid);
*/
SDelData delData = {.version = record.version, .sKey = record.skey, .eKey = record.ekey};
taosArrayPush(pInfo->pTombData, &delData);
}
Expand Down Expand Up @@ -1912,15 +1908,14 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie

int indexSize = TARRAY_SIZE(state->pIndexList);
if (indexSize <= 0) {
clearLastFileSet(state);
state->state = SFSNEXTROW_FILESET;
goto _next_fileset;
goto _check_stt_data;
}

state->state = SFSNEXTROW_INDEXLIST;
state->iBrinIndex = indexSize;
}

_check_stt_data:
if (state->pFileSet != state->pr->pCurFileSet) {
state->pr->pCurFileSet = state->pFileSet;
}
Expand Down