Skip to content

Improve performance of drop table in iceberg connector #15981

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
findepi merged 1 commit into from
Feb 7, 2023
Merged

Improve performance of drop table in iceberg connector #15981

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
37 changes: 35 additions & 2 deletions lib/trino-filesystem/src/main/java/io/trino/filesystem/fileio/ForwardingFileIo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,27 @@
*/
package io.trino.filesystem.fileio;

import com.google.common.collect.Iterables;
import io.trino.filesystem.TrinoFileSystem;
import org.apache.iceberg.io.FileIO;
import org.apache.iceberg.io.BulkDeletionFailureException;
import org.apache.iceberg.io.InputFile;
import org.apache.iceberg.io.OutputFile;
import org.apache.iceberg.io.SupportsBulkOperations;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.List;
import java.util.stream.Stream;

import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.joining;

public class ForwardingFileIo
implements FileIO
implements SupportsBulkOperations
{
private static final int DELETE_BATCH_SIZE = 1000;
private static final int BATCH_DELETE_PATHS_MESSAGE_LIMIT = 5;

private final TrinoFileSystem fileSystem;

public ForwardingFileIo(TrinoFileSystem fileSystem)
Expand Down Expand Up @@ -61,4 +69,29 @@ public void deleteFile(String path)
throw new UncheckedIOException("Failed to delete file: " + path, e);
}
}

@Override
public void deleteFiles(Iterable<String> pathsToDelete)
throws BulkDeletionFailureException
Copy link
Copy Markdown
Member

@electrum electrum Feb 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn’t thrown by the method. Should we be using this instead?

Copy link
Copy Markdown
Member

@findepi findepi Feb 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we cannot throw BulkDeletionFailureException becauase we cannot fill BulkDeletionFailureException#numberFailedObjects

see #15981 (comment) for more

{
Iterable<List<String>> partitions = Iterables.partition(pathsToDelete, DELETE_BATCH_SIZE);
partitions.forEach(this::deleteBatch);
}

private void deleteBatch(List<String> filesToDelete)
{
try {
fileSystem.deleteFiles(filesToDelete);
}
catch (IOException e) {
throw new UncheckedIOException(
"Failed to delete some or all of files: " +
Stream.concat(
filesToDelete.stream()
.limit(BATCH_DELETE_PATHS_MESSAGE_LIMIT),
filesToDelete.size() > BATCH_DELETE_PATHS_MESSAGE_LIMIT ? Stream.of("...") : Stream.of())
.collect(joining(", ", "[", "]")),
e);
}
}
}