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

fix more bug

This commit is contained in:
Hongze Cheng 2021-01-17 15:18:16 +08:00
parent 6192fa9b1e
commit 5abb8224cf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tsdb/src/tsdbFS.c
View File

@ -334,7 +334,7 @@ static int tsdbApplyFSTxn(STsdbFS *pfs, int vid) {
ASSERT(taosArrayGetSize(pfs->nstatus->df) == 0); ASSERT(taosArrayGetSize(pfs->nstatus->df) == 0);
fsheader.len = 0; fsheader.len = 0;
} else { } else {
fsheader.len = tsdbEncodeFSHeader(NULL, &fsheader) + sizeof(TSCKSUM); fsheader.len = tsdbEncodeFSStatus(NULL, pfs->nstatus) + sizeof(TSCKSUM);
} }
// Encode header part and write // Encode header part and write
@ -598,15 +598,15 @@ static int tsdbOpenFSFromCurrent(STsdbRepo *pRepo) {
goto _err; goto _err;
} }
SFSStatus *pStatus = pfs->cstatus;
ptr = buffer; ptr = buffer;
ptr = tsdbDecodeFSHeader(ptr, &fsheader); ptr = tsdbDecodeFSHeader(ptr, &fsheader);
ptr = tsdbDecodeFSMeta(ptr, &(pStatus->meta));
if (fsheader.version != TSDB_FS_VERSION) { if (fsheader.version != TSDB_FS_VERSION) {
// TODO: handle file version change // TODO: handle file version change
} }
SFSStatus *pStatus = pfs->cstatus;
if (fsheader.len > 0) { if (fsheader.len > 0) {
if (tsdbMakeRoom(&buffer, fsheader.len) < 0) { if (tsdbMakeRoom(&buffer, fsheader.len) < 0) {
goto _err; goto _err;
@ -632,7 +632,6 @@ static int tsdbOpenFSFromCurrent(STsdbRepo *pRepo) {
} }
ptr = buffer; ptr = buffer;
ptr = tsdbDecodeFSMeta(ptr, &(pStatus->meta));
ptr = tsdbDecodeFSStatus(ptr, pStatus); ptr = tsdbDecodeFSStatus(ptr, pStatus);
} else { } else {
tsdbResetFSStatus(pStatus); tsdbResetFSStatus(pStatus);