[doris] branch branch-2.0 updated: [fix](compile error) nereids compile error (#23197)

[kxiao]

This is an automated email from the ASF dual-hosted git repository.

kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 4e0f619c09 [fix](compile error) nereids compile error (#23197)
4e0f619c09 is described below

commit 4e0f619c09b42efb8aa85827303e35f37b4e41c3
Author: starocean999 <40539150+starocean...@users.noreply.github.com>
AuthorDate: Fri Aug 18 21:59:24 2023 +0800

    [fix](compile error) nereids compile error (#23197)
---
 .../apache/doris/nereids/properties/ChildrenPropertiesRegulator.java    | 2 +-
 .../apache/doris/nereids/properties/EnforceMissingPropertiesHelper.java | 2 +-
 fe/fe-core/src/test/java/org/apache/doris/nereids/memo/MemoTest.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/ChildrenPropertiesRegulator.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/ChildrenPropertiesRegulator.java
index 05c8641486..34cef75286 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/ChildrenPropertiesRegulator.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/ChildrenPropertiesRegulator.java
@@ -439,7 +439,7 @@ public class ChildrenPropertiesRegulator extends 
PlanVisitor<Boolean, Void> {
 
         PhysicalProperties newOutputProperty = new PhysicalProperties(target);
         GroupExpression enforcer = target.addEnforcer(child.getOwnerGroup());
-        jobContext.getCascadesContext().getMemo().addEnforcerPlan(enforcer, 
child.getOwnerGroup());
+        child.getOwnerGroup().addEnforcer(enforcer);
         Cost totalCost = CostCalculator.addChildCost(enforcer.getPlan(),
                 CostCalculator.calculateCost(enforcer, 
Lists.newArrayList(childOutput)),
                 currentCost,
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/EnforceMissingPropertiesHelper.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/EnforceMissingPropertiesHelper.java
index 2e9a8ac6bb..1c45db6d4c 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/EnforceMissingPropertiesHelper.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/EnforceMissingPropertiesHelper.java
@@ -149,7 +149,7 @@ public class EnforceMissingPropertiesHelper {
     private void addEnforcerUpdateCost(GroupExpression enforcer,
             PhysicalProperties oldOutputProperty,
             PhysicalProperties newOutputProperty) {
-        context.getCascadesContext().getMemo().addEnforcerPlan(enforcer, 
groupExpression.getOwnerGroup());
+        groupExpression.getOwnerGroup().addEnforcer(enforcer);
         NereidsTracer.logEnforcerEvent(enforcer.getOwnerGroup().getGroupId(), 
groupExpression.getPlan(),
                 oldOutputProperty, newOutputProperty);
         ENFORCER_TRACER.log(EnforcerEvent.of(groupExpression, ((PhysicalPlan) 
enforcer.getPlan()),
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/nereids/memo/MemoTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/nereids/memo/MemoTest.java
index 3f55ba9579..9689227d7c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/nereids/memo/MemoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/memo/MemoTest.java
@@ -110,7 +110,7 @@ class MemoTest implements MemoPatternMatchSupported {
         groupExpressions.put(srcParentExpression, srcParentExpression);
         groupExpressions.put(dstParentExpression, dstParentExpression);
 
-        memo.mergeGroup(srcGroup, dstGroup);
+        memo.mergeGroup(srcGroup, dstGroup, null);
 
         // check
         Assertions.assertEquals(0, 
srcGroup.getParentGroupExpressions().size());


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org