From e128a9f80f03c36c03dc029e085c455557fa5f6b Mon Sep 17 00:00:00 2001 From: Teon Banek Date: Fri, 15 Mar 2019 15:58:16 +0100 Subject: [PATCH] Move distributed query stuff to new folder Summary: The new distributed directory is inside the query, and mirrors the query structure. This groups all of the distributed (query) source code together, which should make the potential directory extraction easier. Reviewers: mferencevic, llugovic, mtomic Reviewed By: mferencevic Subscribers: pullbot Differential Revision: https://phabricator.memgraph.io/D1923 --- .gitignore | 12 +++++----- src/CMakeLists.txt | 24 +++++++++---------- src/distributed/bfs_rpc_messages.lcp | 10 ++++---- src/distributed/plan_rpc_messages.lcp | 6 ++--- src/distributed/pull_produce_rpc_messages.lcp | 6 ++--- src/memgraph_distributed.cpp | 2 +- .../frontend/ast/ast_serialization.lcp | 4 ++-- .../semantic/symbol_serialization.lcp | 4 ++-- .../interpreter.cpp} | 6 ++--- .../interpreter.hpp} | 0 .../plan/ops.cpp} | 2 +- .../plan/ops.lcp} | 6 ++--- .../plan/planner.cpp} | 6 ++--- .../plan/planner.hpp} | 0 .../plan/pretty_print.cpp} | 2 +- .../plan/pretty_print.hpp} | 2 +- .../{ => distributed}/serialization.capnp | 4 ++-- src/query/{ => distributed}/serialization.cpp | 4 ++-- src/query/{ => distributed}/serialization.hpp | 4 ++-- src/query/frontend/ast/ast.lcp | 2 +- src/query/plan/operator.lcp | 6 ++--- tests/benchmark/serialization.cpp | 2 +- tests/manual/distributed_common.hpp | 2 +- tests/manual/distributed_query_planner.cpp | 4 ++-- tests/manual/distributed_repl.cpp | 2 +- tests/unit/ast_serialization.cpp | 2 +- tests/unit/bfs_distributed.cpp | 2 +- tests/unit/distributed_interpretation.cpp | 2 +- tests/unit/distributed_plan_pretty_print.cpp | 4 ++-- tests/unit/distributed_query_plan.cpp | 4 ++-- tests/unit/distributed_reset.cpp | 2 +- 31 files changed, 69 insertions(+), 69 deletions(-) rename src/query/{ => distributed}/frontend/ast/ast_serialization.lcp (93%) rename src/query/{ => distributed}/frontend/semantic/symbol_serialization.lcp (50%) rename src/query/{distributed_interpreter.cpp => distributed/interpreter.cpp} (97%) rename src/query/{distributed_interpreter.hpp => distributed/interpreter.hpp} (100%) rename src/query/{plan/distributed_ops.cpp => distributed/plan/ops.cpp} (99%) rename src/query/{plan/distributed_ops.lcp => distributed/plan/ops.lcp} (99%) rename src/query/{plan/distributed.cpp => distributed/plan/planner.cpp} (99%) rename src/query/{plan/distributed.hpp => distributed/plan/planner.hpp} (100%) rename src/query/{plan/distributed_pretty_print.cpp => distributed/plan/pretty_print.cpp} (99%) rename src/query/{plan/distributed_pretty_print.hpp => distributed/plan/pretty_print.hpp} (98%) rename src/query/{ => distributed}/serialization.capnp (84%) rename src/query/{ => distributed}/serialization.cpp (99%) rename src/query/{ => distributed}/serialization.hpp (96%) diff --git a/.gitignore b/.gitignore index 48912923c..5b80f2dcb 100644 --- a/.gitignore +++ b/.gitignore @@ -76,17 +76,17 @@ src/distributed/token_sharing_rpc_messages.hpp src/distributed/updates_rpc_messages.capnp src/distributed/updates_rpc_messages.hpp src/query/frontend/ast/ast.hpp -src/query/frontend/ast/ast_serialization.capnp -src/query/frontend/ast/ast_serialization.hpp +src/query/distributed/frontend/ast/ast_serialization.capnp +src/query/distributed/frontend/ast/ast_serialization.hpp src/durability/distributed/state_delta.capnp src/durability/distributed/state_delta.hpp src/durability/single_node/state_delta.hpp src/durability/single_node_ha/state_delta.hpp src/query/frontend/semantic/symbol.hpp -src/query/frontend/semantic/symbol_serialization.capnp -src/query/frontend/semantic/symbol_serialization.hpp -src/query/plan/distributed_ops.capnp -src/query/plan/distributed_ops.hpp +src/query/distributed/frontend/semantic/symbol_serialization.capnp +src/query/distributed/frontend/semantic/symbol_serialization.hpp +src/query/distributed/plan/ops.capnp +src/query/distributed/plan/ops.hpp src/query/plan/operator.hpp src/raft/log_entry.capnp src/raft/log_entry.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b0d40166..7ff9a85e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -124,10 +124,10 @@ set(mg_distributed_sources distributed/pull_rpc_clients.cpp distributed/updates_rpc_clients.cpp distributed/updates_rpc_server.cpp - query/distributed_interpreter.cpp - query/plan/distributed.cpp - query/plan/distributed_ops.cpp - query/plan/distributed_pretty_print.cpp + query/distributed/interpreter.cpp + query/distributed/plan/planner.cpp + query/distributed/plan/ops.cpp + query/distributed/plan/pretty_print.cpp storage/distributed/concurrent_id_mapper_master.cpp storage/distributed/concurrent_id_mapper_worker.cpp transactions/distributed/engine_master.cpp @@ -158,7 +158,7 @@ set(mg_distributed_sources query/plan/rule_based_planner.cpp query/plan/variable_start_planner.cpp query/repl.cpp - query/serialization.cpp + query/distributed/serialization.cpp query/typed_value.cpp storage/common/locking/record_lock.cpp storage/common/types/property_value.cpp @@ -212,16 +212,16 @@ add_capnp_distributed(distributed/dynamic_worker_rpc_messages.capnp) # distributed_ops.lcp is leading the capnp code generation, so we don't need # to generate any capnp for operator.lcp add_lcp_distributed(query/frontend/ast/ast.lcp) -add_lcp_distributed(query/frontend/ast/ast_serialization.lcp CAPNP_SCHEMA @0xb107d3d6b4b1600b +add_lcp_distributed(query/distributed/frontend/ast/ast_serialization.lcp CAPNP_SCHEMA @0xb107d3d6b4b1600b DEPENDS query/frontend/ast/ast.lcp) -add_capnp_distributed(query/frontend/ast/ast_serialization.capnp) +add_capnp_distributed(query/distributed/frontend/ast/ast_serialization.capnp) add_lcp_distributed(query/frontend/semantic/symbol.lcp) -add_lcp_distributed(query/frontend/semantic/symbol_serialization.lcp CAPNP_SCHEMA @0x93c1dcee84e93b76 +add_lcp_distributed(query/distributed/frontend/semantic/symbol_serialization.lcp CAPNP_SCHEMA @0x93c1dcee84e93b76 DEPENDS query/frontend/semantic/symbol.lcp) add_lcp_distributed(query/plan/operator.lcp) -add_lcp_distributed(query/plan/distributed_ops.lcp CAPNP_SCHEMA @0xe5cae8d045d30c42 +add_lcp_distributed(query/distributed/plan/ops.lcp CAPNP_SCHEMA @0xe5cae8d045d30c42 DEPENDS query/plan/operator.lcp) -add_capnp_distributed(query/plan/distributed_ops.capnp) +add_capnp_distributed(query/distributed/plan/ops.capnp) add_lcp_distributed(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp CAPNP_SCHEMA @0xa6068dae93d225dd) add_capnp_distributed(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp) @@ -235,8 +235,8 @@ add_custom_target(generate_lcp_distributed DEPENDS ${generated_lcp_distributed_f add_capnp_distributed(communication/rpc/messages.capnp) add_capnp_distributed(durability/distributed/serialization.capnp) -add_capnp_distributed(query/frontend/semantic/symbol_serialization.capnp) -add_capnp_distributed(query/serialization.capnp) +add_capnp_distributed(query/distributed/frontend/semantic/symbol_serialization.capnp) +add_capnp_distributed(query/distributed/serialization.capnp) add_capnp_distributed(storage/distributed/rpc/serialization.capnp) add_custom_target(generate_capnp DEPENDS generate_lcp_distributed ${generated_capnp_files}) diff --git a/src/distributed/bfs_rpc_messages.lcp b/src/distributed/bfs_rpc_messages.lcp index 7146d6cc6..b36ab3de9 100644 --- a/src/distributed/bfs_rpc_messages.lcp +++ b/src/distributed/bfs_rpc_messages.lcp @@ -7,8 +7,8 @@ #include "distributed/bfs_rpc_messages.capnp.h" #include "distributed/bfs_subcursor.hpp" #include "query/frontend/semantic/symbol_table.hpp" -#include "query/plan/distributed_ops.hpp" -#include "query/serialization.hpp" +#include "query/distributed/plan/ops.hpp" +#include "query/distributed/serialization.hpp" #include "storage/distributed/rpc/serialization.hpp" #include "transactions/type.hpp" #include "rpc/serialization.hpp" @@ -18,9 +18,9 @@ cpp<# (lcp:capnp-namespace "distributed") -(lcp:capnp-import 'ast "/query/frontend/ast/ast_serialization.capnp") -(lcp:capnp-import 'dist-ops "/query/plan/distributed_ops.capnp") -(lcp:capnp-import 'query "/query/serialization.capnp") +(lcp:capnp-import 'ast "/query/distributed/frontend/ast/ast_serialization.capnp") +(lcp:capnp-import 'dist-ops "/query/distributed/plan/ops.capnp") +(lcp:capnp-import 'query "/query/distributed/serialization.capnp") (lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp") (lcp:capnp-import 'utils "/rpc/serialization.capnp") diff --git a/src/distributed/plan_rpc_messages.lcp b/src/distributed/plan_rpc_messages.lcp index 999853da4..d38698ced 100644 --- a/src/distributed/plan_rpc_messages.lcp +++ b/src/distributed/plan_rpc_messages.lcp @@ -4,7 +4,7 @@ #include "communication/rpc/messages.hpp" #include "query/frontend/ast/ast.hpp" #include "query/frontend/semantic/symbol_table.hpp" -#include "query/plan/distributed_ops.hpp" +#include "query/distributed/plan/ops.hpp" #include "distributed/plan_rpc_messages.capnp.h" cpp<# @@ -14,8 +14,8 @@ cpp<# (lcp:capnp-namespace "distributed") (lcp:capnp-import 'utils "/rpc/serialization.capnp") -(lcp:capnp-import 'plan "/query/plan/distributed_ops.capnp") -(lcp:capnp-import 'query "/query/serialization.capnp") +(lcp:capnp-import 'plan "/query/distributed/plan/ops.capnp") +(lcp:capnp-import 'query "/query/distributed/serialization.capnp") (defun load-plan (reader member capnp-name) (declare (ignore capnp-name)) diff --git a/src/distributed/pull_produce_rpc_messages.lcp b/src/distributed/pull_produce_rpc_messages.lcp index 7ce9237ee..26a6c9a70 100644 --- a/src/distributed/pull_produce_rpc_messages.lcp +++ b/src/distributed/pull_produce_rpc_messages.lcp @@ -10,7 +10,7 @@ #include "query/context.hpp" #include "query/frontend/semantic/symbol.hpp" #include "query/parameters.hpp" -#include "query/serialization.hpp" +#include "query/distributed/serialization.hpp" #include "storage/distributed/address_types.hpp" #include "transactions/type.hpp" #include "rpc/serialization.hpp" @@ -30,8 +30,8 @@ cpp<# (lcp:capnp-namespace "distributed") (lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp") -(lcp:capnp-import 'query "/query/serialization.capnp") -(lcp:capnp-import 'sem "/query/frontend/semantic/symbol_serialization.capnp") +(lcp:capnp-import 'query "/query/distributed/serialization.capnp") +(lcp:capnp-import 'sem "/query/distributed/frontend/semantic/symbol_serialization.capnp") (lcp:capnp-import 'utils "/rpc/serialization.capnp") (lcp:capnp-type-conversion "tx::CommandId" "UInt32") diff --git a/src/memgraph_distributed.cpp b/src/memgraph_distributed.cpp index c9a2ef0fd..577f245a8 100644 --- a/src/memgraph_distributed.cpp +++ b/src/memgraph_distributed.cpp @@ -14,7 +14,7 @@ #include "integrations/kafka/exceptions.hpp" #include "integrations/kafka/streams.hpp" #include "memgraph_init.hpp" -#include "query/distributed_interpreter.hpp" +#include "query/distributed/interpreter.hpp" #include "query/exceptions.hpp" #include "telemetry/telemetry.hpp" #include "utils/flag_validation.hpp" diff --git a/src/query/frontend/ast/ast_serialization.lcp b/src/query/distributed/frontend/ast/ast_serialization.lcp similarity index 93% rename from src/query/frontend/ast/ast_serialization.lcp rename to src/query/distributed/frontend/ast/ast_serialization.lcp index 3a8d0a8e9..ebabb9981 100644 --- a/src/query/frontend/ast/ast_serialization.lcp +++ b/src/query/distributed/frontend/ast/ast_serialization.lcp @@ -4,8 +4,8 @@ #include #include "query/frontend/ast/ast.hpp" -#include "query/frontend/ast/ast_serialization.capnp.h" -#include "query/serialization.hpp" +#include "query/distributed/frontend/ast/ast_serialization.capnp.h" +#include "query/distributed/serialization.hpp" #include "storage/distributed/rpc/serialization.hpp" cpp<# diff --git a/src/query/frontend/semantic/symbol_serialization.lcp b/src/query/distributed/frontend/semantic/symbol_serialization.lcp similarity index 50% rename from src/query/frontend/semantic/symbol_serialization.lcp rename to src/query/distributed/frontend/semantic/symbol_serialization.lcp index 9442c0071..29d9177a6 100644 --- a/src/query/frontend/semantic/symbol_serialization.lcp +++ b/src/query/distributed/frontend/semantic/symbol_serialization.lcp @@ -2,10 +2,10 @@ #pragma once #include "query/frontend/semantic/symbol.hpp" -#include "query/frontend/semantic/symbol_serialization.capnp.h" +#include "query/distributed/frontend/semantic/symbol_serialization.capnp.h" cpp<# ;; Generate serialization code -;; TODO: This should be merged with query/serialization +;; TODO: This should be merged with query/distributed/serialization (load "query/frontend/semantic/symbol.lcp") diff --git a/src/query/distributed_interpreter.cpp b/src/query/distributed/interpreter.cpp similarity index 97% rename from src/query/distributed_interpreter.cpp rename to src/query/distributed/interpreter.cpp index 2608882a6..11c2e8d54 100644 --- a/src/query/distributed_interpreter.cpp +++ b/src/query/distributed/interpreter.cpp @@ -1,10 +1,10 @@ -#include "query/distributed_interpreter.hpp" +#include "query/distributed/interpreter.hpp" #include "database/distributed/distributed_graph_db.hpp" #include "distributed/plan_dispatcher.hpp" #include "query/frontend/semantic/symbol_generator.hpp" -#include "query/plan/distributed.hpp" -#include "query/plan/distributed_pretty_print.hpp" +#include "query/distributed/plan/planner.hpp" +#include "query/distributed/plan/pretty_print.hpp" #include "query/plan/planner.hpp" #include "query/plan/rule_based_planner.hpp" #include "query/plan/vertex_count_cache.hpp" diff --git a/src/query/distributed_interpreter.hpp b/src/query/distributed/interpreter.hpp similarity index 100% rename from src/query/distributed_interpreter.hpp rename to src/query/distributed/interpreter.hpp diff --git a/src/query/plan/distributed_ops.cpp b/src/query/distributed/plan/ops.cpp similarity index 99% rename from src/query/plan/distributed_ops.cpp rename to src/query/distributed/plan/ops.cpp index 5cd43c742..896538c08 100644 --- a/src/query/plan/distributed_ops.cpp +++ b/src/query/distributed/plan/ops.cpp @@ -1,4 +1,4 @@ -#include "query/plan/distributed_ops.hpp" +#include "query/distributed/plan/ops.hpp" #include "database/distributed/graph_db.hpp" #include "distributed/bfs_rpc_clients.hpp" diff --git a/src/query/plan/distributed_ops.lcp b/src/query/distributed/plan/ops.lcp similarity index 99% rename from src/query/plan/distributed_ops.lcp rename to src/query/distributed/plan/ops.lcp index fddc10d85..3362e0cf6 100644 --- a/src/query/plan/distributed_ops.lcp +++ b/src/query/distributed/plan/ops.lcp @@ -3,10 +3,10 @@ #pragma once -#include "query/frontend/ast/ast_serialization.hpp" -#include "query/plan/distributed_ops.capnp.h" +#include "query/distributed/frontend/ast/ast_serialization.hpp" +#include "query/distributed/plan/ops.capnp.h" #include "query/plan/operator.hpp" -#include "query/serialization.hpp" +#include "query/distributed/serialization.hpp" #include "storage/distributed/rpc/serialization.hpp" cpp<# diff --git a/src/query/plan/distributed.cpp b/src/query/distributed/plan/planner.cpp similarity index 99% rename from src/query/plan/distributed.cpp rename to src/query/distributed/plan/planner.cpp index c10af200b..5fd7e4f6f 100644 --- a/src/query/plan/distributed.cpp +++ b/src/query/distributed/plan/planner.cpp @@ -1,4 +1,4 @@ -#include "query/plan/distributed.hpp" +#include "query/distributed/plan/planner.hpp" #include @@ -6,8 +6,8 @@ // serialization when proper cloning is added. #include -#include "query/plan/distributed_ops.hpp" -#include "query/plan/distributed_pretty_print.hpp" +#include "query/distributed/plan/ops.hpp" +#include "query/distributed/plan/pretty_print.hpp" #include "query/plan/operator.hpp" #include "query/plan/preprocess.hpp" #include "utils/exceptions.hpp" diff --git a/src/query/plan/distributed.hpp b/src/query/distributed/plan/planner.hpp similarity index 100% rename from src/query/plan/distributed.hpp rename to src/query/distributed/plan/planner.hpp diff --git a/src/query/plan/distributed_pretty_print.cpp b/src/query/distributed/plan/pretty_print.cpp similarity index 99% rename from src/query/plan/distributed_pretty_print.cpp rename to src/query/distributed/plan/pretty_print.cpp index e0867164c..ef74a4e77 100644 --- a/src/query/plan/distributed_pretty_print.cpp +++ b/src/query/distributed/plan/pretty_print.cpp @@ -1,4 +1,4 @@ -#include "query/plan/distributed_pretty_print.hpp" +#include "query/distributed/plan/pretty_print.hpp" namespace query::plan { diff --git a/src/query/plan/distributed_pretty_print.hpp b/src/query/distributed/plan/pretty_print.hpp similarity index 98% rename from src/query/plan/distributed_pretty_print.hpp rename to src/query/distributed/plan/pretty_print.hpp index 96597dc15..864f35c8b 100644 --- a/src/query/plan/distributed_pretty_print.hpp +++ b/src/query/distributed/plan/pretty_print.hpp @@ -1,7 +1,7 @@ /// @file #pragma once -#include "query/plan/distributed_ops.hpp" +#include "query/distributed/plan/ops.hpp" #include "query/plan/pretty_print.hpp" #include diff --git a/src/query/serialization.capnp b/src/query/distributed/serialization.capnp similarity index 84% rename from src/query/serialization.capnp rename to src/query/distributed/serialization.capnp index f78561ee2..32956ab10 100644 --- a/src/query/serialization.capnp +++ b/src/query/distributed/serialization.capnp @@ -1,8 +1,8 @@ @0xf47e119e21912f20; -using Ast = import "/query/frontend/ast/ast_serialization.capnp"; +using Ast = import "/query/distributed/frontend/ast/ast_serialization.capnp"; using Cxx = import "/capnp/c++.capnp"; -using Sem = import "/query/frontend/semantic/symbol_serialization.capnp"; +using Sem = import "/query/distributed/frontend/semantic/symbol_serialization.capnp"; using Storage = import "/storage/distributed/rpc/serialization.capnp"; using Utils = import "/rpc/serialization.capnp"; diff --git a/src/query/serialization.cpp b/src/query/distributed/serialization.cpp similarity index 99% rename from src/query/serialization.cpp rename to src/query/distributed/serialization.cpp index c237fd491..551723139 100644 --- a/src/query/serialization.cpp +++ b/src/query/distributed/serialization.cpp @@ -1,7 +1,7 @@ -#include "query/serialization.hpp" +#include "query/distributed/serialization.hpp" #include "distributed/data_manager.hpp" -#include "query/frontend/ast/ast_serialization.hpp" +#include "query/distributed/frontend/ast/ast_serialization.hpp" #include "rpc/serialization.hpp" namespace query { diff --git a/src/query/serialization.hpp b/src/query/distributed/serialization.hpp similarity index 96% rename from src/query/serialization.hpp rename to src/query/distributed/serialization.hpp index 27b7930f4..afe8d4fba 100644 --- a/src/query/serialization.hpp +++ b/src/query/distributed/serialization.hpp @@ -2,9 +2,9 @@ #include "query/common.hpp" #include "query/context.hpp" -#include "query/frontend/semantic/symbol_serialization.hpp" +#include "query/distributed/frontend/semantic/symbol_serialization.hpp" #include "query/frontend/semantic/symbol_table.hpp" -#include "query/serialization.capnp.h" +#include "query/distributed/serialization.capnp.h" #include "query/typed_value.hpp" #include "rpc/serialization.hpp" #include "storage/distributed/rpc/serialization.hpp" diff --git a/src/query/frontend/ast/ast.lcp b/src/query/frontend/ast/ast.lcp index 07fc0b9f3..e4fdf4abb 100644 --- a/src/query/frontend/ast/ast.lcp +++ b/src/query/frontend/ast/ast.lcp @@ -22,7 +22,7 @@ cpp<# (lcp:capnp-namespace "query") (lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp") -(lcp:capnp-import 'symbol "/query/frontend/semantic/symbol_serialization.capnp") +(lcp:capnp-import 'symbol "/query/distributed/frontend/semantic/symbol_serialization.capnp") (lcp:capnp-import 'utils "/rpc/serialization.capnp") (lcp:capnp-type-conversion "PropertyValue" "Storage.PropertyValue") diff --git a/src/query/plan/operator.lcp b/src/query/plan/operator.lcp index 83b24c151..c66572693 100644 --- a/src/query/plan/operator.lcp +++ b/src/query/plan/operator.lcp @@ -125,9 +125,9 @@ cpp<# (lcp:capnp-import 'utils "/rpc/serialization.capnp") (lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp") -(lcp:capnp-import 'ast "/query/frontend/ast/ast_serialization.capnp") -(lcp:capnp-import 'semantic "/query/frontend/semantic/symbol_serialization.capnp") -(lcp:capnp-import 'query "/query/serialization.capnp") +(lcp:capnp-import 'ast "/query/distributed/frontend/ast/ast_serialization.capnp") +(lcp:capnp-import 'semantic "/query/distributed/frontend/semantic/symbol_serialization.capnp") +(lcp:capnp-import 'query "/query/distributed/serialization.capnp") (lcp:capnp-type-conversion "Symbol" "Semantic.Symbol") (lcp:capnp-type-conversion "storage::Label" "Storage.Label") diff --git a/tests/benchmark/serialization.cpp b/tests/benchmark/serialization.cpp index fa95d3376..02c39a4ec 100644 --- a/tests/benchmark/serialization.cpp +++ b/tests/benchmark/serialization.cpp @@ -8,7 +8,7 @@ #include "communication/rpc/serialization.hpp" #include "query/frontend/semantic/symbol.hpp" -#include "query/frontend/semantic/symbol_serialization.hpp" +#include "query/distributed/frontend/semantic/symbol_serialization.hpp" class SymbolVectorFixture : public benchmark::Fixture { protected: diff --git a/tests/manual/distributed_common.hpp b/tests/manual/distributed_common.hpp index 134dbdc5b..27b30bbf2 100644 --- a/tests/manual/distributed_common.hpp +++ b/tests/manual/distributed_common.hpp @@ -11,7 +11,7 @@ #include "database/distributed/distributed_graph_db.hpp" #include "database/distributed/graph_db_accessor.hpp" #include "glue/communication.hpp" -#include "query/distributed_interpreter.hpp" +#include "query/distributed/interpreter.hpp" #include "query/typed_value.hpp" #include "utils/file.hpp" diff --git a/tests/manual/distributed_query_planner.cpp b/tests/manual/distributed_query_planner.cpp index cf0d72ac7..1ec2b432c 100644 --- a/tests/manual/distributed_query_planner.cpp +++ b/tests/manual/distributed_query_planner.cpp @@ -5,8 +5,8 @@ #include "database/distributed/distributed_graph_db.hpp" #include "database/distributed/graph_db_accessor.hpp" -#include "query/plan/distributed.hpp" -#include "query/plan/distributed_pretty_print.hpp" +#include "query/distributed/plan/planner.hpp" +#include "query/distributed/plan/pretty_print.hpp" DECLARE_int32(min_log_level); diff --git a/tests/manual/distributed_repl.cpp b/tests/manual/distributed_repl.cpp index 4cbb3ac88..fbfe4d1ae 100644 --- a/tests/manual/distributed_repl.cpp +++ b/tests/manual/distributed_repl.cpp @@ -9,7 +9,7 @@ #include #include "database/distributed/distributed_graph_db.hpp" -#include "query/distributed_interpreter.hpp" +#include "query/distributed/interpreter.hpp" #include "query/repl.hpp" #include "utils/file.hpp" #include "utils/flag_validation.hpp" diff --git a/tests/unit/ast_serialization.cpp b/tests/unit/ast_serialization.cpp index bf6350efd..811d9cee8 100644 --- a/tests/unit/ast_serialization.cpp +++ b/tests/unit/ast_serialization.cpp @@ -12,7 +12,7 @@ #include "communication/rpc/serialization.hpp" #include "query/frontend/ast/ast.hpp" -#include "query/frontend/ast/ast_serialization.hpp" +#include "query/distributed/frontend/ast/ast_serialization.hpp" #include "query/frontend/ast/cypher_main_visitor.hpp" #include "query/frontend/opencypher/parser.hpp" #include "query/frontend/stripped.hpp" diff --git a/tests/unit/bfs_distributed.cpp b/tests/unit/bfs_distributed.cpp index 8a21473d6..40266fe62 100644 --- a/tests/unit/bfs_distributed.cpp +++ b/tests/unit/bfs_distributed.cpp @@ -1,7 +1,7 @@ // Macros from query_common.hpp break enum declaration in distributed_ops.hpp // (because of the SHOW_STREAMS macro), so we must be careful with the order of // includes. -#include "query/plan/distributed_ops.hpp" +#include "query/distributed/plan/ops.hpp" #include "bfs_common.hpp" #include "distributed_common.hpp" diff --git a/tests/unit/distributed_interpretation.cpp b/tests/unit/distributed_interpretation.cpp index dd6ec333a..2cde30432 100644 --- a/tests/unit/distributed_interpretation.cpp +++ b/tests/unit/distributed_interpretation.cpp @@ -10,7 +10,7 @@ #include "distributed/plan_dispatcher.hpp" #include "distributed/pull_rpc_clients.hpp" #include "distributed_common.hpp" -#include "query/distributed_interpreter.hpp" +#include "query/distributed/interpreter.hpp" #include "query_common.hpp" #include "query_plan_common.hpp" #include "utils/timer.hpp" diff --git a/tests/unit/distributed_plan_pretty_print.cpp b/tests/unit/distributed_plan_pretty_print.cpp index 474df8b48..467d35966 100644 --- a/tests/unit/distributed_plan_pretty_print.cpp +++ b/tests/unit/distributed_plan_pretty_print.cpp @@ -2,8 +2,8 @@ #include "database/distributed/graph_db.hpp" #include "query/frontend/semantic/symbol_table.hpp" -#include "query/plan/distributed_ops.hpp" -#include "query/plan/distributed_pretty_print.hpp" +#include "query/distributed/plan/ops.hpp" +#include "query/distributed/plan/pretty_print.hpp" #include "distributed_common.hpp" #include "query_common.hpp" diff --git a/tests/unit/distributed_query_plan.cpp b/tests/unit/distributed_query_plan.cpp index f8fd18137..838db64d3 100644 --- a/tests/unit/distributed_query_plan.cpp +++ b/tests/unit/distributed_query_plan.cpp @@ -22,8 +22,8 @@ #include "query/frontend/semantic/symbol_generator.hpp" #include "query/frontend/semantic/symbol_table.hpp" #include "query/interpreter.hpp" -#include "query/plan/distributed.hpp" -#include "query/plan/distributed_ops.hpp" +#include "query/distributed/plan/planner.hpp" +#include "query/distributed/plan/ops.hpp" #include "query/plan/planner.hpp" #include "query/typed_value.hpp" #include "query_common.hpp" diff --git a/tests/unit/distributed_reset.cpp b/tests/unit/distributed_reset.cpp index 4721bbc98..6b2d16d61 100644 --- a/tests/unit/distributed_reset.cpp +++ b/tests/unit/distributed_reset.cpp @@ -3,7 +3,7 @@ #include "distributed/plan_dispatcher.hpp" #include "distributed_common.hpp" #include "query/context.hpp" -#include "query/plan/distributed_ops.hpp" +#include "query/distributed/plan/ops.hpp" #include "query/interpret/frame.hpp" class DistributedReset : public DistributedGraphDbTest {