You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit f63aecf
Browse filesBrowse the repository at this point in the historyBrowse files
[refactor](fe-core) neutralize iceberg-named row-level DML plan node names
The row-level DELETE/UPDATE/MERGE plan machinery in fe-core (sink nodes,
implementation rules, PlanType/RuleType constants, visitor methods, the merge
partition-field carrier, and the three plan-synthesis helpers) was named Iceberg*
but its content is connector-agnostic engine machinery: it builds the generic
PluginDrivenTableSink, and the iceberg-format thrift is emitted by the connector's
planWrite. Rename it so fe-core reads connector-agnostic:
- Logical/PhysicalIcebergDeleteSink -> Logical/PhysicalExternalRowLevelDeleteSink
- Logical/PhysicalIcebergMergeSink -> Logical/PhysicalExternalRowLevelMergeSink
(+ the two implementation rules, the PlanType and RuleType constants, the
SinkVisitor and PhysicalPlanTranslator visit methods, the ExpressionRewrite
inner rule, and the RequestPropertyDeriver overrides)
- DataPartition/DistributionSpecMerge.IcebergPartitionField -> MergePartitionField
- IcebergDeleteCommand/UpdateCommand/MergeCommand ->
ExternalRowLevel{Delete,Update,Merge}PlanBuilder (they are plan synthesizers, not
Nereids Command subclasses, so the *Command suffix was factually wrong)
IcebergRowLevelDmlTransform keeps its name: it is the genuinely iceberg-specific
strategy (it holds the position-delete $-prefixed metadata column names and the
frozen iceberg_* profile/txn label prefixes).
Pure rename, no behavior change. The FE<->BE contract is untouched: thrift types
(TIceberg*Sink / TIcebergPartitionField), the thrift enum values
TDataSinkType.ICEBERG_{DELETE,MERGE}_SINK, TPartitionType.MERGE_PARTITIONED, the
row-id wire constant Column.ICEBERG_ROWID_COL, the iceberg_* label strings, and the
merge branch-label value all stay byte-identical. EXPLAIN output is unaffected (no
regression .out pins these node names; regular EXPLAIN DELETE/MERGE renders the
generic PluginDrivenTableSink).
Caveat: the four renamed RuleType constants are reachable by string through the
persistable disable_nereids_rules / enable_nereids_rules session variables. A global
that literally names an old rule name would fail after upgrade (uncaught
RuleType.valueOf) -- near-zero probability (these are sink binding/implementation
rules no reasonable user disables), and consistent with the project's standing
no-alias policy for RuleType renames.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01SMtYwYyyubZZiC1odLZTG3
Copy file name to clipboardExpand all lines: fe/fe-connector/fe-connector-api/src/main/java/org/apache/doris/connector/api/write/ConnectorWritePartitionField.java
Copy file name to clipboardExpand all lines: fe/fe-connector/fe-connector-iceberg/src/main/java/org/apache/doris/connector/iceberg/IcebergWritePlanProvider.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -287,7 +287,7 @@ public ConnectorWritePartitionSpec getWritePartitioning(ConnectorSession session
Copy file name to clipboardExpand all lines: fe/fe-connector/fe-connector-iceberg/src/test/java/org/apache/doris/connector/iceberg/IcebergWritePlanProviderTest.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -626,7 +626,7 @@ public void getWriteSortColumnsNonNullEmptyForSortOrderWithoutIdentityColumns()
626
626
// ───────────────────────────── getWritePartitioning (connector declares, ② C3b-core) ─────────────────────────────
627
627
//
628
628
// WHY: post-flip the iceberg merge-write distribution (DistributionSpecMerge) is built fe-core-side, but
629
-
// its native partition-spec walk (PhysicalIcebergMergeSink.buildInsertPartitionFields ->
629
+
// its native partition-spec walk (PhysicalExternalRowLevelMergeSink.buildInsertPartitionFields ->
630
630
// icebergTable.getIcebergTable().spec()) is DEAD once iceberg is a PluginDrivenExternalCatalog (the native
631
631
// table is unreachable across the connector's isolated classloader). The connector therefore declares the
632
632
// partitioning in an engine-neutral carrier; the engine resolves source-column names to expr ids locally.
0 commit comments