diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index a1672fe8e7977171e67a9c76c6a31b55dafdb3c6..f12cb7830dc0faf6f1854f63b31bf18828a080ea 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -1,8 +1,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(TDengine) -INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) +INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) +INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc) IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) AUX_SOURCE_DIRECTORY(src SRC) diff --git a/src/vnode/detail/inc/vnodeStatus.h b/src/util/inc/tstatus.h similarity index 98% rename from src/vnode/detail/inc/vnodeStatus.h rename to src/util/inc/tstatus.h index 456304370d34e6f4101293e197962b069085689f..bdcd2e68a2de2c5405406b317d68049ea4d8d54f 100644 --- a/src/vnode/detail/inc/vnodeStatus.h +++ b/src/util/inc/tstatus.h @@ -16,11 +16,13 @@ #ifndef TDENGINE_TSTATUS_H #define TDENGINE_TSTATUS_H -#include "taoserror.h" - #ifdef __cplusplus extern "C" { #endif + +#include +#include +#include "taoserror.h" enum _TSDB_VG_STATUS { TSDB_VG_STATUS_READY = TSDB_CODE_SUCCESS, diff --git a/src/vnode/detail/src/vnodeStatus.c b/src/util/src/tstatus.c similarity index 99% rename from src/vnode/detail/src/vnodeStatus.c rename to src/util/src/tstatus.c index d78f3633fbb2ab23b5e2f0179eaa7bc98de79813..4c8d7868fdebdcdcbee016cf605881b8070a277d 100644 --- a/src/vnode/detail/src/vnodeStatus.c +++ b/src/util/src/tstatus.c @@ -14,8 +14,7 @@ */ #include "taosmsg.h" -#include "tsdb.h" -#include "vnodeStatus.h" +#include "tstatus.h" const char* taosGetVgroupStatusStr(int32_t vgroupStatus) { switch (vgroupStatus) {