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 45b7eee4429 [minor](Nereids): remove useless override (#33651) 45b7eee4429 is described below commit 45b7eee44290ff0c7442328b37cc788d9f42990d Author: jakevin <jakevin...@gmail.com> AuthorDate: Tue Apr 16 12:30:19 2024 +0800 [minor](Nereids): remove useless override (#33651) --- .../org/apache/doris/nereids/trees/plans/FakePlan.java | 11 ++++++++++- .../java/org/apache/doris/nereids/trees/plans/Plan.java | 4 +--- .../doris/nereids/trees/plans/commands/Command.java | 6 ++++++ .../trees/plans/physical/PhysicalOlapTableSink.java | 16 ---------------- .../nereids/trees/plans/physical/PhysicalProject.java | 5 ----- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/FakePlan.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/FakePlan.java index ad186c680ce..4846fcd448f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/FakePlan.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/FakePlan.java @@ -26,9 +26,13 @@ import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor; import org.apache.doris.nereids.util.MutableState; import org.apache.doris.nereids.util.MutableState.MultiMutableState; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.Set; /** * Used for unit test only. @@ -88,7 +92,12 @@ public class FakePlan implements Plan { @Override public List<Slot> getOutput() { - return new ArrayList<>(); + return ImmutableList.of(); + } + + @Override + public Set<Slot> getOutputSet() { + return ImmutableSet.of(); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/Plan.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/Plan.java index d73b7390ce8..a4a9ec00def 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/Plan.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/Plan.java @@ -98,9 +98,7 @@ public interface Plan extends TreeNode<Plan> { /** * Get output slot set of the plan. */ - default Set<Slot> getOutputSet() { - return ImmutableSet.copyOf(getOutput()); - } + Set<Slot> getOutputSet(); /** getOutputExprIds */ default List<ExprId> getOutputExprIds() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/Command.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/Command.java index a87aaf3d302..4dcf3017097 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/Command.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/Command.java @@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Optional; +import java.util.Set; /** * All DDL and DML commands' super class. @@ -101,6 +102,11 @@ public abstract class Command extends AbstractPlan implements LogicalPlan, Block throw new RuntimeException("Command do not implement getOutput"); } + @Override + public Set<Slot> getOutputSet() { + throw new RuntimeException("Command do not implement getOutputSet"); + } + @Override public String treeString() { throw new RuntimeException("Command do not implement treeString"); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java index debc0ece6c2..04cdc347db7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java @@ -29,7 +29,6 @@ import org.apache.doris.nereids.properties.LogicalProperties; import org.apache.doris.nereids.properties.PhysicalProperties; import org.apache.doris.nereids.trees.expressions.Expression; import org.apache.doris.nereids.trees.expressions.NamedExpression; -import org.apache.doris.nereids.trees.expressions.Slot; import org.apache.doris.nereids.trees.plans.Plan; import org.apache.doris.nereids.trees.plans.PlanType; import org.apache.doris.nereids.trees.plans.algebra.Sink; @@ -40,12 +39,10 @@ import org.apache.doris.statistics.Statistics; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.Set; /** * physical olap table sink for insert command @@ -165,19 +162,6 @@ public class PhysicalOlapTableSink<CHILD_TYPE extends Plan> extends PhysicalTabl ); } - @Override - public List<Slot> getOutput() { - return computeOutput(); - } - - /** - * override function of AbstractPlan. - */ - @Override - public Set<Slot> getOutputSet() { - return ImmutableSet.copyOf(getOutput()); - } - @Override public <R, C> R accept(PlanVisitor<R, C> visitor, C context) { return visitor.visitPhysicalOlapTableSink(this, context); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalProject.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalProject.java index 50e37217e66..9d51d6f7245 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalProject.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalProject.java @@ -315,9 +315,4 @@ public class PhysicalProject<CHILD_TYPE extends Plan> extends PhysicalUnary<CHIL public void setMultiLayerProjects(List<List<NamedExpression>> multiLayers) { this.multiLayerProjects = multiLayers; } - - @Override - public List<Slot> getOutput() { - return computeOutput(); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org