Skip to content

feat(plugin-iceberg): Add support for MERGE INTO #25470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdcmeehan merged 3 commits into from
Jan 14, 2026
Merged

feat(plugin-iceberg): Add support for MERGE INTO #25470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97f48a2
Add SQL Support for MERGE INTO In Presto #20578 (iceberg)
acarpente-denodo Jan 12, 2026
dd9beda
Add SQL Support for MERGE INTO In Presto #20578 (iceberg-tests)
acarpente-denodo Jan 8, 2026
92c97a0
Add SQL Support for MERGE INTO In Presto #20578 (iceberg)
acarpente-denodo Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergAbstractMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.facebook.presto.spi.ConnectorDistributedProcedureHandle;
import com.facebook.presto.spi.ConnectorId;
import com.facebook.presto.spi.ConnectorInsertTableHandle;
import com.facebook.presto.spi.ConnectorMergeTableHandle;
import com.facebook.presto.spi.ConnectorNewTableLayout;
import com.facebook.presto.spi.ConnectorOutputTableHandle;
import com.facebook.presto.spi.ConnectorSession;
Expand Down Expand Up @@ -68,6 +69,7 @@
import com.facebook.presto.spi.connector.ConnectorTableVersion;
import com.facebook.presto.spi.connector.ConnectorTableVersion.VersionOperator;
import com.facebook.presto.spi.connector.ConnectorTableVersion.VersionType;
import com.facebook.presto.spi.connector.RowChangeParadigm;
import com.facebook.presto.spi.function.StandardFunctionResolution;
import com.facebook.presto.spi.plan.FilterStatsCalculatorService;
import com.facebook.presto.spi.procedure.BaseProcedure;
Expand Down Expand Up @@ -98,6 +100,7 @@
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.FileMetadata;
import org.apache.iceberg.IsolationLevel;
import org.apache.iceberg.MetadataColumns;
import org.apache.iceberg.MetricsConfig;
import org.apache.iceberg.MetricsModes.None;
import org.apache.iceberg.PartitionSpec;
Expand All @@ -119,6 +122,7 @@
import org.apache.iceberg.types.TypeUtil;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.types.Types.NestedField;
import org.apache.iceberg.types.Types.StringType;
import org.apache.iceberg.util.CharSequenceSet;
import org.apache.iceberg.view.View;

Expand Down Expand Up @@ -159,6 +163,7 @@
import static com.facebook.presto.iceberg.IcebergColumnHandle.PATH_COLUMN_HANDLE;
import static com.facebook.presto.iceberg.IcebergColumnHandle.PATH_COLUMN_METADATA;
import static com.facebook.presto.iceberg.IcebergErrorCode.ICEBERG_COMMIT_ERROR;
import static com.facebook.presto.iceberg.IcebergErrorCode.ICEBERG_INVALID_FORMAT_VERSION;
import static com.facebook.presto.iceberg.IcebergErrorCode.ICEBERG_INVALID_MATERIALIZED_VIEW;
import static com.facebook.presto.iceberg.IcebergErrorCode.ICEBERG_INVALID_SNAPSHOT_ID;
import static com.facebook.presto.iceberg.IcebergMaterializedViewProperties.getRefreshType;
Expand All @@ -170,6 +175,8 @@
import static com.facebook.presto.iceberg.IcebergMetadataColumn.DELETE_FILE_PATH;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.FILE_PATH;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.IS_DELETED;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.MERGE_PARTITION_DATA;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.MERGE_TARGET_ROW_ID_DATA;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.UPDATE_ROW_DATA;
import static com.facebook.presto.iceberg.IcebergPartitionType.ALL;
import static com.facebook.presto.iceberg.IcebergSessionProperties.getCompressionCodec;
Expand Down Expand Up @@ -225,18 +232,21 @@
import static com.facebook.presto.spi.StandardErrorCode.ALREADY_EXISTS;
import static com.facebook.presto.spi.StandardErrorCode.NOT_FOUND;
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
import static com.facebook.presto.spi.connector.RowChangeParadigm.DELETE_ROW_AND_INSERT_ROW;
import static com.facebook.presto.spi.statistics.TableStatisticType.ROW_COUNT;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.isNullOrEmpty;
import static com.google.common.base.Verify.verify;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.common.collect.Maps.transformValues;
import static java.lang.Long.parseLong;
import static java.lang.String.format;
import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull;
import static org.apache.iceberg.MetadataColumns.ROW_POSITION;
import static org.apache.iceberg.MetadataColumns.SPEC_ID;
import static org.apache.iceberg.RowLevelOperationMode.MERGE_ON_READ;
import static org.apache.iceberg.SnapshotSummary.DELETED_RECORDS_PROP;
import static org.apache.iceberg.SnapshotSummary.REMOVED_EQ_DELETES_PROP;
Expand Down Expand Up @@ -795,6 +805,78 @@ public Optional<ColumnHandle> getDeleteRowIdColumn(ConnectorSession session, Con
return Optional.of(IcebergColumnHandle.create(ROW_POSITION, typeManager, REGULAR));
}

/**
* Return the row change paradigm supported by the connector on the table.
*/
@Override
public RowChangeParadigm getRowChangeParadigm(ConnectorSession session, ConnectorTableHandle tableHandle)
{
return DELETE_ROW_AND_INSERT_ROW;
}

@Override
public ColumnHandle getMergeTargetTableRowIdColumnHandle(ConnectorSession session, ConnectorTableHandle tableHandle)
{
Types.StructType type = Types.StructType.of(ImmutableList.<NestedField>builder()
.add(MetadataColumns.FILE_PATH)
.add(ROW_POSITION)
.add(SPEC_ID)
.add(NestedField.required(MERGE_PARTITION_DATA.getId(), MERGE_PARTITION_DATA.getColumnName(), StringType.get()))
.build());

NestedField field = NestedField.required(MERGE_TARGET_ROW_ID_DATA.getId(), MERGE_TARGET_ROW_ID_DATA.getColumnName(), type);
return IcebergColumnHandle.create(field, typeManager, SYNTHESIZED);
}

@Override
public ConnectorMergeTableHandle beginMerge(ConnectorSession session, ConnectorTableHandle tableHandle)
{
IcebergTableHandle icebergTableHandle = (IcebergTableHandle) tableHandle;
verify(icebergTableHandle.getIcebergTableName().getTableType() == DATA, "only the data table can have data merged");
Table icebergTable = getIcebergTable(session, icebergTableHandle.getSchemaTableName());
int formatVersion = ((BaseTable) icebergTable).operations().current().formatVersion();

if (formatVersion < MIN_FORMAT_VERSION_FOR_DELETE ||
!Optional.ofNullable(icebergTable.properties().get(TableProperties.UPDATE_MODE))
.map(mode -> mode.equals(MERGE_ON_READ.modeName()))
.orElse(false)) {
throw new PrestoException(ICEBERG_INVALID_FORMAT_VERSION,
"Iceberg table updates require at least format version 2 and update mode must be merge-on-read");
}
validateTableMode(session, icebergTable);
transaction = icebergTable.newTransaction();

IcebergInsertTableHandle insertHandle = new IcebergInsertTableHandle(
icebergTableHandle.getSchemaName(),
icebergTableHandle.getIcebergTableName(),
toPrestoSchema(icebergTable.schema(), typeManager),
toPrestoPartitionSpec(icebergTable.spec(), typeManager),
getColumns(icebergTable.schema(), icebergTable.spec(), typeManager),
icebergTable.location(),
getFileFormat(icebergTable),
getCompressionCodec(session),
icebergTable.properties(),
getSupportedSortFields(icebergTable.schema(), icebergTable.sortOrder()),
Optional.empty());

Map<Integer, PrestoIcebergPartitionSpec> partitionSpecs = transformValues(icebergTable.specs(), partitionSpec -> toPrestoPartitionSpec(partitionSpec, typeManager));

return new IcebergMergeTableHandle(icebergTableHandle, insertHandle, partitionSpecs);
}

@Override
public void finishMerge(
ConnectorSession session,
ConnectorMergeTableHandle tableHandle,
Collection<Slice> fragments,
Collection<ComputedStatistics> computedStatistics)
{
IcebergWritableTableHandle insertTableHandle =
((IcebergMergeTableHandle) tableHandle).getInsertTableHandle();

finishWrite(session, insertTableHandle, fragments, UPDATE_AFTER);
}

@Override
public boolean isLegacyGetLayoutSupported(ConnectorSession session, ConnectorTableHandle tableHandle)
{
Expand All @@ -814,6 +896,7 @@ protected List<ColumnMetadata> getColumnMetadata(ConnectorSession session, Table
.setExtraInfo(partitionFields.containsKey(column.name()) ?
columnExtraInfo(partitionFields.get(column.name())) :
null)
.setNullable(column.isOptional())
.build())
.collect(toImmutableList());
}
Expand Down
7 changes: 7 additions & 0 deletions presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergColumnHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import static com.facebook.presto.iceberg.IcebergMetadataColumn.DELETE_FILE_PATH;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.FILE_PATH;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.IS_DELETED;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.MERGE_TARGET_ROW_ID_DATA;
import static com.facebook.presto.iceberg.IcebergMetadataColumn.UPDATE_ROW_DATA;
import static com.facebook.presto.iceberg.TypeConverter.toPrestoType;
import static com.google.common.base.Preconditions.checkArgument;
Expand Down Expand Up @@ -109,6 +110,12 @@ public boolean isUpdateRowIdColumn()
return columnIdentity.getId() == UPDATE_ROW_DATA.getId();
}

@JsonIgnore
public boolean isMergeTargetTableRowIdColumn()
{
return columnIdentity.getId() == MERGE_TARGET_ROW_ID_DATA.getId();
}

@Override
public ColumnHandle withRequiredSubfields(List<Subfield> subfields)
{
Expand Down
6 changes: 6 additions & 0 deletions presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHandleResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.facebook.presto.spi.ConnectorDistributedProcedureHandle;
import com.facebook.presto.spi.ConnectorHandleResolver;
import com.facebook.presto.spi.ConnectorInsertTableHandle;
import com.facebook.presto.spi.ConnectorMergeTableHandle;
import com.facebook.presto.spi.ConnectorOutputTableHandle;
import com.facebook.presto.spi.ConnectorSplit;
import com.facebook.presto.spi.ConnectorTableHandle;
Expand Down Expand Up @@ -64,6 +65,11 @@ public Class<? extends ConnectorInsertTableHandle> getInsertTableHandleClass()
return IcebergInsertTableHandle.class;
}

public Class<? extends ConnectorMergeTableHandle> getMergeTableHandleClass()
{
return IcebergMergeTableHandle.class;
}

@Override
public Class<? extends ConnectorDeleteTableHandle> getDeleteTableHandleClass()
{
Expand Down
Loading
Loading