This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 ee74a4062c0 branch-2.1: [Fix] (nereids) Fix incorrect hive references
in LogicalIcebergTableSink and update PlanType #49306 (#51287)
ee74a4062c0 is described below
commit ee74a4062c08be1c6862b61685496bae3400329e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Jun 2 00:12:15 2025 +0800
branch-2.1: [Fix] (nereids) Fix incorrect hive references in
LogicalIcebergTableSink and update PlanType #49306 (#51287)
Cherry-picked from #49306
Co-authored-by: nivane <[email protected]>
Co-authored-by: zhaolipan <[email protected]>
---
.../apache/doris/nereids/analyzer/UnboundIcebergTableSink.java | 4 ++--
.../java/org/apache/doris/nereids/trees/plans/PlanType.java | 1 +
.../nereids/trees/plans/logical/LogicalIcebergTableSink.java | 10 +++++-----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundIcebergTableSink.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundIcebergTableSink.java
index a540e3a9067..2632bda2310 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundIcebergTableSink.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundIcebergTableSink.java
@@ -52,14 +52,14 @@ public class UnboundIcebergTableSink<CHILD_TYPE extends
Plan> extends UnboundBas
Optional<GroupExpression> groupExpression,
Optional<LogicalProperties>
logicalProperties,
CHILD_TYPE child) {
- super(nameParts, PlanType.LOGICAL_UNBOUND_HIVE_TABLE_SINK,
ImmutableList.of(), groupExpression,
+ super(nameParts, PlanType.LOGICAL_UNBOUND_ICEBERG_TABLE_SINK,
ImmutableList.of(), groupExpression,
logicalProperties, colNames, dmlCommandType, child, hints,
partitions);
}
@Override
public Plan withChildren(List<Plan> children) {
Preconditions.checkArgument(children.size() == 1,
- "UnboundHiveTableSink only accepts one child");
+ "UnboundIcebergTableSink only accepts one child");
return new UnboundIcebergTableSink<>(nameParts, colNames, hints,
partitions,
dmlCommandType, groupExpression, Optional.empty(),
children.get(0));
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
index 14e2229995e..7a985bf9285 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/PlanType.java
@@ -53,6 +53,7 @@ public enum PlanType {
LOGICAL_RESULT_SINK,
LOGICAL_UNBOUND_OLAP_TABLE_SINK,
LOGICAL_UNBOUND_HIVE_TABLE_SINK,
+ LOGICAL_UNBOUND_ICEBERG_TABLE_SINK,
LOGICAL_UNBOUND_JDBC_TABLE_SINK,
LOGICAL_UNBOUND_RESULT_SINK,
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalIcebergTableSink.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalIcebergTableSink.java
index d121645b231..91398ddc5ac 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalIcebergTableSink.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalIcebergTableSink.java
@@ -39,7 +39,7 @@ import java.util.Objects;
import java.util.Optional;
/**
- * logical hive table sink for insert command
+ * logical iceberg table sink for insert command
*/
public class LogicalIcebergTableSink<CHILD_TYPE extends Plan> extends
LogicalTableSink<CHILD_TYPE>
implements Sink, PropagateFuncDeps {
@@ -60,8 +60,8 @@ public class LogicalIcebergTableSink<CHILD_TYPE extends Plan>
extends LogicalTab
Optional<LogicalProperties>
logicalProperties,
CHILD_TYPE child) {
super(PlanType.LOGICAL_ICEBERG_TABLE_SINK, outputExprs,
groupExpression, logicalProperties, cols, child);
- this.database = Objects.requireNonNull(database, "database != null in
LogicalHiveTableSink");
- this.targetTable = Objects.requireNonNull(targetTable, "targetTable !=
null in LogicalHiveTableSink");
+ this.database = Objects.requireNonNull(database, "database != null in
LogicalIcebergTableSink");
+ this.targetTable = Objects.requireNonNull(targetTable, "targetTable !=
null in LogicalIcebergTableSink");
this.dmlCommandType = dmlCommandType;
}
@@ -75,7 +75,7 @@ public class LogicalIcebergTableSink<CHILD_TYPE extends Plan>
extends LogicalTab
@Override
public Plan withChildren(List<Plan> children) {
- Preconditions.checkArgument(children.size() == 1,
"LogicalHiveTableSink only accepts one child");
+ Preconditions.checkArgument(children.size() == 1,
"LogicalIcebergTableSink only accepts one child");
return new LogicalIcebergTableSink<>(database, targetTable, cols,
outputExprs,
dmlCommandType, Optional.empty(), Optional.empty(),
children.get(0));
}
@@ -121,7 +121,7 @@ public class LogicalIcebergTableSink<CHILD_TYPE extends
Plan> extends LogicalTab
@Override
public String toString() {
- return Utils.toSqlString("LogicalHiveTableSink[" + id.asInt() + "]",
+ return Utils.toSqlString("LogicalIcebergTableSink[" + id.asInt() + "]",
"outputExprs", outputExprs,
"database", database.getFullName(),
"targetTable", targetTable.getName(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
