gaborkaszab commented on code in PR #17541: URL: https://github.com/apache/iceberg/pull/17541#discussion_r3844605082
########## core/src/main/java/org/apache/iceberg/ScanTaskPlanner.java: ########## @@ -0,0 +1,314 @@ +/* + * 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.io.IOException; +import java.io.UncheckedIOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.ResidualEvaluator; +import org.apache.iceberg.io.CloseableGroup; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.CloseableIterator; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.metrics.ScanMetrics; +import org.apache.iceberg.metrics.ScanMetricsUtil; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.util.ParallelIterable; + +/** + * Plans {@link FileScanTask}s from a V4 root manifest. + * + * <p>Emits a task for each live {@code DATA} entry and expands {@code DATA_MANIFEST} entries into + * their leaf manifests. A data entry's colocated deletion vector is attached to its task as a + * {@link DeleteFile}. + */ +class ScanTaskPlanner { Review Comment: Just for my benefit to see the bigger picture: Is this meant to replace the functionality in `SnapshotScan.doPlanFiles()` and in `ManifestGroup.planFiles()` and such? I'd like to understand how this fits into the flow that is executed when a user runs `table.newScan().planFiles()`. Is there going to be an if on the table version to branch which code path is run? ########## core/src/main/java/org/apache/iceberg/ScanTaskPlanner.java: ########## @@ -0,0 +1,314 @@ +/* + * 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.io.IOException; +import java.io.UncheckedIOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.ResidualEvaluator; +import org.apache.iceberg.io.CloseableGroup; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.CloseableIterator; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.metrics.ScanMetrics; +import org.apache.iceberg.metrics.ScanMetricsUtil; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.util.ParallelIterable; + +/** + * Plans {@link FileScanTask}s from a V4 root manifest. + * + * <p>Emits a task for each live {@code DATA} entry and expands {@code DATA_MANIFEST} entries into + * their leaf manifests. A data entry's colocated deletion vector is attached to its task as a + * {@link DeleteFile}. + */ +class ScanTaskPlanner { + private static final DeleteFile[] NO_DELETES = new DeleteFile[0]; + + private final FileIO io; + private final String rootManifestLocation; + private final Map<Integer, PartitionSpec> specsById; + private final String tableLocation; + private final Expression dataFilter; + private final boolean ignoreResiduals; + private final boolean caseSensitive; + private final ScanMetrics scanMetrics; + private final ExecutorService executorService; + private final Map<Integer, TaskContext> taskContextsBySpec = Maps.newConcurrentMap(); + + private ScanTaskPlanner( + FileIO io, + String rootManifestLocation, + Map<Integer, PartitionSpec> specsById, + String tableLocation, + Expression dataFilter, + boolean ignoreResiduals, + boolean caseSensitive, + ScanMetrics scanMetrics, + ExecutorService executorService) { + this.io = io; + this.rootManifestLocation = rootManifestLocation; + this.specsById = specsById; + this.tableLocation = tableLocation; + this.dataFilter = dataFilter; + this.ignoreResiduals = ignoreResiduals; + this.caseSensitive = caseSensitive; + this.scanMetrics = scanMetrics; + this.executorService = executorService; + } + + static Builder builder( + FileIO io, + String rootManifestLocation, + Map<Integer, PartitionSpec> specsById, + String tableLocation) { + return new Builder(io, rootManifestLocation, specsById, tableLocation); + } + + CloseableIterable<FileScanTask> planFiles() { + List<TrackedFile> rootDataFiles = Lists.newArrayList(); + List<TrackedFile> leafManifests = Lists.newArrayList(); + + // root is drained into these lists. Leaf references must be buffered so they can be fanned + // out; direct DATA entries are buffered too, bounded by how many data files a tree keeps + // directly in the root. Leaf tasks stay lazy: planLeaf opens no reader until iterated. + scanMetrics.scannedDataManifests().increment(); + try (CloseableIterable<TrackedFile> rootEntries = Review Comment: Root manifest file can be encrypted. I see an exception throws for encrypted leaf manifests, for consistency shouldn't we Thor one here, or let the reader fail anyway because it's unable to parse the file? ########## core/src/main/java/org/apache/iceberg/V4ManifestReader.java: ########## @@ -258,7 +260,18 @@ Builder scanMetrics(ScanMetrics newScanMetrics) { return this; } + /** Sets the deletion vector that marks manifest entries deleted by position. */ + Builder manifestDv(ByteBuffer dv) { + this.manifestDv = dv; + return this; + } + V4ManifestReader build() { + if (manifestDv != null) { Review Comment: What's the point of the changes in this file? I guess it's setting the stage for some follow-up change, but at this point I don't think it adds any value. ########## core/src/main/java/org/apache/iceberg/ScanTaskPlanner.java: ########## @@ -0,0 +1,314 @@ +/* + * 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.io.IOException; +import java.io.UncheckedIOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.ResidualEvaluator; +import org.apache.iceberg.io.CloseableGroup; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.CloseableIterator; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.metrics.ScanMetrics; +import org.apache.iceberg.metrics.ScanMetricsUtil; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.util.ParallelIterable; + +/** + * Plans {@link FileScanTask}s from a V4 root manifest. + * + * <p>Emits a task for each live {@code DATA} entry and expands {@code DATA_MANIFEST} entries into + * their leaf manifests. A data entry's colocated deletion vector is attached to its task as a + * {@link DeleteFile}. + */ +class ScanTaskPlanner { + private static final DeleteFile[] NO_DELETES = new DeleteFile[0]; + + private final FileIO io; + private final String rootManifestLocation; + private final Map<Integer, PartitionSpec> specsById; + private final String tableLocation; + private final Expression dataFilter; + private final boolean ignoreResiduals; + private final boolean caseSensitive; + private final ScanMetrics scanMetrics; + private final ExecutorService executorService; + private final Map<Integer, TaskContext> taskContextsBySpec = Maps.newConcurrentMap(); + + private ScanTaskPlanner( Review Comment: Trying to wrap my head around encrypted root manifests. For that we'd need a couple of more inputs here. If I'm not mistaken, it would go through a similar mechanism as the pre-V4 manifest list location: it'd require a `key-id` from the snapshot, the `encryption-keys` from `TableMetadata` and maybe other stuff. I'm wondering if we want to pass the proposed new interface for "files encrypted with key-id" ([PR here](https://github.com/apache/iceberg/pull/17545/)) instead of `rootManifestLocation` -- 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]
