diff --git a/contrib/test/craft/raftMain.c b/contrib/test/craft/raftMain.c index bae083cf94..b28adfaaca 100644 --- a/contrib/test/craft/raftMain.c +++ b/contrib/test/craft/raftMain.c @@ -10,7 +10,7 @@ #include #include #include "raftServer.h" -#include "common.h" +#include "tcommon.h" const char *exe_name; diff --git a/contrib/test/craft/raftServer.c b/contrib/test/craft/raftServer.c index ffec22e646..c4f347f6f5 100644 --- a/contrib/test/craft/raftServer.c +++ b/contrib/test/craft/raftServer.c @@ -1,5 +1,5 @@ #include -#include "common.h" +#include "tcommon.h" #include "raftServer.h" char *keys; diff --git a/contrib/test/craft/raftServer.h b/contrib/test/craft/raftServer.h index f4087cf1a9..fb6f9d2996 100644 --- a/contrib/test/craft/raftServer.h +++ b/contrib/test/craft/raftServer.h @@ -11,7 +11,7 @@ extern "C" { #include #include "raft.h" #include "raft/uv.h" -#include "common.h" +#include "tcommon.h" // simulate a db store, just for test diff --git a/include/common/common.h b/include/common/tcommon.h similarity index 100% rename from include/common/common.h rename to include/common/tcommon.h diff --git a/include/common/tep.h b/include/common/tep.h index 3b9d379aa4..56a4f7a2f0 100644 --- a/include/common/tep.h +++ b/include/common/tep.h @@ -16,7 +16,7 @@ #ifndef _TD_COMMON_EP_H_ #define _TD_COMMON_EP_H_ -#include "common.h" +#include "tcommon.h" #include "tmsg.h" #ifdef __cplusplus diff --git a/include/libs/catalog/catalog.h b/include/libs/catalog/catalog.h index b6054c02b4..ebe7c92d31 100644 --- a/include/libs/catalog/catalog.h +++ b/include/libs/catalog/catalog.h @@ -24,7 +24,7 @@ extern "C" { #include "taosdef.h" #include "query.h" #include "tname.h" -#include "common.h" +#include "tcommon.h" #include "tarray.h" #include "thash.h" #include "tmsg.h" diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h index 4d53f40176..a4c0be27ab 100644 --- a/include/libs/executor/executor.h +++ b/include/libs/executor/executor.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "common.h" +#include "tcommon.h" typedef void* qTaskInfo_t; typedef void* DataSinkHandle; diff --git a/include/libs/function/function.h b/include/libs/function/function.h index ffd861ff3b..e890a9f0e1 100644 --- a/include/libs/function/function.h +++ b/include/libs/function/function.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "common.h" +#include "tcommon.h" #include "tvariant.h" #include "tbuffer.h" diff --git a/include/libs/parser/parsenodes.h b/include/libs/parser/parsenodes.h index 6cd5feca24..0d209a7f4d 100644 --- a/include/libs/parser/parsenodes.h +++ b/include/libs/parser/parsenodes.h @@ -21,7 +21,7 @@ extern "C" { #endif #include "catalog.h" -#include "common.h" +#include "tcommon.h" #include "function.h" #include "tmsgtype.h" #include "tname.h" diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h index 523921634b..79909a5696 100644 --- a/source/client/inc/clientInt.h +++ b/source/client/inc/clientInt.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "common.h" +#include "tcommon.h" #include "parser.h" #include "query.h" #include "taos.h" diff --git a/source/common/test/commonTests.cpp b/source/common/test/commonTests.cpp index 9b05b5a780..4821d60875 100644 --- a/source/common/test/commonTests.cpp +++ b/source/common/test/commonTests.cpp @@ -1,4 +1,4 @@ -#include +#include "tcommon.h" #include #include #include diff --git a/source/dnode/vnode/inc/tq.h b/source/dnode/vnode/inc/tq.h index f4d3b405d9..ffab15f394 100644 --- a/source/dnode/vnode/inc/tq.h +++ b/source/dnode/vnode/inc/tq.h @@ -16,7 +16,7 @@ #ifndef _TD_TQ_H_ #define _TD_TQ_H_ -#include "common.h" +#include "tcommon.h" #include "executor.h" #include "tmallocator.h" #include "meta.h" diff --git a/source/dnode/vnode/inc/tsdb.h b/source/dnode/vnode/inc/tsdb.h index d578c8b12a..677ca9c336 100644 --- a/source/dnode/vnode/inc/tsdb.h +++ b/source/dnode/vnode/inc/tsdb.h @@ -18,7 +18,7 @@ #include "tmallocator.h" #include "meta.h" -#include "common.h" +#include "tcommon.h" #include "tfs.h" #ifdef __cplusplus diff --git a/source/dnode/vnode/src/inc/tsdbReadImpl.h b/source/dnode/vnode/src/inc/tsdbReadImpl.h index 97cd4e2612..8ecb4e4a6e 100644 --- a/source/dnode/vnode/src/inc/tsdbReadImpl.h +++ b/source/dnode/vnode/src/inc/tsdbReadImpl.h @@ -22,7 +22,7 @@ #include "tsdbFile.h" #include "tskiplist.h" #include "tsdbMemory.h" -#include "common.h" +#include "tcommon.h" typedef struct SReadH SReadH; diff --git a/source/libs/catalog/inc/catalogInt.h b/source/libs/catalog/inc/catalogInt.h index 5857437f9d..f89ac96b03 100644 --- a/source/libs/catalog/inc/catalogInt.h +++ b/source/libs/catalog/inc/catalogInt.h @@ -21,7 +21,7 @@ extern "C" { #endif #include "catalog.h" -#include "common.h" +#include "tcommon.h" #include "query.h" #define CTG_DEFAULT_CACHE_CLUSTER_NUMBER 6 diff --git a/source/libs/executor/inc/dataSinkInt.h b/source/libs/executor/inc/dataSinkInt.h index 7003564365..f15be8521c 100644 --- a/source/libs/executor/inc/dataSinkInt.h +++ b/source/libs/executor/inc/dataSinkInt.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "common.h" +#include "tcommon.h" #include "dataSinkMgt.h" struct SDataSink; diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h index e729c868a7..cff7546a7e 100644 --- a/source/libs/executor/inc/executil.h +++ b/source/libs/executor/inc/executil.h @@ -15,7 +15,7 @@ #ifndef TDENGINE_QUERYUTIL_H #define TDENGINE_QUERYUTIL_H -#include "common.h" +#include "tcommon.h" #include "tbuffer.h" #include "tpagedbuf.h" diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index 4e7076530b..c8e1aeba0e 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -21,7 +21,7 @@ extern "C" { #endif #include "os.h" -#include "common.h" +#include "tcommon.h" #include "tlosertree.h" #include "ttszip.h" #include "tvariant.h" diff --git a/source/libs/executor/inc/tsort.h b/source/libs/executor/inc/tsort.h index 9c9368bb1a..ef7af2b4e3 100644 --- a/source/libs/executor/inc/tsort.h +++ b/source/libs/executor/inc/tsort.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "common.h" +#include "tcommon.h" #include "os.h" enum { diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c index e75ca069c5..d042dc0eff 100644 --- a/source/libs/executor/src/tsort.c +++ b/source/libs/executor/src/tsort.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "common.h" +#include "tcommon.h" #include "query.h" #include "tsort.h" diff --git a/source/libs/function/src/tfill.c b/source/libs/function/src/tfill.c index db1bb3e7b8..653e30cec8 100644 --- a/source/libs/function/src/tfill.c +++ b/source/libs/function/src/tfill.c @@ -23,7 +23,7 @@ #include "tfill.h" #include "thash.h" #include "function.h" -#include "common.h" +#include "tcommon.h" #include "ttime.h" #define FILL_IS_ASC_FILL(_f) ((_f)->order == TSDB_ORDER_ASC) diff --git a/source/libs/planner/inc/plannerInt.h b/source/libs/planner/inc/plannerInt.h index 26ae44a08f..248a24f51e 100644 --- a/source/libs/planner/inc/plannerInt.h +++ b/source/libs/planner/inc/plannerInt.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "common.h" +#include "tcommon.h" #include "tarray.h" #include "planner.h" #include "parser.h" diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c index cebe8178d9..7a6fa4cfd7 100644 --- a/source/libs/qworker/src/qworker.c +++ b/source/libs/qworker/src/qworker.c @@ -1,5 +1,5 @@ #include "qworker.h" -#include +#include "tcommon.h" #include "executor.h" #include "planner.h" #include "query.h" diff --git a/source/libs/qworker/src/qworkerMsg.c b/source/libs/qworker/src/qworkerMsg.c index a1b431fd7d..bdb9617d0d 100644 --- a/source/libs/qworker/src/qworkerMsg.c +++ b/source/libs/qworker/src/qworkerMsg.c @@ -1,5 +1,5 @@ #include "qworker.h" -#include +#include "tcommon.h" #include "executor.h" #include "planner.h" #include "query.h" diff --git a/source/libs/scalar/inc/filterInt.h b/source/libs/scalar/inc/filterInt.h index f1660aa0e8..959b1d9af1 100644 --- a/source/libs/scalar/inc/filterInt.h +++ b/source/libs/scalar/inc/filterInt.h @@ -22,7 +22,7 @@ extern "C" { #include "thash.h" #include "tname.h" -#include "common.h" +#include "tcommon.h" #include "scalar.h" #include "querynodes.h" #include "query.h" diff --git a/source/libs/scalar/inc/sclInt.h b/source/libs/scalar/inc/sclInt.h index 41ee90667e..59834ba299 100644 --- a/source/libs/scalar/inc/sclInt.h +++ b/source/libs/scalar/inc/sclInt.h @@ -18,7 +18,7 @@ #ifdef __cplusplus extern "C" { #endif -#include "common.h" +#include "tcommon.h" #include "thash.h" #include "query.h" diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index 742c7fd706..7a07988479 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -1,5 +1,5 @@ #include "nodes.h" -#include "common.h" +#include "tcommon.h" #include "querynodes.h" #include "function.h" #include "functionMgt.h"