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

fix(tsdb/skip-row): remove s3 size condition

This commit is contained in:
Minglei Jin 2023-11-23 16:19:26 +08:00
parent 460638d294
commit f076bfdfca
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,7 +421,7 @@ static int32_t tsdbCommitFileSetBegin(SCommitter2 *committer) {
if (mtime < committer->ctx->now - tsS3UploadDelaySec) { if (mtime < committer->ctx->now - tsS3UploadDelaySec) {
committer->ctx->skipTsRow = true; committer->ctx->skipTsRow = true;
} }
} else if (s3Size(object_name) > 0) { } else /*if (s3Size(object_name) > 0) */ {
committer->ctx->skipTsRow = true; committer->ctx->skipTsRow = true;
} }
} }

2
source/dnode/vnode/src/tsdb/tsdbFS2.c
View File

@ -901,7 +901,7 @@ int32_t tsdbFSEditCommit(STFileSystem *fs) {
if (mtime < now - tsS3UploadDelaySec) { if (mtime < now - tsS3UploadDelaySec) {
skipMerge = true; skipMerge = true;
} }
} else if (s3Size(object_name) > 0) { } else /* if (s3Size(object_name) > 0) */ {
skipMerge = true; skipMerge = true;
} }
} }

2
source/dnode/vnode/src/tsdb/tsdbMerge.c
View File

@ -568,7 +568,7 @@ static int32_t tsdbMerge(void *arg) {
if (mtime < now - tsS3UploadDelaySec) { if (mtime < now - tsS3UploadDelaySec) {
skipMerge = true; skipMerge = true;
} }
} else if (s3Size(object_name) > 0) { } else /* if (s3Size(object_name) > 0) */ {
skipMerge = true; skipMerge = true;
} }
} }