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

fixup: about to revert this commit

This commit is contained in:
Benguang Zhao 2023-09-11 10:54:28 +08:00
parent 0ddbcd50d0
commit b23bcee690
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1026,10 +1026,14 @@ static int32_t tsdbTFSetInsertSnapRange(STFileSet *fset, TSnapRangeArray *snapR)
TARRAY2_FOREACH(fset->lvlArr, lvl) { TARRAY2_FOREACH(fset->lvlArr, lvl) {
STFileObj *fobj; STFileObj *fobj;
TARRAY2_FOREACH(lvl->fobjArr, fobj) { TARRAY2_FOREACH(lvl->fobjArr, fobj) {
// tsdbTFileUpdVerRange(&tf, (SVersionRange){.minVer = fobj->f->minVer, .maxVer = fobj->f->maxVer});
code = tsdbTFileInsertSnapRange(fobj->f, snapR); code = tsdbTFileInsertSnapRange(fobj->f, snapR);
if (code) return code; if (code) return code;
} }
} }
// int32_t code = tsdbTFileInsertSnapRange(&tf, snapR);
// if (code) return code;
return code; return code;
} }
@ -1272,6 +1276,10 @@ int32_t tsdbFSCreateRefRangedSnapshot(STFileSystem *fs, int64_t sver, int64_t ev
} }
int32_t i = 0; int32_t i = 0;
code = 0;
// TODO: use the same fs fSetArr as get snapDiff. The following treatment is potentially wrong
// if the fSetArr are changed.
taosThreadRwlockRdlock(&fs->tsdb->rwLock); taosThreadRwlockRdlock(&fs->tsdb->rwLock);
TARRAY2_FOREACH(fs->fSetArr, fset) { TARRAY2_FOREACH(fs->fSetArr, fset) {
while (i < TARRAY2_SIZE(snapD)) { while (i < TARRAY2_SIZE(snapD)) {
@ -1279,6 +1287,7 @@ int32_t tsdbFSCreateRefRangedSnapshot(STFileSystem *fs, int64_t sver, int64_t ev
if (fset->fid < u->fid) { if (fset->fid < u->fid) {
break; break;
} else if (fset->fid > u->fid) { } else if (fset->fid > u->fid) {
ASSERT(false);
i++; i++;
continue; continue;
} else { } else {
@ -1289,6 +1298,8 @@ int32_t tsdbFSCreateRefRangedSnapshot(STFileSystem *fs, int64_t sver, int64_t ev
if (sver1 > ever1) { if (sver1 > ever1) {
continue; continue;
} }
tsdbInfo("fsrArr:%p, fid:%d, sver:%" PRId64 ", ever:%" PRId64, fsrArr, fset->fid, sver1, ever1);
code = tsdbTSnapRangeInitRef(fs->tsdb, fset, sver1, ever1, &fsr1); code = tsdbTSnapRangeInitRef(fs->tsdb, fset, sver1, ever1, &fsr1);
if (code) break; if (code) break;