refactor

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();

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;

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;