This is an automated email from the ASF dual-hosted git repository.
jakevin 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 bcf1806864 [opt](Nereids): GroupExpressionMatching don't need
withGroupExpression (#24684)
bcf1806864 is described below
commit bcf18068648c9de97fdb5ca374aa78aadfafcb65
Author: jakevin <[email protected]>
AuthorDate: Thu Sep 21 12:51:44 2023 +0800
[opt](Nereids): GroupExpressionMatching don't need withGroupExpression
(#24684)
---
.../java/org/apache/doris/nereids/analyzer/UnboundOlapTableSink.java | 2 +-
.../java/org/apache/doris/nereids/analyzer/UnboundResultSink.java | 2 +-
.../src/main/java/org/apache/doris/nereids/memo/GroupExpression.java | 5 -----
.../org/apache/doris/nereids/pattern/GroupExpressionMatching.java | 2 +-
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundOlapTableSink.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundOlapTableSink.java
index 1880581143..1fd371d856 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundOlapTableSink.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundOlapTableSink.java
@@ -110,7 +110,7 @@ public class UnboundOlapTableSink<CHILD_TYPE extends Plan>
extends LogicalSink<C
public Plan withChildren(List<Plan> children) {
Preconditions.checkArgument(children.size() == 1,
"UnboundOlapTableSink only accepts one child");
return new UnboundOlapTableSink<>(nameParts, colNames, hints,
partitions, isPartialUpdate,
- isFromNativeInsertStmt, groupExpression,
Optional.of(getLogicalProperties()), children.get(0));
+ isFromNativeInsertStmt, groupExpression, Optional.empty(),
children.get(0));
}
@Override
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundResultSink.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundResultSink.java
index 3c1519d6f8..99a3a591f2 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundResultSink.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundResultSink.java
@@ -52,7 +52,7 @@ public class UnboundResultSink<CHILD_TYPE extends Plan>
extends LogicalSink<CHIL
@Override
public Plan withChildren(List<Plan> children) {
Preconditions.checkArgument(children.size() == 1, "UnboundResultSink
only accepts one child");
- return new UnboundResultSink<>(groupExpression,
Optional.of(getLogicalProperties()), children.get(0));
+ return new UnboundResultSink<>(groupExpression, Optional.empty(),
children.get(0));
}
@Override
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java
index 9d51152f1f..8eabceb425 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java
@@ -257,11 +257,6 @@ public class GroupExpression {
this.requestPropertiesMap.put(requiredProperties, outputProperties);
}
- public void putOutputPropertiesMapIfAbsent(PhysicalProperties
outputProperties,
- PhysicalProperties requiredProperties) {
- this.requestPropertiesMap.putIfAbsent(requiredProperties,
outputProperties);
- }
-
/**
* Merge GroupExpression.
*/
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/GroupExpressionMatching.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/GroupExpressionMatching.java
index 804ebcda84..e685f8484f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/GroupExpressionMatching.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/GroupExpressionMatching.java
@@ -98,7 +98,7 @@ public class GroupExpressionMatching implements
Iterable<Plan> {
if (pattern.matchPredicates(root)) {
// if no children pattern, we treat all children as GROUP.
e.g. Pattern.ANY.
// leaf plan will enter this branch too, e.g.
logicalRelation().
-
results.add(root.withGroupExpression(Optional.of(groupExpression)));
+ results.add(root);
}
} else if (childrenGroupArity > 0) {
// matching children group, one List<Plan> per child
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
