diff --git a/include/common/tglobal.h b/include/common/tglobal.h index a6cd04e006c4ccb423d5c95231ea3f10bf6a6518..40999c453c9174b5416dc17c0b73d3269408271a 100644 --- a/include/common/tglobal.h +++ b/include/common/tglobal.h @@ -20,7 +20,6 @@ extern "C" { #endif -#include "tcfg.h" #include "tdef.h" #include "tarray.h" diff --git a/include/dnode/mgmt/dnode.h b/include/dnode/mgmt/dnode.h index bb0f66ca09cd550c204e811bb936860ad89829f5..068e9a69170bfd1659b2961bef220b765d74c35e 100644 --- a/include/dnode/mgmt/dnode.h +++ b/include/dnode/mgmt/dnode.h @@ -17,7 +17,6 @@ #define _TD_DNODE_H_ #include "tdef.h" -#include "tcfg.h" #ifdef __cplusplus extern "C" { diff --git a/include/libs/tfs/tfs.h b/include/libs/tfs/tfs.h index 289cfd9b04bfaf34fc4e8bb1ad5e07cc00ba4959..b6d10c81bffb230c5e8408d4773cd8ceccf25baa 100644 --- a/include/libs/tfs/tfs.h +++ b/include/libs/tfs/tfs.h @@ -16,7 +16,7 @@ #ifndef _TD_TFS_H_ #define _TD_TFS_H_ -#include "tcfg.h" +#include "tdef.h" #ifdef __cplusplus extern "C" { diff --git a/include/util/tcfg.h b/include/util/tcfg.h deleted file mode 100644 index 7ccfd4b0f5d9a739016f506e7a121276a1cac2a5..0000000000000000000000000000000000000000 --- a/include/util/tcfg.h +++ /dev/null @@ -1,35 +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_COMMON_CFG_H_ -#define _TD_COMMON_CFG_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "tdef.h" - -typedef struct { - char dir[TSDB_FILENAME_LEN]; - int level; - int primary; -} SDiskCfg; - -#ifdef __cplusplus -} -#endif - -#endif /*_TD_COMMON_CFG_H_*/ diff --git a/include/util/tdef.h b/include/util/tdef.h index d0f2b77f1fa92ee67ad2a2dce69c234be3b13cf7..b4795a0ecf0c0b30963f3d4c7bb9d2c4ca2863d3 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -410,6 +410,12 @@ typedef enum ELogicConditionType { enum { TRANS_STAT_INIT = 0, TRANS_STAT_EXECUTING, TRANS_STAT_EXECUTED, TRANS_STAT_ROLLBACKING, TRANS_STAT_ROLLBACKED }; enum { TRANS_OPER_INIT = 0, TRANS_OPER_EXECUTE, TRANS_OPER_ROLLBACK }; +typedef struct { + char dir[TSDB_FILENAME_LEN]; + int level; + int primary; +} SDiskCfg; + #ifdef __cplusplus } #endif diff --git a/source/util/src/tconfig.c b/source/util/src/tconfig.c index dc9fa33595defda2234d51f4c936a02551b7cefb..bb86c9389c764d71a0b5c1999b167e09ed49196f 100644 --- a/source/util/src/tconfig.c +++ b/source/util/src/tconfig.c @@ -16,7 +16,6 @@ #define _DEFAULT_SOURCE #include "tconfig.h" #include "taoserror.h" -#include "tcfg.h" #include "thash.h" #include "tutil.h" #include "tlog.h"