Change database from klay to internal

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/plugins/bluetooth/CMakeLists.txt b/plugins/bluetooth/CMakeLists.txt
index 10c866e..b18a5bf 100644 (file)
--- a/plugins/bluetooth/CMakeLists.txt
+++ b/plugins/bluetooth/CMakeLists.txt
@@ -17,7 +17,8 @@ SET(TARGET "vist-plugin-bluetooth")
 SET(PLUGIN_SOURCES "bluetooth.cpp")
 
 SET(DEPENDENCY bluetooth-api
-                          capi-network-bluetooth)
+                          capi-network-bluetooth
+                          klay)
 
 PKG_CHECK_MODULES(PLUGIN_DEPS REQUIRED ${DEPENDENCY})
 

diff --git a/src/vist/client/CMakeLists.txt b/src/vist/client/CMakeLists.txt
index 279cf0d..8428b93 100644 (file)
--- a/src/vist/client/CMakeLists.txt
+++ b/src/vist/client/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 SET(${TARGET_VIST_CLIENT_LIB}_SRCS "")
 
-PKG_CHECK_MODULES(VIST_CLIENT_DEPS REQUIRED gflags klay dlog)
+PKG_CHECK_MODULES(VIST_CLIENT_DEPS REQUIRED gflags dlog)
 
 INCLUDE_DIRECTORIES(SYSTEM . ${VIST_CLIENT_DEPS_INCLUDE_DIRS})
 
@@ -26,5 +26,5 @@ ADD_VIST_TEST(${CLIENT_TESTS})
 
 ADD_LIBRARY(${TARGET_VIST_CLIENT_LIB} STATIC ${${TARGET_VIST_CLIENT_LIB}_SRCS})
 TARGET_LINK_LIBRARIES(${TARGET_VIST_CLIENT_LIB} ${VIST_CLIENT_DEPS_LIBRARIES}
-                                                                                               ${TARGET_VIST_COMMON_LIB} 
+                                                                                               ${TARGET_VIST_COMMON_LIB}
                                                                                                pthread)

diff --git a/src/vist/policy/CMakeLists.txt b/src/vist/policy/CMakeLists.txt
index 5387a8e..8397803 100644 (file)
--- a/src/vist/policy/CMakeLists.txt
+++ b/src/vist/policy/CMakeLists.txt
@@ -15,7 +15,7 @@
 
 SET(${TARGET_VIST_POLICY_LIB}_SRCS "")
 
-PKG_CHECK_MODULES(VIST_POLICY_DEPS REQUIRED klay dlog)
+PKG_CHECK_MODULES(VIST_POLICY_DEPS REQUIRED dlog)
 
 INCLUDE_DIRECTORIES(SYSTEM . ${VIST_POLICY_DEPS_INCLUDE_DIRS})
 
@@ -29,5 +29,6 @@ ADD_VIST_TEST(${POLICY_CORE_TESTS})
 
 ADD_LIBRARY(${TARGET_VIST_POLICY_LIB} STATIC ${${TARGET_VIST_POLICY_LIB}_SRCS})
 TARGET_LINK_LIBRARIES(${TARGET_VIST_POLICY_LIB} ${VIST_POLICY_DEPS_LIBRARIES}
+                                                                                               ${TARGET_VIST_COMMON_LIB}
                                                                                                pthread
                                                                                                dl)

diff --git a/src/vist/policy/policy-storage.cpp b/src/vist/policy/policy-storage.cpp
index b51e202..28b4c55 100644 (file)
--- a/src/vist/policy/policy-storage.cpp
+++ b/src/vist/policy/policy-storage.cpp
@@ -16,14 +16,12 @@
 
 #include "policy-storage.hpp"
 
+#include <vist/database/column.hpp>
+#include <vist/database/statement.hpp>
 #include <vist/exception.hpp>
 #include <vist/logger.hpp>
 #include <vist/query-builder.hpp>
 
-#include <klay/db/column.h>
-#include <klay/db/statement.h>
-#include <klay/exception.h>
-
 #include <algorithm>
 #include <fstream>
 
@@ -52,9 +50,7 @@ namespace vist {
 namespace policy {
 
 PolicyStorage::PolicyStorage(const std::string& path) :
-       database(std::make_shared<database::Connection>(path,
-                                                                                                       database::Connection::ReadWrite |
-                                                                                                       database::Connection::Create))
+       database(std::make_shared<database::Connection>(path))
 {
        database->exec("PRAGMA foreign_keys = ON;");
        database->exec(getScript(SCRIPT_CREATE_SCHEMA));

diff --git a/src/vist/policy/policy-storage.hpp b/src/vist/policy/policy-storage.hpp
index 27bc27e..9022f11 100644 (file)
--- a/src/vist/policy/policy-storage.hpp
+++ b/src/vist/policy/policy-storage.hpp
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <vist/database/connection.hpp>
 #include <vist/sdk/policy-model.hpp>
 #include <vist/sdk/policy-value.hpp>
 
@@ -25,7 +26,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <klay/db/connection.h>
 
 namespace vist {
 namespace policy {
@@ -68,7 +68,7 @@ public:
 private:
        std::string getScript(const std::string& name);
 
-       std::shared_ptr<klay::database::Connection> database;
+       std::shared_ptr<database::Connection> database;
 
        /// DB Cache objects
        /// TODO(Sangwan): add locking mechanism