BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

file mgr db unit tests and fixes

Browse Source
This commit is contained in:
Scott E. Graves 2024-12-09 10:52:23 -06:00
parent 6da907910c
commit 3b87050dcb
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/libraries/rocksdb.cmake
View File

@ -2,12 +2,13 @@ if(PROJECT_ENABLE_ROCKSDB)
if(PROJECT_BUILD)
add_definitions(-DPROJECT_ENABLE_ROCKSDB)
if (PROJECT_IS_MINGW AND NOT PROJECT_IS_MINGW_UNIX)
find_library(ROCKSDB_LIBRARY NAMES librocksdb REQUIRED)
pkg_check_modules(ROCKSDB REQUIRED rocksdb)
include_directories(SYSTEM BEFORE ${ROCKSDB_INCLUDE_DIRS})
link_libraries(${ROCKSDB_LIBRARIES})
else()
find_library(ROCKSDB_LIBRARY NAMES librocksdb.a REQUIRED)
link_libraries(${ROCKSDB_LIBRARY})
endif()
link_libraries(${ROCKSDB_LIBRARY})
elseif(NOT PROJECT_IS_MINGW OR PROJECT_IS_MINGW_UNIX)
ExternalProject_Add(rocksdb_project
PREFIX external

14
repertory/librepertory/src/db/rdb_file_mgr_db.cpp
View File

@ -203,12 +203,18 @@ auto rdb_file_mgr_db::get_upload_active_list() const
auto rdb_file_mgr_db::perform_action(std::string_view function_name,
std::function<rocksdb::Status()> action)
-> bool {
auto res = action();
if (not res.ok()) {
utils::error::raise_error(function_name, res.ToString());
try {
auto res = action();
if (not res.ok()) {
utils::error::raise_error(function_name, res.ToString());
}
return res.ok();
} catch (const std::exception &ex) {
utils::error::raise_error(function_name, ex);
}
return res.ok();
return false;
}
auto rdb_file_mgr_db::remove_resume(const std::string &api_path) -> bool {

3
repertory/repertory_test/src/file_mgr_db_test.cpp
View File

@ -119,7 +119,6 @@ TYPED_TEST(file_mgr_db_test, can_add_get_and_remove_upload) {
this->file_mgr_db->clear();
EXPECT_TRUE(this->file_mgr_db->add_upload({
"/test0",
2ULL,
"/src/test0",
}));
@ -136,13 +135,11 @@ TYPED_TEST(file_mgr_db_test, uploads_are_correctly_ordered) {
this->file_mgr_db->clear();
EXPECT_TRUE(this->file_mgr_db->add_upload({
"/test08",
utils::time::get_time_now(),
"/src/test0",
}));
EXPECT_TRUE(this->file_mgr_db->add_upload({
"/test07",
utils::time::get_time_now(),
"/src/test1",
}));