From 8e7b51470a8b34e5f8c4c7a4a8d88993c4c670d1 Mon Sep 17 00:00:00 2001 From: starocean999 <40539150+starocean999@users.noreply.github.com> Date: Fri, 8 Mar 2024 10:15:05 +0800 Subject: [PATCH] [fix](nereids)forbid some join reorder rules for mark join (#31966) --- .../nereids/rules/exploration/join/JoinCommute.java | 5 +++-- .../join/LogicalJoinSemiJoinTranspose.java | 7 +++++++ .../join/LogicalJoinSemiJoinTransposeProject.java | 7 +++++++ .../org/apache/doris/nereids/util/JoinUtils.java | 12 ++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinCommute.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinCommute.java index ef8868998e069b..49c91b92942c15 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinCommute.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinCommute.java @@ -63,8 +63,9 @@ public Rule build() { // null aware mark join will be translated to null aware left semi/anti join // we don't support null aware right semi/anti join, so should not commute .whenNot(join -> JoinUtils.isNullAwareMarkJoin(join)) - // commuting nest loop mark join is not supported by be - .whenNot(join -> join.isMarkJoin() && join.getHashJoinConjuncts().isEmpty()) + // commuting nest loop mark join or left anti mark join is not supported by be + .whenNot(join -> join.isMarkJoin() && (join.getHashJoinConjuncts().isEmpty() + || join.getJoinType().isLeftAntiJoin())) .then(join -> { LogicalJoin newJoin = join.withTypeChildren(join.getJoinType().swap(), join.right(), join.left(), null); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTranspose.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTranspose.java index 7f0409e45e6438..9482d719451d95 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTranspose.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTranspose.java @@ -23,6 +23,7 @@ import org.apache.doris.nereids.trees.plans.GroupPlan; import org.apache.doris.nereids.trees.plans.Plan; import org.apache.doris.nereids.trees.plans.logical.LogicalJoin; +import org.apache.doris.nereids.util.JoinUtils; import com.google.common.collect.ImmutableList; @@ -46,6 +47,9 @@ public List buildRules() { .whenNot(topJoin -> topJoin.hasDistributeHint() || topJoin.left().hasDistributeHint()) .then(topJoin -> { LogicalJoin bottomJoin = topJoin.left(); + if (!JoinUtils.checkReorderPrecondition(topJoin, bottomJoin)) { + return null; + } GroupPlan a = bottomJoin.left(); GroupPlan b = bottomJoin.right(); GroupPlan c = topJoin.right(); @@ -61,6 +65,9 @@ public List buildRules() { .whenNot(topJoin -> topJoin.hasDistributeHint() || topJoin.right().hasDistributeHint()) .then(topJoin -> { LogicalJoin bottomJoin = topJoin.right(); + if (!JoinUtils.checkReorderPrecondition(topJoin, bottomJoin)) { + return null; + } GroupPlan a = topJoin.left(); GroupPlan b = bottomJoin.left(); GroupPlan c = bottomJoin.right(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTransposeProject.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTransposeProject.java index 3b2c6e0dbc7788..0240fc9958679b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTransposeProject.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/LogicalJoinSemiJoinTransposeProject.java @@ -24,6 +24,7 @@ import org.apache.doris.nereids.trees.plans.GroupPlan; import org.apache.doris.nereids.trees.plans.Plan; import org.apache.doris.nereids.trees.plans.logical.LogicalJoin; +import org.apache.doris.nereids.util.JoinUtils; import com.google.common.collect.ImmutableList; @@ -48,6 +49,9 @@ public List buildRules() { .when(join -> join.left().isAllSlots()) .then(topJoin -> { LogicalJoin bottomJoin = topJoin.left().child(); + if (!JoinUtils.checkReorderPrecondition(topJoin, bottomJoin)) { + return null; + } GroupPlan a = bottomJoin.left(); GroupPlan b = bottomJoin.right(); GroupPlan c = topJoin.right(); @@ -68,6 +72,9 @@ public List buildRules() { .when(join -> join.right().isAllSlots()) .then(topJoin -> { LogicalJoin bottomJoin = topJoin.right().child(); + if (!JoinUtils.checkReorderPrecondition(topJoin, bottomJoin)) { + return null; + } GroupPlan a = topJoin.left(); GroupPlan b = bottomJoin.left(); GroupPlan c = bottomJoin.right(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java index 3c439f8b99fc5b..07274cc27c6a89 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/JoinUtils.java @@ -29,6 +29,7 @@ import org.apache.doris.nereids.trees.expressions.EqualPredicate; import org.apache.doris.nereids.trees.expressions.ExprId; import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.MarkJoinSlotReference; import org.apache.doris.nereids.trees.expressions.Not; import org.apache.doris.nereids.trees.expressions.Slot; import org.apache.doris.nereids.trees.expressions.functions.scalar.BitmapContains; @@ -392,4 +393,15 @@ public static boolean isNullAwareMarkJoin(Join join) { // and translate join type to NULL_AWARE_LEFT_SEMI_JOIN or NULL_AWARE_LEFT_ANTI_JOIN return join.getHashJoinConjuncts().isEmpty() && !join.getMarkJoinConjuncts().isEmpty(); } + + /** + * forbid join reorder if top join's condition use mark join slot produced by bottom join + */ + public static boolean checkReorderPrecondition(LogicalJoin top, LogicalJoin bottom) { + Set markSlots = top.getConditionSlot().stream() + .filter(MarkJoinSlotReference.class::isInstance) + .collect(Collectors.toSet()); + markSlots.retainAll(bottom.getOutputSet()); + return markSlots.isEmpty(); + } }