Skip to content

Harden exception handling in IcebergMetadata #27226

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −13
Open

Harden exception handling in IcebergMetadata #27226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 29 additions & 13 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2038,14 +2038,20 @@ private void executeDropExtendedStats(ConnectorSession session, IcebergTableExec
{
checkArgument(executeHandle.procedureHandle() instanceof IcebergDropExtendedStatsHandle, "Unexpected procedure handle %s", executeHandle.procedureHandle());

Table icebergTable = catalog.loadTable(session, executeHandle.schemaTableName());
beginTransaction(icebergTable);
UpdateStatistics updateStatistics = transaction.updateStatistics();
for (StatisticsFile statisticsFile : icebergTable.statisticsFiles()) {
updateStatistics.removeStatistics(statisticsFile.snapshotId());
try {
Table icebergTable = catalog.loadTable(session, executeHandle.schemaTableName());
beginTransaction(icebergTable);
UpdateStatistics updateStatistics = transaction.updateStatistics();
for (StatisticsFile statisticsFile : icebergTable.statisticsFiles()) {
updateStatistics.removeStatistics(statisticsFile.snapshotId());
}
updateStatistics.commit();
commitTransaction(transaction, "drop extended stats");
}
updateStatistics.commit();
commitTransaction(transaction, "drop extended stats");
catch (NotFoundException e) {
throw new TrinoException(ICEBERG_INVALID_METADATA, e);
}

transaction = null;
}

Expand All @@ -2054,8 +2060,13 @@ private void executeRollbackToSnapshot(ConnectorSession session, IcebergTableExe
checkArgument(executeHandle.procedureHandle() instanceof IcebergRollbackToSnapshotHandle, "Unexpected procedure handle %s", executeHandle.procedureHandle());
long snapshotId = ((IcebergRollbackToSnapshotHandle) executeHandle.procedureHandle()).snapshotId();

Table icebergTable = catalog.loadTable(session, executeHandle.schemaTableName());
icebergTable.manageSnapshots().setCurrentSnapshot(snapshotId).commit();
try {
Table icebergTable = catalog.loadTable(session, executeHandle.schemaTableName());
icebergTable.manageSnapshots().setCurrentSnapshot(snapshotId).commit();
}
catch (NotFoundException e) {
throw new TrinoException(ICEBERG_INVALID_METADATA, e);
}
}

private void executeExpireSnapshots(ConnectorSession session, IcebergTableExecuteHandle executeHandle)
Expand All @@ -2074,10 +2085,15 @@ private void executeExpireSnapshots(ConnectorSession session, IcebergTableExecut
IcebergSessionProperties.EXPIRE_SNAPSHOTS_MIN_RETENTION);

// ForwardingFileIo handles bulk operations so no separate function implementation is needed
table.expireSnapshots()
.expireOlderThan(session.getStart().toEpochMilli() - retention.toMillis())
.planWith(icebergScanExecutor)
.commit();
try {
table.expireSnapshots()
.expireOlderThan(session.getStart().toEpochMilli() - retention.toMillis())
.planWith(icebergScanExecutor)
.commit();
}
catch (NotFoundException e) {
throw new TrinoException(ICEBERG_INVALID_METADATA, e);
}
}

private static void validateTableExecuteParameters(
Expand Down