Skip to content

Fix incorrect pushdown of expression below join #13114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martint merged 2 commits into from
Jul 7, 2022
Merged

Fix incorrect pushdown of expression below join #13114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98683bd
Fix formatting
sopel39 Jul 7, 2022
db8f487
Fix incorrect pushdown of expression below join
sopel39 Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ...a/io/trino/sql/planner/iterative/rule/PushInequalityFilterExpressionBelowJoinRuleSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import static io.trino.sql.planner.SymbolsExtractor.extractUnique;
import static io.trino.sql.planner.iterative.Rule.Context;
import static io.trino.sql.planner.iterative.Rule.Result;
import static io.trino.sql.planner.plan.JoinNode.Type.INNER;
import static io.trino.sql.planner.plan.Patterns.filter;
import static io.trino.sql.planner.plan.Patterns.join;
import static io.trino.sql.planner.plan.Patterns.source;
Expand Down Expand Up @@ -118,7 +119,21 @@ public Rule<JoinNode> pushJoinInequalityFilterExpressionBelowJoinRule()
private Result pushInequalityFilterExpressionBelowJoin(Context context, JoinNode joinNode, Optional<FilterNode> filterNode)
{
JoinNodeContext joinNodeContext = new JoinNodeContext(joinNode);
Map<Boolean, List<Expression>> parentFilterCandidates = extractPushDownCandidates(joinNodeContext, filterNode.map(FilterNode::getPredicate).orElse(TRUE_LITERAL));

Expression parentFilterPredicate = filterNode.map(FilterNode::getPredicate).orElse(TRUE_LITERAL);
Map<Boolean, List<Expression>> parentFilterCandidates;
if (joinNode.getType() == INNER) {
parentFilterCandidates = extractPushDownCandidates(joinNodeContext, parentFilterPredicate);
}
else {
// Do not push parent filter predicate for outer joins. Pushing it below join changes
// filter semantics because such filter depends on null output from outer join side
// (otherwise outer join would be converted to inner join by predicate push down).
parentFilterCandidates = ImmutableMap.of(
true, ImmutableList.of(),
false, extractConjuncts(parentFilterPredicate));
}

Map<Boolean, List<Expression>> joinFilterCandidates = extractPushDownCandidates(joinNodeContext, joinNode.getFilter().orElse(TRUE_LITERAL));

if (parentFilterCandidates.get(true).isEmpty() && joinFilterCandidates.get(true).isEmpty()) {
Expand Down
37 changes: 35 additions & 2 deletions core/trino-main/src/test/java/io/trino/sql/planner/TestLogicalPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,39 @@ public void testJoinWithOrderBySameKey()
tableScan("lineitem", ImmutableMap.of("LINEITEM_OK", "orderkey"))))));
}

@Test
public void testInequalityPredicatePushdownWithOuterJoin()
{
assertPlan("" +
"SELECT o.orderkey " +
"FROM orders o LEFT JOIN lineitem l " +
"ON o.orderkey = l.orderkey AND o.custkey + 42 < l.partkey + 42 " +
"WHERE o.custkey - 24 < COALESCE(l.partkey - 24, 0)",
anyTree(
// predicate above outer join is not pushed to build side
filter(
"O_CUSTKEY - BIGINT '24' < COALESCE(L_PARTKEY - BIGINT '24', BIGINT '0')",
join(
LEFT,
ImmutableList.of(equiJoinClause("O_ORDERKEY", "L_ORDERKEY")),
// part of inequality predicate within outer join is pushed down to build side
Optional.of("O_CUSTKEY + BIGINT '42' < EXPR"),
anyTree(
tableScan(
"orders",
ImmutableMap.of(
"O_ORDERKEY", "orderkey",
"O_CUSTKEY", "custkey"))),
anyTree(
project(
ImmutableMap.of("EXPR", expression("L_PARTKEY + BIGINT '42'")),
tableScan(
"lineitem",
ImmutableMap.of(
"L_ORDERKEY", "orderkey",
"L_PARTKEY", "partkey"))))))));
}

@Test
public void testTopNPushdownToJoinSource()
{
Expand Down Expand Up @@ -1655,8 +1688,8 @@ public void testRedundantHashRemovalForMarkDistinct()
node(MarkDistinctNode.class,
anyTree(
project(ImmutableMap.of(
"hash_1", expression("combine_hash(bigint '0', coalesce(\"$operator$hash_code\"(suppkey), 0))"),
"hash_2", expression("combine_hash(bigint '0', coalesce(\"$operator$hash_code\"(partkey), 0))")),
"hash_1", expression("combine_hash(bigint '0', coalesce(\"$operator$hash_code\"(suppkey), 0))"),
"hash_2", expression("combine_hash(bigint '0', coalesce(\"$operator$hash_code\"(partkey), 0))")),
node(MarkDistinctNode.class,
tableScan("lineitem", ImmutableMap.of("suppkey", "suppkey", "partkey", "partkey"))))))))));
}
Expand Down
20 changes: 20 additions & 0 deletions core/trino-main/src/test/java/io/trino/sql/query/TestJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,24 @@ public void testOutputDuplicatesInsensitiveJoin()
values())
.with(JoinNode.class, JoinNode::isMaySkipOutputDuplicates)))));
}

@Test
public void testPredicateOverOuterJoin()
{
assertThat(assertions.query(
"SELECT 5 " +
"FROM (VALUES (1,'foo')) l(l1, l2) " +
"LEFT JOIN (VALUES (2,'bar')) r(r1, r2) " +
"ON l2 = r2 " +
"WHERE l1 >= COALESCE(r1, 0)"))
.matches("VALUES 5");

assertThat(assertions.query(
"SELECT 5 " +
"FROM (VALUES (2,'foo')) l(l1, l2) " +
"RIGHT JOIN (VALUES (1,'bar')) r(r1, r2) " +
"ON l2 = r2 " +
"WHERE r1 >= COALESCE(l1, 0)"))
.matches("VALUES 5");
}
}