diff --git a/src/common/inc/tmount.h b/src/common/inc/tmount.h deleted file mode 100644 index 79e8e4baec..0000000000 --- a/src/common/inc/tmount.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2019 TAOS Data, Inc. - * - * This program is free software: you can use, redistribute, and/or modify - * it under the terms of the GNU Affero General Public License, version 3 - * or later ("AGPL"), as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -#ifndef TD_TDISK_H -#define TD_TDISK_H - -#include "tglobal.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - int level; - int id; -} SDiskID; - -int tdInitMount(SDiskCfg *pDiskCfg, int ndisk); -void tdDestroyMount(); -int tdUpdateDiskInfos(); -void tdGetPrimaryPath(char *dst); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/common/inc/tpath.h b/src/common/inc/tpath.h deleted file mode 100644 index fe8663a999..0000000000 --- a/src/common/inc/tpath.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2019 TAOS Data, Inc. - * - * This program is free software: you can use, redistribute, and/or modify - * it under the terms of the GNU Affero General Public License, version 3 - * or later ("AGPL"), as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -#ifndef _TD_TPATH_H_ -#define _TD_TPATH_H_ - -#include -#include "taosdef.h" - -#ifdef __cplusplus -extern "C" { -#endif - -static FORCE_INLINE void tdGetMnodeRootDir(const char *baseDir, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/mnode", baseDir); -} - -static FORCE_INLINE void tdGetDnodeRootDir(const char *baseDir, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/dnode", baseDir); -} - -static FORCE_INLINE void tdGetVnodeRootDir(const char *baseDir, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode", baseDir); -} - -static FORCE_INLINE void tdGetVnodeBackRootDir(const char *baseDir, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode_bak", baseDir); -} - -static FORCE_INLINE void tdGetVnodeDir(const char *baseDir, int vid, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d", baseDir, vid); -} - -static FORCE_INLINE void tdGetVnodeBackDir(const char *baseDir, int vid, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode_bak/vnode%d", baseDir, vid); -} - -static FORCE_INLINE void tdGetTsdbRootDir(const char *baseDir, int vid, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d/tsdb", baseDir, vid); -} - -static FORCE_INLINE void tdGetTsdbDataDir(const char *baseDir, int vid, char *dirName) { - snprintf(dirName, TSDB_FILENAME_LEN, "%s/vnode/vnode%d/tsdb/data", baseDir, vid); -} - -#ifdef __cplusplus -} -#endif - -#endif // _TD_TPATH_H_ \ No newline at end of file diff --git a/src/common/src/tmount.c b/src/common/src/tmount.c index 57a916247d..e403961624 100644 --- a/src/common/src/tmount.c +++ b/src/common/src/tmount.c @@ -13,7 +13,6 @@ * along with this program. If not, see . */ #include "os.h" -#include "tmount.h" #include "hash.h" #include "taosdef.h" #include "taoserror.h" diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c index e54b8763dd..38b548bf79 100644 --- a/src/os/src/detail/osSysinfo.c +++ b/src/os/src/detail/osSysinfo.c @@ -16,7 +16,6 @@ #define _DEFAULT_SOURCE #include "os.h" #include "tconfig.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 8cbc7a1ee6..fd21473c4e 100644 --- a/src/plugins/monitor/src/monitorMain.c +++ b/src/plugins/monitor/src/monitorMain.c @@ -20,7 +20,6 @@ #include "tlog.h" #include "ttimer.h" #include "tutil.h" -#include "tmount.h" #include "tscUtil.h" #include "tsclient.h" #include "dnode.h" diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c index d113d9aa5f..7b8efa9ec1 100644 --- a/src/tsdb/src/tsdbFile.c +++ b/src/tsdb/src/tsdbFile.c @@ -21,8 +21,6 @@ #include "tchecksum.h" #include "tsdbMain.h" #include "tutil.h" -#include "tpath.h" -#include "tmount.h" const char * tsdbFileSuffix[] = {".head", ".data", ".last", ".stat", ".h", ".d", ".l", ".s"}; diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c index 3db64703f7..f91f59c81d 100644 --- a/src/tsdb/src/tsdbRWHelper.c +++ b/src/tsdb/src/tsdbRWHelper.c @@ -21,7 +21,6 @@ #include "tcoding.h" #include "tscompression.h" #include "tsdbMain.h" -#include "tpath.h" #define TSDB_GET_COMPCOL_LEN(nCols) (sizeof(SCompData) + sizeof(SCompCol) * (nCols) + sizeof(TSCKSUM)) #define TSDB_KEY_COL_OFFSET 0 diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 4b3005f196..6ec8ea87f3 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -29,8 +29,6 @@ #include "dnodeVWrite.h" #include "dnodeVRead.h" #include "query.h" -#include "tpath.h" -#include "tmount.h" static SHashObj*tsVnodesHash; static void vnodeCleanUp(SVnodeObj *pVnode);