morrySnow commented on code in PR #10227:
URL: https://github.com/apache/doris/pull/10227#discussion_r901423828
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -278,6 +317,70 @@ last, plan(join.relationPrimary())
return last;
}
+ private LogicalPlan withAggClause(List<Expression> expressions,
+ GroupByItemContext ctx, LogicalPlan aggClause) {
+ List<Expression> tmpExpressions = new ArrayList<>();
+ for (ExpressionContext expressionCtx : ctx.expression()) {
+ tmpExpressions.add(typedVisit(expressionCtx));
+ }
+ List<NamedExpression> groupByExpressions =
tmpExpressions.stream().map(expression -> {
+ if (expression instanceof NamedExpression) {
+ return (NamedExpression) expression;
+ } else {
+ return new UnboundAlias(expression);
+ }
+ }).collect(Collectors.toList());
+ List<Expression> aggExpressions = new ArrayList<>();
+ for (Expression expression : expressions) {
+ if (expression instanceof FunctionCall) {
+ aggExpressions.add(expression);
+ }
+ }
+ return new LogicalUnaryPlan(new LogicalAggregation(groupByExpressions,
aggExpressions), aggClause);
+ }
+
+ /**
+ * Generate sortItems.
+ *
+ * @param ctx SortItemContext
+ * @return SortItems
+ */
+ public SortItems genSortItems(SortItemContext ctx) {
+ boolean orderDirection = true;
+ if (ctx.DESC() != null) {
+ orderDirection = false;
Review Comment:
maybe a enum is better than a boolean
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -278,6 +317,70 @@ last, plan(join.relationPrimary())
return last;
}
+ private LogicalPlan withAggClause(List<Expression> expressions,
+ GroupByItemContext ctx, LogicalPlan aggClause) {
+ List<Expression> tmpExpressions = new ArrayList<>();
+ for (ExpressionContext expressionCtx : ctx.expression()) {
+ tmpExpressions.add(typedVisit(expressionCtx));
+ }
+ List<NamedExpression> groupByExpressions =
tmpExpressions.stream().map(expression -> {
+ if (expression instanceof NamedExpression) {
+ return (NamedExpression) expression;
+ } else {
+ return new UnboundAlias(expression);
+ }
+ }).collect(Collectors.toList());
+ List<Expression> aggExpressions = new ArrayList<>();
+ for (Expression expression : expressions) {
+ if (expression instanceof FunctionCall) {
Review Comment:
should put all expression to aggExpressions, not only function call
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/operators/plans/logical/LogicalAggregation.java:
##########
@@ -0,0 +1,87 @@
+// 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.operators.plans.logical;
+
+import org.apache.doris.nereids.exceptions.UnboundException;
+import org.apache.doris.nereids.operators.OperatorType;
+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 com.google.common.collect.ImmutableList;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Logical Aggregation plan operator.
+ */
+public class LogicalAggregation extends LogicalUnaryOperator {
+
+ private final List<? extends NamedExpression> groupByExpressions;
+ private final List<Expression> aggExpressions;
+
+ /**
+ * Desc: Constructor for LogicalAggregation.
+ */
+ public LogicalAggregation(List<? extends NamedExpression>
groupByExpressions,
+ List<Expression> aggExpressions) {
+ super(OperatorType.LOGICAL_AGGREGATION);
+ this.groupByExpressions = Objects.requireNonNull(groupByExpressions,
"groupByExpressions can not be null");
+ this.aggExpressions = aggExpressions;
+ }
+
+ /**
+ * Get GroupByAggregation list.
+ *
+ * @return all group by of this node.
+ */
+ public List<? extends NamedExpression> getGroupByExpressions() {
+ return groupByExpressions;
+ }
+
+ /**
+ * Get AggExpressions list.
+ *
+ * @return all agg expressions.
+ */
+ public List<Expression> getAggExpressions() {
+ return aggExpressions;
+ }
+
+ @Override
+ public String toString() {
+ return "Aggregation (" + StringUtils.join(groupByExpressions, ", ")
+ + StringUtils.join(aggExpressions, ", ") + ")";
+ }
+
+ @Override
+ public List<Slot> computeOutput(Plan input) {
+ return groupByExpressions.stream()
Review Comment:
use agg expressions instead of group by
--
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-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
