database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](Nereids): fix LogicalProject withXXX(). (#18441)

Browse Source
This commit is contained in:
jakevin
2023-04-07 12:38:53 +08:00
committed by GitHub
parent e77da1519a
commit 2783b27788
4 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fe/fe-core/src/main/java/org/apache/doris/nereids/cost/Cost.java
View File

@ -25,12 +25,12 @@ import org.apache.doris.qe.ConnectContext;
* according different operator
*/
public interface Cost {
public double getValue();
double getValue();
/**
* This is for calculating the cost in simplifier
*/
public static Cost withRowCount(double rowCount) {
static Cost withRowCount(double rowCount) {
if (ConnectContext.get().getSessionVariable().getEnableNewCostModel()) {
return new CostV2(0, rowCount, 0);
}
@ -40,17 +40,14 @@ public interface Cost {
/**
* return zero cost
*/
public static Cost zero() {
static Cost zero() {
if (ConnectContext.get().getSessionVariable().getEnableNewCostModel()) {
return CostV2.zero();
}
return CostV1.zero();
}
/**
* return infinite cost
*/
public static Cost infinite() {
static Cost infinite() {
if (ConnectContext.get().getSessionVariable().getEnableNewCostModel()) {
return CostV2.infinite();
}

2
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
View File

@ -201,7 +201,7 @@ public class BindRelation extends OneAnalysisRuleFactory {
scan = scan.withPreAggStatus(PreAggStatus.off(
Column.DELETE_SIGN + " is used as conjuncts."));
}
return new LogicalFilter(Sets.newHashSet(conjunct), scan);
return new LogicalFilter<>(Sets.newHashSet(conjunct), scan);
}
return scan;
}

2
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/AdjustNullable.java
View File

@ -80,7 +80,7 @@ public class AdjustNullable implements RewriteRuleFactory {
RuleType.ADJUST_NULLABLE_ON_PROJECT.build(logicalProject().then(project -> {
Map<ExprId, Slot> exprIdSlotMap = collectChildrenOutputMap(project);
List<NamedExpression> newProjects = updateExpressions(project.getProjects(), exprIdSlotMap);
return project.withProjects(newProjects).recomputeLogicalProperties();
return project.withProjects(newProjects);
})),
RuleType.ADJUST_NULLABLE_ON_REPEAT.build(logicalRepeat().then(repeat -> {
Map<ExprId, Slot> exprIdSlotMap = collectChildrenOutputMap(repeat);

26
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalProject.java
View File

@ -155,26 +155,12 @@ public class LogicalProject<CHILD_TYPE extends Plan> extends LogicalUnary<CHILD_
return Objects.hash(projects, canEliminate);
}
public LogicalProject<Plan> withEliminate(boolean isEliminate) {
return new LogicalProject<>(projects, excepts, isEliminate, child(), isDistinct);
}
public LogicalProject<Plan> withProjects(List<NamedExpression> projects) {
return new LogicalProject<>(projects, excepts, canEliminate,
Optional.empty(), Optional.of(getLogicalProperties()), child(), isDistinct);
}
@Override
public LogicalProject<Plan> withChildren(List<Plan> children) {
Preconditions.checkArgument(children.size() == 1);
return new LogicalProject<>(projects, excepts, canEliminate, children.get(0), isDistinct);
}
public LogicalProject<Plan> withProjectsAndChild(List<NamedExpression> projects, Plan child) {
return new LogicalProject<>(projects, excepts, canEliminate,
Optional.empty(), Optional.empty(), child, isDistinct);
}
@Override
public LogicalProject<Plan> withGroupExpression(Optional<GroupExpression> groupExpression) {
return new LogicalProject<>(projects, excepts, canEliminate,
@ -187,6 +173,18 @@ public class LogicalProject<CHILD_TYPE extends Plan> extends LogicalUnary<CHILD_
isDistinct);
}
public LogicalProject<Plan> withEliminate(boolean isEliminate) {
return new LogicalProject<>(projects, excepts, isEliminate, child(), isDistinct);
}
public LogicalProject<Plan> withProjects(List<NamedExpression> projects) {
return new LogicalProject<>(projects, excepts, canEliminate, child(), isDistinct);
}
public LogicalProject<Plan> withProjectsAndChild(List<NamedExpression> projects, Plan child) {
return new LogicalProject<>(projects, excepts, canEliminate, child, isDistinct);
}
public boolean canEliminate() {
return canEliminate;
}