Skip to content
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

Jump to bottom

GC: consider statistics files #9898

Merged
merged 1 commit into from
Nov 11, 2024
Merged

GC: consider statistics files #9898

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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ as necessary. Empty sections will not end in the release notes.

### Fixes

- GC: Consider referenced statistics (and partition statistics) files as 'live'.

### Commits

## [0.99.0] Release (2024-09-26)
Expand Down
21 changes: 19 additions & 2 deletions gc/gc-iceberg/src/main/java/org/projectnessie/gc/iceberg/IcebergContentToFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
import org.apache.iceberg.ManifestFile;
import org.apache.iceberg.ManifestReaderUtil;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.PartitionStatisticsFile;
import org.apache.iceberg.Snapshot;
import org.apache.iceberg.StatisticsFile;
import org.apache.iceberg.TableMetadata;
import org.apache.iceberg.TableMetadataParser;
import org.apache.iceberg.io.CloseableIterable;
Expand Down Expand Up @@ -137,11 +139,26 @@ private Stream<FileReference> extractTableFiles(ContentReference contentReferenc
Snapshot snapshot =
snapshotId < 0L ? tableMetadata.currentSnapshot() : tableMetadata.snapshot(snapshotId);

Map<Integer, PartitionSpec> specsById = tableMetadata.specsById();

Stream<StorageUri> allFiles = elementaryUrisFromSnapshot(snapshot, contentReference);

if (snapshot != null) {
long effectiveSnapshotId = snapshot.snapshotId();
allFiles =
Stream.concat(
allFiles,
tableMetadata.statisticsFiles().stream()
.filter(s -> s.snapshotId() == effectiveSnapshotId)
.map(StatisticsFile::path)
.map(StorageUri::of));
allFiles =
Stream.concat(
allFiles,
tableMetadata.partitionStatisticsFiles().stream()
.filter(s -> s.snapshotId() == effectiveSnapshotId)
.map(PartitionStatisticsFile::path)
.map(StorageUri::of));

Map<Integer, PartitionSpec> specsById = tableMetadata.specsById();
allFiles =
Stream.concat(
allFiles,
Expand Down