Merge branch '2.0' into refact/slguan

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)

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)

src/vnode/tsdb/inc/tsdb.h

@@ -20,6 +20,7 @@
 #include <stdint.h>
 
 #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 {