提交 cb1c3a17 编写于 作者: S slguan

rename tsdb.h

上级 649ef3d3
...@@ -27,7 +27,7 @@ extern "C" { ...@@ -27,7 +27,7 @@ extern "C" {
#include "textbuffer.h" #include "textbuffer.h"
#include "tscSecondaryMerge.h" #include "tscSecondaryMerge.h"
#include "tsclient.h" #include "tsclient.h"
#include "tsdb.h" #include "taosdef.h"
#define UTIL_METER_IS_SUPERTABLE(metaInfo) \ #define UTIL_METER_IS_SUPERTABLE(metaInfo) \
(((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->tableType == TSDB_TABLE_TYPE_SUPER_TABLE)) (((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->tableType == TSDB_TABLE_TYPE_SUPER_TABLE))
......
...@@ -27,7 +27,7 @@ extern "C" { ...@@ -27,7 +27,7 @@ extern "C" {
#include "tlog.h" #include "tlog.h"
#include "tscCache.h" #include "tscCache.h"
#include "tscSQLParser.h" #include "tscSQLParser.h"
#include "tsdb.h" #include "taosdef.h"
#include "tsqlfunction.h" #include "tsqlfunction.h"
#include "tutil.h" #include "tutil.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "tscSQLParser.h" #include "tscSQLParser.h"
#include "tscSyntaxtreefunction.h" #include "tscSyntaxtreefunction.h"
#include "tschemautil.h" #include "tschemautil.h"
#include "tsdb.h" #include "taosdef.h"
#include "tskiplist.h" #include "tskiplist.h"
#include "tsqldef.h" #include "tsqldef.h"
#include "tsqlfunction.h" #include "tsqlfunction.h"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "tcache.h" #include "tcache.h"
#include "tlog.h" #include "tlog.h"
#include "trpc.h" #include "trpc.h"
#include "tsdb.h" #include "taosdef.h"
#include "tsocket.h" #include "tsocket.h"
#include "tsystem.h" #include "tsystem.h"
#include "ttime.h" #include "ttime.h"
......
...@@ -22,7 +22,7 @@ extern "C" { ...@@ -22,7 +22,7 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include "tsdb.h" #include "taosdef.h"
#include "taosmsg.h" #include "taosmsg.h"
/* /*
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "tglobalcfg.h" #include "tglobalcfg.h"
#include "tsdb.h"
#include "vnode.h" #include "vnode.h"
#include "dnodeSystem.h" #include "dnodeSystem.h"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "tsdb.h" #include "taosdef.h"
#include "tlog.h" #include "tlog.h"
#include "ttimer.h" #include "ttimer.h"
#include "dnode.h" #include "dnode.h"
......
...@@ -34,7 +34,7 @@ extern "C" { ...@@ -34,7 +34,7 @@ extern "C" {
#include "tlog.h" #include "tlog.h"
#include "tmempool.h" #include "tmempool.h"
#include "trpc.h" #include "trpc.h"
#include "tsdb.h" #include "taosdef.h"
#include "tskiplist.h" #include "tskiplist.h"
#include "tsocket.h" #include "tsocket.h"
#include "ttime.h" #include "ttime.h"
......
...@@ -21,7 +21,7 @@ extern "C" { ...@@ -21,7 +21,7 @@ extern "C" {
#endif #endif
#include "taosmsg.h" #include "taosmsg.h"
#include "tsdb.h" #include "taosdef.h"
extern uint16_t tsMgmtMgmtPort; extern uint16_t tsMgmtMgmtPort;
extern uint16_t tsMgmtSyncPort; extern uint16_t tsMgmtSyncPort;
......
...@@ -23,7 +23,7 @@ extern "C" { ...@@ -23,7 +23,7 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "tsdb.h" #include "taosdef.h"
#include "taoserror.h" #include "taoserror.h"
#include "taosdef.h" #include "taosdef.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "stdbool.h" #include "stdbool.h"
#include "taos.h" #include "taos.h"
#include "tlog.h" #include "tlog.h"
#include "tsdb.h" #include "taosdef.h"
#include "stdbool.h" #include "stdbool.h"
#define MAX_USERNAME_SIZE 64 #define MAX_USERNAME_SIZE 64
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "taosmsg.h" #include "taosmsg.h"
#include "tglobalcfg.h" #include "tglobalcfg.h"
#include "tsclient.h" #include "tsclient.h"
#include "tsdb.h" #include "taosdef.h"
#include "tutil.h" #include "tutil.h"
#define COMMAND_SIZE 65536 #define COMMAND_SIZE 65536
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "mgmtTable.h" #include "mgmtTable.h"
#include "mgmtShell.h" #include "mgmtShell.h"
#include "dnodeModule.h" #include "dnodeModule.h"
#include "tsdb.h" #include "taosdef.h"
// global, not configurable // global, not configurable
char mgmtDirectory[128]; char mgmtDirectory[128];
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "pthread.h" #include "pthread.h"
#include "semaphore.h" #include "semaphore.h"
#include "tmempool.h" #include "tmempool.h"
#include "tsdb.h" #include "taosdef.h"
#include "tutil.h" #include "tutil.h"
#include "zlib.h" #include "zlib.h"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "gcHandle.h" #include "gcHandle.h"
#include "cJSON.h" #include "cJSON.h"
#include "gcJson.h" #include "gcJson.h"
#include "tsdb.h" #include "taosdef.h"
static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest}; static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest};
static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL}; static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL};
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "shash.h" #include "shash.h"
#include "taosmsg.h" #include "taosmsg.h"
#include "tgJson.h" #include "tgJson.h"
#include "tsdb.h" #include "taosdef.h"
/* /*
* taos.telegraf.cfg formats like * taos.telegraf.cfg formats like
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "monitorSystem.h" #include "monitorSystem.h"
#include "tsclient.h" #include "tsclient.h"
#include "tsdb.h" #include "taosdef.h"
#include "tsystem.h" #include "tsystem.h"
#include "ttime.h" #include "ttime.h"
#include "ttimer.h" #include "ttimer.h"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "tglobalcfg.h" #include "tglobalcfg.h"
#include "tlog.h" #include "tlog.h"
#include "tsdb.h" #include "taosdef.h"
#include "tutil.h" #include "tutil.h"
char configDir[TSDB_FILENAME_LEN] = "/etc/taos"; char configDir[TSDB_FILENAME_LEN] = "/etc/taos";
......
...@@ -2,9 +2,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ...@@ -2,9 +2,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(TDengine) PROJECT(TDengine)
IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) 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/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY(src SRC) AUX_SOURCE_DIRECTORY(src SRC)
ADD_LIBRARY(os ${SRC}) ADD_LIBRARY(os ${SRC})
TARGET_LINK_LIBRARIES(os m rt) TARGET_LINK_LIBRARIES(os m rt)
ENDIF () ENDIF ()
...@@ -77,7 +77,6 @@ extern "C" { ...@@ -77,7 +77,6 @@ extern "C" {
#include <wctype.h> #include <wctype.h>
#include <inttypes.h> #include <inttypes.h>
#define taosCloseSocket(x) \ #define taosCloseSocket(x) \
{ \ { \
if (FD_VALID(x)) { \ if (FD_VALID(x)) { \
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "tglobalcfg.h" #include "tglobalcfg.h"
#include "tlog.h" #include "tlog.h"
#include "tsdb.h" #include "taosdef.h"
#include "tutil.h" #include "tutil.h"
#include "ttimer.h" #include "ttimer.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "os.h" #include "os.h"
#include "tlog.h" #include "tlog.h"
#include "tsdb.h" #include "taosdef.h"
#include "tglobalcfg.h" #include "tglobalcfg.h"
#include <intrin.h> #include <intrin.h>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef _taos_tcp_client_header_ #ifndef _taos_tcp_client_header_
#define _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 *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle);
void taosCleanUpTcpClient(void *chandle); void taosCleanUpTcpClient(void *chandle);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef _taos_tcp_server_header_ #ifndef _taos_tcp_server_header_
#define _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 *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle);
void taosCleanUpTcpServer(void *param); void taosCleanUpTcpServer(void *param);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef _taos_udp_header_ #ifndef _taos_udp_header_
#define _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 *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); void *taosInitUdpClient(char *ip, uint16_t port, char *label, int, void *fp, void *shandle);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "tmd5.h" #include "tmd5.h"
#include "tmempool.h" #include "tmempool.h"
#include "trpc.h" #include "trpc.h"
#include "tsdb.h" #include "taosdef.h"
#include "tsocket.h" #include "tsocket.h"
#include "ttcpclient.h" #include "ttcpclient.h"
#include "ttcpserver.h" #include "ttcpserver.h"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <unistd.h> #include <unistd.h>
#include "tmempool.h" #include "tmempool.h"
#include "tsdb.h" #include "taosdef.h"
typedef struct _long_hash_t { typedef struct _long_hash_t {
uint32_t key; uint32_t key;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
*/ */
#include "os.h" #include "os.h"
#include "tsdb.h" #include "taosdef.h"
#define MAX_STR_LEN 40 #define MAX_STR_LEN 40
......
...@@ -22,7 +22,7 @@ extern "C" { ...@@ -22,7 +22,7 @@ extern "C" {
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include "tsdb.h" #include "taosdef.h"
extern int (*startMonitor)(); extern int (*startMonitor)();
extern void (*stopMonitor)(); extern void (*stopMonitor)();
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
extern "C" { extern "C" {
#endif #endif
#include "tsdb.h" #include "taosdef.h"
#define BITS_PER_BYTE 8 #define BITS_PER_BYTE 8
// Masks // Masks
......
...@@ -23,7 +23,7 @@ extern "C" { ...@@ -23,7 +23,7 @@ extern "C" {
#include "os.h" #include "os.h"
#include "tmd5.h" #include "tmd5.h"
#include "tcrc32c.h" #include "tcrc32c.h"
#include "tsdb.h" #include "taosdef.h"
#ifndef STDERR_FILENO #ifndef STDERR_FILENO
#define STDERR_FILENO (2) #define STDERR_FILENO (2)
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include "os.h" #include "os.h"
#include "lz4.h" #include "lz4.h"
#include "tscompression.h" #include "tscompression.h"
#include "tsdb.h" #include "taosdef.h"
#include "ttypes.h" #include "ttypes.h"
const int TEST_NUMBER = 1; const int TEST_NUMBER = 1;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "tglobalcfg.h" #include "tglobalcfg.h"
#include "tkey.h" #include "tkey.h"
#include "tlog.h" #include "tlog.h"
#include "tsdb.h" #include "taosdef.h"
#include "tsocket.h" #include "tsocket.h"
#include "tsystem.h" #include "tsystem.h"
#include "tutil.h" #include "tutil.h"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "taosmsg.h" #include "taosmsg.h"
#include "thistogram.h" #include "thistogram.h"
#include "tlosertree.h" #include "tlosertree.h"
#include "tsdb.h" #include "taosdef.h"
/** /**
* *
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "tsdb.h" #include "taosdef.h"
/* forward declaration */ /* forward declaration */
static void Transform(uint32_t *buf, uint32_t *in); static void Transform(uint32_t *buf, uint32_t *in);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "os.h" #include "os.h"
#include "taosmsg.h" #include "taosmsg.h"
#include "tsdb.h" #include "taosdef.h"
#include "tlog.h" #include "tlog.h"
#include "ttypes.h" #include "ttypes.h"
#include "tpercentile.h" #include "tpercentile.h"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "os.h" #include "os.h"
#include "tlog.h" #include "tlog.h"
#include "tsdb.h" #include "taosdef.h"
#include "tskiplist.h" #include "tskiplist.h"
#include "tutil.h" #include "tutil.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "tsdb.h" #include "taosdef.h"
#include "ttime.h" #include "ttime.h"
#include "tutil.h" #include "tutil.h"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
*/ */
#include "os.h" #include "os.h"
#include "taos.h" #include "taos.h"
#include "tsdb.h" #include "taosdef.h"
#include "tsqldef.h" #include "tsqldef.h"
#include "ttypes.h" #include "ttypes.h"
#include "tutil.h" #include "tutil.h"
......
...@@ -22,7 +22,7 @@ extern "C" { ...@@ -22,7 +22,7 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "tsdb.h" #include "taosdef.h"
/* /*
* Initialize the resources * Initialize the resources
......
...@@ -28,7 +28,7 @@ extern "C" { ...@@ -28,7 +28,7 @@ extern "C" {
#include "tmempool.h" #include "tmempool.h"
#include "trpc.h" #include "trpc.h"
#include "tsclient.h" #include "tsclient.h"
#include "tsdb.h" #include "taosdef.h"
#include "tsocket.h" #include "tsocket.h"
#include "ttime.h" #include "ttime.h"
#include "ttimer.h" #include "ttimer.h"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#define _GNU_SOURCE /* See feature_test_macros(7) */ #define _GNU_SOURCE /* See feature_test_macros(7) */
#include "os.h" #include "os.h"
#include "tsdb.h" #include "taosdef.h"
#include "vnode.h" #include "vnode.h"
#include "vnodeUtil.h" #include "vnodeUtil.h"
#include "vnodeStatus.h" #include "vnodeStatus.h"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "tsdb.h" #include "taosdef.h"
#include "tlog.h" #include "tlog.h"
#include "tutil.h" #include "tutil.h"
#include "taosmsg.h" #include "taosmsg.h"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <pthread.h> #include <pthread.h>
#include "tsdb.h" #include "taosdef.h"
// Initially, there are 4 tables // Initially, there are 4 tables
#define TSDB_INIT_NUMBER_OF_SUPER_TABLE 4 #define TSDB_INIT_NUMBER_OF_SUPER_TABLE 4
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "tsdb.h" #include "taosdef.h"
// #include "disk.h" // #include "disk.h"
#include "tsdbCache.h" #include "tsdbCache.h"
#include "tsdbMeta.h" #include "tsdbMeta.h"
......
#include <stdlib.h> #include <stdlib.h>
#include "tsdb.h" #include "taosdef.h"
#include "tsdbMeta.h" #include "tsdbMeta.h"
SMetaHandle *tsdbCreateMetaHandle(int32_t numOfTables) { SMetaHandle *tsdbCreateMetaHandle(int32_t numOfTables) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册