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

more work

This commit is contained in:
Hongze Cheng 2022-08-24 14:05:20 +08:00
parent cab6bb1be2
commit aa08b76479
1 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source/dnode/vnode/src/tsdb/tsdbFS.c
View File

@ -859,8 +859,31 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
} }
// last // last
fSet.aLastF[0] = pSetOld->aLastF[0]; if (sameDisk) {
if ((!sameDisk) || (pSetOld->aLastF[0]->commitID != pSetNew->aLastF[0]->commitID)) { if (pSetNew->nLastF > pSetOld->nLastF) {
ASSERT(pSetNew->nLastF = pSetOld->nLastF + 1);
pSetOld->aLastF[pSetOld->nLastF] = (SLastFile *)taosMemoryMalloc(sizeof(SLastFile));
if (pSetOld->aLastF[pSetOld->nLastF] == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
goto _err;
}
*pSetOld->aLastF[pSetOld->nLastF] = *pSetNew->aLastF[pSetOld->nLastF];
pSetOld->aLastF[pSetOld->nLastF]->nRef = 1;
pSetOld->nLastF++;
} else if (pSetNew->nLastF < pSetOld->nLastF) {
ASSERT(pSetNew->nLastF == 1);
for (int32_t iLast = 0; iLast < pSetOld->nLastF; iLast++) {
SLastFile *pLastFile = pSetOld->aLastF[iLast];
nRef = atomic_sub_fetch_32(&pLastFile->nRef, 1);
if (nRef == 0) {
tsdbLastFileName(pTsdb, pSetOld->diskId, pSetOld->fid, pLastFile, fname);
taosRemoveFile(fname);
taosMemoryFree(pLastFile);
}
pSetOld->aLastF[iLast] = NULL;
}
pSetOld->nLastF = 1;
pSetOld->aLastF[0] = (SLastFile *)taosMemoryMalloc(sizeof(SLastFile)); pSetOld->aLastF[0] = (SLastFile *)taosMemoryMalloc(sizeof(SLastFile));
if (pSetOld->aLastF[0] == NULL) { if (pSetOld->aLastF[0] == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY; code = TSDB_CODE_OUT_OF_MEMORY;
@ -868,15 +891,28 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
} }
*pSetOld->aLastF[0] = *pSetNew->aLastF[0]; *pSetOld->aLastF[0] = *pSetNew->aLastF[0];
pSetOld->aLastF[0]->nRef = 1; pSetOld->aLastF[0]->nRef = 1;
} else {
nRef = atomic_sub_fetch_32(&fSet.aLastF[0]->nRef, 1); ASSERT(0);
if (nRef == 0) {
tsdbLastFileName(pTsdb, pSetOld->diskId, pSetOld->fid, fSet.aLastF[0], fname);
taosRemoveFile(fname);
taosMemoryFree(fSet.aLastF[0]);
} }
} else { } else {
ASSERT(pSetOld->aLastF[0]->size == pSetNew->aLastF[0]->size); ASSERT(pSetOld->nLastF == pSetNew->nLastF);
for (int32_t iLast = 0; iLast < pSetOld->nLastF; iLast++) {
SLastFile *pLastFile = pSetOld->aLastF[iLast];
nRef = atomic_sub_fetch_32(&pLastFile->nRef, 1);
if (nRef == 0) {
tsdbLastFileName(pTsdb, pSetOld->diskId, pSetOld->fid, pLastFile, fname);
taosRemoveFile(fname);
taosMemoryFree(pLastFile);
}
pSetOld->aLastF[iLast] = (SLastFile *)taosMemoryMalloc(sizeof(SLastFile));
if (pSetOld->aLastF[iLast] == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
goto _err;
}
*pSetOld->aLastF[iLast] = *pSetNew->aLastF[iLast];
pSetOld->aLastF[iLast]->nRef = 1;
}
} }
if (!sameDisk) { if (!sameDisk) {