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

enh: unify handling of vnode primary dir in current_fname

This commit is contained in:
Benguang Zhao 2023-07-13 17:37:53 +08:00
parent d81d2790ea
commit 81a2cd16e7
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#include "tsdbFS2.h" #include "tsdbFS2.h"
#include "tsdbUpgrade.h" #include "tsdbUpgrade.h"
#include "vnd.h"
extern int vnodeScheduleTask(int (*execute)(void *), void *arg); extern int vnodeScheduleTask(int (*execute)(void *), void *arg);
extern int vnodeScheduleTaskEx(int tpid, int (*execute)(void *), void *arg); extern int vnodeScheduleTaskEx(int tpid, int (*execute)(void *), void *arg);
@ -69,23 +70,12 @@ static int32_t destroy_fs(STFileSystem **fs) {
} }
int32_t current_fname(STsdb *pTsdb, char *fname, EFCurrentT ftype) { int32_t current_fname(STsdb *pTsdb, char *fname, EFCurrentT ftype) {
if (pTsdb->pVnode->pTfs) { int32_t offset = 0;
snprintf(fname, //
TSDB_FILENAME_LEN, // vnodeGetPrimaryDir(pTsdb->path, pTsdb->pVnode->pTfs, fname, TSDB_FILENAME_LEN);
"%s%s%s%s%s", // offset = strlen(fname);
tfsGetPrimaryPath(pTsdb->pVnode->pTfs), // snprintf(fname + offset, TSDB_FILENAME_LEN - offset - 1, "%s%s", TD_DIRSEP, gCurrentFname[ftype]);
TD_DIRSEP, //
pTsdb->path, //
TD_DIRSEP, //
gCurrentFname[ftype]);
} else {
snprintf(fname, //
TSDB_FILENAME_LEN, //
"%s%s%s", //
pTsdb->path, //
TD_DIRSEP, //
gCurrentFname[ftype]);
}
return 0; return 0;
} }
@ -892,4 +882,4 @@ int32_t tsdbFSEnableBgTask(STFileSystem *fs) {
fs->stop = false; fs->stop = false;
taosThreadMutexUnlock(fs->mutex); taosThreadMutexUnlock(fs->mutex);
return 0; return 0;
} }