xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch '3.0' into merge/mainto3.0

This commit is contained in:
Simon Guan 2025-03-17 15:16:59 +08:00
parent dfe32225de 60498503b2
commit 9164bf815c
4 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -19,6 +19,7 @@ include(${TD_SUPPORT_DIR}/cmake.options)
include(${TD_SUPPORT_DIR}/cmake.define) include(${TD_SUPPORT_DIR}/cmake.define)
include(${TD_SUPPORT_DIR}/cmake.version) include(${TD_SUPPORT_DIR}/cmake.version)
include(${TD_SUPPORT_DIR}/cmake.install) include(${TD_SUPPORT_DIR}/cmake.install)
enable_testing()
set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES OFF) set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES OFF)
add_subdirectory(contrib) add_subdirectory(contrib)

2
include/common/tcommon.h
View File

@ -124,7 +124,7 @@ enum {
TMQ_MSG_TYPE__POLL_RAW_DATA_RSP, TMQ_MSG_TYPE__POLL_RAW_DATA_RSP,
}; };
static const char* tmqMsgTypeStr[] = { static const char* const tmqMsgTypeStr[] = {
"data", "meta", "ask ep", "meta data", "wal info", "batch meta", "raw data" "data", "meta", "ask ep", "meta data", "wal info", "batch meta", "raw data"
}; };

40
source/libs/tdb/test/CMakeLists.txt
View File

@ -1,23 +1,49 @@
# tdbTest # tdbTest
add_executable(tdbTest "tdbTest.cpp") if(${TD_LINUX})
target_link_libraries(tdbTest tdb gtest gtest_main) add_executable(tdbTest "tdbTest.cpp")
target_link_libraries(tdbTest tdb gtest_main)
add_test(
NAME tdbTest
COMMAND tdbTest
)
endif()
# tdbUtilTest # tdbUtilTest
add_executable(tdbUtilTest "tdbUtilTest.cpp") add_executable(tdbUtilTest "tdbUtilTest.cpp")
target_link_libraries(tdbUtilTest tdb gtest gtest_main) target_link_libraries(tdbUtilTest tdb gtest_main)
add_test(
NAME tdbUtilTest
COMMAND tdbUtilTest
)
# overflow pages testing # overflow pages testing
add_executable(tdbExOVFLTest "tdbExOVFLTest.cpp") add_executable(tdbExOVFLTest "tdbExOVFLTest.cpp")
target_link_libraries(tdbExOVFLTest tdb gtest gtest_main) target_link_libraries(tdbExOVFLTest tdb gtest_main)
add_test(
NAME tdbExOVFLTest
COMMAND tdbExOVFLTest
)
# page defragment testing # page defragment testing
add_executable(tdbPageDefragmentTest "tdbPageDefragmentTest.cpp") add_executable(tdbPageDefragmentTest "tdbPageDefragmentTest.cpp")
target_link_libraries(tdbPageDefragmentTest tdb gtest gtest_main) target_link_libraries(tdbPageDefragmentTest tdb gtest_main)
add_test(
NAME tdbPageDefragmentTest
COMMAND tdbPageDefragmentTest
)
# page recycling testing # page recycling testing
add_executable(tdbPageRecycleTest "tdbPageRecycleTest.cpp") add_executable(tdbPageRecycleTest "tdbPageRecycleTest.cpp")
target_link_libraries(tdbPageRecycleTest tdb gtest gtest_main) target_link_libraries(tdbPageRecycleTest tdb gtest_main)
add_test(
NAME tdbPageRecycleTest
COMMAND tdbPageRecycleTest
)
# page flush testing # page flush testing
add_executable(tdbPageFlushTest "tdbPageFlushTest.cpp") add_executable(tdbPageFlushTest "tdbPageFlushTest.cpp")
target_link_libraries(tdbPageFlushTest tdb gtest gtest_main) target_link_libraries(tdbPageFlushTest tdb gtest_main)
add_test(
NAME tdbPageFlushTest
COMMAND tdbPageFlushTest
)

4
source/libs/tdb/test/tdbExOVFLTest.cpp
View File

@ -336,8 +336,8 @@ tdbBegin(pEnv, &txn);
int vLen = -1; int vLen = -1;
ret = tdbTbGet(pDb, "key1", strlen("key1"), &pVal, &vLen); ret = tdbTbGet(pDb, "key1", strlen("key1"), &pVal, &vLen);
ASSERT(ret == -1); ASSERT(ret == TSDB_CODE_NOT_FOUND);
GTEST_ASSERT_EQ(ret, -1); GTEST_ASSERT_EQ(ret, TSDB_CODE_NOT_FOUND);
GTEST_ASSERT_EQ(vLen, -1); GTEST_ASSERT_EQ(vLen, -1);
GTEST_ASSERT_EQ(pVal, nullptr); GTEST_ASSERT_EQ(pVal, nullptr);