You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2022/10/18 03:37:56 UTC
[GitHub] [doris] morrySnow commented on a diff in pull request #13252: [fix](nerieds) Fix NPE caused by GroupExpression has null owner group when choosing best plan
morrySnow commented on code in PR #13252:
URL: https://github.com/apache/doris/pull/13252#discussion_r997683944
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java:
##########
@@ -190,25 +190,32 @@ public Group getRoot() {
private PhysicalPlan chooseBestPlan(Group rootGroup, PhysicalProperties physicalProperties)
throws AnalysisException {
- GroupExpression groupExpression = rootGroup.getLowestCostPlan(physicalProperties).orElseThrow(
- () -> new AnalysisException("lowestCostPlans with physicalProperties doesn't exist")).second;
- List<PhysicalProperties> inputPropertiesList = groupExpression.getInputPropertiesList(physicalProperties);
-
- List<Plan> planChildren = Lists.newArrayList();
- for (int i = 0; i < groupExpression.arity(); i++) {
- planChildren.add(chooseBestPlan(groupExpression.child(i), inputPropertiesList.get(i)));
- }
-
- Plan plan = groupExpression.getPlan().withChildren(planChildren);
- if (!(plan instanceof PhysicalPlan)) {
- throw new AnalysisException("Result plan must be PhysicalPlan");
+ try {
+ GroupExpression groupExpression = rootGroup.getLowestCostPlan(physicalProperties).orElseThrow(
+ () -> new AnalysisException("lowestCostPlans with physicalProperties doesn't exist")).second;
+ List<PhysicalProperties> inputPropertiesList = groupExpression.getInputPropertiesList(physicalProperties);
+
+ List<Plan> planChildren = Lists.newArrayList();
+ for (int i = 0; i < groupExpression.arity(); i++) {
+ planChildren.add(chooseBestPlan(groupExpression.child(i), inputPropertiesList.get(i)));
+ }
+
+ Plan plan = groupExpression.getPlan().withChildren(planChildren);
+ if (!(plan instanceof PhysicalPlan)) {
+ throw new AnalysisException("Result plan must be PhysicalPlan");
+ }
+
+ // TODO: set (logical and physical)properties/statistics/... for physicalPlan.
+ PhysicalPlan physicalPlan = ((PhysicalPlan) plan).withPhysicalPropertiesAndStats(
+ groupExpression.getOutputProperties(physicalProperties),
+ groupExpression.getOwnerGroup().getStatistics());
+ return physicalPlan;
+ } catch (Exception e) {
+ String memo = cascadesContext.getMemo().toString();
+ LOG.warn(memo);
+ LOG.warn("<--|Error|--------->", e);
+ throw new AnalysisException("<--|Error|--------->", e);
Review Comment:
use some words to describe this error
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java:
##########
@@ -229,11 +229,21 @@ public StatsDeriveResult getCopyOfChildStats(int idx) {
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append(ownerGroup.getGroupId()).append("(plan=").append(plan).append(") children=[");
+ if (ownerGroup == null) {
+ builder.append("OWNER GROUP IS NULL[]");
+ } else {
+ builder.append(ownerGroup.getGroupId())
+ .append("(plan=" + plan.toString() + ") children=[");
+ }
Review Comment:
```suggestion
if (ownerGroup == null) {
builder.append("OWNER GROUP IS NULL[]");
} else {
builder.append(ownerGroup.getGroupId());
}
builder.append("(plan=" + plan.toString() + ") children=[");
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/DummyPlan.java:
##########
@@ -0,0 +1,104 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.trees.plans;
+
+import org.apache.doris.nereids.memo.GroupExpression;
+import org.apache.doris.nereids.properties.LogicalProperties;
+import org.apache.doris.nereids.trees.expressions.Expression;
+import org.apache.doris.nereids.trees.expressions.Slot;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Used for unit test only.
+ */
+public class DummyPlan implements Plan {
Review Comment:
we use fake instead of dummy
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/cascades/DeriveStatsJob.java:
##########
@@ -60,9 +60,8 @@ public void execute() {
deriveChildren = true;
pushJob(new DeriveStatsJob(this));
for (Group child : groupExpression.children()) {
- GroupExpression childGroupExpr = child.getLogicalExpressions().get(0);
- if (!child.getLogicalExpressions().isEmpty() && !childGroupExpr.isStatDerived()) {
- pushJob(new DeriveStatsJob(childGroupExpr, context));
+ if (!child.getLogicalExpressions().isEmpty()) {
Review Comment:
why remove the second condition?
##########
fe/fe-core/src/test/java/org/apache/doris/nereids/memo/MemoTest.java:
##########
@@ -0,0 +1,62 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.nereids.memo;
+
+import org.apache.doris.common.jmockit.Deencapsulation;
+import org.apache.doris.nereids.properties.LogicalProperties;
+import org.apache.doris.nereids.properties.PhysicalProperties;
+import org.apache.doris.nereids.trees.plans.DummyPlan;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+class MemoTest {
Review Comment:
plz merge all memo test file into this file, thx
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/memo/Memo.java:
##########
@@ -47,6 +47,10 @@ public class Memo {
private final Map<GroupExpression, GroupExpression> groupExpressions = Maps.newHashMap();
private Group root;
+ // FOR TEST ONLY
Review Comment:
we need to provide a annotation to do some compile check later
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org