You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/01/17 03:48:02 UTC
[doris] branch master updated: [fix](Nereids) all slot in grouping sets in repeat node should be nullable (#15991)
This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b469efdb17 [fix](Nereids) all slot in grouping sets in repeat node should be nullable (#15991)
b469efdb17 is described below
commit b469efdb174a123aa8b6311741793b4a5251b857
Author: morrySnow <10...@users.noreply.github.com>
AuthorDate: Tue Jan 17 11:47:55 2023 +0800
[fix](Nereids) all slot in grouping sets in repeat node should be nullable (#15991)
according to be's code, all slot in grouping set should be nullable.
reference to be code (https://github.com/apache/doris/blob/be3482e6d6d7812509fd92601ce88b488dcddcf6/be/src/vec/exec/vrepeat_node.cpp#L113)
---
.../nereids/rules/analysis/BindSlotReference.java | 23 ++++++++++------------
.../nereids/rules/analysis/NormalizeRepeat.java | 9 +++------
.../nereids/trees/expressions/SlotReference.java | 8 --------
.../doris/nereids/trees/plans/algebra/Repeat.java | 1 -
4 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java
index e2aa4bb78c..aee951cb2a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindSlotReference.java
@@ -72,12 +72,12 @@ import org.apache.doris.planner.PlannerContext;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -923,7 +923,7 @@ public class BindSlotReference implements AnalysisRuleFactory {
.filter(ExpressionTrait::nullable)
.collect(Collectors.toSet());
return projects.stream()
- .map(e -> e.accept(new RewriteNullableToTrue(childrenOutput), null))
+ .map(e -> e.accept(RewriteNullableToTrue.INSTANCE, childrenOutput))
.map(NamedExpression.class::cast)
.collect(ImmutableList.toImmutableList());
}
@@ -939,7 +939,7 @@ public class BindSlotReference implements AnalysisRuleFactory {
.filter(ExpressionTrait::nullable)
.collect(Collectors.toSet());
return output.stream()
- .map(e -> e.accept(new RewriteNullableToTrue(childrenOutput), null))
+ .map(e -> e.accept(RewriteNullableToTrue.INSTANCE, childrenOutput))
.map(NamedExpression.class::cast)
.collect(ImmutableList.toImmutableList());
}
@@ -951,24 +951,21 @@ public class BindSlotReference implements AnalysisRuleFactory {
List<List<Expression>> groupingSets,
List<NamedExpression> output) {
Set<Slot> groupingSetsSlots = groupingSets.stream()
- .flatMap(e -> e.stream())
- .flatMap(e -> e.<Set<SlotReference>>collect(SlotReference.class::isInstance).stream())
+ .flatMap(Collection::stream)
+ .map(Expression::getInputSlots)
+ .flatMap(Set::stream)
.collect(Collectors.toSet());
return output.stream()
- .map(e -> e.accept(new RewriteNullableToTrue(groupingSetsSlots), null))
+ .map(e -> e.accept(RewriteNullableToTrue.INSTANCE, groupingSetsSlots))
.map(NamedExpression.class::cast)
.collect(ImmutableList.toImmutableList());
}
- private static class RewriteNullableToTrue extends DefaultExpressionRewriter<PlannerContext> {
- private final Set<Slot> childrenOutput;
-
- public RewriteNullableToTrue(Set<Slot> childrenOutput) {
- this.childrenOutput = ImmutableSet.copyOf(childrenOutput);
- }
+ private static class RewriteNullableToTrue extends DefaultExpressionRewriter<Set<Slot>> {
+ public static RewriteNullableToTrue INSTANCE = new RewriteNullableToTrue();
@Override
- public Expression visitSlotReference(SlotReference slotReference, PlannerContext context) {
+ public Expression visitSlotReference(SlotReference slotReference, Set<Slot> childrenOutput) {
if (childrenOutput.contains(slotReference)) {
return slotReference.withNullable(true);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/NormalizeRepeat.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/NormalizeRepeat.java
index 7738384ac4..c621176d48 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/NormalizeRepeat.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/NormalizeRepeat.java
@@ -223,7 +223,6 @@ public class NormalizeRepeat extends OneAnalysisRuleFactory {
}
List<Expression> groupingSetExpressions = ExpressionUtils.flatExpressions(repeat.getGroupingSets());
- Set<Expression> commonGroupingSetExpressions = repeat.getCommonGroupingSetExpressions();
// nullable will be different from grouping set and output expressions,
// so we can not use the slot in grouping set，but use the equivalent slot in output expressions.
@@ -236,9 +235,7 @@ public class NormalizeRepeat extends OneAnalysisRuleFactory {
expression = outputs.get(outputs.indexOf(expression));
}
if (groupingSetExpressions.contains(expression)) {
- boolean isCommonGroupingSetExpression = commonGroupingSetExpressions.contains(expression);
- pushDownTriplet = toGroupingSetExpressionPushDownTriplet(
- isCommonGroupingSetExpression, expression, existsAliasMap.get(expression));
+ pushDownTriplet = toGroupingSetExpressionPushDownTriplet(expression, existsAliasMap.get(expression));
} else {
pushDownTriplet = Optional.of(
NormalizeToSlotTriplet.toTriplet(expression, existsAliasMap.get(expression)));
@@ -252,10 +249,10 @@ public class NormalizeRepeat extends OneAnalysisRuleFactory {
}
private Optional<NormalizeToSlotTriplet> toGroupingSetExpressionPushDownTriplet(
- boolean isCommonGroupingSetExpression, Expression expression, @Nullable Alias existsAlias) {
+ Expression expression, @Nullable Alias existsAlias) {
NormalizeToSlotTriplet originTriplet = NormalizeToSlotTriplet.toTriplet(expression, existsAlias);
SlotReference remainSlot = (SlotReference) originTriplet.remainExpr;
- Slot newSlot = remainSlot.withCommonGroupingSetExpression(isCommonGroupingSetExpression);
+ Slot newSlot = remainSlot.withNullable(true);
return Optional.of(new NormalizeToSlotTriplet(expression, newSlot, originTriplet.pushedExpr));
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/SlotReference.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/SlotReference.java
index ee5feed16d..acc536a3df 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/SlotReference.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/SlotReference.java
@@ -186,12 +186,4 @@ public class SlotReference extends Slot {
public Slot withName(String name) {
return new SlotReference(exprId, name, dataType, nullable, qualifier, column);
}
-
- /** withCommonGroupingSetExpression */
- public Slot withCommonGroupingSetExpression(boolean isCommonGroupingSetExpression) {
- if (!isCommonGroupingSetExpression) {
- return withNullable(true);
- }
- return this;
- }
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Repeat.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Repeat.java
index 7b937943a1..267e60c629 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Repeat.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Repeat.java
@@ -76,7 +76,6 @@ public interface Repeat<CHILD_PLAN extends Plan> extends Aggregate<CHILD_PLAN> {
*/
default Set<Expression> getCommonGroupingSetExpressions() {
List<List<Expression>> groupingSets = getGroupingSets();
- Sets.newLinkedHashSet();
Iterator<List<Expression>> iterator = groupingSets.iterator();
Set<Expression> commonGroupingExpressions = Sets.newLinkedHashSet(iterator.next());
while (iterator.hasNext()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org