diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt index d4901845fafe953d187fe7d5f2a9429310280cba..298eb6110c8dab7ac34a24446d851b37a6b5dace 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 8c7c3369520e71ae742304dc11f0118c473a3c44..8a7c7a1a5197e3e47ed7e36cdb2ebcdcef2d6b49 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 ecc5dc86b16fce727962407a1ec4d062f3970223..d5493fdee0e44e20aa27913bdb4e34baec43e518 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 {