refactor

src/common/src/tmount.c

@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 #include "os.h"
-#include "tdisk.h"
+#include "tmount.h"
 #include "hash.h"
 #include "taosdef.h"
 #include "taoserror.h"
@@ -26,18 +26,18 @@ typedef struct {
   uint64_t nfiles;
 } SDiskMeta;
 
-typedef struct {
-  uint64_t tsize;
-  uint64_t avail; // bytes
-} STiersMeta;
-
 typedef struct {
   int       level;
-  int       did;
+  int       id;
   char      dir[TSDB_FILENAME_LEN];
   SDiskMeta dmeta;
 } SDisk;
 
+typedef struct {
+  uint64_t tsize;
+  uint64_t avail; // bytes
+} STiersMeta;
+
 typedef struct {
   int    level;
   int    nDisks;

src/dnode/src/dnodeMain.c

@@ -38,7 +38,7 @@
 #include "dnodeShell.h"
 #include "dnodeTelemetry.h"
 #include "tpath.h"
-#include "tdisk.h"
+#include "tmount.h"
 
 static SRunStatus tsRunStatus = TSDB_RUN_STATUS_STOPPED;
 

src/os/src/detail/osSysinfo.c

@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tconfig.h"
-#include "tdisk.h"
+#include "tmount.h"
 #include "tglobal.h"
 #include "tulog.h"
 

src/plugins/monitor/src/monitorMain.c

@@ -20,7 +20,7 @@
 #include "tlog.h"
 #include "ttimer.h"
 #include "tutil.h"
-#include "tdisk.h"
+#include "tmount.h"
 #include "tscUtil.h"
 #include "tsclient.h"
 #include "dnode.h"

src/tsdb/inc/tsdbMain.h

@@ -26,7 +26,7 @@
 #include "tsdb.h"
 #include "tskiplist.h"
 #include "tutil.h"
-#include "tdisk.h"
+#include "tmount.h"
 
 #ifdef __cplusplus
 extern "C" {

src/tsdb/src/tsdbFile.c

@@ -22,7 +22,7 @@
 #include "tsdbMain.h"
 #include "tutil.h"
 #include "tpath.h"
-#include "tdisk.h"
+#include "tmount.h"
 
 const char *       tsdbFileSuffix[] = {".head", ".data", ".last", ".stat", ".h", ".d", ".l", ".s"};
 

src/vnode/src/vnodeMain.c

@@ -30,7 +30,7 @@
 #include "dnodeVRead.h"
 #include "query.h"
 #include "tpath.h"
-#include "tdisk.h"
+#include "tmount.h"
 
 static SHashObj*tsVnodesHash;
 static void     vnodeCleanUp(SVnodeObj *pVnode);