From 6068a95a0ee033a68e18f991ee7319b664746697 Mon Sep 17 00:00:00 2001 From: Mislav Bradac Date: Wed, 12 Jul 2017 12:17:15 +0200 Subject: [PATCH] Move dbms to database Summary: There was only two files in dbms directory so I moved them to database directory. Reviewers: buda Reviewed By: buda Subscribers: pullbot Differential Revision: https://phabricator.memgraph.io/D540 --- CMakeLists.txt | 2 +- src/communication/bolt/v1/session.hpp | 2 +- src/communication/server.hpp | 2 +- src/communication/worker.hpp | 2 +- src/{dbms => database}/dbms.cpp | 2 +- src/{dbms => database}/dbms.hpp | 0 src/memgraph_bolt.cpp | 2 +- src/query/console.hpp | 2 +- tests/concurrent/network_common.hpp | 2 +- tests/concurrent/network_read_hang.cpp | 2 +- tests/integration/query_engine.cpp | 2 +- tests/integration/query_engine_common.hpp | 2 +- tests/manual/console_test.cpp | 2 +- tests/manual/query_engine.cpp | 2 +- tests/property_based/random_graph.cpp | 2 +- tests/unit/bolt_common.hpp | 2 +- tests/unit/cypher_main_visitor.cpp | 2 +- tests/unit/database_key_index.cpp | 2 +- tests/unit/database_label_property_index.cpp | 2 +- tests/unit/dbms_recovery.cpp | 2 +- tests/unit/graph_db_accessor.cpp | 2 +- tests/unit/graph_db_accessor_index_api.cpp | 2 +- tests/unit/query_cost_estimator.cpp | 2 +- tests/unit/query_engine.cpp | 2 +- tests/unit/query_expression_evaluator.cpp | 2 +- tests/unit/query_plan_accumulate_aggregate.cpp | 2 +- tests/unit/query_plan_bag_semantics.cpp | 2 +- tests/unit/query_plan_create_set_remove_delete.cpp | 2 +- tests/unit/query_plan_match_filter_return.cpp | 2 +- tests/unit/query_planner.cpp | 2 +- tests/unit/query_semantic.cpp | 2 +- tests/unit/query_variable_start_planner.cpp | 2 +- tests/unit/record_edge_vertex_accessor.cpp | 2 +- tests/unit/recovery.cpp | 2 +- tests/unit/snapshot.cpp | 2 +- 35 files changed, 34 insertions(+), 34 deletions(-) rename src/{dbms => database}/dbms.cpp (96%) rename src/{dbms => database}/dbms.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00687f33d..1b3c730b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,7 +277,7 @@ set(memgraph_src_files ${src_dir}/data_structures/concurrent/skiplist_gc.cpp ${src_dir}/database/graph_db.cpp ${src_dir}/database/graph_db_accessor.cpp - ${src_dir}/dbms/dbms.cpp + ${src_dir}/database/dbms.cpp ${src_dir}/durability/recovery.cpp ${src_dir}/durability/snapshooter.cpp ${src_dir}/io/network/addrinfo.cpp diff --git a/src/communication/bolt/v1/session.hpp b/src/communication/bolt/v1/session.hpp index 3632ec4ab..d362148f3 100644 --- a/src/communication/bolt/v1/session.hpp +++ b/src/communication/bolt/v1/session.hpp @@ -3,7 +3,7 @@ #include "io/network/epoll.hpp" #include "io/network/socket.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/engine.hpp" #include "communication/bolt/v1/constants.hpp" diff --git a/src/communication/server.hpp b/src/communication/server.hpp index 43be85449..f734dd9fd 100644 --- a/src/communication/server.hpp +++ b/src/communication/server.hpp @@ -9,7 +9,7 @@ #include #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/engine.hpp" #include "communication/worker.hpp" diff --git a/src/communication/worker.hpp b/src/communication/worker.hpp index ddce9c843..cd401a8d4 100644 --- a/src/communication/worker.hpp +++ b/src/communication/worker.hpp @@ -9,7 +9,7 @@ #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/engine.hpp" #include "communication/bolt/v1/session.hpp" diff --git a/src/dbms/dbms.cpp b/src/database/dbms.cpp similarity index 96% rename from src/dbms/dbms.cpp rename to src/database/dbms.cpp index ab8f4a326..4d6ae6803 100644 --- a/src/dbms/dbms.cpp +++ b/src/database/dbms.cpp @@ -1,6 +1,6 @@ #include "gflags/gflags.h" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" DEFINE_string(snapshot_directory, "snapshots", "Relative path to directory in which to save snapshots."); diff --git a/src/dbms/dbms.hpp b/src/database/dbms.hpp similarity index 100% rename from src/dbms/dbms.hpp rename to src/database/dbms.hpp diff --git a/src/memgraph_bolt.cpp b/src/memgraph_bolt.cpp index 6288bd3a5..32084b9e1 100644 --- a/src/memgraph_bolt.cpp +++ b/src/memgraph_bolt.cpp @@ -4,7 +4,7 @@ #include #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/engine.hpp" #include "communication/bolt/v1/session.hpp" diff --git a/src/query/console.hpp b/src/query/console.hpp index 8b545429b..b8f09e24e 100644 --- a/src/query/console.hpp +++ b/src/query/console.hpp @@ -8,7 +8,7 @@ #include #include "communication/result_stream_faker.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" namespace query { diff --git a/tests/concurrent/network_common.hpp b/tests/concurrent/network_common.hpp index 0fc0b41e0..691ec796d 100644 --- a/tests/concurrent/network_common.hpp +++ b/tests/concurrent/network_common.hpp @@ -11,7 +11,7 @@ #include "communication/bolt/v1/decoder/buffer.hpp" #include "communication/server.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "io/network/epoll.hpp" #include "io/network/socket.hpp" #include "query/engine.hpp" diff --git a/tests/concurrent/network_read_hang.cpp b/tests/concurrent/network_read_hang.cpp index 2e57bd97d..424dc1195 100644 --- a/tests/concurrent/network_read_hang.cpp +++ b/tests/concurrent/network_read_hang.cpp @@ -15,7 +15,7 @@ #include "communication/bolt/v1/decoder/buffer.hpp" #include "communication/server.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "io/network/epoll.hpp" #include "io/network/socket.hpp" #include "query/engine.hpp" diff --git a/tests/integration/query_engine.cpp b/tests/integration/query_engine.cpp index b6111426a..a180b887d 100644 --- a/tests/integration/query_engine.cpp +++ b/tests/integration/query_engine.cpp @@ -2,7 +2,7 @@ #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query_engine_common.hpp" DECLARE_bool(interpret); diff --git a/tests/integration/query_engine_common.hpp b/tests/integration/query_engine_common.hpp index bc64bfb8a..3db544501 100644 --- a/tests/integration/query_engine_common.hpp +++ b/tests/integration/query_engine_common.hpp @@ -8,7 +8,7 @@ namespace fs = std::experimental::filesystem; #include #include "database/graph_db_accessor.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/engine.hpp" #include "query/frontend/stripped.hpp" #include "stream/print_record_stream.hpp" diff --git a/tests/manual/console_test.cpp b/tests/manual/console_test.cpp index 3eb8130d2..b746dae04 100644 --- a/tests/manual/console_test.cpp +++ b/tests/manual/console_test.cpp @@ -3,7 +3,7 @@ #include #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/console.hpp" #include "query/interpreter.hpp" #include "utils/random_graph_generator.hpp" diff --git a/tests/manual/query_engine.cpp b/tests/manual/query_engine.cpp index cf9782d91..2326f51f8 100644 --- a/tests/manual/query_engine.cpp +++ b/tests/manual/query_engine.cpp @@ -1,7 +1,7 @@ #define HARDCODED_OUTPUT_STREAM #include #include "../integration/query_engine_common.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "utils/fswatcher.hpp" diff --git a/tests/property_based/random_graph.cpp b/tests/property_based/random_graph.cpp index 752dd0e7f..6cf18585a 100644 --- a/tests/property_based/random_graph.cpp +++ b/tests/property_based/random_graph.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" /** * gtest/gtest.h must be included before rapidcheck/gtest.h! diff --git a/tests/unit/bolt_common.hpp b/tests/unit/bolt_common.hpp index a0af28311..36c079222 100644 --- a/tests/unit/bolt_common.hpp +++ b/tests/unit/bolt_common.hpp @@ -6,7 +6,7 @@ #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "gtest/gtest.h" /** diff --git a/tests/unit/cypher_main_visitor.cpp b/tests/unit/cypher_main_visitor.cpp index 4836cd177..7e9d9a5f1 100644 --- a/tests/unit/cypher_main_visitor.cpp +++ b/tests/unit/cypher_main_visitor.cpp @@ -5,7 +5,7 @@ #include #include "antlr4-runtime.h" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "query/context.hpp" diff --git a/tests/unit/database_key_index.cpp b/tests/unit/database_key_index.cpp index 4b229ffdb..3399de068 100644 --- a/tests/unit/database_key_index.cpp +++ b/tests/unit/database_key_index.cpp @@ -3,7 +3,7 @@ #include "database/graph_db_accessor.hpp" #include "database/graph_db_datatypes.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "storage/vertex.hpp" #include "mvcc_gc_common.hpp" diff --git a/tests/unit/database_label_property_index.cpp b/tests/unit/database_label_property_index.cpp index 418b76fab..f6e707918 100644 --- a/tests/unit/database_label_property_index.cpp +++ b/tests/unit/database_label_property_index.cpp @@ -3,7 +3,7 @@ #include "database/graph_db.hpp" #include "database/graph_db_datatypes.hpp" #include "database/indexes/label_property_index.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "mvcc_gc_common.hpp" diff --git a/tests/unit/dbms_recovery.cpp b/tests/unit/dbms_recovery.cpp index 145829ac2..dc8187e5f 100644 --- a/tests/unit/dbms_recovery.cpp +++ b/tests/unit/dbms_recovery.cpp @@ -3,7 +3,7 @@ #include "gflags/gflags.h" #include "gtest/gtest.h" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" DECLARE_bool(recovery_on_startup); DECLARE_string(snapshot_directory); diff --git a/tests/unit/graph_db_accessor.cpp b/tests/unit/graph_db_accessor.cpp index 5df3b6fa0..730e1f5bb 100644 --- a/tests/unit/graph_db_accessor.cpp +++ b/tests/unit/graph_db_accessor.cpp @@ -2,7 +2,7 @@ #include "database/graph_db.hpp" #include "database/graph_db_accessor.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "storage/edge_accessor.hpp" #include "storage/vertex_accessor.hpp" diff --git a/tests/unit/graph_db_accessor_index_api.cpp b/tests/unit/graph_db_accessor_index_api.cpp index 314f804b4..37261df95 100644 --- a/tests/unit/graph_db_accessor_index_api.cpp +++ b/tests/unit/graph_db_accessor_index_api.cpp @@ -5,7 +5,7 @@ #include #include "database/graph_db_accessor.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "utils/bound.hpp" using testing::UnorderedElementsAreArray; diff --git a/tests/unit/query_cost_estimator.cpp b/tests/unit/query_cost_estimator.cpp index c39de4ebe..fd96a7b0f 100644 --- a/tests/unit/query_cost_estimator.cpp +++ b/tests/unit/query_cost_estimator.cpp @@ -1,7 +1,7 @@ #include #include -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/frontend/ast/ast.hpp" #include "query/frontend/semantic/symbol_table.hpp" #include "query/plan/cost_estimator.hpp" diff --git a/tests/unit/query_engine.cpp b/tests/unit/query_engine.cpp index 8930359f8..3f82421a1 100644 --- a/tests/unit/query_engine.cpp +++ b/tests/unit/query_engine.cpp @@ -1,6 +1,6 @@ #include "communication/result_stream_faker.hpp" #include "database/graph_db_accessor.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "query/engine.hpp" diff --git a/tests/unit/query_expression_evaluator.cpp b/tests/unit/query_expression_evaluator.cpp index bf347aa38..35136edbb 100644 --- a/tests/unit/query_expression_evaluator.cpp +++ b/tests/unit/query_expression_evaluator.cpp @@ -8,7 +8,7 @@ #include "database/graph_db_accessor.hpp" #include "database/graph_db_datatypes.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/frontend/ast/ast.hpp" #include "query/frontend/opencypher/parser.hpp" #include "query/interpret/awesome_memgraph_functions.hpp" diff --git a/tests/unit/query_plan_accumulate_aggregate.cpp b/tests/unit/query_plan_accumulate_aggregate.cpp index 71a8107d6..6d3d23278 100644 --- a/tests/unit/query_plan_accumulate_aggregate.cpp +++ b/tests/unit/query_plan_accumulate_aggregate.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" #include "communication/result_stream_faker.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/context.hpp" #include "query/exceptions.hpp" #include "query/plan/operator.hpp" diff --git a/tests/unit/query_plan_bag_semantics.cpp b/tests/unit/query_plan_bag_semantics.cpp index 873fa4631..a71c98110 100644 --- a/tests/unit/query_plan_bag_semantics.cpp +++ b/tests/unit/query_plan_bag_semantics.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" #include "communication/result_stream_faker.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/context.hpp" #include "query/exceptions.hpp" #include "query/plan/operator.hpp" diff --git a/tests/unit/query_plan_create_set_remove_delete.cpp b/tests/unit/query_plan_create_set_remove_delete.cpp index c4d461854..59c489c6b 100644 --- a/tests/unit/query_plan_create_set_remove_delete.cpp +++ b/tests/unit/query_plan_create_set_remove_delete.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" #include "communication/result_stream_faker.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/context.hpp" #include "query/exceptions.hpp" #include "query/interpret/frame.hpp" diff --git a/tests/unit/query_plan_match_filter_return.cpp b/tests/unit/query_plan_match_filter_return.cpp index 2c4f35167..33e32af3e 100644 --- a/tests/unit/query_plan_match_filter_return.cpp +++ b/tests/unit/query_plan_match_filter_return.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" #include "communication/result_stream_faker.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/context.hpp" #include "query/exceptions.hpp" #include "query/plan/operator.hpp" diff --git a/tests/unit/query_planner.cpp b/tests/unit/query_planner.cpp index b8107524c..a5013168c 100644 --- a/tests/unit/query_planner.cpp +++ b/tests/unit/query_planner.cpp @@ -4,7 +4,7 @@ #include "gtest/gtest.h" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/frontend/ast/ast.hpp" #include "query/frontend/semantic/symbol_generator.hpp" #include "query/frontend/semantic/symbol_table.hpp" diff --git a/tests/unit/query_semantic.cpp b/tests/unit/query_semantic.cpp index 05f20995a..1543d9fce 100644 --- a/tests/unit/query_semantic.cpp +++ b/tests/unit/query_semantic.cpp @@ -2,7 +2,7 @@ #include "gtest/gtest.h" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/frontend/ast/ast.hpp" #include "query/frontend/semantic/symbol_generator.hpp" #include "query/frontend/semantic/symbol_table.hpp" diff --git a/tests/unit/query_variable_start_planner.cpp b/tests/unit/query_variable_start_planner.cpp index ea85572a9..3a110163e 100644 --- a/tests/unit/query_variable_start_planner.cpp +++ b/tests/unit/query_variable_start_planner.cpp @@ -2,7 +2,7 @@ #include "gtest/gtest.h" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "query/frontend/semantic/symbol_generator.hpp" #include "query/frontend/semantic/symbol_table.hpp" #include "query/plan/planner.hpp" diff --git a/tests/unit/record_edge_vertex_accessor.cpp b/tests/unit/record_edge_vertex_accessor.cpp index 1349f3a89..87176e8ce 100644 --- a/tests/unit/record_edge_vertex_accessor.cpp +++ b/tests/unit/record_edge_vertex_accessor.cpp @@ -5,7 +5,7 @@ #include "database/graph_db.hpp" #include "database/graph_db_accessor.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "storage/edge_accessor.hpp" #include "storage/property_value.hpp" diff --git a/tests/unit/recovery.cpp b/tests/unit/recovery.cpp index 6d4497093..5ceec8433 100644 --- a/tests/unit/recovery.cpp +++ b/tests/unit/recovery.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" #include "communication/bolt/v1/decoder/decoder.hpp" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "durability/file_reader_buffer.hpp" #include "durability/recovery.hpp" #include "utils/assert.hpp" diff --git a/tests/unit/snapshot.cpp b/tests/unit/snapshot.cpp index 9c80fdba9..8b0cd1e06 100644 --- a/tests/unit/snapshot.cpp +++ b/tests/unit/snapshot.cpp @@ -3,7 +3,7 @@ #include "gflags/gflags.h" #include "gtest/gtest.h" -#include "dbms/dbms.hpp" +#include "database/dbms.hpp" #include "durability/snapshooter.hpp" DECLARE_bool(snapshot_on_db_exit);