From bb983594d5f4bca207768d563dbd71f7c022d8fc Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 18 Dec 2024 12:37:00 -0600 Subject: [PATCH] refactor create rocksdb --- .../include/db/impl/rdb_file_db.hpp | 2 +- .../include/db/impl/rdb_meta_db.hpp | 2 +- .../librepertory/src/db/impl/rdb_file_db.cpp | 20 +++++++++---------- .../librepertory/src/db/impl/rdb_meta_db.cpp | 13 ++++++------ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/repertory/librepertory/include/db/impl/rdb_file_db.hpp b/repertory/librepertory/include/db/impl/rdb_file_db.hpp index 88ed5048..b3377587 100644 --- a/repertory/librepertory/include/db/impl/rdb_file_db.hpp +++ b/repertory/librepertory/include/db/impl/rdb_file_db.hpp @@ -42,9 +42,9 @@ private: private: std::unique_ptr db_{nullptr}; - rocksdb::ColumnFamilyHandle *default_family_{}; rocksdb::ColumnFamilyHandle *directory_family_{}; rocksdb::ColumnFamilyHandle *file_family_{}; + rocksdb::ColumnFamilyHandle *source_family_{}; private: void create_or_open(bool clear); diff --git a/repertory/librepertory/include/db/impl/rdb_meta_db.hpp b/repertory/librepertory/include/db/impl/rdb_meta_db.hpp index 9b5788b7..87060a3a 100644 --- a/repertory/librepertory/include/db/impl/rdb_meta_db.hpp +++ b/repertory/librepertory/include/db/impl/rdb_meta_db.hpp @@ -43,7 +43,7 @@ private: private: std::unique_ptr db_{nullptr}; - rocksdb::ColumnFamilyHandle *default_family_{}; + rocksdb::ColumnFamilyHandle *meta_family_{}; rocksdb::ColumnFamilyHandle *pinned_family_{}; rocksdb::ColumnFamilyHandle *size_family_{}; rocksdb::ColumnFamilyHandle *source_family_{}; diff --git a/repertory/librepertory/src/db/impl/rdb_file_db.cpp b/repertory/librepertory/src/db/impl/rdb_file_db.cpp index aac8fbb3..0cbc22d3 100644 --- a/repertory/librepertory/src/db/impl/rdb_file_db.cpp +++ b/repertory/librepertory/src/db/impl/rdb_file_db.cpp @@ -50,9 +50,9 @@ void rdb_file_db::create_or_open(bool clear) { db_ = utils::create_rocksdb(cfg_, "file", families, handles, clear); std::size_t idx{}; - default_family_ = handles.at(idx++); - file_family_ = handles.at(idx++); + source_family_ = handles.at(idx++); directory_family_ = handles.at(idx++); + file_family_ = handles.at(idx++); } auto rdb_file_db::add_directory(const std::string &api_path, @@ -80,7 +80,7 @@ auto rdb_file_db::add_directory(const std::string &api_path, return res; } - return txn->Put(default_family_, source_path, api_path); + return txn->Put(source_family_, source_path, api_path); }); } @@ -114,7 +114,7 @@ auto rdb_file_db::add_or_update_file(const i_file_db::file_data &data) return res; } - return txn->Put(default_family_, data.source_path, data.api_path); + return txn->Put(source_family_, data.source_path, data.api_path); }); } @@ -129,7 +129,7 @@ auto rdb_file_db::create_iterator(rocksdb::ColumnFamilyHandle *family) const auto rdb_file_db::count() const -> std::uint64_t { std::uint64_t ret{}; - auto iter = create_iterator(default_family_); + auto iter = create_iterator(source_family_); for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { ++ret; } @@ -142,7 +142,7 @@ auto rdb_file_db::get_api_path(const std::string &source_path, REPERTORY_USES_FUNCTION_NAME(); return perform_action(function_name, [&]() -> rocksdb::Status { - return db_->Get(rocksdb::ReadOptions{}, default_family_, source_path, + return db_->Get(rocksdb::ReadOptions{}, source_family_, source_path, &api_path); }); } @@ -153,7 +153,7 @@ auto rdb_file_db::get_directory_api_path(const std::string &source_path, REPERTORY_USES_FUNCTION_NAME(); auto result = perform_action(function_name, [&]() -> rocksdb::Status { - auto res = db_->Get(rocksdb::ReadOptions{}, default_family_, source_path, + auto res = db_->Get(rocksdb::ReadOptions{}, source_family_, source_path, &api_path); if (not res.ok()) { return res; @@ -191,7 +191,7 @@ auto rdb_file_db::get_file_api_path(const std::string &source_path, REPERTORY_USES_FUNCTION_NAME(); auto result = perform_action(function_name, [&]() -> rocksdb::Status { - auto res = db_->Get(rocksdb::ReadOptions{}, default_family_, source_path, + auto res = db_->Get(rocksdb::ReadOptions{}, source_family_, source_path, &api_path); if (not res.ok()) { return res; @@ -285,7 +285,7 @@ auto rdb_file_db::get_item_list() const -> std::vector { auto rdb_file_db::get_source_path(const std::string &api_path, std::string &source_path) const -> api_error { - auto iter = create_iterator(default_family_); + auto iter = create_iterator(source_family_); for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { if (iter->value().ToString() != api_path) { continue; @@ -366,7 +366,7 @@ auto rdb_file_db::remove_item(const std::string &api_path) -> api_error { auto rdb_file_db::remove_item(const std::string &api_path, const std::string &source_path, rocksdb::Transaction *txn) -> rocksdb::Status { - auto res = txn->Delete(default_family_, source_path); + auto res = txn->Delete(source_family_, source_path); if (not res.ok()) { return res; } diff --git a/repertory/librepertory/src/db/impl/rdb_meta_db.cpp b/repertory/librepertory/src/db/impl/rdb_meta_db.cpp index 371edb99..7a9b49a7 100644 --- a/repertory/librepertory/src/db/impl/rdb_meta_db.cpp +++ b/repertory/librepertory/src/db/impl/rdb_meta_db.cpp @@ -50,7 +50,7 @@ void rdb_meta_db::create_or_open(bool clear) { db_ = utils::create_rocksdb(cfg_, "provider_meta", families, handles, clear); std::size_t idx{}; - default_family_ = handles.at(idx++); + meta_family_ = handles.at(idx++); pinned_family_ = handles.at(idx++); size_family_ = handles.at(idx++); source_family_ = handles.at(idx++); @@ -80,7 +80,7 @@ auto rdb_meta_db::get_api_path(const std::string &source_path, auto rdb_meta_db::get_api_path_list() const -> std::vector { std::vector ret; - auto iter = create_iterator(default_family_); + auto iter = create_iterator(meta_family_); for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { ret.push_back(iter->key().ToString()); } @@ -98,8 +98,7 @@ auto rdb_meta_db::get_item_meta_json(const std::string &api_path, { std::string value; auto res = perform_action(function_name, [&]() -> rocksdb::Status { - return db_->Get(rocksdb::ReadOptions{}, default_family_, api_path, - &value); + return db_->Get(rocksdb::ReadOptions{}, meta_family_, api_path, &value); }); if (res != api_error::success) { return res; @@ -207,7 +206,7 @@ auto rdb_meta_db::get_pinned_files() const -> std::vector { auto rdb_meta_db::get_total_item_count() const -> std::uint64_t { std::uint64_t ret{}; - auto iter = create_iterator(default_family_); + auto iter = create_iterator(meta_family_); for (iter->SeekToFirst(); iter->Valid(); iter->Next()) { ++ret; } @@ -317,7 +316,7 @@ auto rdb_meta_db::remove_api_path(const std::string &api_path, } } - return txn->Delete(default_family_, api_path); + return txn->Delete(meta_family_, api_path); } auto rdb_meta_db::remove_item_meta(const std::string &api_path, @@ -491,7 +490,7 @@ auto rdb_meta_db::update_item_meta(const std::string &api_path, json json_data, } } - return set_status(txn->Put(default_family_, api_path, json_data.dump())); + return set_status(txn->Put(meta_family_, api_path, json_data.dump())); }; if (base_txn == nullptr) {