rdblue commented on code in PR #16100: URL: https://github.com/apache/iceberg/pull/16100#discussion_r3243111222
########## core/src/main/java/org/apache/iceberg/TrackedFileAdapters.java: ########## @@ -0,0 +1,547 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg; + +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.types.Type; + +/** + * Adapts {@link TrackedFile} entries to the {@link DataFile} and {@link DeleteFile} APIs. + * + * <p>V4 colocates deletion vectors with data file entries in {@link TrackedFile}. Rather than + * extending {@link DataFile} with deletion vector fields, DVs are extracted as separate {@link + * DeleteFile} objects via {@link #asDVDeleteFile(TrackedFile, Map)}. This matches the v3 convention + * where DVs are tracked as {@link DeleteFile} entries in delete manifests and keeps the existing + * {@link FileScanTask} contract ({@code file()} + {@code deletes()}) unchanged. + */ +class TrackedFileAdapters { + + private TrackedFileAdapters() {} + + static DataFile asDataFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.DATA, + "Cannot convert tracked file to DataFile: content type is %s, not DATA", + file.contentType()); + return new TrackedDataFile(file, resolveSpec(file, specsById)); + } + + static DeleteFile asDVDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.DATA, + "Cannot extract DV from tracked file: content type is %s, not DATA", + file.contentType()); + return new TrackedDVDeleteFile(file, resolveSpec(file, specsById)); + } + + static DeleteFile asPositionDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.POSITION_DELETES, + "Cannot convert tracked file to DeleteFile: content type is %s, not POSITION_DELETES", + file.contentType()); + return new TrackedPositionDeleteFile(file, resolveSpec(file, specsById)); + } + + static DeleteFile asEqualityDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.EQUALITY_DELETES, + "Cannot convert tracked file to DeleteFile: content type is %s, not EQUALITY_DELETES", + file.contentType()); + return new TrackedEqualityDeleteFile(file, resolveSpec(file, specsById)); + } + + private static PartitionSpec resolveSpec( + TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Integer specId = file.specId(); + if (specId != null) { + PartitionSpec spec = specsById.get(specId); + Preconditions.checkArgument( + spec != null, "Cannot find partition spec for spec ID: %s", specId); + return spec; + } + + return PartitionSpec.unpartitioned(); + } + + // TODO: TrackedFile will likely get an explicit partition tuple field (using a union partition + // schema), replacing this transform-based derivation. Once that lands, this method should be + // removed and the adapter should read the tuple directly. + // + // This derives partition values by applying the partition transform to the lower bound of the + // source column stats. This is correct because each data file belongs to exactly one partition, + // so lower == upper for partition source columns. For non-identity transforms (bucket, truncate), + // the transform of the lower bound produces the correct partition value under this invariant. + @SuppressWarnings({"unchecked", "rawtypes"}) + static StructLike extractPartition(TrackedFile file, PartitionSpec spec) { + if (spec.isUnpartitioned()) { + return BaseFile.EMPTY_PARTITION_DATA; + } + + ContentStats stats = file.contentStats(); + if (stats == null) { + return new PartitionData(spec.partitionType()); + } + + PartitionData partition = new PartitionData(spec.partitionType()); + + for (int i = 0; i < spec.fields().size(); i += 1) { + PartitionField field = spec.fields().get(i); + + if (field.transform().isVoid()) { + partition.set(i, null); + continue; + } + + FieldStats<?> fieldStats = stats.statsFor(field.sourceId()); + if (fieldStats == null || fieldStats.lowerBound() == null) { + partition.set(i, null); + continue; + } + + Type sourceType = spec.schema().findType(field.sourceId()); + Function boundTransform = field.transform().bind(sourceType); + partition.set(i, boundTransform.apply(fieldStats.lowerBound())); + } + + return partition; + } + + /** + * Shared base for all tracked file adapters. Holds the common fields and implements the methods + * that delegate to {@link Tracking} and {@link PartitionSpec}. + */ + private abstract static class TrackedFileAdapter<F extends ContentFile<F>> + implements ContentFile<F> { + private final TrackedFile file; + private final Tracking tracking; + private final PartitionSpec spec; + + private TrackedFileAdapter(TrackedFile file, PartitionSpec spec) { + this.file = file; + this.tracking = file.tracking(); + this.spec = spec; + } + + protected TrackedFile file() { + return file; + } + + protected Tracking tracking() { + return tracking; + } + + protected PartitionSpec spec() { + return spec; + } + + @Override + public Long pos() { + return tracking != null ? tracking.manifestPos() : null; + } + + @Override + public String manifestLocation() { + return tracking != null ? tracking.manifestLocation() : null; + } + + @Override + public int specId() { + return file.specId() != null ? file.specId() : spec.specId(); + } + + @Override + public StructLike partition() { + return extractPartition(file, spec); + } + + @Override + public Long dataSequenceNumber() { + return tracking != null ? tracking.dataSequenceNumber() : null; + } + + @Override + public Long fileSequenceNumber() { + return tracking != null ? tracking.fileSequenceNumber() : null; + } + } + + /** + * Shared base for adapters that delegate to a {@link TrackedFile} for content file fields. + * + * <p>Subclasses provide {@code content()}, {@code firstRowId()}, {@code equalityFieldIds()}, and + * the copy methods. + */ + private abstract static class TrackedContentFile<F extends ContentFile<F>> + extends TrackedFileAdapter<F> { + private TrackedContentFile(TrackedFile file, PartitionSpec spec) { + super(file, spec); + } + + @SuppressWarnings("deprecation") + @Override + public CharSequence path() { + return file().location(); + } + + @Override + public String location() { + return file().location(); + } + + @Override + public FileFormat format() { + return file().fileFormat(); + } + + @Override + public long recordCount() { + return file().recordCount(); + } + + @Override + public long fileSizeInBytes() { + return file().fileSizeInBytes(); + } + + @Override + public Integer sortOrderId() { + return file().sortOrderId(); + } + + @Override + public ByteBuffer keyMetadata() { + return file().keyMetadata(); + } + + @Override + public List<Long> splitOffsets() { + return file().splitOffsets(); + } + + @Override + public Map<Integer, Long> columnSizes() { + return null; + } + + @Override + public Map<Integer, Long> valueCounts() { + return MetricsUtil.valueCounts(file().contentStats()); + } + + @Override + public Map<Integer, Long> nullValueCounts() { + return MetricsUtil.nullValueCounts(file().contentStats()); + } + + @Override + public Map<Integer, Long> nanValueCounts() { + return MetricsUtil.nanValueCounts(file().contentStats()); + } + + @Override + public Map<Integer, ByteBuffer> lowerBounds() { + return MetricsUtil.lowerBounds(file().contentStats()); + } + + @Override + public Map<Integer, ByteBuffer> upperBounds() { + return MetricsUtil.upperBounds(file().contentStats()); + } + } + + /** Adapts a TrackedFile DATA entry to the {@link DataFile} interface. */ + private static class TrackedDataFile extends TrackedContentFile<DataFile> implements DataFile { + private TrackedDataFile(TrackedFile file, PartitionSpec spec) { + super(file, spec); + } + + @Override + public FileContent content() { + return FileContent.DATA; + } + + @Override + public Long firstRowId() { + return tracking() != null ? tracking().firstRowId() : null; + } + + @Override + public List<Integer> equalityFieldIds() { + return null; + } + + @Override + public DataFile copy() { + return new TrackedDataFile(file().copy(), spec()); + } + + @Override + public DataFile copy(boolean withStats) { + return withStats ? copy() : copyWithoutStats(); + } + + @Override + public DataFile copyWithoutStats() { + return new TrackedDataFile(file().copyWithoutStats(), spec()); + } + + @Override + public DataFile copyWithStats(Set<Integer> requestedColumnIds) { + return new TrackedDataFile(file().copyWithStats(requestedColumnIds), spec()); + } + } + + /** Adapts a TrackedFile EQUALITY_DELETES entry to the {@link DeleteFile} interface. */ + private static class TrackedEqualityDeleteFile extends TrackedContentFile<DeleteFile> + implements DeleteFile { + private TrackedEqualityDeleteFile(TrackedFile file, PartitionSpec spec) { + super(file, spec); + } + + @Override + public FileContent content() { + return FileContent.EQUALITY_DELETES; + } + + @Override + public Long firstRowId() { + return null; + } + + @Override + public List<Integer> equalityFieldIds() { + return file().equalityIds(); + } + + @Override + public DeleteFile copy() { + return new TrackedEqualityDeleteFile(file().copy(), spec()); + } + + @Override + public DeleteFile copy(boolean withStats) { + return withStats ? copy() : copyWithoutStats(); + } + + @Override + public DeleteFile copyWithoutStats() { + return new TrackedEqualityDeleteFile(file().copyWithoutStats(), spec()); + } + + @Override + public DeleteFile copyWithStats(Set<Integer> requestedColumnIds) { + return new TrackedEqualityDeleteFile(file().copyWithStats(requestedColumnIds), spec()); + } + } + + /** Adapts a TrackedFile POSITION_DELETES entry to the {@link DeleteFile} interface. */ Review Comment: Thanks for pointing this out, @stevenzwu! I think this is a good thing to think through. And while I'm not sure we did it on purpose, I think that not allowing `TrackedFile` to contain `POSITION_DELETES` is probably the right solution. These adapter classes have 3 potential cases: 1. An equality delete file moved from a v1-3 manifest into a v4 manifest 2. A standalone v2 (Parquet) position delete file moved into a v4 manifest 3. A DV moved into a v4 manifest, which must be co-located with its data file (no `referenced_data_file` needed) When reading from v3 or earlier manifests, we don't use adapters and we know that it works fine, so I'm ignoring those cases. I'm also ignoring whether we can avoid the equality deletes, since that's a separate discussion. The case that matters here is 2, when there is a v4 manifest with a standalone v2 position delete. I don't think that this is a case that we should support. v3 requires that v2 position deletes must be combined into a single DV when they are modified. It is fine to leave them alone, but you can no longer write one and when you write a DV it must contain all of the deleted positions from older v2 position deletes. This means that the files for this case are either sitting unmodified, or are already required to be rewritten to a DV. v4 requires that DVs are co-located with data files when they are written to v4 metadata. This is to move the responsibility to the write side rather than 2-phase planning for DVs. This also means that `referenced_data_file` is not needed for DVs. The combined result of these changes is that any further deletes to a file with v2 deletes must rewrite all v2 deletes to a DV and co-locate that DV with the data file. That means that the only case where we would have v2 deletes in a v4 manifest is when they are carried forward, unmodified. This is fairly narrow so I think the best solution is to leave v2 deletes in v3 manifests. We don't need to rewrite v3 manifests to v4 manifests: as long as we can use metadata DVs to remove entries they can stay as v3 manifests. This would mean that in order to get rid of a v3 manifest, you'd have to rewrite all of its v2 position deletes as DVs, but that's what we want to happen anyway so I think it is a good idea. It would be good to have @aokolnychyi and @amogh-jahagirdar take a look at this as well. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
