diff --git a/src/common/src/tmount.c b/src/common/src/tmount.c index abc01d9dfaa62d868b13f378d6165a1502ca99ad..420fdd76ded4ce580488599b88438392b82d1467 100644 --- a/src/common/src/tmount.c +++ b/src/common/src/tmount.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ #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; diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c index d96b0fe25cc319c9eba134b080ab5b6885091e93..63e71cbb319aadb37f0cedcbd275e875646ac72c 100644 --- a/src/dnode/src/dnodeMain.c +++ b/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; diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c index 7baa58bfcd842a9bbbf40c7434db988d0510cdc0..e54b8763dd071dc142983ad4c53dd3d756f66bc3 100644 --- a/src/os/src/detail/osSysinfo.c +++ b/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" diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c index e39e0388074e535ad5e09dce28158afbf0709c52..8cbc7a1ee69d0cbbbaee4e9642c032ea95c79f97 100644 --- a/src/plugins/monitor/src/monitorMain.c +++ b/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" diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h index ef9222c59ea5024bb20bb7cb8ede7643166754f2..cb21108e9d4e506905d7588ed7728abd34220f49 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 "tdisk.h" +#include "tmount.h" #ifdef __cplusplus extern "C" { diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c index 1bfa09fc11343436e46aebb1c5e879e21f0fb828..d113d9aa5ff019c4eac81f4fb93e877932fd2af7 100644 --- a/src/tsdb/src/tsdbFile.c +++ b/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"}; diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 357a067947192d0bbfb83905adfe3c191a16dc12..4b3005f1965d87d1cb7917b59c84a6037634375c 100644 --- a/src/vnode/src/vnodeMain.c +++ b/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);