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

Handle transitive dependencies for Cartesian

Browse Source 
Reviewers: mtomic, msantl

Reviewed By: msantl

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1641
This commit is contained in:
Teon Banek 2018-10-09 14:44:21 +02:00
parent ce6085fa06
commit ca2106bb91
2 changed files with 57 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/query/plan/distributed.cpp
View File

@ -851,20 +851,17 @@ class DistributedPlanner : public HierarchicalLogicalOperatorVisitor {
dependent_branches.push_back(right_branch); dependent_branches.push_back(right_branch);
} }
auto append_dependants = [&dependent_branches](auto op, int64_t branch_ix) { auto append_dependants = [&dependent_branches](auto op, int64_t branch_ix) {
// Append dependent parents, iteration is in reverse because we want // Append dependent parents, using LIFO behaviour, because
// LIFO behaviour. // dependent_branches is filled in reverse.
for (auto it = dependent_branches.rbegin(); while (!dependent_branches.empty()) {
it != dependent_branches.rend(); ++it) { auto branch = dependent_branches.back();
if (it->depends_on.value() != branch_ix) continue; // Following branches may depend on this one, so we have to break as
it->parent_end->set_input(op); // soon as the first one cannot be appended.
op = it->parent_start; if (branch.depends_on.value() < branch_ix) break;
branch.parent_end->set_input(op);
op = branch.parent_start;
dependent_branches.pop_back();
} }
dependent_branches.erase(
std::remove_if(dependent_branches.begin(), dependent_branches.end(),
[branch_ix](const auto &branch) {
return branch.depends_on.value() == branch_ix;
}),
dependent_branches.end());
return op; return op;
}; };
// We use this ordering of operators, so that left hand side can be // We use this ordering of operators, so that left hand side can be

50
tests/unit/distributed_query_plan.cpp
View File

@ -1743,11 +1743,11 @@ TYPED_TEST(TestPlanner, DistributedCartesianFilter) {
MakeCheckers(ExpectScanAll(), ExpectFilter(), ExpectPullRemote({sym_a})); MakeCheckers(ExpectScanAll(), ExpectFilter(), ExpectPullRemote({sym_a}));
auto mid_cart = MakeCheckers(ExpectScanAll(), ExpectPullRemote({sym_b})); auto mid_cart = MakeCheckers(ExpectScanAll(), ExpectPullRemote({sym_b}));
auto right_cart = MakeCheckers(ExpectScanAll(), ExpectPullRemote({sym_c})); auto right_cart = MakeCheckers(ExpectScanAll(), ExpectPullRemote({sym_c}));
auto mid_right_cart = MakeCheckers( auto mid_right_cart =
ExpectDistributedCartesian(mid_cart, right_cart), ExpectFilter()); MakeCheckers(ExpectDistributedCartesian(mid_cart, right_cart));
auto expected = ExpectDistributed( auto expected = ExpectDistributed(
MakeCheckers(ExpectDistributedCartesian(left_cart, mid_right_cart), MakeCheckers(ExpectDistributedCartesian(left_cart, mid_right_cart),
ExpectFilter(), ExpectProduce()), ExpectFilter(), ExpectFilter(), ExpectProduce()),
MakeCheckers(ExpectScanAll(), ExpectFilter()), MakeCheckers(ExpectScanAll(), ExpectFilter()),
MakeCheckers(ExpectScanAll()), MakeCheckers(ExpectScanAll())); MakeCheckers(ExpectScanAll()), MakeCheckers(ExpectScanAll()));
FakeDbAccessor dba; FakeDbAccessor dba;
@ -2106,6 +2106,50 @@ TYPED_TEST(TestPlanner, DistributedOptionalCartesian) {
CheckDistributedPlan(planner.plan(), symbol_table, expected); CheckDistributedPlan(planner.plan(), symbol_table, expected);
} }
TYPED_TEST(TestPlanner, DistributedCartesianTransitiveDependency) {
// Test MATCH (n:L)-[a]-(m:L)-[b]-(l:L) RETURN l;
AstStorage storage;
FakeDbAccessor dba;
auto label = dba.Label("L");
// Set indexes so that multiple scans and expanding to existing is preferred.
dba.SetIndexCount(label, 1);
auto *node_n = NODE("n", label);
auto *node_m = NODE("m", label);
auto *node_l = NODE("l", label);
auto *edge_a = EDGE("a");
auto *edge_b = EDGE("b");
QUERY(SINGLE_QUERY(MATCH(PATTERN(node_n, edge_a, node_m, edge_b, node_l)),
RETURN("l")));
auto symbol_table = MakeSymbolTable(*storage.query());
auto sym_a = symbol_table.at(*edge_a->identifier_);
auto sym_b = symbol_table.at(*edge_b->identifier_);
auto sym_n = symbol_table.at(*node_n->identifier_);
auto sym_m = symbol_table.at(*node_m->identifier_);
auto sym_l = symbol_table.at(*node_l->identifier_);
auto right_cart =
MakeCheckers(ExpectScanAllByLabel(), ExpectPullRemote({sym_l}));
auto mid_cart =
MakeCheckers(ExpectScanAllByLabel(), ExpectPullRemote({sym_m}));
auto left_cart =
MakeCheckers(ExpectScanAllByLabel(), ExpectPullRemote({sym_n}));
auto mid_right_cart =
MakeCheckers(ExpectDistributedCartesian(mid_cart, right_cart));
auto expected = ExpectDistributed(
MakeCheckers(ExpectDistributedCartesian(left_cart, mid_right_cart),
// This expand depends on Cartesian branches.
ExpectDistributedExpand(),
// This expand depends on the previous one.
ExpectDistributedExpand(),
// UniquenessFilter depends on both expands.
ExpectExpandUniquenessFilter<EdgeAccessor>(),
ExpectProduce()),
MakeCheckers(ExpectScanAllByLabel()),
MakeCheckers(ExpectScanAllByLabel()),
MakeCheckers(ExpectScanAllByLabel()));
auto planner = MakePlanner<TypeParam>(dba, storage, symbol_table);
CheckDistributedPlan(planner.plan(), symbol_table, expected);
}
TYPED_TEST(TestPlanner, DistributedOptionalScanExpandExisting) { TYPED_TEST(TestPlanner, DistributedOptionalScanExpandExisting) {
// Test MATCH (a) OPTIONAL MATCH (b)-[e]-(a) RETURN e; // Test MATCH (a) OPTIONAL MATCH (b)-[e]-(a) RETURN e;
AstStorage storage; AstStorage storage;