This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 1dcf8a470e5724f2d8a8e371c5736de5709cc3d9 Author: 谢健 <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
