diff --git a/fe/src/main/java/org/apache/doris/planner/SingleNodePlanner.java b/fe/src/main/java/org/apache/doris/planner/SingleNodePlanner.java index 6f7b186d6689e9..875c7c8b81434d 100644 --- a/fe/src/main/java/org/apache/doris/planner/SingleNodePlanner.java +++ b/fe/src/main/java/org/apache/doris/planner/SingleNodePlanner.java @@ -17,51 +17,17 @@ package org.apache.doris.planner; -import org.apache.doris.analysis.AggregateInfo; -import org.apache.doris.analysis.AnalyticInfo; -import org.apache.doris.analysis.Analyzer; -import org.apache.doris.analysis.BaseTableRef; -import org.apache.doris.analysis.BinaryPredicate; -import org.apache.doris.analysis.CaseExpr; -import org.apache.doris.analysis.CastExpr; -import org.apache.doris.analysis.DescriptorTable; -import org.apache.doris.analysis.Expr; -import org.apache.doris.analysis.ExprSubstitutionMap; -import org.apache.doris.analysis.FunctionCallExpr; -import org.apache.doris.analysis.InPredicate; -import org.apache.doris.analysis.InlineViewRef; -import org.apache.doris.analysis.IsNullPredicate; -import org.apache.doris.analysis.JoinOperator; -import org.apache.doris.analysis.LiteralExpr; -import org.apache.doris.analysis.NullLiteral; -import org.apache.doris.analysis.QueryStmt; -import org.apache.doris.analysis.SelectStmt; -import org.apache.doris.analysis.SlotDescriptor; -import org.apache.doris.analysis.SlotId; -import org.apache.doris.analysis.SlotRef; -import org.apache.doris.analysis.TableRef; -import org.apache.doris.analysis.TupleDescriptor; -import org.apache.doris.analysis.TupleId; -import org.apache.doris.analysis.TupleIsNullPredicate; -import org.apache.doris.analysis.UnionStmt; -import org.apache.doris.catalog.AggregateType; -import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.MysqlTable; -import org.apache.doris.catalog.Table; -import org.apache.doris.common.AnalysisException; -import org.apache.doris.common.UserException; -import org.apache.doris.common.NotImplementedException; -import org.apache.doris.common.Pair; -import org.apache.doris.common.Reference; - import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - -import javassist.expr.NewArray; - +import org.apache.doris.analysis.*; +import org.apache.doris.catalog.AggregateType; +import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.MysqlTable; +import org.apache.doris.catalog.Table; +import org.apache.doris.common.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -555,6 +521,9 @@ private void turnOffPreAgg(AggregateInfo aggInfo, SelectStmt selectStmt, Analyze break; } } else if (aggExpr.getFnName().getFunction().equalsIgnoreCase("HLL_UNION_AGG")) { + // do nothing + } else if (aggExpr.getFnName().getFunction().equalsIgnoreCase("HLL_RAW_AGG")) { + // do nothing } else if (aggExpr.getFnName().getFunction().equalsIgnoreCase("NDV")) { if ((!col.isKey())) { turnOffReason = "NDV function with non-key column: " + col.getName(); @@ -568,7 +537,7 @@ private void turnOffPreAgg(AggregateInfo aggInfo, SelectStmt selectStmt, Analyze returnColumnValidate = false; break; } - } else { + } else { turnOffReason = "Invalid Aggregate Operator: " + aggExpr.getFnName().getFunction(); returnColumnValidate = false; break;