rename tsdb.h

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))

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"
 

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"

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"

src/dnode/inc/dnodeVnodeMgmt.h

@@ -22,7 +22,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "taosmsg.h"
 
 /*

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"
 

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"

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"

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;

src/inc/taosmsg.h

@@ -23,7 +23,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "taoserror.h"
 #include "taosdef.h"
 

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

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

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];

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"
 

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};

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

src/modules/monitor/src/monitorSystem.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include "monitorSystem.h"
 #include "tsclient.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsystem.h"
 #include "ttime.h"
 #include "ttimer.h"

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";

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 ()

src/os/linux/inc/os.h

@@ -77,7 +77,6 @@ extern "C" {
 #include <wctype.h>
 #include <inttypes.h>
 
-
 #define taosCloseSocket(x) \
   {                        \
     if (FD_VALID(x)) {     \

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"
 

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 <intrin.h>

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);

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);

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);

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"

src/sdb/src/hashint.c

@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include "tmempool.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 typedef struct _long_hash_t {
   uint32_t             key;

src/sdb/src/hashstr.c

@@ -14,7 +14,7 @@
  */
 
 #include "os.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 #define MAX_STR_LEN 40
 

src/util/inc/tglobalcfg.h

@@ -22,7 +22,7 @@ extern "C" {
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "tsdb.h"
+#include "taosdef.h"
 
 extern int  (*startMonitor)();
 extern void (*stopMonitor)();

src/util/inc/tscompression.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include "tsdb.h"
+#include "taosdef.h"
 
 #define BITS_PER_BYTE 8
 // Masks

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)

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;

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"

src/util/src/thistogram.c

@@ -17,7 +17,7 @@
 #include "taosmsg.h"
 #include "thistogram.h"
 #include "tlosertree.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 /**
  *

src/util/src/tmd5.c

@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "tsdb.h"
+#include "taosdef.h"
 
 /* forward declaration */
 static void Transform(uint32_t *buf, uint32_t *in);

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"

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"
 

src/util/src/ttime.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "ttime.h"
 #include "tutil.h"
 

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"

src/vnode/common/inc/vnodePeer.h

@@ -22,7 +22,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "tsdb.h"
+#include "taosdef.h"
 
 /*
  * Initialize the resources

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"

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"

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"

src/vnode/tsdb/inc/tsdbMeta.h

@@ -4,7 +4,7 @@
 
 #include <pthread.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 
 // Initially, there are 4 tables
 #define TSDB_INIT_NUMBER_OF_SUPER_TABLE 4

src/vnode/tsdb/src/tsdb.c

@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 // #include "disk.h"
 #include "tsdbCache.h"
 #include "tsdbMeta.h"

src/vnode/tsdb/src/tsdbMeta.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsdbMeta.h"
 
 SMetaHandle *tsdbCreateMetaHandle(int32_t numOfTables) {