morrySnow commented on code in PR #11531: URL: https://github.com/apache/doris/pull/11531#discussion_r939548389
########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinLAsscomHelper.java: ########## @@ -0,0 +1,219 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.exploration.join; + +import org.apache.doris.common.Pair; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +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.trees.plans.logical.LogicalProject; +import org.apache.doris.nereids.util.ExpressionUtils; +import org.apache.doris.nereids.util.Utils; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; + +import java.util.HashSet; +import java.util.List; +import java.util.Optional; + +/** + * Common function for JoinLAsscom + */ +public class JoinLAsscomHelper { + /* + * topJoin newTopJoin + * / \ / \ + * bottomJoin C --> newBottomJoin B + * / \ / \ + * A B A C + */ + private final LogicalJoin topJoin; + private final LogicalJoin<GroupPlan, GroupPlan> bottomJoin; + private final Plan a; + private final Plan b; + private final Plan c; + + private final Expression topJoinOnClause; + private final Expression bottomJoinOnClause; + + private final List<SlotReference> aOutputSlots; + private final List<SlotReference> bOutputSlots; + private final List<SlotReference> cOutputSlots; + + private final List<Expression> newBottomJoinOnCondition = Lists.newArrayList(); + private final List<Expression> newTopJoinOnCondition = Lists.newArrayList(); + + /** + * Init plan and output. + */ + public JoinLAsscomHelper(LogicalJoin<? extends Plan, GroupPlan> topJoin, + LogicalJoin<GroupPlan, GroupPlan> bottomJoin) { + this.topJoin = topJoin; + this.bottomJoin = bottomJoin; + + a = bottomJoin.left(); + b = bottomJoin.right(); + c = (Plan) topJoin.right(); Review Comment: ```suggestion c = topJoin.right(); ``` ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinLAsscomHelper.java: ########## @@ -167,32 +173,26 @@ private LogicalJoin<GroupPlan, GroupPlan> newBottomJoin() { * Create topJoin for project-inside. */ public LogicalJoin newProjectTopJoin() { + Plan left; + Plan right; + List<NamedExpression> newLeftProjectExpr = getProjectExprs().first; List<NamedExpression> newRightProjectExprs = getProjectExprs().second; - - // no right project - if (newRightProjectExprs.size() == 0) { - return new LogicalJoin( - topJoin.getJoinType(), - Optional.of(ExpressionUtils.and(newTopJoinOnCondition)), - newBottomJoin(), b); + if (!newLeftProjectExpr.isEmpty()) { + left = new LogicalProject<>(newLeftProjectExpr, newBottomJoin()); + } else { + left = newBottomJoin(); } - - LogicalProject newRightProject = new LogicalProject<>(newRightProjectExprs, b); - if (newLeftProjectExpr.size() == 0) { - // no left project - return new LogicalJoin( - topJoin.getJoinType(), - Optional.of(ExpressionUtils.and(newTopJoinOnCondition)), - newBottomJoin(), newRightProject); + if (!newRightProjectExprs.isEmpty()) { + right = new LogicalProject<>(newLeftProjectExpr, newBottomJoin()); Review Comment: error intro by copy code from left project? ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinLAsscomHelper.java: ########## @@ -0,0 +1,219 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.exploration.join; + +import org.apache.doris.common.Pair; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +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.trees.plans.logical.LogicalProject; +import org.apache.doris.nereids.util.ExpressionUtils; +import org.apache.doris.nereids.util.Utils; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; + +import java.util.HashSet; +import java.util.List; +import java.util.Optional; + +/** + * Common function for JoinLAsscom + */ +public class JoinLAsscomHelper { + /* + * topJoin newTopJoin + * / \ / \ + * bottomJoin C --> newBottomJoin B + * / \ / \ + * A B A C + */ + private final LogicalJoin topJoin; + private final LogicalJoin<GroupPlan, GroupPlan> bottomJoin; + private final Plan a; + private final Plan b; + private final Plan c; + + private final Expression topJoinOnClause; + private final Expression bottomJoinOnClause; + + private final List<SlotReference> aOutputSlots; + private final List<SlotReference> bOutputSlots; + private final List<SlotReference> cOutputSlots; + + private final List<Expression> newBottomJoinOnCondition = Lists.newArrayList(); + private final List<Expression> newTopJoinOnCondition = Lists.newArrayList(); + + /** + * Init plan and output. + */ + public JoinLAsscomHelper(LogicalJoin<? extends Plan, GroupPlan> topJoin, + LogicalJoin<GroupPlan, GroupPlan> bottomJoin) { + this.topJoin = topJoin; + this.bottomJoin = bottomJoin; + + a = bottomJoin.left(); + b = bottomJoin.right(); + c = (Plan) topJoin.right(); + + Preconditions.checkArgument(topJoin.getCondition().isPresent(), "topJoin onClause must be present."); + topJoinOnClause = (Expression) topJoin.getCondition().get(); Review Comment: ```suggestion topJoinOnClause = topJoin.getCondition().get(); ``` ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinLAsscomHelper.java: ########## @@ -0,0 +1,219 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.exploration.join; + +import org.apache.doris.common.Pair; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +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.trees.plans.logical.LogicalProject; +import org.apache.doris.nereids.util.ExpressionUtils; +import org.apache.doris.nereids.util.Utils; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; + +import java.util.HashSet; +import java.util.List; +import java.util.Optional; + +/** + * Common function for JoinLAsscom + */ +public class JoinLAsscomHelper { + /* + * topJoin newTopJoin + * / \ / \ + * bottomJoin C --> newBottomJoin B + * / \ / \ + * A B A C + */ + private final LogicalJoin topJoin; + private final LogicalJoin<GroupPlan, GroupPlan> bottomJoin; + private final Plan a; + private final Plan b; + private final Plan c; + + private final Expression topJoinOnClause; + private final Expression bottomJoinOnClause; + + private final List<SlotReference> aOutputSlots; + private final List<SlotReference> bOutputSlots; + private final List<SlotReference> cOutputSlots; + + private final List<Expression> newBottomJoinOnCondition = Lists.newArrayList(); + private final List<Expression> newTopJoinOnCondition = Lists.newArrayList(); + + /** + * Init plan and output. + */ + public JoinLAsscomHelper(LogicalJoin<? extends Plan, GroupPlan> topJoin, + LogicalJoin<GroupPlan, GroupPlan> bottomJoin) { + this.topJoin = topJoin; + this.bottomJoin = bottomJoin; + + a = bottomJoin.left(); + b = bottomJoin.right(); + c = (Plan) topJoin.right(); + + Preconditions.checkArgument(topJoin.getCondition().isPresent(), "topJoin onClause must be present."); + topJoinOnClause = (Expression) topJoin.getCondition().get(); + Preconditions.checkArgument(bottomJoin.getCondition().isPresent(), "bottomJoin onClause must be present."); + bottomJoinOnClause = (Expression) bottomJoin.getCondition().get(); Review Comment: ```suggestion bottomJoinOnClause = bottomJoin.getCondition().get(); ``` ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinLAsscomHelper.java: ########## @@ -0,0 +1,219 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.exploration.join; + +import org.apache.doris.common.Pair; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +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.trees.plans.logical.LogicalProject; +import org.apache.doris.nereids.util.ExpressionUtils; +import org.apache.doris.nereids.util.Utils; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; + +import java.util.HashSet; +import java.util.List; +import java.util.Optional; + +/** + * Common function for JoinLAsscom + */ +public class JoinLAsscomHelper { + /* + * topJoin newTopJoin + * / \ / \ + * bottomJoin C --> newBottomJoin B + * / \ / \ + * A B A C + */ + private final LogicalJoin topJoin; + private final LogicalJoin<GroupPlan, GroupPlan> bottomJoin; + private final Plan a; + private final Plan b; + private final Plan c; + + private final Expression topJoinOnClause; + private final Expression bottomJoinOnClause; + + private final List<SlotReference> aOutputSlots; + private final List<SlotReference> bOutputSlots; + private final List<SlotReference> cOutputSlots; + + private final List<Expression> newBottomJoinOnCondition = Lists.newArrayList(); + private final List<Expression> newTopJoinOnCondition = Lists.newArrayList(); + + /** + * Init plan and output. + */ + public JoinLAsscomHelper(LogicalJoin<? extends Plan, GroupPlan> topJoin, + LogicalJoin<GroupPlan, GroupPlan> bottomJoin) { + this.topJoin = topJoin; + this.bottomJoin = bottomJoin; + + a = bottomJoin.left(); + b = bottomJoin.right(); + c = (Plan) topJoin.right(); + + Preconditions.checkArgument(topJoin.getCondition().isPresent(), "topJoin onClause must be present."); + topJoinOnClause = (Expression) topJoin.getCondition().get(); + Preconditions.checkArgument(bottomJoin.getCondition().isPresent(), "bottomJoin onClause must be present."); + bottomJoinOnClause = (Expression) bottomJoin.getCondition().get(); + + aOutputSlots = Utils.getOutputSlotReference(a); + bOutputSlots = Utils.getOutputSlotReference(b); + cOutputSlots = Utils.getOutputSlotReference(c); + } + + public static JoinLAsscomHelper of(LogicalJoin<? extends Plan, GroupPlan> topJoin, + LogicalJoin<GroupPlan, GroupPlan> bottomJoin) { + return new JoinLAsscomHelper(topJoin, bottomJoin); + } + + /** + * Get the onCondition of newTopJoin and newBottomJoin. + */ + public boolean initJoinOnCondition() { + List<Expression> topJoinOnClauseConjuncts = ExpressionUtils.extractConjunction(topJoinOnClause); + for (Expression topJoinOnClauseConjunct : topJoinOnClauseConjuncts) { + // Ignore join with some OnClause like: + // Join C = B + A for above example. + List<SlotReference> topJoinUsedSlot = topJoinOnClauseConjunct.collect(SlotReference.class::isInstance); + if (ExpressionUtils.isIntersecting(topJoinUsedSlot, aOutputSlots) + && ExpressionUtils.isIntersecting(topJoinUsedSlot, bOutputSlots) + && ExpressionUtils.isIntersecting(topJoinUsedSlot, cOutputSlots) + ) { + return false; + } + } + + List<Expression> allOnCondition = Lists.newArrayList(); + allOnCondition.addAll(topJoinOnClauseConjuncts); + allOnCondition.addAll(ExpressionUtils.extractConjunction(bottomJoinOnClause)); + + HashSet<SlotReference> newBottomJoinSlots = new HashSet<>(aOutputSlots); + newBottomJoinSlots.addAll(cOutputSlots); + + for (Expression onCondition : allOnCondition) { + List<SlotReference> slots = onCondition.collect(SlotReference.class::isInstance); + if (newBottomJoinSlots.containsAll(slots)) { + newBottomJoinOnCondition.add(onCondition); + } else { + newTopJoinOnCondition.add(onCondition); + } + } + + // newBottomJoinOnCondition/newTopJoinOnCondition is empty. They are cross join. + // Example: + // A: col1, col2. B: col2, col3. C: col3, col4 + // (A & B on A.col2=B.col2) & C on B.col3=C.col3. + // (A & B) & C -> (A & C) & B. + // (A & C) will be cross join (newBottomJoinOnCondition is empty) + if (newBottomJoinOnCondition.isEmpty() || newTopJoinOnCondition.isEmpty()) { + return false; + } + + return true; + } + + + /** + * Get projectExpr of left and right. + * Just for project-inside. + */ + private Pair<List<NamedExpression>, List<NamedExpression>> getProjectExprs() { + Preconditions.checkArgument(topJoin.left() instanceof LogicalProject); + LogicalProject project = (LogicalProject) topJoin.left(); + + List<NamedExpression> projectExprs = project.getProjects(); + List<NamedExpression> newRightProjectExprs = Lists.newArrayList(); + List<NamedExpression> newLeftProjectExpr = Lists.newArrayList(); + + HashSet<SlotReference> bOutputSlotsSet = new HashSet<>(bOutputSlots); + for (NamedExpression projectExpr : projectExprs) { + List<SlotReference> usedSlotRefs = projectExpr.collect(SlotReference.class::isInstance); + if (bOutputSlotsSet.containsAll(usedSlotRefs)) { + newRightProjectExprs.add(projectExpr); + } else { + newLeftProjectExpr.add(projectExpr); + } + } + + return new Pair<>(newLeftProjectExpr, newRightProjectExprs); + } + + + private LogicalJoin<GroupPlan, GroupPlan> newBottomJoin() { + return new LogicalJoin( + bottomJoin.getJoinType(), + Optional.of(ExpressionUtils.and(newBottomJoinOnCondition)), + a, c); + } + + /** + * Create topJoin for project-inside. + */ + public LogicalJoin newProjectTopJoin() { + Plan left; + Plan right; + + List<NamedExpression> newLeftProjectExpr = getProjectExprs().first; + List<NamedExpression> newRightProjectExprs = getProjectExprs().second; + if (!newLeftProjectExpr.isEmpty()) { + left = new LogicalProject<>(newLeftProjectExpr, newBottomJoin()); + } else { + left = newBottomJoin(); Review Comment: ```suggestion if (newLeftProjectExpr.isEmpty()) { left = newBottomJoin(); } else { left = new LogicalProject<>(newLeftProjectExpr, newBottomJoin()); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org
