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

fix coredump

This commit is contained in:
Hongze Cheng 2021-01-25 15:38:10 +08:00
parent c8ef616ac5
commit 481abb03cc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1093,8 +1093,10 @@ static int tsdbRestoreDFileSet(STsdbRepo *pRepo) {
int tvid, tfid; int tvid, tfid;
TSDB_FILE_T ttype; TSDB_FILE_T ttype;
uint32_t tversion; uint32_t tversion;
char bname[TSDB_FILENAME_LEN];
tsdbParseDFilename(TFILE_NAME(pf), &tvid, &tfid, &ttype, &tversion); tfsbasename(pf, bname);
tsdbParseDFilename(bname, &tvid, &tfid, &ttype, &tversion);
ASSERT(tvid == REPO_ID(pRepo)); ASSERT(tvid == REPO_ID(pRepo));
@ -1169,9 +1171,13 @@ static int tsdbComparTFILE(const void *arg1, const void *arg2) {
int vid1, fid1, vid2, fid2; int vid1, fid1, vid2, fid2;
TSDB_FILE_T ftype1, ftype2; TSDB_FILE_T ftype1, ftype2;
uint32_t version1, version2; uint32_t version1, version2;
char bname1[TSDB_FILENAME_LEN];
char bname2[TSDB_FILENAME_LEN];
tsdbParseDFilename(TFILE_NAME(pf1), &vid1, &fid1, &ftype1, &version1); tfsbasename(pf1, bname1);
tsdbParseDFilename(TFILE_NAME(pf2), &vid2, &fid2, &ftype2, &version2); tfsbasename(pf2, bname2);
tsdbParseDFilename(bname1, &vid1, &fid1, &ftype1, &version1);
tsdbParseDFilename(bname2, &vid2, &fid2, &ftype2, &version2);
if (fid1 < fid2) { if (fid1 < fid2) {
return -1; return -1;

2
src/tsdb/src/tsdbFile.c
View File

@ -581,7 +581,7 @@ int tsdbParseDFilename(const char *fname, int *vid, int *fid, TSDB_FILE_T *ftype
} }
} }
free(p); tfree(p);
return 0; return 0;
} }