stevenzwu commented on code in PR #16100: URL: https://github.com/apache/iceberg/pull/16100#discussion_r3384217684
########## core/src/test/java/org/apache/iceberg/TestTrackedFileAdapters.java: ########## @@ -0,0 +1,438 @@ +/* + * 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 static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.types.Conversions; +import org.apache.iceberg.types.Types; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +class TestTrackedFileAdapters { + + private static final String MANIFEST_LOCATION = "s3://bucket/table/manifest.parquet"; + private static final String DATA_FILE_LOCATION = "s3://bucket/data/file.parquet"; + private static final String DV_LOCATION = "s3://bucket/puffin/dv-file.bin"; + + // Tracking values that the delegation tests validate. + private static final long MANIFEST_POS = 3L; + private static final long DATA_SEQUENCE_NUMBER = 10L; + private static final long FILE_SEQUENCE_NUMBER = 11L; + private static final long FIRST_ROW_ID = 1000L; + + private static final int UNPARTITIONED_SPEC_ID = 0; Review Comment: nit: ` = PartitionSpec.unpartitioned().specId()` ########## core/src/main/java/org/apache/iceberg/TrackedFileAdapters.java: ########## @@ -0,0 +1,435 @@ +/* + * 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 org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +/** + * 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, + "Invalid content type for DataFile: %s", + file.contentType()); + return new TrackedDataFile(file, resolveSpec(file, specsById)); + } + + static DeleteFile asDVDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.DATA, + "Invalid content type for DV delete file: %s", + file.contentType()); + return new TrackedDVDeleteFile(file, resolveSpec(file, specsById)); + } + + static DeleteFile asEqualityDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.EQUALITY_DELETES, + "Invalid content type for equality delete file: %s", + file.contentType()); + return new TrackedEqualityDeleteFile(file, resolveSpec(file, specsById)); + } + + /** + * Shared base for all tracked file adapters. Holds the common fields and implements the methods + * that delegate to {@link TrackedFile} and {@link PartitionSpec}. + */ + private abstract static class TrackedFileAdapter<F extends ContentFile<F>> + implements ContentFile<F> { + private final TrackedFile file; + private final PartitionSpec spec; + + private TrackedFileAdapter(TrackedFile file, PartitionSpec spec) { + this.file = file; + this.spec = spec; + } + + protected TrackedFile file() { + return file; + } + + protected PartitionSpec spec() { + return spec; + } + + protected Tracking tracking() { + return file.tracking(); + } + + @Override + public Long pos() { + Tracking tracking = tracking(); + return tracking != null ? tracking.manifestPos() : null; + } + + @Override + public String manifestLocation() { + Tracking tracking = tracking(); + return tracking != null ? tracking.manifestLocation() : null; + } + + @Override + public int specId() { + return file.specId() != null ? file.specId() : spec.specId(); + } + + @Override + public StructLike partition() { + return file().partition(); + } + + @Override + public Long dataSequenceNumber() { + Tracking tracking = tracking(); + return tracking != null ? tracking.dataSequenceNumber() : null; + } + + @Override + public Long fileSequenceNumber() { + Tracking tracking = tracking(); + return tracking != null ? tracking.fileSequenceNumber() : null; + } + } + + /** Shared base for adapters that delegate to a {@link TrackedFile} for content file fields. */ + 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 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 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 the deletion vector from a TrackedFile DATA entry to the {@link DeleteFile} interface. + * + * <p>The DV blob metadata is mapped to the DeleteFile DV fields: {@link + * DeleteFile#referencedDataFile()} is the data file location, and {@link + * DeleteFile#contentOffset()} / {@link DeleteFile#contentSizeInBytes()} point to the blob within + * the Puffin file. + */ + private static class TrackedDVDeleteFile extends TrackedFileAdapter<DeleteFile> + implements DeleteFile { + private final DeletionVector dv; + + private TrackedDVDeleteFile(TrackedFile file, PartitionSpec spec) { + super(file, spec); + Preconditions.checkArgument( + file.deletionVector() != null, "Cannot create DV delete file: no deletion vector"); + this.dv = file.deletionVector(); + } + + @Override + public FileContent content() { + return FileContent.POSITION_DELETES; + } + + @SuppressWarnings("deprecation") + @Override + public CharSequence path() { + return dv.location(); + } + + @Override + public String location() { + return dv.location(); + } + + @Override + public FileFormat format() { + return FileFormat.PUFFIN; + } + + @Override + public long recordCount() { + return dv.cardinality(); + } + + // Returns the DV blob size, not the full Puffin file size. The DeletionVector metadata does not + // include the Puffin file size, so this is the best approximation available. Space accounting + // that sums fileSizeInBytes() was already imprecise in v3 (multiple DVs sharing a Puffin file + // each reported the full file size). + @Override + public long fileSizeInBytes() { + return dv.sizeInBytes(); + } + + // From the spec: position deletes are required to be sorted by file and position, not a table + // order, and should set sort order id to null + @Override + public Integer sortOrderId() { + return null; + } + + @Override + public ByteBuffer keyMetadata() { + return null; + } + + @Override + public List<Integer> equalityFieldIds() { + return null; + } + + @Override + public String referencedDataFile() { + return file().location(); + } + + @Override + public Long contentOffset() { + return dv.offset(); + } + + @Override + public Long contentSizeInBytes() { + return dv.sizeInBytes(); + } + + @Override + public Map<Integer, Long> columnSizes() { + return null; + } + + @Override + public Map<Integer, Long> valueCounts() { + return null; + } + + @Override + public Map<Integer, Long> nullValueCounts() { + return null; + } + + @Override + public Map<Integer, Long> nanValueCounts() { + return null; + } + + @Override + public Map<Integer, ByteBuffer> lowerBounds() { + return null; + } + + @Override + public Map<Integer, ByteBuffer> upperBounds() { + return null; + } + + @Override + public DeleteFile copy() { + return new TrackedDVDeleteFile(file().copyWithoutStats(), spec()); + } + + @Override + public DeleteFile copy(boolean withStats) { + return copy(); + } + + @Override + public DeleteFile copyWithoutStats() { + return copy(); + } + + @Override + public DeleteFile copyWithStats(Set<Integer> requestedColumnIds) { + return copy(); + } + } + + private static PartitionSpec resolveSpec( Review Comment: a note for future. if this util method is useful in other settings, we can consider move it to a util class like `TrackedFileUtil`. but not now. ########## core/src/test/java/org/apache/iceberg/TestTrackedFileAdapters.java: ########## @@ -0,0 +1,438 @@ +/* + * 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 static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.types.Conversions; +import org.apache.iceberg.types.Types; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +class TestTrackedFileAdapters { + + private static final String MANIFEST_LOCATION = "s3://bucket/table/manifest.parquet"; + private static final String DATA_FILE_LOCATION = "s3://bucket/data/file.parquet"; + private static final String DV_LOCATION = "s3://bucket/puffin/dv-file.bin"; + + // Tracking values that the delegation tests validate. + private static final long MANIFEST_POS = 3L; + private static final long DATA_SEQUENCE_NUMBER = 10L; + private static final long FILE_SEQUENCE_NUMBER = 11L; + private static final long FIRST_ROW_ID = 1000L; + + private static final int UNPARTITIONED_SPEC_ID = 0; + private static final Map<Integer, PartitionSpec> UNPARTITIONED = + ImmutableMap.of(UNPARTITIONED_SPEC_ID, PartitionSpec.unpartitioned()); + + private static final int PARTITIONED_SPEC_ID = 1; + private static final PartitionSpec PARTITIONED_SPEC = Review Comment: The partitioned-spec path isn't actually covered in this file: - `testDataFileAdapterDelegation` (line 81) sets `file.specId() = UNPARTITIONED_SPEC_ID` (0) and passes `UNPARTITIONED` for the specs map, but the partition tuple has a `category: string` field set to `"books"`. That state can't be produced by real v4 metadata — the partition tuple's struct type is derived from the spec's `partitionType()` (`TrackedFile.schemaWithContentStats(partitionType, ...)`), so spec 0 with the unpartitioned spec must give an empty partition tuple. The assertion `partition().isSameAs(partition)` passes only because the test bypasses normal construction with direct field sets. - `PARTITIONED_SPEC` (line 52) is built from `new Schema()` with no transforms, so `isUnpartitioned()` returns true. The two delete-adapter tests use `NO_PARTITION` (null) with this spec, so `partition()` resolves to `EMPTY_PARTITION_DATA` — also unpartitioned. Net: no test exercises a real partitioned spec with a matching partition tuple, even though `partition()` was just wired in the latest commit to delegate to `file().partition()` (`TrackedFileAdapters.java:108`). Suggest making `PARTITIONED_SPEC` an actual partitioned spec (e.g. an `identity("category")` transform on a real schema), constructing the partition tuple with a struct type that matches `spec.partitionType()`, and asserting `partition()` on the equality- and DV-delete delegation tests as well. ########## core/src/main/java/org/apache/iceberg/TrackedFileAdapters.java: ########## @@ -0,0 +1,435 @@ +/* + * 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 org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +/** + * 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, + "Invalid content type for DataFile: %s", + file.contentType()); + return new TrackedDataFile(file, resolveSpec(file, specsById)); + } + + static DeleteFile asDVDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.DATA, + "Invalid content type for DV delete file: %s", + file.contentType()); + return new TrackedDVDeleteFile(file, resolveSpec(file, specsById)); + } + + static DeleteFile asEqualityDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.EQUALITY_DELETES, + "Invalid content type for equality delete file: %s", + file.contentType()); + return new TrackedEqualityDeleteFile(file, resolveSpec(file, specsById)); + } + + /** + * Shared base for all tracked file adapters. Holds the common fields and implements the methods + * that delegate to {@link TrackedFile} and {@link PartitionSpec}. + */ + private abstract static class TrackedFileAdapter<F extends ContentFile<F>> + implements ContentFile<F> { + private final TrackedFile file; + private final PartitionSpec spec; + + private TrackedFileAdapter(TrackedFile file, PartitionSpec spec) { + this.file = file; + this.spec = spec; + } + + protected TrackedFile file() { + return file; + } + + protected PartitionSpec spec() { + return spec; + } + + protected Tracking tracking() { + return file.tracking(); + } + + @Override + public Long pos() { + Tracking tracking = tracking(); + return tracking != null ? tracking.manifestPos() : null; + } + + @Override + public String manifestLocation() { + Tracking tracking = tracking(); + return tracking != null ? tracking.manifestLocation() : null; + } + + @Override + public int specId() { + return file.specId() != null ? file.specId() : spec.specId(); Review Comment: Minor: this can simplify to `return spec.specId();`. `resolveSpec` already returns the right spec for both branches — when `file.specId()` is non-null it does `specsById.get(specId)` (so `spec.specId() == file.specId()`), and when null it returns the resolved unpartitioned spec. The ternary just does the same lookup twice. -- 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]
