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

updates
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves 2024-12-04 17:58:52 -06:00
parent 4b32664e46
commit 65096f60b1
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repertory/librepertory/src/db/rdb_meta_db.cpp
View File

@ -376,8 +376,8 @@ auto rdb_meta_db::update_item_meta(const std::string &api_path, json json_data)
auto size = directory ? std::uint64_t(0U) auto size = directory ? std::uint64_t(0U)
: utils::string::to_uint64( : utils::string::to_uint64(
json_data.at(META_SIZE).get<std::string>()); json_data.at(META_SIZE).get<std::string>());
auto source_path = auto source_path = directory ? std::string("")
directory ? "" : json_data.at(META_SOURCE).get<std::string>(); : json_data.at(META_SOURCE).get<std::string>();
if (not directory) { if (not directory) {
std::string orig_source_path; std::string orig_source_path;
@ -413,13 +413,13 @@ auto rdb_meta_db::update_item_meta(const std::string &api_path, json json_data)
if (not res.ok()) { if (not res.ok()) {
return res; return res;
} }
}
if (not source_path.empty()) { if (not source_path.empty()) {
auto res = db_->Put(rocksdb::WriteOptions(), source_family_, res = db_->Put(rocksdb::WriteOptions(), source_family_, source_path,
source_path, api_path); api_path);
if (not res.ok()) { if (not res.ok()) {
return res; return res;
}
} }
} }

2
repertory/librepertory/src/db/sqlite_meta_db.cpp
View File

@ -322,7 +322,7 @@ auto sqlite_meta_db::update_item_meta(const std::string &api_path,
directory ? false : utils::string::to_bool(meta.at(META_PINNED)); directory ? false : utils::string::to_bool(meta.at(META_PINNED));
auto size = directory ? std::uint64_t(0U) auto size = directory ? std::uint64_t(0U)
: utils::string::to_uint64(meta.at(META_SIZE)); : utils::string::to_uint64(meta.at(META_SIZE));
auto source_path = directory ? "" : meta.at(META_SOURCE); auto source_path = directory ? std::string("") : meta.at(META_SOURCE);
meta.erase(META_DIRECTORY); meta.erase(META_DIRECTORY);
meta.erase(META_PINNED); meta.erase(META_PINNED);

8
repertory/repertory_test/include/fixtures/meta_db_fixture.hpp
View File

@ -25,20 +25,23 @@
#include "test_common.hpp" #include "test_common.hpp"
#include "app_config.hpp" #include "app_config.hpp"
#include "db/i_meta_db.hpp"
#include "db/rdb_meta_db.hpp" #include "db/rdb_meta_db.hpp"
#include "db/sqlite_meta_db.hpp" #include "db/sqlite_meta_db.hpp"
#include "events/consumers/console_consumer.hpp"
#include "events/event_system.hpp"
namespace repertory { namespace repertory {
template <typename db_t> class meta_db_test : public ::testing::Test { template <typename db_t> class meta_db_test : public ::testing::Test {
protected: protected:
static std::unique_ptr<app_config> config; static std::unique_ptr<app_config> config;
static console_consumer console_;
static std::unique_ptr<db_t> meta_db; static std::unique_ptr<db_t> meta_db;
protected: protected:
static void SetUpTestCase() { static void SetUpTestCase() {
static std::uint64_t idx{}; static std::uint64_t idx{};
event_system::instance().start();
auto cfg_directory = utils::path::combine(test::get_test_output_dir(), auto cfg_directory = utils::path::combine(test::get_test_output_dir(),
{ {
"meta_db_test", "meta_db_test",
@ -51,6 +54,7 @@ protected:
static void TearDownTestCase() { static void TearDownTestCase() {
meta_db.reset(); meta_db.reset();
config.reset(); config.reset();
event_system::instance().stop();
} }
}; };
@ -58,6 +62,8 @@ using meta_db_types = ::testing::Types<rdb_meta_db, sqlite_meta_db>;
template <typename db_t> std::unique_ptr<app_config> meta_db_test<db_t>::config; template <typename db_t> std::unique_ptr<app_config> meta_db_test<db_t>::config;
template <typename db_t> console_consumer meta_db_test<db_t>::console_;
template <typename db_t> std::unique_ptr<db_t> meta_db_test<db_t>::meta_db; template <typename db_t> std::unique_ptr<db_t> meta_db_test<db_t>::meta_db;
} // namespace repertory } // namespace repertory