(doris) branch master updated: [fix](Nereids): fix choose id when there is enforcer in group (#34573)

[jakevin]

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 9da023362d0 [fix](Nereids): fix choose id when there is enforcer in 
group (#34573)
9da023362d0 is described below

commit 9da023362d08e2dd92dca2ecae23917a4d406468
Author: 谢健 <jianx...@gmail.com>
AuthorDate: Fri May 10 10:18:29 2024 +0800

    [fix](Nereids): fix choose id when there is enforcer in group (#34573)
---
 fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Group.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Group.java 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Group.java
index a9d3d881491..c9beb29c0dc 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Group.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Group.java
@@ -73,7 +73,7 @@ public class Group {
 
     private PhysicalProperties chosenProperties;
 
-    private int chosenGroupExpressionId = -1;
+    private List<Integer> chosenGroupExpressionId = new ArrayList<>();
 
     private StructInfoMap structInfoMap = new StructInfoMap();
 
@@ -215,13 +215,13 @@ public class Group {
     public Optional<Pair<Cost, GroupExpression>> 
getLowestCostPlan(PhysicalProperties physicalProperties) {
         chosenProperties = physicalProperties;
         if (physicalProperties == null || lowestCostPlans.isEmpty()) {
-            chosenGroupExpressionId = -1;
+            chosenGroupExpressionId.clear();
             return Optional.empty();
         }
         Optional<Pair<Cost, GroupExpression>> costAndGroupExpression =
                 Optional.ofNullable(lowestCostPlans.get(physicalProperties));
         if (costAndGroupExpression.isPresent()) {
-            chosenGroupExpressionId = 
costAndGroupExpression.get().second.getId().asInt();
+            
chosenGroupExpressionId.add(costAndGroupExpression.get().second.getId().asInt());
         }
         return costAndGroupExpression;
     }
@@ -463,7 +463,7 @@ public class Group {
         for (GroupExpression enforcer : enforcers) {
             str.append("    ").append(enforcer).append("\n");
         }
-        if (chosenGroupExpressionId != -1) {
+        if (!chosenGroupExpressionId.isEmpty()) {
             str.append("  chosen expression id: 
").append(chosenGroupExpressionId).append("\n");
             str.append("  chosen properties: 
").append(chosenProperties).append("\n");
         }


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