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

Plan Filter at the end of With clause

Browse Source 
Reviewers: mislav.bradac

Reviewed By: mislav.bradac

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D727
This commit is contained in:
Teon Banek 2017-08-30 13:48:11 +02:00
parent d40319c111
commit fe6d64066b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/query/plan/rule_based_planner.cpp
View File

@ -472,13 +472,7 @@ auto GenReturnBody(LogicalOperator *input_op, bool advance_command,
} }
last_op = new Produce(std::shared_ptr<LogicalOperator>(last_op), last_op = new Produce(std::shared_ptr<LogicalOperator>(last_op),
body.named_expressions()); body.named_expressions());
// Where may see new symbols so it comes after we generate Produce.
if (body.where()) {
last_op = new Filter(std::shared_ptr<LogicalOperator>(last_op),
body.where()->expression_);
}
// Distinct in ReturnBody only makes Produce values unique, so plan after it. // Distinct in ReturnBody only makes Produce values unique, so plan after it.
// Hopefully, it is more efficient to have Filter before Distinct.
if (body.distinct()) { if (body.distinct()) {
last_op = new Distinct(std::shared_ptr<LogicalOperator>(last_op), last_op = new Distinct(std::shared_ptr<LogicalOperator>(last_op),
body.output_symbols()); body.output_symbols());
@ -498,6 +492,12 @@ auto GenReturnBody(LogicalOperator *input_op, bool advance_command,
last_op = last_op =
new Limit(std::shared_ptr<LogicalOperator>(last_op), body.limit()); new Limit(std::shared_ptr<LogicalOperator>(last_op), body.limit());
} }
// Where may see new symbols so it comes after we generate Produce and in
// general, comes after any OrderBy, Skip or Limit.
if (body.where()) {
last_op = new Filter(std::shared_ptr<LogicalOperator>(last_op),
body.where()->expression_);
}
return last_op; return last_op;
} }

4
tests/unit/query_planner.cpp
View File

@ -703,7 +703,7 @@ TEST(TestLogicalPlanner, CreateWithOrderByWhere) {
}); });
auto plan = MakeLogicalPlan<RuleBasedPlanner>(storage, symbol_table, *dba); auto plan = MakeLogicalPlan<RuleBasedPlanner>(storage, symbol_table, *dba);
CheckPlan(*plan, symbol_table, ExpectCreateNode(), ExpectCreateExpand(), acc, CheckPlan(*plan, symbol_table, ExpectCreateNode(), ExpectCreateExpand(), acc,
ExpectProduce(), ExpectFilter(), ExpectOrderBy()); ExpectProduce(), ExpectOrderBy(), ExpectFilter());
} }
TEST(TestLogicalPlanner, ReturnAddSumCountOrderBy) { TEST(TestLogicalPlanner, ReturnAddSumCountOrderBy) {
@ -796,7 +796,7 @@ TEST(TestLogicalPlanner, CreateWithDistinctSumWhereReturn) {
auto aggr = ExpectAggregate({sum}, {}); auto aggr = ExpectAggregate({sum}, {});
auto plan = MakeLogicalPlan<RuleBasedPlanner>(storage, symbol_table, *dba); auto plan = MakeLogicalPlan<RuleBasedPlanner>(storage, symbol_table, *dba);
CheckPlan(*plan, symbol_table, ExpectCreateNode(), acc, aggr, ExpectProduce(), CheckPlan(*plan, symbol_table, ExpectCreateNode(), acc, aggr, ExpectProduce(),
ExpectFilter(), ExpectDistinct(), ExpectProduce()); ExpectDistinct(), ExpectFilter(), ExpectProduce());
} }
TEST(TestLogicalPlanner, MatchCrossReferenceVariable) { TEST(TestLogicalPlanner, MatchCrossReferenceVariable) {