From 7415f562ffcc563827413fb4863c025303b29b19 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 9 Dec 2024 13:38:05 -0600 Subject: [PATCH] file mgr db unit tests and fixes --- .../include/db/{ => impl}/rdb_file_mgr_db.hpp | 40 +++++++++---------- .../include/db/{ => impl}/rdb_meta_db.hpp | 6 +-- .../db/{ => impl}/sqlite_file_mgr_db.hpp | 40 +++++++++---------- .../include/db/{ => impl}/sqlite_meta_db.hpp | 6 +-- repertory/librepertory/src/db/file_mgr_db.cpp | 4 +- .../src/db/{ => impl}/rdb_file_mgr_db.cpp | 2 +- .../src/db/{ => impl}/rdb_meta_db.cpp | 2 +- .../src/db/{ => impl}/sqlite_file_mgr_db.cpp | 2 +- .../src/db/{ => impl}/sqlite_meta_db.cpp | 2 +- repertory/librepertory/src/db/meta_db.cpp | 4 +- .../src/file_manager/file_manager.cpp | 6 +-- 11 files changed, 57 insertions(+), 57 deletions(-) rename repertory/librepertory/include/db/{ => impl}/rdb_file_mgr_db.hpp (71%) rename repertory/librepertory/include/db/{ => impl}/rdb_meta_db.hpp (96%) rename repertory/librepertory/include/db/{ => impl}/sqlite_file_mgr_db.hpp (67%) rename repertory/librepertory/include/db/{ => impl}/sqlite_meta_db.hpp (95%) rename repertory/librepertory/src/db/{ => impl}/rdb_file_mgr_db.cpp (99%) rename repertory/librepertory/src/db/{ => impl}/rdb_meta_db.cpp (99%) rename repertory/librepertory/src/db/{ => impl}/sqlite_file_mgr_db.cpp (99%) rename repertory/librepertory/src/db/{ => impl}/sqlite_meta_db.cpp (99%) diff --git a/repertory/librepertory/include/db/rdb_file_mgr_db.hpp b/repertory/librepertory/include/db/impl/rdb_file_mgr_db.hpp similarity index 71% rename from repertory/librepertory/include/db/rdb_file_mgr_db.hpp rename to repertory/librepertory/include/db/impl/rdb_file_mgr_db.hpp index ad13fe1d..08a2c9f0 100644 --- a/repertory/librepertory/include/db/rdb_file_mgr_db.hpp +++ b/repertory/librepertory/include/db/impl/rdb_file_mgr_db.hpp @@ -19,8 +19,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef REPERTORY_INCLUDE_DB_RDB_FILE_MGR_DB_HPP_ -#define REPERTORY_INCLUDE_DB_RDB_FILE_MGR_DB_HPP_ +#ifndef REPERTORY_INCLUDE_DB_IMPL_RDB_FILE_MGR_DB_HPP_ +#define REPERTORY_INCLUDE_DB_IMPL_RDB_FILE_MGR_DB_HPP_ #include "db/i_file_mgr_db.hpp" @@ -62,37 +62,37 @@ public: [[nodiscard]] auto add_upload(upload_entry entry) -> bool override; - [[nodiscard]] auto - add_upload_active(upload_active_entry entry) -> bool override; + [[nodiscard]] auto add_upload_active(upload_active_entry entry) + -> bool override; void clear() override; - [[nodiscard]] auto - get_next_upload() const -> std::optional override; + [[nodiscard]] auto get_next_upload() const + -> std::optional override; - [[nodiscard]] auto - get_resume_list() const -> std::vector override; + [[nodiscard]] auto get_resume_list() const + -> std::vector override; [[nodiscard]] auto get_upload(const std::string &api_path) const -> std::optional override; - [[nodiscard]] auto - get_upload_active_list() const -> std::vector override; + [[nodiscard]] auto get_upload_active_list() const + -> std::vector override; - [[nodiscard]] auto - remove_resume(const std::string &api_path) -> bool override; + [[nodiscard]] auto remove_resume(const std::string &api_path) + -> bool override; - [[nodiscard]] auto - remove_upload(const std::string &api_path) -> bool override; + [[nodiscard]] auto remove_upload(const std::string &api_path) + -> bool override; - [[nodiscard]] auto - remove_upload_active(const std::string &api_path) -> bool override; + [[nodiscard]] auto remove_upload_active(const std::string &api_path) + -> bool override; - [[nodiscard]] auto - rename_resume(const std::string &from_api_path, - const std::string &to_api_path) -> bool override; + [[nodiscard]] auto rename_resume(const std::string &from_api_path, + const std::string &to_api_path) + -> bool override; }; } // namespace repertory -#endif // REPERTORY_INCLUDE_DB_RDB_FILE_MGR_DB_HPP_ +#endif // REPERTORY_INCLUDE_DB_IMPL_RDB_FILE_MGR_DB_HPP_ diff --git a/repertory/librepertory/include/db/rdb_meta_db.hpp b/repertory/librepertory/include/db/impl/rdb_meta_db.hpp similarity index 96% rename from repertory/librepertory/include/db/rdb_meta_db.hpp rename to repertory/librepertory/include/db/impl/rdb_meta_db.hpp index 0accfb0a..ccc59ffd 100644 --- a/repertory/librepertory/include/db/rdb_meta_db.hpp +++ b/repertory/librepertory/include/db/impl/rdb_meta_db.hpp @@ -19,8 +19,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef REPERTORY_INCLUDE_DB_RDB_META_DB_HPP_ -#define REPERTORY_INCLUDE_DB_RDB_META_DB_HPP_ +#ifndef REPERTORY_INCLUDE_DB_IMPL_RDB_META_DB_HPP_ +#define REPERTORY_INCLUDE_DB_IMPL_RDB_META_DB_HPP_ #include "db/i_meta_db.hpp" #include "types/repertory.hpp" @@ -109,4 +109,4 @@ public: }; } // namespace repertory -#endif // REPERTORY_INCLUDE_DB_RDB_META_DB_HPP_ +#endif // REPERTORY_INCLUDE_DB_IMPL_RDB_META_DB_HPP_ diff --git a/repertory/librepertory/include/db/sqlite_file_mgr_db.hpp b/repertory/librepertory/include/db/impl/sqlite_file_mgr_db.hpp similarity index 67% rename from repertory/librepertory/include/db/sqlite_file_mgr_db.hpp rename to repertory/librepertory/include/db/impl/sqlite_file_mgr_db.hpp index 7a891429..223045d3 100644 --- a/repertory/librepertory/include/db/sqlite_file_mgr_db.hpp +++ b/repertory/librepertory/include/db/impl/sqlite_file_mgr_db.hpp @@ -19,8 +19,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef REPERTORY_INCLUDE_DB_SQLITE_FILE_MGR_DB_HPP_ -#define REPERTORY_INCLUDE_DB_SQLITE_FILE_MGR_DB_HPP_ +#ifndef REPERTORY_INCLUDE_DB_IMPL_SQLITE_FILE_MGR_DB_HPP_ +#define REPERTORY_INCLUDE_DB_IMPL_SQLITE_FILE_MGR_DB_HPP_ #include "db/i_file_mgr_db.hpp" #include "utils/db/sqlite/db_common.hpp" @@ -46,37 +46,37 @@ public: [[nodiscard]] auto add_upload(upload_entry entry) -> bool override; - [[nodiscard]] auto - add_upload_active(upload_active_entry entry) -> bool override; + [[nodiscard]] auto add_upload_active(upload_active_entry entry) + -> bool override; void clear() override; - [[nodiscard]] auto - get_next_upload() const -> std::optional override; + [[nodiscard]] auto get_next_upload() const + -> std::optional override; - [[nodiscard]] auto - get_resume_list() const -> std::vector override; + [[nodiscard]] auto get_resume_list() const + -> std::vector override; [[nodiscard]] auto get_upload(const std::string &api_path) const -> std::optional override; - [[nodiscard]] auto - get_upload_active_list() const -> std::vector override; + [[nodiscard]] auto get_upload_active_list() const + -> std::vector override; - [[nodiscard]] auto - remove_resume(const std::string &api_path) -> bool override; + [[nodiscard]] auto remove_resume(const std::string &api_path) + -> bool override; - [[nodiscard]] auto - remove_upload(const std::string &api_path) -> bool override; + [[nodiscard]] auto remove_upload(const std::string &api_path) + -> bool override; - [[nodiscard]] auto - remove_upload_active(const std::string &api_path) -> bool override; + [[nodiscard]] auto remove_upload_active(const std::string &api_path) + -> bool override; - [[nodiscard]] auto - rename_resume(const std::string &from_api_path, - const std::string &to_api_path) -> bool override; + [[nodiscard]] auto rename_resume(const std::string &from_api_path, + const std::string &to_api_path) + -> bool override; }; } // namespace repertory -#endif // REPERTORY_INCLUDE_DB_SQLITE_FILE_MGR_DB_HPP_ +#endif // REPERTORY_INCLUDE_DB_IMPL_SQLITE_FILE_MGR_DB_HPP_ diff --git a/repertory/librepertory/include/db/sqlite_meta_db.hpp b/repertory/librepertory/include/db/impl/sqlite_meta_db.hpp similarity index 95% rename from repertory/librepertory/include/db/sqlite_meta_db.hpp rename to repertory/librepertory/include/db/impl/sqlite_meta_db.hpp index 2e19effe..f96e9d6f 100644 --- a/repertory/librepertory/include/db/sqlite_meta_db.hpp +++ b/repertory/librepertory/include/db/impl/sqlite_meta_db.hpp @@ -19,8 +19,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef REPERTORY_INCLUDE_DB_SQLITE_META_DB_HPP_ -#define REPERTORY_INCLUDE_DB_SQLITE_META_DB_HPP_ +#ifndef REPERTORY_INCLUDE_DB_IMPL_SQLITE_META_DB_HPP_ +#define REPERTORY_INCLUDE_DB_IMPL_SQLITE_META_DB_HPP_ #include "db/i_meta_db.hpp" #include "types/repertory.hpp" @@ -94,4 +94,4 @@ public: }; } // namespace repertory -#endif // REPERTORY_INCLUDE_DB_SQLITE_META_DB_HPP_ +#endif // REPERTORY_INCLUDE_DB_IMPL_SQLITE_META_DB_HPP_ diff --git a/repertory/librepertory/src/db/file_mgr_db.cpp b/repertory/librepertory/src/db/file_mgr_db.cpp index bca6117c..65a23e9b 100644 --- a/repertory/librepertory/src/db/file_mgr_db.cpp +++ b/repertory/librepertory/src/db/file_mgr_db.cpp @@ -23,8 +23,8 @@ #include "app_config.hpp" #include "db/i_file_mgr_db.hpp" -#include "db/rdb_file_mgr_db.hpp" -#include "db/sqlite_file_mgr_db.hpp" +#include "db/impl/rdb_file_mgr_db.hpp" +#include "db/impl/sqlite_file_mgr_db.hpp" namespace repertory { auto create_file_mgr_db(const app_config &cfg) diff --git a/repertory/librepertory/src/db/rdb_file_mgr_db.cpp b/repertory/librepertory/src/db/impl/rdb_file_mgr_db.cpp similarity index 99% rename from repertory/librepertory/src/db/rdb_file_mgr_db.cpp rename to repertory/librepertory/src/db/impl/rdb_file_mgr_db.cpp index 46dac70d..0892a50d 100644 --- a/repertory/librepertory/src/db/rdb_file_mgr_db.cpp +++ b/repertory/librepertory/src/db/impl/rdb_file_mgr_db.cpp @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "db/rdb_file_mgr_db.hpp" +#include "db/impl/rdb_file_mgr_db.hpp" #include "app_config.hpp" #include "types/startup_exception.hpp" diff --git a/repertory/librepertory/src/db/rdb_meta_db.cpp b/repertory/librepertory/src/db/impl/rdb_meta_db.cpp similarity index 99% rename from repertory/librepertory/src/db/rdb_meta_db.cpp rename to repertory/librepertory/src/db/impl/rdb_meta_db.cpp index 41b76244..9ed333a4 100644 --- a/repertory/librepertory/src/db/rdb_meta_db.cpp +++ b/repertory/librepertory/src/db/impl/rdb_meta_db.cpp @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "db/rdb_meta_db.hpp" +#include "db/impl/rdb_meta_db.hpp" #include "app_config.hpp" #include "types/startup_exception.hpp" diff --git a/repertory/librepertory/src/db/sqlite_file_mgr_db.cpp b/repertory/librepertory/src/db/impl/sqlite_file_mgr_db.cpp similarity index 99% rename from repertory/librepertory/src/db/sqlite_file_mgr_db.cpp rename to repertory/librepertory/src/db/impl/sqlite_file_mgr_db.cpp index 15181e15..1e193339 100644 --- a/repertory/librepertory/src/db/sqlite_file_mgr_db.cpp +++ b/repertory/librepertory/src/db/impl/sqlite_file_mgr_db.cpp @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "db/sqlite_file_mgr_db.hpp" +#include "db/impl/sqlite_file_mgr_db.hpp" #include "app_config.hpp" #include "utils/config.hpp" diff --git a/repertory/librepertory/src/db/sqlite_meta_db.cpp b/repertory/librepertory/src/db/impl/sqlite_meta_db.cpp similarity index 99% rename from repertory/librepertory/src/db/sqlite_meta_db.cpp rename to repertory/librepertory/src/db/impl/sqlite_meta_db.cpp index 96ad97c0..2c7ec27e 100644 --- a/repertory/librepertory/src/db/sqlite_meta_db.cpp +++ b/repertory/librepertory/src/db/impl/sqlite_meta_db.cpp @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "db/sqlite_meta_db.hpp" +#include "db/impl/sqlite_meta_db.hpp" #include "app_config.hpp" #include "utils/db/sqlite/db_common.hpp" diff --git a/repertory/librepertory/src/db/meta_db.cpp b/repertory/librepertory/src/db/meta_db.cpp index dd38bf17..9f5898bb 100644 --- a/repertory/librepertory/src/db/meta_db.cpp +++ b/repertory/librepertory/src/db/meta_db.cpp @@ -22,8 +22,8 @@ #include "db/meta_db.hpp" #include "app_config.hpp" -#include "db/rdb_meta_db.hpp" -#include "db/sqlite_meta_db.hpp" +#include "db/impl/rdb_meta_db.hpp" +#include "db/impl/sqlite_meta_db.hpp" namespace repertory { auto create_meta_db(const app_config &cfg) -> std::unique_ptr { diff --git a/repertory/librepertory/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp index 823fce6c..b40bbce0 100644 --- a/repertory/librepertory/src/file_manager/file_manager.cpp +++ b/repertory/librepertory/src/file_manager/file_manager.cpp @@ -501,9 +501,9 @@ void file_manager::remove_upload(const std::string &api_path, bool no_lock) { auto removed = mgr_db_->remove_upload_active(api_path); if (not removed) { - utils::error::raise_api_path_error( - function_name, api_path, api_error::error, - "failed to remove from upload_active table"); + utils::error::raise_api_path_error(function_name, api_path, + api_error::error, + "failed to remove active upload"); } if (upload_lookup_.find(api_path) != upload_lookup_.end()) {