diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a85df15776f0e2f419fa63bbad90e33354e1d5e5..34768b00dfa0da5fbb20e8e2c22fa0294e6864ba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,6 +9,6 @@ ADD_SUBDIRECTORY(kit) ADD_SUBDIRECTORY(plugins) ADD_SUBDIRECTORY(sdb) ADD_SUBDIRECTORY(mnode) +ADD_SUBDIRECTORY(vnode) ADD_SUBDIRECTORY(dnode) -#ADD_SUBDIRECTORY(vnode) #ADD_SUBDIRECTORY(connector/jdbc) diff --git a/src/vnode/tsdb/CMakeLists.txt b/src/vnode/tsdb/CMakeLists.txt index 4a88fbd7d65dfe6a327d7b5ad0348fb12dc079e4..ed924109a7cca1cc5606ce50490fbc6eaa656f8a 100644 --- a/src/vnode/tsdb/CMakeLists.txt +++ b/src/vnode/tsdb/CMakeLists.txt @@ -1,9 +1,10 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST) -message(STATUS "tsdb source files: ${SOURCE_LIST}") - add_library(tsdb STATIC ${SOURCE_LIST}) - target_link_libraries(tsdb common) -target_include_directories(tsdb PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc") \ No newline at end of file +target_include_directories(tsdb + PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc" + PUBLIC "${CMAKE_SOURCE_DIR}/src/util/inc" + PUBLIC "${CMAKE_SOURCE_DIR}/src/os/linux/inc" + ) \ No newline at end of file diff --git a/src/vnode/tsdb/src/tsdbCache.c b/src/vnode/tsdb/src/tsdbCache.c index e957778eb6d324c3556d44caa39ef6dc74492edf..25b649b73de63b9ec7c33b656ee431f44720a3d6 100644 --- a/src/vnode/tsdb/src/tsdbCache.c +++ b/src/vnode/tsdb/src/tsdbCache.c @@ -14,5 +14,4 @@ SCacheHandle *tsdbCreateCache(int32_t numOfBlocks) { } -int32_t tsdbFreeCache(SCacheHandle *pHandle) { -} \ No newline at end of file +int32_t tsdbFreeCache(SCacheHandle *pHandle) { return 0; } \ No newline at end of file diff --git a/src/vnode/tsdb/src/tsdbMain.c b/src/vnode/tsdb/src/tsdbMain.c index 3999b88ef828fcc6db0761a35e8edfeaabd6dff4..793f67d176cd0dd063841ef4b460e138b85c0152 100644 --- a/src/vnode/tsdb/src/tsdbMain.c +++ b/src/vnode/tsdb/src/tsdbMain.c @@ -159,6 +159,7 @@ tsdb_repo_t *tsdbOpenRepo(char *tsdbDir) { static int32_t tsdbFlushCache(STsdbRepo *pRepo) { // TODO + return 0; } int32_t tsdbCloseRepo(tsdb_repo_t *repo) { @@ -186,6 +187,7 @@ int32_t tsdbConfigRepo(tsdb_repo_t *repo, STsdbCfg *pCfg) { STsdbRepoInfo *tsdbGetStatus(tsdb_repo_t *pRepo) { // TODO + return NULL; } int32_t tsdbCreateTable(tsdb_repo_t *repo, STableCfg *pCfg) { @@ -195,14 +197,17 @@ int32_t tsdbCreateTable(tsdb_repo_t *repo, STableCfg *pCfg) { int32_t tsdbAlterTable(tsdb_repo_t *pRepo, STableCfg *pCfg) { // TODO + return 0; } STableInfo *tsdbGetTableInfo(tsdb_repo_t *pRepo, STableId tid, int32_t *error) { // TODO + return NULL; } int32_t tsdbInsertData(tsdb_repo_t *pRepo, STableId tid, char *pData, int32_t *error) { // TODO + return 0; } // Check the configuration and set default options @@ -272,7 +277,7 @@ static int32_t tsdbDestroyRepoEnv(STsdbRepo *pRepo) { static int tsdbOpenMetaFile(char *tsdbDir) { // TODO - return 0 + return 0; } static int tsdbRecoverRepo(int fd, STsdbCfg *pCfg) {