From 8999f5fccd07cd36cb3c0da2f65ae364cd5c7df8 Mon Sep 17 00:00:00 2001 From: Matej Ferencevic Date: Wed, 17 Apr 2019 14:23:24 +0200 Subject: [PATCH] Extract HA config to separate file Reviewers: msantl, ipaljak Reviewed By: msantl Subscribers: pullbot Differential Revision: https://phabricator.memgraph.io/D1964 --- src/database/single_node_ha/config.cpp | 6 ++-- src/database/single_node_ha/config.hpp | 35 ++++++++++++++++++++++++ src/database/single_node_ha/graph_db.hpp | 26 +----------------- 3 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 src/database/single_node_ha/config.hpp diff --git a/src/database/single_node_ha/config.cpp b/src/database/single_node_ha/config.cpp index b7a7988f2..fa4930c1b 100644 --- a/src/database/single_node_ha/config.cpp +++ b/src/database/single_node_ha/config.cpp @@ -1,6 +1,8 @@ -#include +#include "database/single_node_ha/config.hpp" + +#include +#include -#include "database/single_node_ha/graph_db.hpp" #include "utils/flag_validation.hpp" #include "utils/string.hpp" diff --git a/src/database/single_node_ha/config.hpp b/src/database/single_node_ha/config.hpp new file mode 100644 index 000000000..0c9d78aa9 --- /dev/null +++ b/src/database/single_node_ha/config.hpp @@ -0,0 +1,35 @@ +/// @file + +#pragma once + +#include +#include +#include + +namespace database { + +/// Database configuration. Initialized from flags, but modifiable. +struct Config { + Config(); + + // Durability flags. + std::string durability_directory; + bool db_recover_on_startup; + + // Misc flags. + int gc_cycle_sec; + int query_execution_time_sec; + + // set of properties which will be stored on disk + std::vector properties_on_disk; + + // RPC flags. + uint16_t rpc_num_client_workers; + uint16_t rpc_num_server_workers; + + // HA flags. + std::string coordination_config_file; + std::string raft_config_file; + uint16_t server_id; +}; +} // namespace database diff --git a/src/database/single_node_ha/graph_db.hpp b/src/database/single_node_ha/graph_db.hpp index e623353d5..e67e92072 100644 --- a/src/database/single_node_ha/graph_db.hpp +++ b/src/database/single_node_ha/graph_db.hpp @@ -6,6 +6,7 @@ #include #include +#include "database/single_node_ha/config.hpp" #include "database/single_node_ha/counters.hpp" #include "io/network/endpoint.hpp" #include "raft/coordination.hpp" @@ -38,31 +39,6 @@ struct Stat { std::atomic avg_degree{0}; }; -/// Database configuration. Initialized from flags, but modifiable. -struct Config { - Config(); - - // Durability flags. - std::string durability_directory; - bool db_recover_on_startup; - - // Misc flags. - int gc_cycle_sec; - int query_execution_time_sec; - - // set of properties which will be stored on disk - std::vector properties_on_disk; - - // RPC flags. - uint16_t rpc_num_client_workers; - uint16_t rpc_num_server_workers; - - // HA flags. - std::string coordination_config_file; - std::string raft_config_file; - uint16_t server_id; -}; - class GraphDbAccessor; /// An abstract base class providing the interface for a graph database.