tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move distributed query stuff to new folder

Browse Source 
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
This commit is contained in:
Teon Banek 2019-03-15 15:58:16 +01:00
parent 4e56673f0d
commit e128a9f80f
31 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -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

24
src/CMakeLists.txt
View File

@ -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})

10
src/distributed/bfs_rpc_messages.lcp
View File

@ -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")

6
src/distributed/plan_rpc_messages.lcp
View File

@ -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))

6
src/distributed/pull_produce_rpc_messages.lcp
View File

@ -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")

2
src/memgraph_distributed.cpp
View File

@ -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"

4
src/query/frontend/ast/ast_serialization.lcp → src/query/distributed/frontend/ast/ast_serialization.lcp
View File

@ -4,8 +4,8 @@
#include <type_traits>
#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<#

4
src/query/frontend/semantic/symbol_serialization.lcp → src/query/distributed/frontend/semantic/symbol_serialization.lcp
View File

@ -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")

6
src/query/distributed_interpreter.cpp → src/query/distributed/interpreter.cpp
View File

@ -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"

0
src/query/distributed_interpreter.hpp → src/query/distributed/interpreter.hpp
View File

2
src/query/plan/distributed_ops.cpp → src/query/distributed/plan/ops.cpp
View File

@ -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"

6
src/query/plan/distributed_ops.lcp → src/query/distributed/plan/ops.lcp
View File

@ -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<#

6
src/query/plan/distributed.cpp → src/query/distributed/plan/planner.cpp
View File

@ -1,4 +1,4 @@
#include "query/plan/distributed.hpp"
#include "query/distributed/plan/planner.hpp"
#include <memory>
@ -6,8 +6,8 @@
// serialization when proper cloning is added.
#include <capnp/message.h>
#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"

0
src/query/plan/distributed.hpp → src/query/distributed/plan/planner.hpp
View File

2
src/query/plan/distributed_pretty_print.cpp → src/query/distributed/plan/pretty_print.cpp
View File

@ -1,4 +1,4 @@
#include "query/plan/distributed_pretty_print.hpp"
#include "query/distributed/plan/pretty_print.hpp"
namespace query::plan {

2
src/query/plan/distributed_pretty_print.hpp → src/query/distributed/plan/pretty_print.hpp
View File

@ -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 <json/json.hpp>

4
src/query/serialization.capnp → src/query/distributed/serialization.capnp
View File

@ -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";

4
src/query/serialization.cpp → src/query/distributed/serialization.cpp
View File

@ -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 {

4
src/query/serialization.hpp → src/query/distributed/serialization.hpp
View File

@ -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"

2
src/query/frontend/ast/ast.lcp
View File

@ -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")

6
src/query/plan/operator.lcp
View File

@ -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")

2
tests/benchmark/serialization.cpp
View File

@ -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:

2
tests/manual/distributed_common.hpp
View File

@ -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"

4
tests/manual/distributed_query_planner.cpp
View File

@ -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);

2
tests/manual/distributed_repl.cpp
View File

@ -9,7 +9,7 @@
#include <gtest/gtest.h>
#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"

2
tests/unit/ast_serialization.cpp
View File

@ -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"

2
tests/unit/bfs_distributed.cpp
View File

@ -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"

2
tests/unit/distributed_interpretation.cpp
View File

@ -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"

4
tests/unit/distributed_plan_pretty_print.cpp
View File

@ -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"

4
tests/unit/distributed_query_plan.cpp
View File

@ -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"

2
tests/unit/distributed_reset.cpp
View File

@ -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 {