Skip to content

Fix multi-join dynamic filtering #2659

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
sopel39 merged 1 commit into from
Jan 31, 2020
Merged

Fix multi-join dynamic filtering #2659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ...rc/main/java/io/prestosql/sql/planner/iterative/rule/RemoveUnsupportedDynamicFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -120,14 +121,17 @@ public PlanWithConsumedDynamicFilters visitJoin(JoinNode node, Set<String> allow
PlanNode left = leftResult.getNode();
PlanNode right = rightResult.getNode();
if (!left.equals(node.getLeft()) || !right.equals(node.getRight()) || !dynamicFilters.equals(node.getDynamicFilters())) {
Optional<Expression> filter = node
.getFilter().map(this::removeAllDynamicFilters) // no DF support at Join operators.
.filter(expression -> !expression.equals(TRUE_LITERAL));
return new PlanWithConsumedDynamicFilters(new JoinNode(
node.getId(),
node.getType(),
left,
right,
node.getCriteria(),
node.getOutputSymbols(),
node.getFilter(),
filter,
node.getLeftHashSymbol(),
node.getRightHashSymbol(),
node.getDistributionType(),
Expand Down
18 changes: 14 additions & 4 deletions presto-main/src/main/java/io/prestosql/sql/planner/sanity/DynamicFiltersChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/
package io.prestosql.sql.planner.sanity;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import io.prestosql.Session;
import io.prestosql.execution.warnings.WarningCollector;
Expand Down Expand Up @@ -72,12 +73,21 @@ public Set<String> visitJoin(JoinNode node, Void context)
{
Set<String> currentJoinDynamicFilters = node.getDynamicFilters().keySet();
Set<String> consumedProbeSide = node.getLeft().accept(this, context);
verify(difference(currentJoinDynamicFilters, consumedProbeSide).isEmpty(),
"Dynamic filters present in join were not fully consumed by it's probe side.");
Set<String> unconsumedByProbeSide = difference(currentJoinDynamicFilters, consumedProbeSide);
verify(unconsumedByProbeSide.isEmpty(),
"Dynamic filters %s present in join were not fully consumed by it's probe side.", unconsumedByProbeSide);

Set<String> consumedBuildSide = node.getRight().accept(this, context);
verify(intersection(currentJoinDynamicFilters, consumedBuildSide).isEmpty(),
"Dynamic filters present in join were consumed by it's build side.");
Set<String> unconsumedByBuildSide = intersection(currentJoinDynamicFilters, consumedBuildSide);
verify(unconsumedByBuildSide.isEmpty(),
"Dynamic filters %s present in join were consumed by it's build side.", unconsumedByBuildSide);

List<DynamicFilters.Descriptor> nonPushedDownFilters = node
.getFilter()
.map(DynamicFilters::extractDynamicFilters)
.map(DynamicFilters.ExtractResult::getDynamicConjuncts)
.orElse(ImmutableList.of());
verify(nonPushedDownFilters.isEmpty(), "Dynamic filters %s present in join filter predicate were not pushed down.", nonPushedDownFilters);

Set<String> unmatched = new HashSet<>(consumedBuildSide);
unmatched.addAll(consumedProbeSide);
Expand Down
29 changes: 29 additions & 0 deletions presto-main/src/test/java/io/prestosql/sql/planner/TestDynamicFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import static io.prestosql.sql.planner.assertions.PlanMatchPattern.anyTree;
import static io.prestosql.sql.planner.assertions.PlanMatchPattern.equiJoinClause;
import static io.prestosql.sql.planner.assertions.PlanMatchPattern.exchange;
import static io.prestosql.sql.planner.assertions.PlanMatchPattern.expression;
import static io.prestosql.sql.planner.assertions.PlanMatchPattern.filter;
import static io.prestosql.sql.planner.assertions.PlanMatchPattern.join;
import static io.prestosql.sql.planner.assertions.PlanMatchPattern.node;
Expand Down Expand Up @@ -259,6 +260,34 @@ public void testNestedDynamicFiltersRemoval()
tableScan("orders", ImmutableMap.of("ORDERS_CK27", "clerk"))))), metadata)));
}

@Test
public void testNonPushedDownJoinFilterRemoval()
{
assertPlan(
"SELECT 1 FROM part t0, part t1, part t2 " +
"WHERE t0.partkey = t1.partkey AND t0.partkey = t2.partkey " +
"AND t0.size + t1.size = t2.size",
noJoinReordering(),
anyTree(
join(INNER,
ImmutableList.of(equiJoinClause("K0", "K2"), equiJoinClause("S", "V2")),
project(
project(ImmutableMap.of("S", expression("V0 + V1")),
join(
INNER,
ImmutableList.of(equiJoinClause("K0", "K1")),
project(
node(FilterNode.class,
tableScan("part", ImmutableMap.of("K0", "partkey", "V0", "size")))),
exchange(
project(
node(FilterNode.class,
tableScan("part", ImmutableMap.of("K1", "partkey", "V1", "size")))))))),
exchange(
project(
tableScan("part", ImmutableMap.of("K2", "partkey", "V2", "size")))))));
}

private Session noJoinReordering()
{
return Session.builder(getQueryRunner().getDefaultSession())
Expand Down
4 changes: 2 additions & 2 deletions presto-main/src/test/java/io/prestosql/sql/planner/sanity/TestDynamicFiltersChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void setup()
ordersTableScanNode = builder.tableScan(ordersTableHandle, ImmutableList.of(ordersOrderKeySymbol), ImmutableMap.of(ordersOrderKeySymbol, new TpchColumnHandle("orderkey", BIGINT)));
}

@Test(expectedExceptions = VerifyException.class, expectedExceptionsMessageRegExp = "Dynamic filters present in join were not fully consumed by it's probe side.")
@Test(expectedExceptions = VerifyException.class, expectedExceptionsMessageRegExp = "Dynamic filters \\[DF\\] present in join were not fully consumed by it's probe side.")
public void testUnconsumedDynamicFilterInJoin()
{
PlanNode root = builder.join(
Expand All @@ -93,7 +93,7 @@ public void testUnconsumedDynamicFilterInJoin()
validatePlan(root);
}

@Test(expectedExceptions = VerifyException.class, expectedExceptionsMessageRegExp = "Dynamic filters present in join were consumed by it's build side.")
@Test(expectedExceptions = VerifyException.class, expectedExceptionsMessageRegExp = "Dynamic filters \\[DF\\] present in join were consumed by it's build side.")
public void testDynamicFilterConsumedOnBuildSide()
{
PlanNode root = builder.join(
Expand Down
20 changes: 20 additions & 0 deletions presto-memory/src/test/java/io/prestosql/plugin/memory/TestMemorySmoke.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static io.prestosql.SystemSessionProperties.ENABLE_DYNAMIC_FILTERING;
import static io.prestosql.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE;
import static io.prestosql.SystemSessionProperties.JOIN_REORDERING_STRATEGY;
import static io.prestosql.testing.assertions.Assert.assertEquals;
import static java.lang.String.format;
import static org.testng.Assert.assertTrue;
Expand Down Expand Up @@ -136,6 +137,25 @@ public void testJoinDynamicFilteringSingleValue()
assertEquals(rowsRead, ImmutableSet.of(6L, buildSideRowsCount));
}

@Test
public void testJoinDynamicFilteringMultiJoin()
{
assertUpdate("CREATE TABLE t0 (k0 integer, v0 real)");
assertUpdate("CREATE TABLE t1 (k1 integer, v1 real)");
assertUpdate("CREATE TABLE t2 (k2 integer, v2 real)");
assertUpdate("INSERT INTO t0 VALUES (1, 1.0)", 1);
assertUpdate("INSERT INTO t1 VALUES (1, 2.0)", 1);
assertUpdate("INSERT INTO t2 VALUES (1, 3.0)", 1);

String query = "SELECT k0, k1, k2 FROM t0, t1, t2 WHERE (k0 = k1) AND (k0 = k2) AND (v0 + v1 = v2)";
Session session = Session.builder(getSession())
.setSystemProperty(ENABLE_DYNAMIC_FILTERING, "true")
.setSystemProperty(JOIN_DISTRIBUTION_TYPE, FeaturesConfig.JoinDistributionType.BROADCAST.name())
.setSystemProperty(JOIN_REORDERING_STRATEGY, FeaturesConfig.JoinReorderingStrategy.NONE.name())
.build();
assertQuery(session, query, "SELECT 1, 1, 1");
}

@Test
public void testCreateTableWithNoData()
{
Expand Down