From cd223327c83ca3da32a17dfa6ae0e972267e900e Mon Sep 17 00:00:00 2001 From: xy720 <22125576+xy720@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:16:23 +0800 Subject: [PATCH] [bug](auto partition)Fix insert failed because partition exprs of table is empty (#44391) Fix insert failed because partition exprs of table is empty. Revert PR: #43274 --- .../main/java/org/apache/doris/analysis/FunctionCallExpr.java | 2 +- .../src/main/java/org/apache/doris/catalog/PartitionInfo.java | 1 - .../nereids/trees/expressions/functions/scalar/DateTrunc.java | 2 +- .../src/main/java/org/apache/doris/planner/OlapTableSink.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java index 953b30f75c..88791504b8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java @@ -1735,7 +1735,7 @@ public class FunctionCallExpr extends Expr { if (!Lists.newArrayList("year", "quarter", "month", "week", "day", "hour", "minute", "second") .contains(constParam)) { throw new AnalysisException("date_trunc function second param only support argument is " - + "year|quarter|month|week|day|hour|minute|second but got " + constParam); + + "year|quarter|month|week|day|hour|minute|second"); } } if (fnName.getFunction().equalsIgnoreCase("array_range") diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java index 0979dfaf32..8f148188a5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java @@ -264,7 +264,6 @@ public class PartitionInfo implements Writable { // forbid change metadata. public ArrayList getPartitionExprs() { - LOG.info("Debug16494 getPartitionExprs: " + this.partitionExprs.get(0).debugString()); return Expr.cloneList(this.partitionExprs); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DateTrunc.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DateTrunc.java index daac07e0e2..cbd2da5627 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DateTrunc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/DateTrunc.java @@ -71,7 +71,7 @@ public class DateTrunc extends ScalarFunction if (!Lists.newArrayList("year", "quarter", "month", "week", "day", "hour", "minute", "second") .contains(constParam)) { throw new AnalysisException("date_trunc function second param only support argument is " - + "year|quarter|month|week|day|hour|minute|second but got" + constParam); + + "year|quarter|month|week|day|hour|minute|second"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java index 4eee3d346d..cfaa4d7d50 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java @@ -387,7 +387,6 @@ public class OlapTableSink extends DataSink { } for (Expr e : exprs) { e.reset(); - LOG.info("Debug16494: will analyze " + e.debugString()); e.analyze(funcAnalyzer); } partitionParam.setPartitionFunctionExprs(Expr.treesToThrift(exprs));