(Refactor)[Nereids] Combine operator and plan

fe/fe-core/pom.xml

@@ -859,7 +859,7 @@ under the License.
                         <configuration>
                             <proc>only</proc>
                             <compilerArgs>
-                                <arg>-AoperatorPath=${basedir}/src/main/java/org/apache/doris/nereids</arg>
+                                <arg>-AplanPath=${basedir}/src/main/java/org/apache/doris/nereids</arg>
                             </compilerArgs>
                             <includes>
                                 <include>org/apache/doris/nereids/pattern/generator/PatternDescribableProcessPoint.java</include>

fe/fe-core/src/main/java/org/apache/doris/analysis/BuiltinAggregateFunction.java

@@ -127,6 +127,7 @@ public enum Operator {
         // The intermediate type for this function if it is constant regardless of
         // input type. Set to null if it can only be determined during analysis.
         private final org.apache.doris.catalog.Type intermediateType;
+
         Operator(String description, TAggregationOp thriftOp,
                 org.apache.doris.catalog.Type intermediateType) {
             this.description = description;

fe/fe-core/src/main/java/org/apache/doris/analysis/DateLiteral.java

@@ -158,7 +158,8 @@ private enum  DateLiteralType {
         DATEV2(3);
 
         private final int value;
-        private DateLiteralType(int value) {
+
+        DateLiteralType(int value) {
             this.value = value;
         }
 

fe/fe-core/src/main/java/org/apache/doris/common/InternalErrorCode.java

@@ -37,7 +37,8 @@ public enum InternalErrorCode {
     TASKS_ABORT_ERR(104);
 
     private long errCode;
-    private InternalErrorCode(long code) {
+
+    InternalErrorCode(long code) {
         this.errCode = code;
     }
 

fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java

@@ -150,8 +150,7 @@ private PhysicalPlan chooseBestPlan(Group rootGroup, PhysicalProperties physical
             planChildren.add(chooseBestPlan(groupExpression.child(i), inputPropertiesList.get(i)));
         }
 
-        Plan plan = ((PhysicalPlan) groupExpression.getOperator().toTreeNode(groupExpression)).withChildren(
-                planChildren);
+        Plan plan = groupExpression.getPlan().withChildren(planChildren);
         if (!(plan instanceof PhysicalPlan)) {
             throw new AnalysisException("generate logical plan");
         }

fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundAlias.java

@@ -18,8 +18,8 @@
 package org.apache.doris.nereids.analyzer;
 
 import org.apache.doris.nereids.exceptions.UnboundException;
-import org.apache.doris.nereids.trees.NodeType;
 import org.apache.doris.nereids.trees.expressions.Expression;
+import org.apache.doris.nereids.trees.expressions.ExpressionType;
 import org.apache.doris.nereids.trees.expressions.NamedExpression;
 import org.apache.doris.nereids.trees.expressions.UnaryExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
@@ -35,7 +35,7 @@
 public class UnboundAlias extends NamedExpression implements UnaryExpression, Unbound {
 
     public UnboundAlias(Expression child) {
-        super(NodeType.UNBOUND_ALIAS, child);
+        super(ExpressionType.UNBOUND_ALIAS, child);
     }
 
     @Override

fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundFunction.java

@@ -18,8 +18,8 @@
 package org.apache.doris.nereids.analyzer;
 
 import org.apache.doris.nereids.exceptions.UnboundException;
-import org.apache.doris.nereids.trees.NodeType;
 import org.apache.doris.nereids.trees.expressions.Expression;
+import org.apache.doris.nereids.trees.expressions.ExpressionType;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 
 import com.google.common.base.Joiner;
@@ -37,7 +37,7 @@ public class UnboundFunction extends Expression implements Unbound {
     private final boolean isDistinct;
 
     public UnboundFunction(String name, boolean isDistinct, List<Expression> arguments) {
-        super(NodeType.UNBOUND_FUNCTION, arguments.toArray(new Expression[0]));
+        super(ExpressionType.UNBOUND_FUNCTION, arguments.toArray(new Expression[0]));
         this.name = Objects.requireNonNull(name, "name can not be null");
         this.isDistinct = isDistinct;
     }

fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundRelation.java

@@ -19,38 +19,51 @@
 
 import org.apache.doris.nereids.analyzer.identifier.TableIdentifier;
 import org.apache.doris.nereids.exceptions.UnboundException;
-import org.apache.doris.nereids.operators.OperatorType;
-import org.apache.doris.nereids.operators.plans.logical.LogicalLeafOperator;
+import org.apache.doris.nereids.memo.GroupExpression;
 import org.apache.doris.nereids.properties.LogicalProperties;
 import org.apache.doris.nereids.properties.UnboundLogicalProperties;
 import org.apache.doris.nereids.trees.expressions.Expression;
 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.logical.LogicalLeaf;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
 import org.apache.doris.nereids.util.Utils;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Represent a relation plan node that has not been bound.
  */
-public class UnboundRelation extends LogicalLeafOperator implements Unbound {
+public class UnboundRelation extends LogicalLeaf implements Unbound {
     private final List<String> nameParts;
 
     public UnboundRelation(List<String> nameParts) {
-        super(OperatorType.LOGICAL_UNBOUND_RELATION);
+        this(nameParts, Optional.empty(), Optional.empty());
+    }
+
+    public UnboundRelation(List<String> nameParts, Optional<GroupExpression> groupExpression,
+            Optional<LogicalProperties> logicalProperties) {
+        super(PlanType.LOGICAL_UNBOUND_RELATION, groupExpression, logicalProperties);
         this.nameParts = nameParts;
     }
 
+    public UnboundRelation(TableIdentifier identifier) {
+        this(identifier, Optional.empty(), Optional.empty());
+    }
+
     /**
      * Constructor for UnboundRelation.
      *
      * @param identifier relation identifier
      */
-    public UnboundRelation(TableIdentifier identifier) {
-        super(OperatorType.LOGICAL_UNBOUND_RELATION);
+    public UnboundRelation(TableIdentifier identifier, Optional<GroupExpression> groupExpression,
+            Optional<LogicalProperties> logicalProperties) {
+        super(PlanType.LOGICAL_UNBOUND_RELATION, groupExpression, logicalProperties);
         this.nameParts = Lists.newArrayList();
         if (identifier.getDatabaseName().isPresent()) {
             nameParts.add(identifier.getDatabaseName().get());
@@ -72,6 +85,16 @@ public LogicalProperties computeLogicalProperties(Plan... inputs) {
         return new UnboundLogicalProperties();
     }
 
+    @Override
+    public Plan withGroupExpression(Optional<GroupExpression> groupExpression) {
+        return new UnboundRelation(nameParts, groupExpression, Optional.of(logicalProperties));
+    }
+
+    @Override
+    public Plan withLogicalProperties(Optional<LogicalProperties> logicalProperties) {
+        return new UnboundRelation(nameParts, Optional.empty(), logicalProperties);
+    }
+
     @Override
     public List<Slot> computeOutput() {
         throw new UnboundException("output");
@@ -82,6 +105,11 @@ public String toString() {
         return "UnresolvedRelation" + "(" + StringUtils.join(nameParts, ".") + ")";
     }
 
+    @Override
+    public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+        return visitor.visitUnboundRelation(this, context);
+    }
+
     @Override
     public List<Expression> getExpressions() {
         throw new UnsupportedOperationException(this.getClass().getSimpleName() + " don't support getExpression()");

fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundSlot.java

@@ -17,7 +17,7 @@
 
 package org.apache.doris.nereids.analyzer;
 
-import org.apache.doris.nereids.trees.NodeType;
+import org.apache.doris.nereids.trees.expressions.ExpressionType;
 import org.apache.doris.nereids.trees.expressions.Slot;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.util.Utils;
@@ -33,7 +33,7 @@ public class UnboundSlot extends Slot implements Unbound {
     private final List<String> nameParts;
 
     public UnboundSlot(List<String> nameParts) {
-        super(NodeType.UNBOUND_SLOT);
+        super(ExpressionType.UNBOUND_SLOT);
         this.nameParts = nameParts;
     }
 

fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundStar.java

@@ -18,7 +18,7 @@
 package org.apache.doris.nereids.analyzer;
 
 import org.apache.doris.nereids.exceptions.UnboundException;
-import org.apache.doris.nereids.trees.NodeType;
+import org.apache.doris.nereids.trees.expressions.ExpressionType;
 import org.apache.doris.nereids.trees.expressions.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.NamedExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
@@ -35,7 +35,7 @@ public class UnboundStar extends NamedExpression implements LeafExpression, Unbo
     private final List<String> qualifier;
 
     public UnboundStar(List<String> qualifier) {
-        super(NodeType.UNBOUND_STAR);
+        super(ExpressionType.UNBOUND_STAR);
         this.qualifier = qualifier;
     }
 

fe/fe-core/src/main/java/org/apache/doris/nereids/cost/CostCalculator.java

@@ -20,12 +20,12 @@
 import org.apache.doris.common.Id;
 import org.apache.doris.nereids.PlanContext;
 import org.apache.doris.nereids.memo.GroupExpression;
-import org.apache.doris.nereids.operators.Operator;
-import org.apache.doris.nereids.operators.OperatorVisitor;
-import org.apache.doris.nereids.operators.plans.physical.PhysicalAggregate;
-import org.apache.doris.nereids.operators.plans.physical.PhysicalHashJoin;
-import org.apache.doris.nereids.operators.plans.physical.PhysicalOlapScan;
-import org.apache.doris.nereids.operators.plans.physical.PhysicalProject;
+import org.apache.doris.nereids.trees.plans.Plan;
+import org.apache.doris.nereids.trees.plans.physical.PhysicalAggregate;
+import org.apache.doris.nereids.trees.plans.physical.PhysicalHashJoin;
+import org.apache.doris.nereids.trees.plans.physical.PhysicalOlapScan;
+import org.apache.doris.nereids.trees.plans.physical.PhysicalProject;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
 import org.apache.doris.statistics.StatsDeriveResult;
 
 import com.google.common.base.Preconditions;
@@ -43,7 +43,7 @@ public class CostCalculator {
     public static double calculateCost(GroupExpression groupExpression) {
         PlanContext planContext = new PlanContext(groupExpression);
         CostEstimator costCalculator = new CostEstimator();
-        CostEstimate costEstimate = groupExpression.getOperator().accept(costCalculator, planContext);
+        CostEstimate costEstimate = groupExpression.getPlan().accept(costCalculator, planContext);
         return costFormula(costEstimate);
     }
 
@@ -55,14 +55,14 @@ private static double costFormula(CostEstimate costEstimate) {
                 + costEstimate.getNetworkCost() * networkCostWeight;
     }
 
-    private static class CostEstimator extends OperatorVisitor<CostEstimate, PlanContext> {
+    private static class CostEstimator extends PlanVisitor<CostEstimate, PlanContext> {
         @Override
-        public CostEstimate visitOperator(Operator operator, PlanContext context) {
+        public CostEstimate visit(Plan plan, PlanContext context) {
             return CostEstimate.zero();
         }
 
         @Override
-        public CostEstimate visitPhysicalAggregation(PhysicalAggregate physicalAggregate, PlanContext context) {
+        public CostEstimate visitPhysicalAggregate(PhysicalAggregate<Plan> aggregate, PlanContext context) {
             StatsDeriveResult statistics = context.getStatisticsWithCheck();
             return CostEstimate.ofCpu(statistics.computeSize());
         }
@@ -74,7 +74,7 @@ public CostEstimate visitPhysicalOlapScan(PhysicalOlapScan physicalOlapScan, Pla
         }
 
         @Override
-        public CostEstimate visitPhysicalHashJoin(PhysicalHashJoin physicalHashJoin, PlanContext context) {
+        public CostEstimate visitPhysicalHashJoin(PhysicalHashJoin<Plan, Plan> physicalHashJoin, PlanContext context) {
             Preconditions.checkState(context.getGroupExpression().arity() == 2);
             Preconditions.checkState(context.getChildrenStats().size() == 2);
 

fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/ExpressionTranslator.java

@@ -29,13 +29,13 @@
 import org.apache.doris.analysis.StringLiteral;
 import org.apache.doris.catalog.Type;
 import org.apache.doris.nereids.exceptions.AnalysisException;
-import org.apache.doris.nereids.trees.NodeType;
 import org.apache.doris.nereids.trees.expressions.Alias;
 import org.apache.doris.nereids.trees.expressions.Arithmetic;
 import org.apache.doris.nereids.trees.expressions.Between;
 import org.apache.doris.nereids.trees.expressions.CompoundPredicate;
 import org.apache.doris.nereids.trees.expressions.EqualTo;
 import org.apache.doris.nereids.trees.expressions.Expression;
+import org.apache.doris.nereids.trees.expressions.ExpressionType;
 import org.apache.doris.nereids.trees.expressions.GreaterThan;
 import org.apache.doris.nereids.trees.expressions.GreaterThanEqual;
 import org.apache.doris.nereids.trees.expressions.LessThan;
@@ -170,7 +170,7 @@ public Expr visitBetween(Between between, PlanTranslatorContext context) {
 
     @Override
     public Expr visitCompoundPredicate(CompoundPredicate compoundPredicate, PlanTranslatorContext context) {
-        NodeType nodeType = compoundPredicate.getType();
+        ExpressionType nodeType = compoundPredicate.getType();
         org.apache.doris.analysis.CompoundPredicate.Operator staleOp;
         switch (nodeType) {
             case OR: