Skip to content

Core: Preserve manifest content pruning when ignoring residuals #17443

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
szehon-ho merged 1 commit into from
Jul 31, 2026
Merged

Core: Preserve manifest content pruning when ignoring residuals #17443

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ static CloseableIterable<FileScanTask> planFiles(
Expression rowFilter = context.rowFilter();
boolean caseSensitive = context.caseSensitive();
boolean ignoreResiduals = context.ignoreResiduals();
Expression filter = ignoreResiduals ? Expressions.alwaysTrue() : rowFilter;

LoadingCache<Integer, ManifestEvaluator> evalCache =
Caffeine.newBuilder()
Expand All @@ -82,7 +81,7 @@ static CloseableIterable<FileScanTask> planFiles(
return ManifestEvaluator.forRowFilter(rowFilter, transformedSpec, caseSensitive);
});
ManifestContentEvaluator manifestContentEvaluator =
new ManifestContentEvaluator(filter, tableSchema.asStruct(), caseSensitive);
new ManifestContentEvaluator(rowFilter, tableSchema.asStruct(), caseSensitive);

CloseableIterable<ManifestFile> filteredManifests =
CloseableIterable.filter(
Expand All @@ -91,9 +90,11 @@ static CloseableIterable<FileScanTask> planFiles(
evalCache.get(manifest.partitionSpecId()).eval(manifest)
&& manifestContentEvaluator.eval(manifest));

Expression residual = ignoreResiduals ? Expressions.alwaysTrue() : rowFilter;

return CloseableIterable.transform(
filteredManifests,
manifest -> new ManifestReadTask(table, manifest, projectedSchema, filter));
manifest -> new ManifestReadTask(table, manifest, projectedSchema, residual));
}

/**
Expand Down
35 changes: 35 additions & 0 deletions core/src/test/java/org/apache/iceberg/TestEntriesMetadataTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.assertj.core.api.Assumptions.assumeThat;

import java.util.List;
import org.apache.iceberg.expressions.Expressions;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
import org.apache.iceberg.relocated.com.google.common.collect.Iterables;
import org.apache.iceberg.types.TypeUtil;
Expand Down Expand Up @@ -152,4 +153,38 @@ public void testEntriesTableWithDeleteManifests() {
.as("Should contain 1 delete file record")
.isEqualTo(1);
}

@TestTemplate
public void testIgnoreResidualsPreservesManifestContentPruning() {
assumeThat(formatVersion).as("Only V2 Tables Support Deletes").isGreaterThanOrEqualTo(2);

table.newAppend().appendFile(FILE_A).appendFile(FILE_B).commit();
table.newRowDelta().addDeletes(fileADeletes()).commit();

String dataManifestPath = table.currentSnapshot().dataManifests(table.io()).get(0).path();
String deleteManifestPath = table.currentSnapshot().deleteManifests(table.io()).get(0).path();

List<Table> entriesTables =
ImmutableList.of(new ManifestEntriesTable(table), new AllEntriesTable(table));

for (Table entriesTable : entriesTables) {
TableScan scan =
entriesTable
.newScan()
.filter(Expressions.equal("data_file.content", FileContent.POSITION_DELETES.id()))
.ignoreResiduals();

List<FileScanTask> tasks = ImmutableList.copyOf(scan.planFiles());

assertThat(tasks)
.as("Should retain manifest content pruning for %s", entriesTable.name())
.extracting(task -> task.file().location())
.contains(deleteManifestPath)
.doesNotContain(dataManifestPath);

assertThat(tasks)
.as("Should ignore residuals for %s", entriesTable.name())
.allSatisfy(task -> assertThat(task.residual()).isEqualTo(Expressions.alwaysTrue()));
}
}
}
Loading