This is an automated email from the ASF dual-hosted git repository.
xuyang pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new cd223327c83 [bug](auto partition)Fix insert failed because partition
exprs of table is empty (#44391)
cd223327c83 is described below
commit cd223327c83ca3da32a17dfa6ae0e972267e900e
Author: xy720 <22125576+xy...@users.noreply.github.com>
AuthorDate: Fri Nov 22 11:16:23 2024 +0800
[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
---
.../src/main/java/org/apache/doris/analysis/FunctionCallExpr.java | 2 +-
fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java | 1 -
.../doris/nereids/trees/expressions/functions/scalar/DateTrunc.java | 2 +-
fe/fe-core/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 953b30f75c0..88791504b8e 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 0979dfaf321..8f148188a5a 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<Expr> 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 daac07e0e25..cbd2da5627b 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 4eee3d346d1..cfaa4d7d507 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));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
