From 4eedfc40d60ab41f4a1144a8b976345c0e1c2478 Mon Sep 17 00:00:00 2001 From: hzcheng Date: Thu, 5 Mar 2020 08:22:41 +0000 Subject: [PATCH] add more code --- src/vnode/CMakeLists.txt | 2 +- src/vnode/tests/CMakeLists.txt | 3 - src/vnode/tests/common/CMakeLists.txt | 14 ---- src/vnode/tests/common/commonDataTests.cpp | 7 -- src/vnode/tests/common/commonSChemaTests.cpp | 9 --- src/vnode/tests/tsdb/tsdbTests.cpp | 37 ----------- src/vnode/tsdb/CMakeLists.txt | 4 +- src/vnode/tsdb/inc/tsdbMeta.h | 1 + src/vnode/tsdb/src/tsdbMeta.c | 3 +- .../{tests/tsdb => tsdb/tests}/CMakeLists.txt | 2 - src/vnode/tsdb/tests/tsdbTests.cpp | 65 +++++++++++++++++++ 11 files changed, 71 insertions(+), 76 deletions(-) delete mode 100644 src/vnode/tests/CMakeLists.txt delete mode 100644 src/vnode/tests/common/CMakeLists.txt delete mode 100644 src/vnode/tests/common/commonDataTests.cpp delete mode 100644 src/vnode/tests/common/commonSChemaTests.cpp delete mode 100644 src/vnode/tests/tsdb/tsdbTests.cpp rename src/vnode/{tests/tsdb => tsdb/tests}/CMakeLists.txt (86%) create mode 100644 src/vnode/tsdb/tests/tsdbTests.cpp diff --git a/src/vnode/CMakeLists.txt b/src/vnode/CMakeLists.txt index 22770e3799..8224507f1c 100644 --- a/src/vnode/CMakeLists.txt +++ b/src/vnode/CMakeLists.txt @@ -6,4 +6,4 @@ add_subdirectory(tsdb) enable_testing() -add_subdirectory(tests) \ No newline at end of file +# add_subdirectory(tests) \ No newline at end of file diff --git a/src/vnode/tests/CMakeLists.txt b/src/vnode/tests/CMakeLists.txt deleted file mode 100644 index 786fa9a66f..0000000000 --- a/src/vnode/tests/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(common) - -add_subdirectory(tsdb) \ No newline at end of file diff --git a/src/vnode/tests/common/CMakeLists.txt b/src/vnode/tests/common/CMakeLists.txt deleted file mode 100644 index 093768be1a..0000000000 --- a/src/vnode/tests/common/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) - -message(STATUS "COMMON: ${SOURCE_LIST}") - -add_executable(commonTests ${SOURCE_LIST}) - -target_link_libraries(commonTests gtest gtest_main pthread common) - -add_test( - NAME - unit - COMMAND - ${CMAKE_CURRENT_BINARY_DIR}/commonTests -) \ No newline at end of file diff --git a/src/vnode/tests/common/commonDataTests.cpp b/src/vnode/tests/common/commonDataTests.cpp deleted file mode 100644 index 7becb8699c..0000000000 --- a/src/vnode/tests/common/commonDataTests.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include - -#include "dataformat.h" - -TEST(commonDataTests, createDataRow) { - EXPECT_EQ(1, 2/2); -} \ No newline at end of file diff --git a/src/vnode/tests/common/commonSChemaTests.cpp b/src/vnode/tests/common/commonSChemaTests.cpp deleted file mode 100644 index 44fd384b61..0000000000 --- a/src/vnode/tests/common/commonSChemaTests.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include -#include - -#include "schema.h" - -TEST(commonSchemaTests, createSchema) { - EXPECT_EQ(1, 2/2); -} \ No newline at end of file diff --git a/src/vnode/tests/tsdb/tsdbTests.cpp b/src/vnode/tests/tsdb/tsdbTests.cpp deleted file mode 100644 index a7d558d38c..0000000000 --- a/src/vnode/tests/tsdb/tsdbTests.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include -#include - -#include "tsdb.h" - -TEST(TsdbTest, createTsdbRepo) { - STsdbCfg *pCfg = tsdbCreateDefaultCfg(); - - - tsdb_repo_t *pRepo = tsdbCreateRepo("/root/mnt/test/vnode0", pCfg, NULL); - - tsdbFreeCfg(pCfg); - - ASSERT_NE(pRepo, nullptr); - - STableCfg config; - config.tableId.tid = 0; - config.tableId.uid = 10889498868728187539; - config.numOfCols = 2; - config.schema = (SSchema *)malloc(sizeof(SSchema) + sizeof(SColumn) * config.numOfCols); - config.schema->version = 0; - config.schema->numOfCols = 2; - config.schema->numOfTags = 0; - config.schema->colIdCounter = 1; - for (int i = 0; i < config.numOfCols; i++) { - SColumn *pCol = config.schema->columns + i; - pCol->type = TD_DATATYPE_BIGINT; - pCol->colId = config.schema->colIdCounter++; - pCol->offset = 10; - pCol->colName = strdup("col1"); - } - config.tagValues = NULL; - - tsdbCreateTable(pRepo, &config); - - tsdbCloseRepo(pRepo); -} \ No newline at end of file diff --git a/src/vnode/tsdb/CMakeLists.txt b/src/vnode/tsdb/CMakeLists.txt index 91c7d571e8..9736f2cb88 100644 --- a/src/vnode/tsdb/CMakeLists.txt +++ b/src/vnode/tsdb/CMakeLists.txt @@ -8,4 +8,6 @@ target_include_directories(tsdb PUBLIC "${CMAKE_SOURCE_DIR}/src/inc" PUBLIC "${CMAKE_SOURCE_DIR}/src/util/inc" PUBLIC "${CMAKE_SOURCE_DIR}/src/os/linux/inc" - ) \ No newline at end of file + ) + +add_subdirectory(tests) \ No newline at end of file diff --git a/src/vnode/tsdb/inc/tsdbMeta.h b/src/vnode/tsdb/inc/tsdbMeta.h index 833e5b134a..12edfece8c 100644 --- a/src/vnode/tsdb/inc/tsdbMeta.h +++ b/src/vnode/tsdb/inc/tsdbMeta.h @@ -116,6 +116,7 @@ int32_t tsdbCreateTableImpl(STsdbMeta *pMeta, STableCfg *pCfg); int32_t tsdbDropTableImpl(STsdbMeta *pMeta, STableId tableId); STable *tsdbIsValidTableToInsert(STsdbMeta *pMeta, STableId tableId); int32_t tsdbInsertRowToTableImpl(SSkipListNode *pNode, STable *pTable); +STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid); #ifdef __cplusplus } diff --git a/src/vnode/tsdb/src/tsdbMeta.c b/src/vnode/tsdb/src/tsdbMeta.c index a780deb7df..bbb813ad74 100644 --- a/src/vnode/tsdb/src/tsdbMeta.c +++ b/src/vnode/tsdb/src/tsdbMeta.c @@ -12,7 +12,6 @@ static int tsdbFreeTable(STable *pTable); static int32_t tsdbCheckTableCfg(STableCfg *pCfg); -static STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid); static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable); static int tsdbAddTableIntoMap(STsdbMeta *pMeta, STable *pTable); static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable); @@ -206,7 +205,7 @@ static int32_t tsdbCheckTableCfg(STableCfg *pCfg) { return 0; } -static STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid) { +STable *tsdbGetTableByUid(STsdbMeta *pMeta, int64_t uid) { return (STable *)taosGetDataFromHashTable(pMeta->tableMap, (char *)(&uid), sizeof(uid)); } diff --git a/src/vnode/tests/tsdb/CMakeLists.txt b/src/vnode/tsdb/tests/CMakeLists.txt similarity index 86% rename from src/vnode/tests/tsdb/CMakeLists.txt rename to src/vnode/tsdb/tests/CMakeLists.txt index a942dd917e..1026ee0d9c 100644 --- a/src/vnode/tests/tsdb/CMakeLists.txt +++ b/src/vnode/tsdb/tests/CMakeLists.txt @@ -1,7 +1,5 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) -message(STATUS "TSDB: ${SOURCE_LIST}") - add_executable(tsdbTests ${SOURCE_LIST}) target_link_libraries(tsdbTests gtest gtest_main pthread tsdb) diff --git a/src/vnode/tsdb/tests/tsdbTests.cpp b/src/vnode/tsdb/tests/tsdbTests.cpp new file mode 100644 index 0000000000..33a557aeaf --- /dev/null +++ b/src/vnode/tsdb/tests/tsdbTests.cpp @@ -0,0 +1,65 @@ +#include +#include + +#include "tsdbMeta.h" + +TEST(TsdbTest, createTable) { + STsdbMeta *pMeta = tsdbCreateMeta(100); + ASSERT_NE(pMeta, nullptr); + + STableCfg config; + config.tableId.tid = 0; + config.tableId.uid = 98868728187539L; + config.numOfCols = 2; + config.schema = (SSchema *)malloc(sizeof(SSchema) + sizeof(SColumn) * config.numOfCols); + config.schema->version = 0; + config.schema->numOfCols = 2; + config.schema->numOfTags = 0; + config.schema->colIdCounter = 1; + for (int i = 0; i < config.numOfCols; i++) { + SColumn *pCol = config.schema->columns + i; + pCol->type = TD_DATATYPE_BIGINT; + pCol->colId = config.schema->colIdCounter++; + pCol->offset = 10; + pCol->colName = strdup("col1"); + } + config.tagValues = nullptr; + + tsdbCreateTableImpl(pMeta, &config), 0; + + STable *pTable = tsdbGetTableByUid(pMeta, config.tableId.uid); + ASSERT_NE(pTable, nullptr); +} + +TEST(TsdbTest, DISABLED_createTsdbRepo) { + STsdbCfg *pCfg = tsdbCreateDefaultCfg(); + + + tsdb_repo_t *pRepo = tsdbCreateRepo("/root/mnt/test/vnode0", pCfg, NULL); + + tsdbFreeCfg(pCfg); + + ASSERT_NE(pRepo, nullptr); + + STableCfg config; + config.tableId.tid = 0; + config.tableId.uid = 10889498868728187539; + config.numOfCols = 2; + config.schema = (SSchema *)malloc(sizeof(SSchema) + sizeof(SColumn) * config.numOfCols); + config.schema->version = 0; + config.schema->numOfCols = 2; + config.schema->numOfTags = 0; + config.schema->colIdCounter = 1; + for (int i = 0; i < config.numOfCols; i++) { + SColumn *pCol = config.schema->columns + i; + pCol->type = TD_DATATYPE_BIGINT; + pCol->colId = config.schema->colIdCounter++; + pCol->offset = 10; + pCol->colName = strdup("col1"); + } + config.tagValues = NULL; + + tsdbCreateTable(pRepo, &config); + + tsdbCloseRepo(pRepo); +} \ No newline at end of file -- GitLab