From 09889788269f0dd18020545a138c81e091be4321 Mon Sep 17 00:00:00 2001 From: Teemu Ollakka Date: Mon, 7 May 2018 19:40:10 +0300 Subject: [PATCH] Moved public API includes under include/trrep --- CMakeLists.txt | 5 ++++- {src => include/trrep}/client_context.hpp | 0 {src => include/trrep}/compiler.hpp | 0 {src => include/trrep}/condition_variable.hpp | 0 {src => include/trrep}/data.hpp | 0 {src => include/trrep}/exception.hpp | 0 {src => include/trrep}/key.hpp | 0 {src => include/trrep}/lock.hpp | 0 {src => include/trrep}/logger.hpp | 0 {src => include/trrep}/mutex.hpp | 0 {src => include/trrep}/provider.hpp | 7 +++++++ {src => include/trrep}/server_context.hpp | 0 {src => include/trrep}/transaction_context.hpp | 0 {src => include/trrep}/view.hpp | 0 src/client_context.cpp | 4 ++-- src/dbms_simulator.cpp | 18 +++++++++--------- src/logger.cpp | 2 +- src/mock_client_context.cpp | 2 +- src/mock_client_context.hpp | 6 +++--- src/mock_provider.hpp | 2 +- src/mock_server_context.hpp | 4 ++-- src/mock_utils.cpp | 2 +- src/mock_utils.hpp | 2 +- src/provider.cpp | 2 +- src/server_context.cpp | 12 ++++++------ src/transaction_context.cpp | 14 +++++++------- src/transaction_context_test.cpp | 5 +++-- src/wsrep_provider_v26.cpp | 2 +- src/wsrep_provider_v26.hpp | 2 +- 29 files changed, 51 insertions(+), 40 deletions(-) rename {src => include/trrep}/client_context.hpp (100%) rename {src => include/trrep}/compiler.hpp (100%) rename {src => include/trrep}/condition_variable.hpp (100%) rename {src => include/trrep}/data.hpp (100%) rename {src => include/trrep}/exception.hpp (100%) rename {src => include/trrep}/key.hpp (100%) rename {src => include/trrep}/lock.hpp (100%) rename {src => include/trrep}/logger.hpp (100%) rename {src => include/trrep}/mutex.hpp (100%) rename {src => include/trrep}/provider.hpp (94%) rename {src => include/trrep}/server_context.hpp (100%) rename {src => include/trrep}/transaction_context.hpp (100%) rename {src => include/trrep}/view.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 672b7b1..13d92dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,14 @@ # cmake_minimum_required (VERSION 2.8) -project (wsrep-cpp) +project (trrep) include(CheckIncludeFile) include(CTest) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Weffc++ -Woverloaded-virtual -Wno-non-virtual-dtor -g") check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP) +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep") link_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep") @@ -51,3 +52,5 @@ if (WITH_DOCUMENTATION) endif() add_subdirectory(src) +add_subdirectory(wsrep) + diff --git a/src/client_context.hpp b/include/trrep/client_context.hpp similarity index 100% rename from src/client_context.hpp rename to include/trrep/client_context.hpp diff --git a/src/compiler.hpp b/include/trrep/compiler.hpp similarity index 100% rename from src/compiler.hpp rename to include/trrep/compiler.hpp diff --git a/src/condition_variable.hpp b/include/trrep/condition_variable.hpp similarity index 100% rename from src/condition_variable.hpp rename to include/trrep/condition_variable.hpp diff --git a/src/data.hpp b/include/trrep/data.hpp similarity index 100% rename from src/data.hpp rename to include/trrep/data.hpp diff --git a/src/exception.hpp b/include/trrep/exception.hpp similarity index 100% rename from src/exception.hpp rename to include/trrep/exception.hpp diff --git a/src/key.hpp b/include/trrep/key.hpp similarity index 100% rename from src/key.hpp rename to include/trrep/key.hpp diff --git a/src/lock.hpp b/include/trrep/lock.hpp similarity index 100% rename from src/lock.hpp rename to include/trrep/lock.hpp diff --git a/src/logger.hpp b/include/trrep/logger.hpp similarity index 100% rename from src/logger.hpp rename to include/trrep/logger.hpp diff --git a/src/mutex.hpp b/include/trrep/mutex.hpp similarity index 100% rename from src/mutex.hpp rename to include/trrep/mutex.hpp diff --git a/src/provider.hpp b/include/trrep/provider.hpp similarity index 94% rename from src/provider.hpp rename to include/trrep/provider.hpp index af808cd..5a1296f 100644 --- a/src/provider.hpp +++ b/include/trrep/provider.hpp @@ -84,6 +84,13 @@ namespace trrep virtual int sst_received(const wsrep_gtid_t&, int) = 0; virtual std::vector status() const = 0; + + /*! + * Return a pointer to native handle. + * + * \todo This should be eventually deprecated. + */ + // virtual struct wsrep* native() = 0; // Factory method static provider* make_provider(const std::string& provider); }; diff --git a/src/server_context.hpp b/include/trrep/server_context.hpp similarity index 100% rename from src/server_context.hpp rename to include/trrep/server_context.hpp diff --git a/src/transaction_context.hpp b/include/trrep/transaction_context.hpp similarity index 100% rename from src/transaction_context.hpp rename to include/trrep/transaction_context.hpp diff --git a/src/view.hpp b/include/trrep/view.hpp similarity index 100% rename from src/view.hpp rename to include/trrep/view.hpp diff --git a/src/client_context.cpp b/src/client_context.cpp index 129f815..c626967 100644 --- a/src/client_context.cpp +++ b/src/client_context.cpp @@ -2,8 +2,8 @@ // Copyright (C) 2018 Codership Oy // -#include "client_context.hpp" -#include "compiler.hpp" +#include "trrep/client_context.hpp" +#include "trrep/compiler.hpp" #include #include diff --git a/src/dbms_simulator.cpp b/src/dbms_simulator.cpp index 969f90f..5a10dc7 100644 --- a/src/dbms_simulator.cpp +++ b/src/dbms_simulator.cpp @@ -9,15 +9,15 @@ // -#include "server_context.hpp" -#include "client_context.hpp" -#include "transaction_context.hpp" -#include "key.hpp" -#include "data.hpp" -#include "provider.hpp" -#include "condition_variable.hpp" -#include "view.hpp" -#include "logger.hpp" +#include "trrep/server_context.hpp" +#include "trrep/client_context.hpp" +#include "trrep/transaction_context.hpp" +#include "trrep/key.hpp" +#include "trrep/data.hpp" +#include "trrep/provider.hpp" +#include "trrep/condition_variable.hpp" +#include "trrep/view.hpp" +#include "trrep/logger.hpp" #include #include diff --git a/src/logger.cpp b/src/logger.cpp index c53da18..a6611d2 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -1,5 +1,5 @@ -#include "logger.hpp" +#include "trrep/logger.hpp" #include diff --git a/src/mock_client_context.cpp b/src/mock_client_context.cpp index 0201702..28a1b58 100644 --- a/src/mock_client_context.cpp +++ b/src/mock_client_context.cpp @@ -2,7 +2,7 @@ // Copyright (C) 2018 Codership Oy // -#include "transaction_context.hpp" +#include "trrep/transaction_context.hpp" #include "mock_client_context.hpp" diff --git a/src/mock_client_context.hpp b/src/mock_client_context.hpp index 1a2e24a..dc9c8b7 100644 --- a/src/mock_client_context.hpp +++ b/src/mock_client_context.hpp @@ -5,9 +5,9 @@ #ifndef TRREP_MOCK_CLIENT_CONTEXT_HPP #define TRREP_MOCK_CLIENT_CONTEXT_HPP -#include "client_context.hpp" -#include "mutex.hpp" -#include "compiler.hpp" +#include "trrep/client_context.hpp" +#include "trrep/mutex.hpp" +#include "trrep/compiler.hpp" namespace trrep { diff --git a/src/mock_provider.hpp b/src/mock_provider.hpp index e35759e..5d3d2ff 100644 --- a/src/mock_provider.hpp +++ b/src/mock_provider.hpp @@ -5,7 +5,7 @@ #ifndef TRREP_MOCK_PROVIDER_HPP #define TRREP_MOCK_PROVIDER_HPP -#include "provider.hpp" +#include "trrep/provider.hpp" #include #include diff --git a/src/mock_server_context.hpp b/src/mock_server_context.hpp index 106ab0f..d58316d 100644 --- a/src/mock_server_context.hpp +++ b/src/mock_server_context.hpp @@ -5,11 +5,11 @@ #ifndef TRREP_MOCK_SERVER_CONTEXT_HPP #define TRREP_MOCK_SERVER_CONTEXT_HPP -#include "server_context.hpp" +#include "trrep/server_context.hpp" #include "mock_client_context.hpp" #include "mock_provider.hpp" -#include "compiler.hpp" +#include "trrep/compiler.hpp" namespace trrep { diff --git a/src/mock_utils.cpp b/src/mock_utils.cpp index edc8389..096d266 100644 --- a/src/mock_utils.cpp +++ b/src/mock_utils.cpp @@ -3,7 +3,7 @@ // #include "mock_utils.hpp" -#include "client_context.hpp" +#include "trrep/client_context.hpp" #include "mock_server_context.hpp" diff --git a/src/mock_utils.hpp b/src/mock_utils.hpp index a14286f..b6e66eb 100644 --- a/src/mock_utils.hpp +++ b/src/mock_utils.hpp @@ -11,7 +11,7 @@ namespace trrep class mock_server_context; } -#include "transaction_context.hpp" +#include "trrep/transaction_context.hpp" // // Utility functions diff --git a/src/provider.cpp b/src/provider.cpp index 93ac820..a37a93c 100644 --- a/src/provider.cpp +++ b/src/provider.cpp @@ -2,7 +2,7 @@ // Copyright (C) 2018 Codership Oy // -#include "provider.hpp" +#include "trrep/provider.hpp" #include "provider_impl.hpp" diff --git a/src/server_context.cpp b/src/server_context.cpp index 55501bb..97fa9b8 100644 --- a/src/server_context.cpp +++ b/src/server_context.cpp @@ -2,12 +2,12 @@ // Copyright (C) 2018 Codership Oy // -#include "server_context.hpp" -#include "client_context.hpp" -#include "transaction_context.hpp" -#include "view.hpp" -#include "logger.hpp" -#include "compiler.hpp" +#include "trrep/server_context.hpp" +#include "trrep/client_context.hpp" +#include "trrep/transaction_context.hpp" +#include "trrep/view.hpp" +#include "trrep/logger.hpp" +#include "trrep/compiler.hpp" // Todo: refactor into provider factory #include "mock_provider.hpp" diff --git a/src/transaction_context.cpp b/src/transaction_context.cpp index bc6bacc..4c02c9d 100644 --- a/src/transaction_context.cpp +++ b/src/transaction_context.cpp @@ -2,13 +2,13 @@ // Copyright (C) 2018 Codership Oy // -#include "transaction_context.hpp" -#include "client_context.hpp" -#include "server_context.hpp" -#include "key.hpp" -#include "data.hpp" -#include "logger.hpp" -#include "compiler.hpp" +#include "trrep/transaction_context.hpp" +#include "trrep/client_context.hpp" +#include "trrep/server_context.hpp" +#include "trrep/key.hpp" +#include "trrep/data.hpp" +#include "trrep/logger.hpp" +#include "trrep/compiler.hpp" #include #include diff --git a/src/transaction_context_test.cpp b/src/transaction_context_test.cpp index ab81f3f..0aaf905 100644 --- a/src/transaction_context_test.cpp +++ b/src/transaction_context_test.cpp @@ -2,10 +2,11 @@ // Copyright (C) 2018 Codership Oy // -#include "transaction_context.hpp" +#include "trrep/transaction_context.hpp" +#include "trrep/provider.hpp" + #include "mock_client_context.hpp" #include "mock_server_context.hpp" -#include "provider.hpp" #include "mock_utils.hpp" diff --git a/src/wsrep_provider_v26.cpp b/src/wsrep_provider_v26.cpp index 739333c..3feaab4 100644 --- a/src/wsrep_provider_v26.cpp +++ b/src/wsrep_provider_v26.cpp @@ -3,7 +3,7 @@ // #include "wsrep_provider_v26.hpp" -#include "exception.hpp" +#include "trrep/exception.hpp" #include diff --git a/src/wsrep_provider_v26.hpp b/src/wsrep_provider_v26.hpp index 25a4c6f..6f940dc 100644 --- a/src/wsrep_provider_v26.hpp +++ b/src/wsrep_provider_v26.hpp @@ -5,7 +5,7 @@ #ifndef TRREP_WSREP_PROVIDER_V26_HPP #define TRREP_WSREP_PROVIDER_V26_HPP -#include "provider.hpp" +#include "trrep/provider.hpp" #include