-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fix](Nereids): slot set in condition can be empty (#32169)
(cherry picked from commit ca09213)
- Loading branch information
Showing
6 changed files
with
174 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PullUpProjectUnderLimit.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // 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.rewrite; | ||
|
|
||
| import org.apache.doris.nereids.rules.Rule; | ||
| import org.apache.doris.nereids.rules.RuleType; | ||
| import org.apache.doris.nereids.trees.expressions.Slot; | ||
| 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.PlanUtils; | ||
|
|
||
| import com.google.common.base.Preconditions; | ||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Pull up Project under Limit. | ||
| */ | ||
| public class PullUpProjectUnderLimit extends OneRewriteRuleFactory { | ||
| @Override | ||
| public Rule build() { | ||
| return logicalLimit(logicalProject(logicalJoin().when(j -> j.getJoinType().isLeftRightOuterOrCrossJoin())) | ||
| .whenNot(p -> p.isAllSlots())) | ||
| .then(limit -> { | ||
| LogicalProject<LogicalJoin<Plan, Plan>> project = limit.child(); | ||
| Set<Slot> allUsedSlots = project.getProjects().stream().flatMap(ne -> ne.getInputSlots().stream()) | ||
| .collect(Collectors.toSet()); | ||
| Set<Slot> outputSet = project.child().getOutputSet(); | ||
| if (outputSet.size() == allUsedSlots.size()) { | ||
| Preconditions.checkState(outputSet.equals(allUsedSlots)); | ||
| return project.withChildren(limit.withChildren(project.child())); | ||
| } else { | ||
| Plan columnProject = PlanUtils.projectOrSelf(ImmutableList.copyOf(allUsedSlots), | ||
| project.child()); | ||
| return project.withChildren(limit.withChildren(columnProject)); | ||
| } | ||
| }).toRule(RuleType.PULL_UP_PROJECT_UNDER_LIMIT); | ||
| } | ||
| } |
75 changes: 75 additions & 0 deletions
75
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PullUpProjectUnderTopN.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // 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.rewrite; | ||
|
|
||
| import org.apache.doris.nereids.properties.OrderKey; | ||
| import org.apache.doris.nereids.rules.Rule; | ||
| import org.apache.doris.nereids.rules.RuleType; | ||
| import org.apache.doris.nereids.trees.expressions.Expression; | ||
| import org.apache.doris.nereids.trees.expressions.Slot; | ||
| 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 java.util.List; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Pull up Project under TopN for PushDownTopNThroughJoin | ||
| */ | ||
| public class PullUpProjectUnderTopN extends OneRewriteRuleFactory { | ||
| @Override | ||
| public Rule build() { | ||
| return logicalTopN(logicalProject(logicalJoin().when(j -> j.getJoinType().isLeftRightOuterOrCrossJoin())) | ||
| .whenNot(p -> p.isAllSlots())) | ||
| .then(topN -> { | ||
| LogicalProject<LogicalJoin<Plan, Plan>> project = topN.child(); | ||
| LogicalJoin<Plan, Plan> join = project.child(); | ||
| // Set<Slot> outputSet = join.getOutputSet(); | ||
|
|
||
| Plan newTopN; | ||
| Map<Slot, Expression> slotMap = ExpressionUtils.generateReplaceMap(project.getProjects()); | ||
| List<OrderKey> newOrderKeys = topN.getOrderKeys().stream().map(orderKey -> { | ||
| Expression expr = orderKey.getExpr(); | ||
| if (expr instanceof Slot && slotMap.containsKey((Slot) expr)) { | ||
| return orderKey.withExpression(ExpressionUtils.replace(expr, slotMap)); | ||
| } else { | ||
| return orderKey; | ||
| } | ||
| }).collect(Collectors.toList()); | ||
| if (!newOrderKeys.equals(topN.getOrderKeys())) { | ||
| newTopN = topN.withOrderKeys(newOrderKeys); | ||
| } else { | ||
| newTopN = topN; | ||
| } | ||
|
|
||
| // Set<Slot> allUsedSlots = project.getProjects().stream().flatMap(ne -> ne.getInputSlots().stream()) | ||
| // .collect(Collectors.toSet()); | ||
| // if (outputSet.size() == allUsedSlots.size()) { | ||
| // Preconditions.checkState(outputSet.equals(allUsedSlots)); | ||
| return project.withChildren(newTopN.withChildren(join)); | ||
| // } else { | ||
| // Plan columnProject = PlanUtils.projectOrSelf(ImmutableList.copyOf(allUsedSlots), | ||
| // join); | ||
| // return project.withChildren(newTopN.withChildren(columnProject)); | ||
| // } | ||
| }).toRule(RuleType.PULL_UP_PROJECT_UNDER_TOPN); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters