From 798d2171ebd0269e05a86acfdac8f6f0924f6e91 Mon Sep 17 00:00:00 2001 From: hzcheng Date: Tue, 10 Mar 2020 17:54:13 +0800 Subject: [PATCH] make code compile --- src/dnode/CMakeLists.txt | 2 +- src/vnode/tsdb/CMakeLists.txt | 3 ++- src/vnode/tsdb/inc/tsdb.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt index d4901845fa..298eb6110c 100644 --- a/src/dnode/CMakeLists.txt +++ b/src/dnode/CMakeLists.txt @@ -13,7 +13,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) AUX_SOURCE_DIRECTORY(src SRC) ADD_EXECUTABLE(taosd ${SRC}) - TARGET_LINK_LIBRARIES(taosd mnode sdb taos_static monitor http) + TARGET_LINK_LIBRARIES(taosd mnode sdb taos_static monitor http tsdb) #IF (TD_CLUSTER) # TARGET_LINK_LIBRARIES(taosd dcluster) diff --git a/src/vnode/tsdb/CMakeLists.txt b/src/vnode/tsdb/CMakeLists.txt index 8c7c336952..8a7c7a1a51 100644 --- a/src/vnode/tsdb/CMakeLists.txt +++ b/src/vnode/tsdb/CMakeLists.txt @@ -5,7 +5,8 @@ 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_COMMUNITY_DIR}/src/vnode/common/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc) + # INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/common/inc) INCLUDE_DIRECTORIES(inc) AUX_SOURCE_DIRECTORY(src SRC) diff --git a/src/vnode/tsdb/inc/tsdb.h b/src/vnode/tsdb/inc/tsdb.h index ecc5dc86b1..d5493fdee0 100644 --- a/src/vnode/tsdb/inc/tsdb.h +++ b/src/vnode/tsdb/inc/tsdb.h @@ -20,6 +20,7 @@ #include #include "taosdef.h" +#include "taosmsg.h" #include "dataformat.h" #ifdef __cplusplus @@ -215,8 +216,8 @@ typedef struct STimeWindow { int64_t ekey; } STimeWindow; -typedef struct { -} SColumnFilterInfo; +// typedef struct { +// } SColumnFilterInfo; // query condition to build vnode iterator typedef struct STSDBQueryCond { -- GitLab