diff --git a/src/inc/tfs.h b/src/inc/tfs.h index 3c0ae1ed75d848673b72b24b0e181b6b318dc61c..c02dc2bb0f6234dd5dc4e6470abf4b0eb200f913 100644 --- a/src/inc/tfs.h +++ b/src/inc/tfs.h @@ -22,6 +22,16 @@ extern "C" { #endif +typedef struct { + int level; + int id; +} SDiskID; + +typedef struct { + SDiskID did; + char fname[TSDB_FILENAME_LEN]; +} STfsFile; + int tfsInit(SDiskCfg *pDiskCfg, int ndisk); void tfsDestroy(); int tfsUpdateInfo(); diff --git a/src/tfs/inc/tdisk.h b/src/tfs/inc/tdisk.h index 532dc6a39fb980623b6fc496df2defc2b9d3895d..f15512355dcfb0c2538c0e10313274b836925436 100644 --- a/src/tfs/inc/tdisk.h +++ b/src/tfs/inc/tdisk.h @@ -20,11 +20,6 @@ extern "C" { #endif -typedef struct { - int level; - int id; -} SDiskID; - typedef struct { uint64_t size; uint64_t free; diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h index cb21108e9d4e506905d7588ed7728abd34220f49..fce5fb1eaf43fe5463547628777eb9b09cbc6db8 100644 --- a/src/tsdb/inc/tsdbMain.h +++ b/src/tsdb/inc/tsdbMain.h @@ -26,7 +26,7 @@ #include "tsdb.h" #include "tskiplist.h" #include "tutil.h" -#include "tmount.h" +#include "tfs.h" #ifdef __cplusplus extern "C" { @@ -189,9 +189,10 @@ typedef struct { } STsdbFileInfo; typedef struct { - char fname[TSDB_FILENAME_LEN]; - int fd; + // char fname[TSDB_FILENAME_LEN]; + // int fd; + STfsFile tfile; STsdbFileInfo info; } SFile;