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

fix(tsdb/commit2): new maxDelKey for commit context

This commit is contained in:
Minglei Jin 2023-07-27 09:16:28 +08:00
parent fb860726de
commit 580b7124cf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ typedef struct {
int64_t cid; int64_t cid;
int64_t now; int64_t now;
TSKEY nextKey; TSKEY nextKey;
TSKEY maxDelKey;
int32_t fid; int32_t fid;
int32_t expLevel; int32_t expLevel;
SDiskID did; SDiskID did;
@ -161,6 +162,9 @@ static int32_t tsdbCommitTombData(SCommitter2 *committer) {
SMetaInfo info; SMetaInfo info;
if (committer->ctx->fset == NULL && !committer->ctx->hasTSData) { if (committer->ctx->fset == NULL && !committer->ctx->hasTSData) {
if (committer->ctx->maxKey < committer->ctx->maxDelKey) {
committer->ctx->nextKey = committer->ctx->maxKey + 1;
}
return 0; return 0;
} }
@ -185,16 +189,18 @@ static int32_t tsdbCommitTombData(SCommitter2 *committer) {
goto _next; goto _next;
} }
TSKEY maxKey = committer->ctx->maxKey;
if (record->ekey > committer->ctx->maxKey) { if (record->ekey > committer->ctx->maxKey) {
committer->ctx->maxKey = committer->ctx->maxKey + 1; maxKey = committer->ctx->maxKey + 1;
} }
if (record->ekey > committer->ctx->maxKey) { if (record->ekey > committer->ctx->maxKey && committer->ctx->nextKey > maxKey) {
committer->ctx->nextKey = record->ekey; committer->ctx->nextKey = maxKey;
committer->ctx->maxDelKey = TMAX(record->ekey, committer->ctx->maxDelKey);
} }
record->skey = TMAX(record->skey, committer->ctx->minKey); record->skey = TMAX(record->skey, committer->ctx->minKey);
record->ekey = TMIN(record->ekey, committer->ctx->maxKey); record->ekey = TMIN(record->ekey, maxKey);
numRecord++; numRecord++;
code = tsdbFSetWriteTombRecord(committer->writer, record); code = tsdbFSetWriteTombRecord(committer->writer, record);