Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 29e7529

Browse files
author
GustavoAngulo
committed
Fixed formatting and requested changes
1 parent 6073ba2 commit 29e7529

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/optimizer/rule_impls.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ void InnerJoinAssociativity::Transform(
111111

112112
// Get Alias sets
113113
auto &memo = context->metadata->memo;
114-
115-
auto middle_group_id =
116-
children[0]->Children()[1]->Op().As<LeafOperator>()->origin_group;
117-
auto right_group_id = children[1]->Op().As<LeafOperator>()->origin_group;
114+
auto middle_group_id = middle->Op().As<LeafOperator>()->origin_group;
115+
auto right_group_id = right->Op().As<LeafOperator>()->origin_group;
118116

119117
const auto &middle_group_aliases_set =
120118
memo.GetGroupByID(middle_group_id)->GetTableAliases();
@@ -144,10 +142,11 @@ void InnerJoinAssociativity::Transform(
144142
std::vector<AnnotatedExpression> new_parent_join_predicates;
145143

146144
for (auto predicate : predicates) {
147-
if (util::IsSubset(right_join_aliases_set, predicate.table_alias_set))
145+
if (util::IsSubset(right_join_aliases_set, predicate.table_alias_set)) {
148146
new_child_join_predicates.emplace_back(predicate);
149-
else
147+
} else {
150148
new_parent_join_predicates.emplace_back(predicate);
149+
}
151150
}
152151

153152
// Construct new child join operator

test/optimizer/optimizer_rule_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest) {
9090
LogicalGet::make(2, {}, nullptr, "test3"));
9191

9292
auto left_get_group = optimizer.metadata_.memo.InsertExpression(
93-
optimizer.metadata_.MakeGroupExpression(left_get), true);
93+
optimizer.metadata_.MakeGroupExpression(left_get), false);
9494
auto middle_get_group = optimizer.metadata_.memo.InsertExpression(
95-
optimizer.metadata_.MakeGroupExpression(middle_get), true);
95+
optimizer.metadata_.MakeGroupExpression(middle_get), false);
9696
auto right_get_group = optimizer.metadata_.memo.InsertExpression(
97-
optimizer.metadata_.MakeGroupExpression(right_get), true);
97+
optimizer.metadata_.MakeGroupExpression(right_get), false);
9898

9999
auto left_leaf = std::make_shared<OperatorExpression>(
100100
LeafOperator::make(left_get_group->GetGroupID()));
@@ -186,11 +186,11 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest2) {
186186

187187
// Create Groups for Get Operators
188188
auto left_get_group = memo.InsertExpression(
189-
optimizer.metadata_.MakeGroupExpression(left_get), true);
189+
optimizer.metadata_.MakeGroupExpression(left_get), false);
190190
auto middle_get_group = memo.InsertExpression(
191-
optimizer.metadata_.MakeGroupExpression(middle_get), true);
191+
optimizer.metadata_.MakeGroupExpression(middle_get), false);
192192
auto right_get_group = memo.InsertExpression(
193-
optimizer.metadata_.MakeGroupExpression(right_get), true);
193+
optimizer.metadata_.MakeGroupExpression(right_get), false);
194194

195195
auto left_leaf = std::make_shared<OperatorExpression>(
196196
LeafOperator::make(left_get_group->GetGroupID()));

0 commit comments

Comments
 (0)