Add pid as default parameter of dbhandler

Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/common/database/abstract_db_handler.cc b/src/common/database/abstract_db_handler.cc
index 3a46d10..3296c46 100644 (file)
--- a/src/common/database/abstract_db_handler.cc
+++ b/src/common/database/abstract_db_handler.cc
@@ -216,7 +216,10 @@ static int __open_write_db(uid_t uid, const char *path, sqlite3 **db, int flags)
 namespace pkgmgr_common {
 namespace database {
 
-AbstractDBHandler::AbstractDBHandler(uid_t uid) { uid_ = uid; }
+AbstractDBHandler::AbstractDBHandler(uid_t uid, int pid) {
+  uid_ = uid;
+  pid_ = pid;
+}
 
 AbstractDBHandler::~AbstractDBHandler() {
   // Is this necessary?
@@ -286,10 +289,6 @@ std::string AbstractDBHandler::GetLocale() { return locale_; }
 
 int AbstractDBHandler::GetPID() { return pid_; }
 
-void AbstractDBHandler::SetPID(int pid) {
-  pid_ = pid;
-}
-
 void AbstractDBHandler::SetLocale(const std::string& locale) {
   locale_ = locale;
 }

diff --git a/src/common/database/abstract_db_handler.hh b/src/common/database/abstract_db_handler.hh
index bcea655..3b9c1b4 100644 (file)
--- a/src/common/database/abstract_db_handler.hh
+++ b/src/common/database/abstract_db_handler.hh
@@ -44,10 +44,9 @@ class EXPORT_API AbstractDBHandler {
     OPERATION_TYPE_WRITE
   };
 
-  AbstractDBHandler(uid_t uid);
+  AbstractDBHandler(uid_t uid, int pid);
   virtual ~AbstractDBHandler();
   virtual int Execute() = 0;
-  void SetPID(int pid);
   void SetLocale(const std::string& locale);
   void SetDBType(DBType type);
   void SetOpType(OperationType type);

diff --git a/src/common/database/appinfo_db_handler.cc b/src/common/database/appinfo_db_handler.cc
index 6fdccd6..d5ce985 100644 (file)
--- a/src/common/database/appinfo_db_handler.cc
+++ b/src/common/database/appinfo_db_handler.cc
@@ -35,8 +35,8 @@ void _move(gpointer key, gpointer value, gpointer user_data) {
 namespace pkgmgr_common {
 namespace database {
 
-AppInfoDBHandler::AppInfoDBHandler(uid_t uid)
-    : AbstractDBHandler(uid), uid_(uid) {}
+AppInfoDBHandler::AppInfoDBHandler(uid_t uid, int pid)
+    : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 AppInfoDBHandler::~AppInfoDBHandler() {}
 

diff --git a/src/common/database/appinfo_db_handler.hh b/src/common/database/appinfo_db_handler.hh
index 41e6668..398ee41 100644 (file)
--- a/src/common/database/appinfo_db_handler.hh
+++ b/src/common/database/appinfo_db_handler.hh
@@ -34,7 +34,7 @@ namespace database {
 
 class EXPORT_API AppInfoDBHandler : public AbstractDBHandler{
  public:
-  AppInfoDBHandler(uid_t uid);
+  AppInfoDBHandler(uid_t uid, int pid);
   ~AppInfoDBHandler();
   std::vector<application_x*> GetAppHandle();
   void SetFilter(pkgmgrinfo_filter_x* filter);

diff --git a/src/common/database/cache_db_handler.cc b/src/common/database/cache_db_handler.cc
index cea448a..9f076b6 100644 (file)
--- a/src/common/database/cache_db_handler.cc
+++ b/src/common/database/cache_db_handler.cc
@@ -19,7 +19,7 @@
 namespace pkgmgr_common {
 namespace database {
 
-CacheDBHandler::CacheDBHandler(uid_t uid) : AbstractDBHandler(uid), uid_(uid) {}
+CacheDBHandler::CacheDBHandler(uid_t uid, int pid) : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 CacheDBHandler::~CacheDBHandler() {}
 

diff --git a/src/common/database/cache_db_handler.hh b/src/common/database/cache_db_handler.hh
index 0470b77..5873fc3 100644 (file)
--- a/src/common/database/cache_db_handler.hh
+++ b/src/common/database/cache_db_handler.hh
@@ -34,7 +34,7 @@ namespace database {
 
 class EXPORT_API CacheDBHandler : public AbstractDBHandler{
  public:
-  CacheDBHandler(uid_t uid);
+  CacheDBHandler(uid_t uid, int pid);
   ~CacheDBHandler();
   bool InitCacheDB();
   bool RemoveCache(std::string pkgid);

diff --git a/src/common/database/cert_get_db_handler.cc b/src/common/database/cert_get_db_handler.cc
index a7ba33e..18c0651 100644 (file)
--- a/src/common/database/cert_get_db_handler.cc
+++ b/src/common/database/cert_get_db_handler.cc
@@ -24,8 +24,8 @@
 namespace pkgmgr_common {
 namespace database {
 
-CertGetDBHandler::CertGetDBHandler(uid_t uid)
-    : AbstractDBHandler(uid), uid_(uid) {}
+CertGetDBHandler::CertGetDBHandler(uid_t uid, int pid)
+    : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 CertGetDBHandler::~CertGetDBHandler() {}
 

diff --git a/src/common/database/cert_get_db_handler.hh b/src/common/database/cert_get_db_handler.hh
index 2021798..0f8172a 100644 (file)
--- a/src/common/database/cert_get_db_handler.hh
+++ b/src/common/database/cert_get_db_handler.hh
@@ -34,7 +34,7 @@ namespace database {
 
 class EXPORT_API CertGetDBHandler : public AbstractDBHandler{
  public:
-  CertGetDBHandler(uid_t uid);
+  CertGetDBHandler(uid_t uid, int pid);
   ~CertGetDBHandler();
   pkgmgr_certinfo_x* GetCertHandle();
   void SetPkgID (std::string pkgid);

diff --git a/src/common/database/cert_set_db_handler.cc b/src/common/database/cert_set_db_handler.cc
index d9ff59b..54a5e17 100644 (file)
--- a/src/common/database/cert_set_db_handler.cc
+++ b/src/common/database/cert_set_db_handler.cc
@@ -24,8 +24,8 @@
 namespace pkgmgr_common {
 namespace database {
 
-CertSetDBHandler::CertSetDBHandler(uid_t uid)
-    : AbstractDBHandler(uid), uid_(uid) {}
+CertSetDBHandler::CertSetDBHandler(uid_t uid, int pid)
+    : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 CertSetDBHandler::~CertSetDBHandler() {}
 

diff --git a/src/common/database/cert_set_db_handler.hh b/src/common/database/cert_set_db_handler.hh
index c44477c..74310fb 100644 (file)
--- a/src/common/database/cert_set_db_handler.hh
+++ b/src/common/database/cert_set_db_handler.hh
@@ -34,7 +34,7 @@ namespace database {
 
 class EXPORT_API CertSetDBHandler : public AbstractDBHandler{
  public:
-  CertSetDBHandler(uid_t uid);
+  CertSetDBHandler(uid_t uid, int pid);
   ~CertSetDBHandler();
   void SetCertHandle (pkgmgr_certinfo_x* cert_info);
   int Execute() override;

diff --git a/src/common/database/depinfo_db_handler.cc b/src/common/database/depinfo_db_handler.cc
index 29bca41..04c3571 100644 (file)
--- a/src/common/database/depinfo_db_handler.cc
+++ b/src/common/database/depinfo_db_handler.cc
@@ -24,8 +24,8 @@
 namespace pkgmgr_common {
 namespace database {
 
-DepInfoGetDBHandler::DepInfoGetDBHandler(uid_t uid)
-    : AbstractDBHandler(uid), uid_(uid) {}
+DepInfoGetDBHandler::DepInfoGetDBHandler(uid_t uid, int pid)
+    : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 DepInfoGetDBHandler::~DepInfoGetDBHandler() {}
 

diff --git a/src/common/database/depinfo_db_handler.hh b/src/common/database/depinfo_db_handler.hh
index 6ccf89e..180b469 100644 (file)
--- a/src/common/database/depinfo_db_handler.hh
+++ b/src/common/database/depinfo_db_handler.hh
@@ -34,7 +34,7 @@ namespace database {
 
 class EXPORT_API DepInfoGetDBHandler : public AbstractDBHandler{
  public:
-  DepInfoGetDBHandler(uid_t uid);
+  DepInfoGetDBHandler(uid_t uid, int pid);
   ~DepInfoGetDBHandler();
   std::vector<dependency_x*> GetDependencyList();
   void SetPkgID(const std::string& pkgid);

diff --git a/src/common/database/pkg_get_db_handler.cc b/src/common/database/pkg_get_db_handler.cc
index 967cbbc..2b822de 100644 (file)
--- a/src/common/database/pkg_get_db_handler.cc
+++ b/src/common/database/pkg_get_db_handler.cc
@@ -35,8 +35,8 @@ void _move(gpointer key, gpointer value, gpointer user_data) {
 namespace pkgmgr_common {
 namespace database {
 
-PkgGetDBHandler::PkgGetDBHandler(uid_t uid)
-    : AbstractDBHandler(uid), uid_(uid) {}
+PkgGetDBHandler::PkgGetDBHandler(uid_t uid, int pid)
+    : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 PkgGetDBHandler::~PkgGetDBHandler() {}
 

diff --git a/src/common/database/pkg_get_db_handler.hh b/src/common/database/pkg_get_db_handler.hh
index 4126260..9b849ab 100644 (file)
--- a/src/common/database/pkg_get_db_handler.hh
+++ b/src/common/database/pkg_get_db_handler.hh
@@ -34,7 +34,7 @@ namespace database {
 
 class EXPORT_API PkgGetDBHandler : public AbstractDBHandler{
  public:
-  PkgGetDBHandler(uid_t uid);
+  PkgGetDBHandler(uid_t uid, int pid);
   ~PkgGetDBHandler();
   std::vector<package_x*> GetPkgHandle();
   void SetFilter(pkgmgrinfo_filter_x* filter);

diff --git a/src/common/database/pkg_set_db_handler.cc b/src/common/database/pkg_set_db_handler.cc
index 1f95172..06a8c98 100644 (file)
--- a/src/common/database/pkg_set_db_handler.cc
+++ b/src/common/database/pkg_set_db_handler.cc
@@ -25,8 +25,8 @@
 namespace pkgmgr_common {
 namespace database {
 
-PkgSetDBHandler::PkgSetDBHandler(uid_t uid)
-    : AbstractDBHandler(uid), uid_(uid) {}
+PkgSetDBHandler::PkgSetDBHandler(uid_t uid, int pid)
+    : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 PkgSetDBHandler::~PkgSetDBHandler() {}
 

diff --git a/src/common/database/pkg_set_db_handler.hh b/src/common/database/pkg_set_db_handler.hh
index bc0b1bc..b83642f 100644 (file)
--- a/src/common/database/pkg_set_db_handler.hh
+++ b/src/common/database/pkg_set_db_handler.hh
@@ -43,7 +43,7 @@ namespace database {
 
 class EXPORT_API PkgSetDBHandler : public AbstractDBHandler{
  public:
-  PkgSetDBHandler(uid_t uid);
+  PkgSetDBHandler(uid_t uid, int pid);
   ~PkgSetDBHandler();
   void SetPkgInfo(package_x* package);
   void SetPkgID(std::string pkgid);

diff --git a/src/common/database/query_handler.cc b/src/common/database/query_handler.cc
index 2c3ce4c..d5aba60 100644 (file)
--- a/src/common/database/query_handler.cc
+++ b/src/common/database/query_handler.cc
@@ -24,7 +24,8 @@
 namespace pkgmgr_common {
 namespace database {
 
-QueryHandler::QueryHandler(uid_t uid) : AbstractDBHandler(uid), uid_(uid) {}
+QueryHandler::QueryHandler(uid_t uid, int pid)
+    : AbstractDBHandler(uid, pid), uid_(uid) {}
 
 QueryHandler::~QueryHandler() {}
 
@@ -63,7 +64,7 @@ int QueryHandler::Execute() {
         _LOGE("Failed to execute query");
         return ret;
       }
-      
+
       result_.clear();
       result_.resize(row);
       GList* tmp = list;

diff --git a/src/common/database/query_handler.hh b/src/common/database/query_handler.hh
index 9077a4d..c655a22 100644 (file)
--- a/src/common/database/query_handler.hh
+++ b/src/common/database/query_handler.hh
@@ -35,7 +35,7 @@ namespace database {
 
 class EXPORT_API QueryHandler : public AbstractDBHandler{
  public:
-  QueryHandler(uid_t uid);
+  QueryHandler(uid_t uid, int pid);
   ~QueryHandler();
   void SetQuery(std::vector<std::string> query);
   bool BindString(std::string value);

diff --git a/src/common/request_handler/get_appinfo_request_handler.cc b/src/common/request_handler/get_appinfo_request_handler.cc
index 33ad9ab..f9e7873 100644 (file)
--- a/src/common/request_handler/get_appinfo_request_handler.cc
+++ b/src/common/request_handler/get_appinfo_request_handler.cc
@@ -37,8 +37,7 @@ bool GetAppinfoRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  AppInfoDBHandler db(parcel->GetUid());
-  db.SetPID(GetPID());
+  AppInfoDBHandler db(parcel->GetUid(), GetPID());
   db.SetLocale(locale);
   db.SetFilter(const_cast<pkgmgrinfo_filter_x*>(parcel->GetFilter()));
   int ret = db.Execute();

diff --git a/src/common/request_handler/get_cert_request_handler.cc b/src/common/request_handler/get_cert_request_handler.cc
index 0e8cd79..ee31472 100644 (file)
--- a/src/common/request_handler/get_cert_request_handler.cc
+++ b/src/common/request_handler/get_cert_request_handler.cc
@@ -36,8 +36,7 @@ bool GetCertRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  CertGetDBHandler db(parcel->GetUid());
-  db.SetPID(GetPID());
+  CertGetDBHandler db(parcel->GetUid(), GetPID());
   db.SetLocale(locale);
   db.SetPkgID(parcel->GetPkgId());
 

diff --git a/src/common/request_handler/get_depinfo_request_handler.cc b/src/common/request_handler/get_depinfo_request_handler.cc
index bb7b628..c9c4aba 100644 (file)
--- a/src/common/request_handler/get_depinfo_request_handler.cc
+++ b/src/common/request_handler/get_depinfo_request_handler.cc
@@ -37,8 +37,7 @@ bool GetDepinfoRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  DepInfoGetDBHandler db(parcel->GetUid());
-  db.SetPID(GetPID());
+  DepInfoGetDBHandler db(parcel->GetUid(), GetPID());
   db.SetPkgID(parcel->GetPkgID());
   int ret = db.Execute();
 

diff --git a/src/common/request_handler/get_pkginfo_request_handler.cc b/src/common/request_handler/get_pkginfo_request_handler.cc
index 46e6350..0307c11 100644 (file)
--- a/src/common/request_handler/get_pkginfo_request_handler.cc
+++ b/src/common/request_handler/get_pkginfo_request_handler.cc
@@ -37,8 +37,7 @@ bool GetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  PkgGetDBHandler db(parcel->GetUid());
-  db.SetPID(GetPID());
+  PkgGetDBHandler db(parcel->GetUid(), GetPID());
   db.SetLocale(locale);
   db.SetFilter(const_cast<pkgmgrinfo_filter_x*>(parcel->GetFilter()));
   int ret = db.Execute();

diff --git a/src/common/request_handler/query_request_handler.cc b/src/common/request_handler/query_request_handler.cc
index ace0c19..7044e32 100644 (file)
--- a/src/common/request_handler/query_request_handler.cc
+++ b/src/common/request_handler/query_request_handler.cc
@@ -37,8 +37,7 @@ bool QueryRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  QueryHandler db(parcel->GetUid());
-  db.SetPID(GetPID());
+  QueryHandler db(parcel->GetUid(), GetPID());
   db.SetLocale(locale);
   db.SetQuery(parcel->GetQueries());
   db.SetDBType(parcel->GetDBType());

diff --git a/src/common/request_handler/set_cert_request_handler.cc b/src/common/request_handler/set_cert_request_handler.cc
index 99bd010..c9e4703 100644 (file)
--- a/src/common/request_handler/set_cert_request_handler.cc
+++ b/src/common/request_handler/set_cert_request_handler.cc
@@ -31,8 +31,7 @@ bool SetCertRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  CertSetDBHandler db(parcel->GetUid());
-  db.SetPID(GetPID());
+  CertSetDBHandler db(parcel->GetUid(), GetPID());
   db.SetLocale(locale);
   db.SetCertHandle(const_cast<pkgmgr_certinfo_x*>(parcel->GetCertInfo()));
 

diff --git a/src/common/request_handler/set_pkginfo_request_handler.cc b/src/common/request_handler/set_pkginfo_request_handler.cc
index 49e52af..904c434 100644 (file)
--- a/src/common/request_handler/set_pkginfo_request_handler.cc
+++ b/src/common/request_handler/set_pkginfo_request_handler.cc
@@ -38,8 +38,7 @@ bool SetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  PkgSetDBHandler db(parcel->GetUid());
-  db.SetPID(GetPID());
+  PkgSetDBHandler db(parcel->GetUid(), GetPID());
   db.SetLocale(locale);
   db.SetWriteType(parcel->GetWriteType());
 

diff --git a/test/unit_tests/test_database.cc b/test/unit_tests/test_database.cc
index 296f26d..a5ad46e 100644 (file)
--- a/test/unit_tests/test_database.cc
+++ b/test/unit_tests/test_database.cc
@@ -41,6 +41,6 @@ class DatabaseTest : public ::testing::Test {
 };
 
 TEST_F(DatabaseTest, AppInfoDBHandler) {
-  pd::AppInfoDBHandler db_handler(0);
+  pd::AppInfoDBHandler db_handler(0, 0);
   EXPECT_NE(db_handler.Execute(), PMINFO_R_OK);
 }