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 3cb3d01
Browse filesBrowse the repository at this point in the historyBrowse files
[refactor](fe-core) source the iceberg row-level DML row-id column identity from the connector
The position-delete synthesized row-id column (__DORIS_ICEBERG_ROWID_COL__, a
STRUCT{file_path,row_position,partition_spec_id,partition_data}) was defined in
two fe-core classes -- IcebergRowId and IcebergMetadataColumn -- duplicating the
identical column the iceberg connector already declares as a synthetic write
column (IcebergWritePlanProvider.getSyntheticWriteColumns). Delete both classes
and source the identity from the connector, aligning with Trino (the connector
supplies the row-id column; the engine holds the generic row-level DML machine):
- RowLevelDmlRowIdUtils.getRowIdColumn resolves the row-id column from the
table's full schema (already connector-appended during row-level DML), falling
back to a new ungated PluginDrivenExternalTable.getSyntheticWriteColumns()
accessor, and fails loud if the connector declares none (was: reconstruct the
STRUCT in fe-core).
- IcebergMergeCommand's not-matched INSERT-branch NULL-literal type comes from
that column's type instead of the deleted IcebergRowId.getRowIdType().
- IcebergRowLevelDmlTransform's write-constraint exclusion uses an inline
constant set of the four $-prefixed position-delete metadata names.
The FE<->BE wire name __DORIS_ICEBERG_ROWID_COL__ (resolved by name in the BE)
and the STRUCT shape are unchanged, so DML behavior and the BE contract stay
byte-identical. Net fe-core source: +40/-194.
Tests: strengthen the ConnectorColumnConverter contract pin to assert the exact
STRUCT type; add getRowIdColumn branch coverage (full-schema / connector-fallback
/ throw) and the getSyntheticWriteColumns accessor coverage; drop the tests of the
deleted classes.
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-iceberg/src/main/java/org/apache/doris/connector/iceberg/IcebergWritePlanProvider.java
+9-9Lines changed: 9 additions & 9 deletions
Original file line number
Diff line number
Diff line change
@@ -107,15 +107,15 @@ public class IcebergWritePlanProvider implements ConnectorWritePlanProvider {
Copy file name to clipboardExpand all lines: fe/fe-connector/fe-connector-iceberg/src/test/java/org/apache/doris/connector/iceberg/IcebergWritePlanProviderTest.java
+4-4Lines changed: 4 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -697,9 +697,9 @@ public void getWritePartitioningBucketTransformCarriesParamAndDistinctNames() {
697
697
// WHY: post-flip the iceberg DML hidden column __DORIS_ICEBERG_ROWID_COL__ that legacy
698
698
// IcebergExternalTable.getFullSchema injected is unreachable — a PluginDrivenExternalTable carries no
699
699
// iceberg knowledge. The connector therefore declares it as an engine-neutral invisible ConnectorColumn;
700
-
// fe-core converts + appends it (gated request-side) while a DML over the table is in flight. This pins
701
-
// the carried STRUCT shape (name / 4 fields / types / invisible / not-null) against the legacy
702
-
// fe-core IcebergRowId.createHiddenColumn() (its mirror is the fe-core ConnectorColumnConverter contract pin).
700
+
// fe-core converts + appends it (gated request-side) while a DML over the table is in flight. The connector
701
+
// is the sole source of this identity; this pins the carried STRUCT shape (name / 4 fields / types /
702
+
// invisible / not-null), mirrored by the fe-core ConnectorColumnConverter contract pin.
0 commit comments