From cb1c3a174bfbfc620ed780f3263367b18a29e561 Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 14 Feb 2020 23:18:14 +0800 Subject: [PATCH] rename tsdb.h --- src/client/inc/tscUtil.h | 2 +- src/client/inc/tsclient.h | 2 +- src/client/src/tscAst.c | 2 +- src/client/src/tscSystem.c | 2 +- src/dnode/inc/dnodeVnodeMgmt.h | 2 +- src/dnode/src/dnodeService.c | 1 - src/dnode/src/dnodeSystem.c | 2 +- src/inc/mnode.h | 2 +- src/inc/sdb.h | 2 +- src/inc/taosmsg.h | 2 +- src/kit/shell/inc/shell.h | 2 +- src/kit/taosdump/taosdump.c | 2 +- src/mnode/src/mgmtSystem.c | 2 +- src/modules/http/inc/httpHandle.h | 2 +- src/modules/http/src/gcHandle.c | 2 +- src/modules/http/src/tgHandle.c | 2 +- src/modules/monitor/src/monitorSystem.c | 2 +- src/os/darwin/src/tdarwin.c | 2 +- src/os/linux/CMakeLists.txt | 4 ++++ src/os/linux/inc/os.h | 1 - src/os/linux/src/tlinux.c | 2 +- src/os/windows/src/twindows.c | 2 +- src/rpc/inc/ttcpclient.h | 2 +- src/rpc/inc/ttcpserver.h | 2 +- src/rpc/inc/tudp.h | 2 +- src/rpc/src/trpc.c | 2 +- src/sdb/src/hashint.c | 2 +- src/sdb/src/hashstr.c | 2 +- src/util/inc/tglobalcfg.h | 2 +- src/util/inc/tscompression.h | 2 +- src/util/inc/tutil.h | 2 +- src/util/src/tcompression.c | 2 +- src/util/src/tglobalcfg.c | 2 +- src/util/src/thistogram.c | 2 +- src/util/src/tmd5.c | 2 +- src/util/src/tpercentile.c | 2 +- src/util/src/tskiplist.c | 2 +- src/util/src/ttime.c | 2 +- src/util/src/ttypes.c | 2 +- src/vnode/common/inc/vnodePeer.h | 2 +- src/vnode/detail/inc/vnode.h | 2 +- src/vnode/detail/src/vnodeCommit.c | 2 +- src/vnode/detail/src/vnodeTagMgmt.c | 2 +- src/vnode/tsdb/inc/tsdbMeta.h | 2 +- src/vnode/tsdb/src/tsdb.c | 2 +- src/vnode/tsdb/src/tsdbMeta.c | 2 +- 46 files changed, 47 insertions(+), 45 deletions(-) diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h index e1123b9178..f60861a349 100644 --- a/src/client/inc/tscUtil.h +++ b/src/client/inc/tscUtil.h @@ -27,7 +27,7 @@ extern "C" { #include "textbuffer.h" #include "tscSecondaryMerge.h" #include "tsclient.h" -#include "tsdb.h" +#include "taosdef.h" #define UTIL_METER_IS_SUPERTABLE(metaInfo) \ (((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->tableType == TSDB_TABLE_TYPE_SUPER_TABLE)) diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index 7220a34359..3720a09459 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -27,7 +27,7 @@ extern "C" { #include "tlog.h" #include "tscCache.h" #include "tscSQLParser.h" -#include "tsdb.h" +#include "taosdef.h" #include "tsqlfunction.h" #include "tutil.h" diff --git a/src/client/src/tscAst.c b/src/client/src/tscAst.c index cf0873b5b6..c740f65dcf 100644 --- a/src/client/src/tscAst.c +++ b/src/client/src/tscAst.c @@ -20,7 +20,7 @@ #include "tscSQLParser.h" #include "tscSyntaxtreefunction.h" #include "tschemautil.h" -#include "tsdb.h" +#include "taosdef.h" #include "tskiplist.h" #include "tsqldef.h" #include "tsqlfunction.h" diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c index 6c685b06b4..e07f459cf4 100644 --- a/src/client/src/tscSystem.c +++ b/src/client/src/tscSystem.c @@ -18,7 +18,7 @@ #include "tcache.h" #include "tlog.h" #include "trpc.h" -#include "tsdb.h" +#include "taosdef.h" #include "tsocket.h" #include "tsystem.h" #include "ttime.h" diff --git a/src/dnode/inc/dnodeVnodeMgmt.h b/src/dnode/inc/dnodeVnodeMgmt.h index 9c677ba9e0..137461607e 100644 --- a/src/dnode/inc/dnodeVnodeMgmt.h +++ b/src/dnode/inc/dnodeVnodeMgmt.h @@ -22,7 +22,7 @@ extern "C" { #include -#include "tsdb.h" +#include "taosdef.h" #include "taosmsg.h" /* diff --git a/src/dnode/src/dnodeService.c b/src/dnode/src/dnodeService.c index 6a0dfdb63a..763422b1dd 100644 --- a/src/dnode/src/dnodeService.c +++ b/src/dnode/src/dnodeService.c @@ -16,7 +16,6 @@ #define _DEFAULT_SOURCE #include "os.h" #include "tglobalcfg.h" -#include "tsdb.h" #include "vnode.h" #include "dnodeSystem.h" diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c index 7b2a273a14..1203e15ed4 100644 --- a/src/dnode/src/dnodeSystem.c +++ b/src/dnode/src/dnodeSystem.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tsdb.h" +#include "taosdef.h" #include "tlog.h" #include "ttimer.h" #include "dnode.h" diff --git a/src/inc/mnode.h b/src/inc/mnode.h index 4d7591fdd3..101df94805 100644 --- a/src/inc/mnode.h +++ b/src/inc/mnode.h @@ -34,7 +34,7 @@ extern "C" { #include "tlog.h" #include "tmempool.h" #include "trpc.h" -#include "tsdb.h" +#include "taosdef.h" #include "tskiplist.h" #include "tsocket.h" #include "ttime.h" diff --git a/src/inc/sdb.h b/src/inc/sdb.h index 636a764237..7316fd7ef5 100644 --- a/src/inc/sdb.h +++ b/src/inc/sdb.h @@ -21,7 +21,7 @@ extern "C" { #endif #include "taosmsg.h" -#include "tsdb.h" +#include "taosdef.h" extern uint16_t tsMgmtMgmtPort; extern uint16_t tsMgmtSyncPort; diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h index f6e117d426..98f82b2e72 100644 --- a/src/inc/taosmsg.h +++ b/src/inc/taosmsg.h @@ -23,7 +23,7 @@ extern "C" { #include #include -#include "tsdb.h" +#include "taosdef.h" #include "taoserror.h" #include "taosdef.h" diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h index 0c8153e3ab..0315aa1b27 100644 --- a/src/kit/shell/inc/shell.h +++ b/src/kit/shell/inc/shell.h @@ -19,7 +19,7 @@ #include "stdbool.h" #include "taos.h" #include "tlog.h" -#include "tsdb.h" +#include "taosdef.h" #include "stdbool.h" #define MAX_USERNAME_SIZE 64 diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c index 8cf015b342..a7a8da2479 100644 --- a/src/kit/taosdump/taosdump.c +++ b/src/kit/taosdump/taosdump.c @@ -32,7 +32,7 @@ #include "taosmsg.h" #include "tglobalcfg.h" #include "tsclient.h" -#include "tsdb.h" +#include "taosdef.h" #include "tutil.h" #define COMMAND_SIZE 65536 diff --git a/src/mnode/src/mgmtSystem.c b/src/mnode/src/mgmtSystem.c index 3ed29fdd09..f63215ce1b 100644 --- a/src/mnode/src/mgmtSystem.c +++ b/src/mnode/src/mgmtSystem.c @@ -29,7 +29,7 @@ #include "mgmtTable.h" #include "mgmtShell.h" #include "dnodeModule.h" -#include "tsdb.h" +#include "taosdef.h" // global, not configurable char mgmtDirectory[128]; diff --git a/src/modules/http/inc/httpHandle.h b/src/modules/http/inc/httpHandle.h index 1b746e1520..c564337187 100644 --- a/src/modules/http/inc/httpHandle.h +++ b/src/modules/http/inc/httpHandle.h @@ -20,7 +20,7 @@ #include "pthread.h" #include "semaphore.h" #include "tmempool.h" -#include "tsdb.h" +#include "taosdef.h" #include "tutil.h" #include "zlib.h" diff --git a/src/modules/http/src/gcHandle.c b/src/modules/http/src/gcHandle.c index eb0c6223a7..2ba8250eac 100644 --- a/src/modules/http/src/gcHandle.c +++ b/src/modules/http/src/gcHandle.c @@ -16,7 +16,7 @@ #include "gcHandle.h" #include "cJSON.h" #include "gcJson.h" -#include "tsdb.h" +#include "taosdef.h" static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest}; static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL}; diff --git a/src/modules/http/src/tgHandle.c b/src/modules/http/src/tgHandle.c index b9adf54162..9004dc4737 100644 --- a/src/modules/http/src/tgHandle.c +++ b/src/modules/http/src/tgHandle.c @@ -17,7 +17,7 @@ #include "shash.h" #include "taosmsg.h" #include "tgJson.h" -#include "tsdb.h" +#include "taosdef.h" /* * taos.telegraf.cfg formats like diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c index 649b1a3baa..d3bff0e281 100644 --- a/src/modules/monitor/src/monitorSystem.c +++ b/src/modules/monitor/src/monitorSystem.c @@ -20,7 +20,7 @@ #include #include "monitorSystem.h" #include "tsclient.h" -#include "tsdb.h" +#include "taosdef.h" #include "tsystem.h" #include "ttime.h" #include "ttimer.h" diff --git a/src/os/darwin/src/tdarwin.c b/src/os/darwin/src/tdarwin.c index af3b1bd8a5..ff9576542f 100644 --- a/src/os/darwin/src/tdarwin.c +++ b/src/os/darwin/src/tdarwin.c @@ -30,7 +30,7 @@ #include "tglobalcfg.h" #include "tlog.h" -#include "tsdb.h" +#include "taosdef.h" #include "tutil.h" char configDir[TSDB_FILENAME_LEN] = "/etc/taos"; diff --git a/src/os/linux/CMakeLists.txt b/src/os/linux/CMakeLists.txt index a702cac759..d5a736ce2e 100644 --- a/src/os/linux/CMakeLists.txt +++ b/src/os/linux/CMakeLists.txt @@ -2,9 +2,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(TDengine) IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) + INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc) + INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc) INCLUDE_DIRECTORIES(inc) AUX_SOURCE_DIRECTORY(src SRC) + ADD_LIBRARY(os ${SRC}) TARGET_LINK_LIBRARIES(os m rt) ENDIF () diff --git a/src/os/linux/inc/os.h b/src/os/linux/inc/os.h index aa54a3563e..d3c401e3cf 100644 --- a/src/os/linux/inc/os.h +++ b/src/os/linux/inc/os.h @@ -77,7 +77,6 @@ extern "C" { #include #include - #define taosCloseSocket(x) \ { \ if (FD_VALID(x)) { \ diff --git a/src/os/linux/src/tlinux.c b/src/os/linux/src/tlinux.c index b81b98a5f7..98faffdfd2 100644 --- a/src/os/linux/src/tlinux.c +++ b/src/os/linux/src/tlinux.c @@ -30,7 +30,7 @@ #include "tglobalcfg.h" #include "tlog.h" -#include "tsdb.h" +#include "taosdef.h" #include "tutil.h" #include "ttimer.h" diff --git a/src/os/windows/src/twindows.c b/src/os/windows/src/twindows.c index 30973165df..15e42d8948 100644 --- a/src/os/windows/src/twindows.c +++ b/src/os/windows/src/twindows.c @@ -25,7 +25,7 @@ #include "os.h" #include "tlog.h" -#include "tsdb.h" +#include "taosdef.h" #include "tglobalcfg.h" #include diff --git a/src/rpc/inc/ttcpclient.h b/src/rpc/inc/ttcpclient.h index 8427c6f162..1246b2560e 100644 --- a/src/rpc/inc/ttcpclient.h +++ b/src/rpc/inc/ttcpclient.h @@ -16,7 +16,7 @@ #ifndef _taos_tcp_client_header_ #define _taos_tcp_client_header_ -#include "tsdb.h" +#include "taosdef.h" void *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle); void taosCleanUpTcpClient(void *chandle); diff --git a/src/rpc/inc/ttcpserver.h b/src/rpc/inc/ttcpserver.h index ba3bd25719..b62949e73e 100644 --- a/src/rpc/inc/ttcpserver.h +++ b/src/rpc/inc/ttcpserver.h @@ -16,7 +16,7 @@ #ifndef _taos_tcp_server_header_ #define _taos_tcp_server_header_ -#include "tsdb.h" +#include "taosdef.h" void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle); void taosCleanUpTcpServer(void *param); diff --git a/src/rpc/inc/tudp.h b/src/rpc/inc/tudp.h index 27c7593090..647d54bade 100644 --- a/src/rpc/inc/tudp.h +++ b/src/rpc/inc/tudp.h @@ -16,7 +16,7 @@ #ifndef _taos_udp_header_ #define _taos_udp_header_ -#include "tsdb.h" +#include "taosdef.h" void *taosInitUdpServer(char *ip, uint16_t port, char *label, int, void *fp, void *shandle); void *taosInitUdpClient(char *ip, uint16_t port, char *label, int, void *fp, void *shandle); diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c index 379925a6bf..fe2ed91ce3 100755 --- a/src/rpc/src/trpc.c +++ b/src/rpc/src/trpc.c @@ -21,7 +21,7 @@ #include "tmd5.h" #include "tmempool.h" #include "trpc.h" -#include "tsdb.h" +#include "taosdef.h" #include "tsocket.h" #include "ttcpclient.h" #include "ttcpserver.h" diff --git a/src/sdb/src/hashint.c b/src/sdb/src/hashint.c index c99a5aff73..87a6da4fa8 100644 --- a/src/sdb/src/hashint.c +++ b/src/sdb/src/hashint.c @@ -22,7 +22,7 @@ #include #include "tmempool.h" -#include "tsdb.h" +#include "taosdef.h" typedef struct _long_hash_t { uint32_t key; diff --git a/src/sdb/src/hashstr.c b/src/sdb/src/hashstr.c index c34d61f1de..d87e605176 100644 --- a/src/sdb/src/hashstr.c +++ b/src/sdb/src/hashstr.c @@ -14,7 +14,7 @@ */ #include "os.h" -#include "tsdb.h" +#include "taosdef.h" #define MAX_STR_LEN 40 diff --git a/src/util/inc/tglobalcfg.h b/src/util/inc/tglobalcfg.h index 243835bacd..6448e379b9 100644 --- a/src/util/inc/tglobalcfg.h +++ b/src/util/inc/tglobalcfg.h @@ -22,7 +22,7 @@ extern "C" { #include #include -#include "tsdb.h" +#include "taosdef.h" extern int (*startMonitor)(); extern void (*stopMonitor)(); diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h index 71c25eed3f..55e282296f 100644 --- a/src/util/inc/tscompression.h +++ b/src/util/inc/tscompression.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "tsdb.h" +#include "taosdef.h" #define BITS_PER_BYTE 8 // Masks diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h index b66da28697..04b2b32f69 100644 --- a/src/util/inc/tutil.h +++ b/src/util/inc/tutil.h @@ -23,7 +23,7 @@ extern "C" { #include "os.h" #include "tmd5.h" #include "tcrc32c.h" -#include "tsdb.h" +#include "taosdef.h" #ifndef STDERR_FILENO #define STDERR_FILENO (2) diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c index 0f0c7bed34..1592a47c15 100644 --- a/src/util/src/tcompression.c +++ b/src/util/src/tcompression.c @@ -50,7 +50,7 @@ #include "os.h" #include "lz4.h" #include "tscompression.h" -#include "tsdb.h" +#include "taosdef.h" #include "ttypes.h" const int TEST_NUMBER = 1; diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c index 45efcad563..c07268aa1e 100644 --- a/src/util/src/tglobalcfg.c +++ b/src/util/src/tglobalcfg.c @@ -19,7 +19,7 @@ #include "tglobalcfg.h" #include "tkey.h" #include "tlog.h" -#include "tsdb.h" +#include "taosdef.h" #include "tsocket.h" #include "tsystem.h" #include "tutil.h" diff --git a/src/util/src/thistogram.c b/src/util/src/thistogram.c index 93046cf796..b603163b39 100644 --- a/src/util/src/thistogram.c +++ b/src/util/src/thistogram.c @@ -17,7 +17,7 @@ #include "taosmsg.h" #include "thistogram.h" #include "tlosertree.h" -#include "tsdb.h" +#include "taosdef.h" /** * diff --git a/src/util/src/tmd5.c b/src/util/src/tmd5.c index 90b41dacf4..4971ed7a12 100644 --- a/src/util/src/tmd5.c +++ b/src/util/src/tmd5.c @@ -37,7 +37,7 @@ #include #include #include -#include "tsdb.h" +#include "taosdef.h" /* forward declaration */ static void Transform(uint32_t *buf, uint32_t *in); diff --git a/src/util/src/tpercentile.c b/src/util/src/tpercentile.c index b3c09033b4..a5c074839c 100644 --- a/src/util/src/tpercentile.c +++ b/src/util/src/tpercentile.c @@ -16,7 +16,7 @@ #include "os.h" #include "taosmsg.h" -#include "tsdb.h" +#include "taosdef.h" #include "tlog.h" #include "ttypes.h" #include "tpercentile.h" diff --git a/src/util/src/tskiplist.c b/src/util/src/tskiplist.c index 01c91b6c65..69a7144253 100644 --- a/src/util/src/tskiplist.c +++ b/src/util/src/tskiplist.c @@ -15,7 +15,7 @@ #include "os.h" #include "tlog.h" -#include "tsdb.h" +#include "taosdef.h" #include "tskiplist.h" #include "tutil.h" diff --git a/src/util/src/ttime.c b/src/util/src/ttime.c index 65c5d0ea4c..015cb19606 100644 --- a/src/util/src/ttime.c +++ b/src/util/src/ttime.c @@ -20,7 +20,7 @@ #include #include -#include "tsdb.h" +#include "taosdef.h" #include "ttime.h" #include "tutil.h" diff --git a/src/util/src/ttypes.c b/src/util/src/ttypes.c index ae994cb77b..86fa7cd5f8 100644 --- a/src/util/src/ttypes.c +++ b/src/util/src/ttypes.c @@ -14,7 +14,7 @@ */ #include "os.h" #include "taos.h" -#include "tsdb.h" +#include "taosdef.h" #include "tsqldef.h" #include "ttypes.h" #include "tutil.h" diff --git a/src/vnode/common/inc/vnodePeer.h b/src/vnode/common/inc/vnodePeer.h index becf9bae39..6c69326fbc 100644 --- a/src/vnode/common/inc/vnodePeer.h +++ b/src/vnode/common/inc/vnodePeer.h @@ -22,7 +22,7 @@ extern "C" { #include #include -#include "tsdb.h" +#include "taosdef.h" /* * Initialize the resources diff --git a/src/vnode/detail/inc/vnode.h b/src/vnode/detail/inc/vnode.h index 13831d17bd..158f4b2479 100644 --- a/src/vnode/detail/inc/vnode.h +++ b/src/vnode/detail/inc/vnode.h @@ -28,7 +28,7 @@ extern "C" { #include "tmempool.h" #include "trpc.h" #include "tsclient.h" -#include "tsdb.h" +#include "taosdef.h" #include "tsocket.h" #include "ttime.h" #include "ttimer.h" diff --git a/src/vnode/detail/src/vnodeCommit.c b/src/vnode/detail/src/vnodeCommit.c index a650376afa..a43ad3728a 100644 --- a/src/vnode/detail/src/vnodeCommit.c +++ b/src/vnode/detail/src/vnodeCommit.c @@ -16,7 +16,7 @@ #define _GNU_SOURCE /* See feature_test_macros(7) */ #include "os.h" -#include "tsdb.h" +#include "taosdef.h" #include "vnode.h" #include "vnodeUtil.h" #include "vnodeStatus.h" diff --git a/src/vnode/detail/src/vnodeTagMgmt.c b/src/vnode/detail/src/vnodeTagMgmt.c index 5585813ec3..d3e22ec00a 100644 --- a/src/vnode/detail/src/vnodeTagMgmt.c +++ b/src/vnode/detail/src/vnodeTagMgmt.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tsdb.h" +#include "taosdef.h" #include "tlog.h" #include "tutil.h" #include "taosmsg.h" diff --git a/src/vnode/tsdb/inc/tsdbMeta.h b/src/vnode/tsdb/inc/tsdbMeta.h index dc697d52fe..28bafa1dc8 100644 --- a/src/vnode/tsdb/inc/tsdbMeta.h +++ b/src/vnode/tsdb/inc/tsdbMeta.h @@ -4,7 +4,7 @@ #include -#include "tsdb.h" +#include "taosdef.h" // Initially, there are 4 tables #define TSDB_INIT_NUMBER_OF_SUPER_TABLE 4 diff --git a/src/vnode/tsdb/src/tsdb.c b/src/vnode/tsdb/src/tsdb.c index a50c674001..d008794524 100644 --- a/src/vnode/tsdb/src/tsdb.c +++ b/src/vnode/tsdb/src/tsdb.c @@ -2,7 +2,7 @@ #include #include -#include "tsdb.h" +#include "taosdef.h" // #include "disk.h" #include "tsdbCache.h" #include "tsdbMeta.h" diff --git a/src/vnode/tsdb/src/tsdbMeta.c b/src/vnode/tsdb/src/tsdbMeta.c index a5e4025108..5bc82dfa10 100644 --- a/src/vnode/tsdb/src/tsdbMeta.c +++ b/src/vnode/tsdb/src/tsdbMeta.c @@ -1,6 +1,6 @@ #include -#include "tsdb.h" +#include "taosdef.h" #include "tsdbMeta.h" SMetaHandle *tsdbCreateMetaHandle(int32_t numOfTables) { -- GitLab