From 0ca84ebe03718a04f2171778faad9172c016ec2f Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Fri, 18 Jun 2021 19:19:49 +0900 Subject: [PATCH] Cleanup db handlers and db handle provider - Add empty lines for readability. - Move initialization to initialization list for consistency. - Fix minor coding rule. Signed-off-by: Junghyun Yeon --- src/server/database/appinfo_db_handler.cc | 6 ++++-- src/server/database/appinfo_db_handler.hh | 2 +- src/server/database/cert_get_db_handler.cc | 9 +++++---- src/server/database/cert_get_db_handler.hh | 2 +- src/server/database/cert_set_db_handler.cc | 9 +++++---- src/server/database/cert_set_db_handler.hh | 2 +- src/server/database/db_handle_provider.cc | 4 ++-- src/server/database/db_handle_provider.hh | 9 ++++++--- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/server/database/appinfo_db_handler.cc b/src/server/database/appinfo_db_handler.cc index ab40c6a..26ce9d1 100644 --- a/src/server/database/appinfo_db_handler.cc +++ b/src/server/database/appinfo_db_handler.cc @@ -20,8 +20,8 @@ #include #include "pkgmgrinfo_basic.h" -#include "pkgmgrinfo_internal.h" #include "pkgmgrinfo_debug.h" +#include "pkgmgrinfo_internal.h" namespace { @@ -30,6 +30,7 @@ gboolean _move_func(gpointer key, gpointer value, gpointer user_data) { std::vector* app_list = static_cast*>(user_data); app_list->emplace_back(appinfo); + return true; } @@ -43,7 +44,7 @@ namespace pkgmgr_server { namespace database { AppInfoDBHandler::AppInfoDBHandler(uid_t uid, int pid) - : AbstractDBHandler(uid, pid), uid_(uid) {} + : AbstractDBHandler(uid, pid), filter_(nullptr), uid_(uid) {} AppInfoDBHandler::~AppInfoDBHandler() {} @@ -59,6 +60,7 @@ int AppInfoDBHandler::Execute() { std::shared_lock s(lock_); SetOpType(pkgmgr_common::DBOperationType::OPERATION_TYPE_READ); SetDBType(pkgmgr_common::DBType::DB_TYPE_FILE_PKGDB); + if (!Connect()) return PMINFO_R_ERROR; diff --git a/src/server/database/appinfo_db_handler.hh b/src/server/database/appinfo_db_handler.hh index 7e77c02..e239ef5 100644 --- a/src/server/database/appinfo_db_handler.hh +++ b/src/server/database/appinfo_db_handler.hh @@ -41,7 +41,7 @@ class EXPORT_API AppInfoDBHandler : public AbstractDBHandler{ int Execute() override; private: - pkgmgrinfo_filter_x* filter_ = nullptr; + pkgmgrinfo_filter_x* filter_; std::vector handle_list_; uid_t uid_; }; diff --git a/src/server/database/cert_get_db_handler.cc b/src/server/database/cert_get_db_handler.cc index 4a7b32b..d6daecb 100644 --- a/src/server/database/cert_get_db_handler.cc +++ b/src/server/database/cert_get_db_handler.cc @@ -26,7 +26,7 @@ namespace pkgmgr_server { namespace database { CertGetDBHandler::CertGetDBHandler(uid_t uid, int pid) - : AbstractDBHandler(uid, pid), uid_(uid) {} + : AbstractDBHandler(uid, pid), uid_(uid), handle_(nullptr) {} CertGetDBHandler::~CertGetDBHandler() {} @@ -40,8 +40,10 @@ void CertGetDBHandler::SetPkgID(std::string pkgid) { int CertGetDBHandler::Execute() { std::shared_lock s(lock_); + SetOpType(pkgmgr_common::DBOperationType::OPERATION_TYPE_READ); SetDBType(pkgmgr_common::DBType::DB_TYPE_FILE_CERTDB); + if (!Connect()) { _LOGE("Failed to connect database"); return PMINFO_R_ERROR; @@ -52,11 +54,10 @@ int CertGetDBHandler::Execute() { if (ret != PMINFO_R_OK) return ret; - handle_ = static_cast(handle); + handle_ = reinterpret_cast(handle); sqlite3* conn = GetConnection().front().first; - ret = certinfo_internal_get(conn, pkgid_.c_str(), uid_, handle_); - return ret; + return certinfo_internal_get(conn, pkgid_.c_str(), uid_, handle_); } } // namespace database diff --git a/src/server/database/cert_get_db_handler.hh b/src/server/database/cert_get_db_handler.hh index 946dc79..f1ae3f0 100644 --- a/src/server/database/cert_get_db_handler.hh +++ b/src/server/database/cert_get_db_handler.hh @@ -43,7 +43,7 @@ class EXPORT_API CertGetDBHandler : public AbstractDBHandler{ private: uid_t uid_; std::string pkgid_; - pkgmgr_certinfo_x* handle_ = nullptr; + pkgmgr_certinfo_x* handle_; }; } // namespace database diff --git a/src/server/database/cert_set_db_handler.cc b/src/server/database/cert_set_db_handler.cc index 68e7c99..9edc508 100644 --- a/src/server/database/cert_set_db_handler.cc +++ b/src/server/database/cert_set_db_handler.cc @@ -26,7 +26,7 @@ namespace pkgmgr_server { namespace database { CertSetDBHandler::CertSetDBHandler(uid_t uid, int pid) - : AbstractDBHandler(uid, pid), uid_(uid) {} + : AbstractDBHandler(uid, pid), uid_(uid), handle_(nullptr) {} CertSetDBHandler::~CertSetDBHandler() {} @@ -36,16 +36,17 @@ void CertSetDBHandler::SetCertHandle(pkgmgr_certinfo_x* cert_info) { int CertSetDBHandler::Execute() { std::unique_lock u(lock_); + SetOpType(pkgmgr_common::DBOperationType::OPERATION_TYPE_WRITE); SetDBType(pkgmgr_common::DBType::DB_TYPE_FILE_CERTDB); + if (!Connect()) return PMINFO_R_ERROR; DBHandleProvider::GetInst(uid_).SetMemoryMode(GetPID(), true); - sqlite3 *conn = GetConnection().front().first; - int ret = certinfo_internal_set(conn, handle_->pkgid, handle_, uid_); + sqlite3* conn = GetConnection().front().first; - return ret; + return certinfo_internal_set(conn, handle_->pkgid, handle_, uid_); } } // namespace database diff --git a/src/server/database/cert_set_db_handler.hh b/src/server/database/cert_set_db_handler.hh index 7ef50ff..51dcd9a 100644 --- a/src/server/database/cert_set_db_handler.hh +++ b/src/server/database/cert_set_db_handler.hh @@ -41,7 +41,7 @@ class EXPORT_API CertSetDBHandler : public AbstractDBHandler{ private: uid_t uid_; - pkgmgr_certinfo_x* handle_ = nullptr; + pkgmgr_certinfo_x* handle_; }; } // namespace database diff --git a/src/server/database/db_handle_provider.cc b/src/server/database/db_handle_provider.cc index 7207f85..a2122b2 100644 --- a/src/server/database/db_handle_provider.cc +++ b/src/server/database/db_handle_provider.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "db_handle_provider.hh" + #include #include @@ -23,11 +25,9 @@ #include #include -#include "db_handle_provider.hh" #include "pkgmgrinfo_debug.h" #include "pkgmgr-info.h" - #ifdef LOG_TAG #undef LOG_TAG #endif diff --git a/src/server/database/db_handle_provider.hh b/src/server/database/db_handle_provider.hh index df5e636..522bfe4 100644 --- a/src/server/database/db_handle_provider.hh +++ b/src/server/database/db_handle_provider.hh @@ -42,7 +42,8 @@ class EXPORT_API DBHandleProvider { ~DBHandleProvider() = default; static DBHandleProvider& GetInst(uid_t uid); static bool IsCrashedWriteRequest(); - std::vector> GetParserDBPath(int pid, bool write); + std::vector> GetParserDBPath( + int pid, bool write); std::string GetCertDBPath(int pid, bool write); void SetMemoryMode(pid_t pid, bool flag); @@ -52,7 +53,8 @@ class EXPORT_API DBHandleProvider { const std::string& memorydb_path); private: - static std::unordered_map> provider_; + static std::unordered_map> provider_; static bool is_memory_global_; static std::unique_ptr global_parser_memory_db_handle_; @@ -67,7 +69,8 @@ class EXPORT_API DBHandleProvider { uid_t uid_; bool is_memory_; - std::unique_ptr parser_memory_db_handle_; + std::unique_ptr parser_memory_db_handle_; std::string parser_memory_db_path_; std::string parser_file_db_path_; }; -- 2.7.4