anoopj commented on code in PR #16100: URL: https://github.com/apache/iceberg/pull/16100#discussion_r3230236627
########## core/src/main/java/org/apache/iceberg/TrackedFileAdapters.java: ########## @@ -0,0 +1,505 @@ +/* + * 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 asPositionDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.POSITION_DELETES, + "Invalid content type for position delete file: %s", + 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, + "Invalid content type for equality delete file: %s", + 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; + } + + for (PartitionSpec spec : specsById.values()) { + if (spec.isUnpartitioned()) { + return spec; + } + } + + throw new IllegalArgumentException( + "Cannot find unpartitioned spec in specs: " + specsById.keySet()); + } + + /** + * 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() { Review Comment: Changed to just delegate to file.tracking() ########## core/src/main/java/org/apache/iceberg/TrackedFileAdapters.java: ########## @@ -0,0 +1,505 @@ +/* + * 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 asPositionDeleteFile(TrackedFile file, Map<Integer, PartitionSpec> specsById) { + Preconditions.checkArgument( + file.contentType() == FileContent.POSITION_DELETES, + "Invalid content type for position delete file: %s", + 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, + "Invalid content type for equality delete file: %s", + 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; + } + + for (PartitionSpec spec : specsById.values()) { + if (spec.isUnpartitioned()) { + return spec; + } + } + + throw new IllegalArgumentException( + "Cannot find unpartitioned spec in specs: " + specsById.keySet()); + } + + /** + * Shared base for all tracked file adapters. Holds the common fields and implements the methods + * that delegate to {@link Tracking} and {@link PartitionSpec}. Review Comment: The comment was a bit stale. Fixed. Thanks for the callout! -- 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]
