Skip to content

Stop early if no allowed entry types in v2 checkpoint #26940

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
merged 1 commit into from
Oct 14, 2025
Merged

Stop early if no allowed entry types in v2 checkpoint #26940

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
73 changes: 45 additions & 28 deletions ...rino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/TableSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,34 +350,51 @@ private Stream<DeltaLakeTransactionLogEntry> getV2CheckpointTransactionLogEntrie
{
// Sidecar files contain only ADD and REMOVE entry types. https://github.com/delta-io/delta/blob/master/PROTOCOL.md#v2-spec
Set<CheckpointEntryIterator.EntryType> dataEntryTypes = Sets.intersection(entryTypes, Set.of(ADD, REMOVE));
List<CompletableFuture<Stream<DeltaLakeTransactionLogEntry>>> logEntryStreamFutures =
getV2CheckpointEntries(session, entryTypes, metadataEntry, protocolEntry, checkpointSchemaManager, typeManager, stats, checkpoint, checkpointFile, partitionConstraint, addStatsMinMaxColumnFilter, fileSystem, fileSize)
.map(v2checkpointEntry -> {
if (v2checkpointEntry.getSidecar() == null || dataEntryTypes.isEmpty()) {
return CompletableFuture.completedFuture(Stream.of(v2checkpointEntry));
}
// Sidecar files are retrieved in parallel using a bounded executor
return supplyAsync(() -> {
Location sidecar = checkpointFile.location().sibling("_sidecars").appendPath(v2checkpointEntry.getSidecar().path());
CheckpointEntryIterator iterator = new CheckpointEntryIterator(
fileSystem.newInputFile(sidecar),
session,
v2checkpointEntry.getSidecar().sizeInBytes(),
checkpointSchemaManager,
typeManager,
dataEntryTypes,
metadataEntry,
protocolEntry,
stats,
parquetReaderOptions,
checkpointRowStatisticsWritingEnabled,
domainCompactionThreshold,
partitionConstraint,
addStatsMinMaxColumnFilter);
return stream(iterator).onClose(iterator::close);
}, executor);
})
.collect(toImmutableList());
Stream<DeltaLakeTransactionLogEntry> v2CheckpointEntries = getV2CheckpointEntries(
session,
entryTypes,
metadataEntry,
protocolEntry,
checkpointSchemaManager,
typeManager,
stats,
checkpoint,
checkpointFile,
partitionConstraint,
addStatsMinMaxColumnFilter,
fileSystem,
fileSize);
if (dataEntryTypes.isEmpty()) {
return v2CheckpointEntries;
}

List<CompletableFuture<Stream<DeltaLakeTransactionLogEntry>>> logEntryStreamFutures = v2CheckpointEntries
.map(v2checkpointEntry -> {
if (v2checkpointEntry.getSidecar() == null) {
return CompletableFuture.completedFuture(Stream.of(v2checkpointEntry));
}
// Sidecar files are retrieved in parallel using a bounded executor
return supplyAsync(() -> {
Location sidecar = checkpointFile.location().sibling("_sidecars").appendPath(v2checkpointEntry.getSidecar().path());
CheckpointEntryIterator iterator = new CheckpointEntryIterator(
fileSystem.newInputFile(sidecar),
session,
v2checkpointEntry.getSidecar().sizeInBytes(),
checkpointSchemaManager,
typeManager,
dataEntryTypes,
metadataEntry,
protocolEntry,
stats,
parquetReaderOptions,
checkpointRowStatisticsWritingEnabled,
domainCompactionThreshold,
partitionConstraint,
addStatsMinMaxColumnFilter);
return stream(iterator).onClose(iterator::close);
}, executor);
})
.collect(toImmutableList());
// Return the stream to retrieve the values of the futures lazily and allow streamlined split generation
return logEntryStreamFutures.stream()
.mapMulti((logEntryStream, builder)
Expand Down
Loading