pvary commented on code in PR #12493: URL: https://github.com/apache/iceberg/pull/12493#discussion_r2016134878
########## core/src/main/java/org/apache/iceberg/actions/RewritePositionDeletesGroupPlanner.java: ########## @@ -0,0 +1,221 @@ +/* + * 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.actions; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.MetadataTableType; +import org.apache.iceberg.MetadataTableUtils; +import org.apache.iceberg.Partitioning; +import org.apache.iceberg.PositionDeletesScanTask; +import org.apache.iceberg.PositionDeletesTable; +import org.apache.iceberg.RewriteJobOrder; +import org.apache.iceberg.StructLike; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.actions.RewritePositionDeleteFiles.FileGroupInfo; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.types.Types; +import org.apache.iceberg.util.PartitionUtil; +import org.apache.iceberg.util.PropertyUtil; +import org.apache.iceberg.util.StructLikeMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Groups specified delete files in the {@link Table} into {@link RewritePositionDeletesGroup}s. + * These will be grouped by partitions based on their size using fix sized bins. Extends the {@link + * SizeBasedFileRewritePlanner} with {@link RewritePositionDeleteFiles#REWRITE_JOB_ORDER} handling. + */ +public class RewritePositionDeletesGroupPlanner + extends SizeBasedFileRewritePlanner< + FileGroupInfo, PositionDeletesScanTask, DeleteFile, RewritePositionDeletesGroup> { + private static final Logger LOG = + LoggerFactory.getLogger(RewritePositionDeletesGroupPlanner.class); + + private final Expression filter; + private final boolean caseSensitive; + private RewriteJobOrder rewriteJobOrder; + + public RewritePositionDeletesGroupPlanner(Table table) { + this(table, Expressions.alwaysTrue(), false); + } + + /** + * Creates the planner for the given table. + * + * @param table to plan for + * @param filter used to remove files from the plan + * @param caseSensitive property used for scanning + */ + public RewritePositionDeletesGroupPlanner(Table table, Expression filter, boolean caseSensitive) { + super(table); + this.caseSensitive = caseSensitive; + this.filter = filter; + } + + @Override + public Set<String> validOptions() { + return ImmutableSet.<String>builder() + .addAll(super.validOptions()) + .add(RewritePositionDeleteFiles.REWRITE_JOB_ORDER) + .build(); + } + + @Override + public void init(Map<String, String> options) { + super.init(options); + this.rewriteJobOrder = + RewriteJobOrder.fromName( + PropertyUtil.propertyAsString( + options, + RewritePositionDeleteFiles.REWRITE_JOB_ORDER, + RewritePositionDeleteFiles.REWRITE_JOB_ORDER_DEFAULT)); + } + + @Override + public FileRewritePlan< + FileGroupInfo, PositionDeletesScanTask, DeleteFile, RewritePositionDeletesGroup> + plan() { + StructLikeMap<List<List<PositionDeletesScanTask>>> plan = planFileGroups(); + RewriteExecutionContext ctx = new RewriteExecutionContext(); + Stream<RewritePositionDeletesGroup> groups = + plan.entrySet().stream() + .filter(e -> !e.getValue().isEmpty()) + .flatMap( + e -> { + StructLike partition = e.getKey(); + List<List<PositionDeletesScanTask>> scanGroups = e.getValue(); + return scanGroups.stream() + .map( + tasks -> { + long inputSize = inputSize(tasks); + return newRewriteGroup( + ctx, + partition, + tasks, + inputSplitSize(inputSize), + expectedOutputFiles(inputSize)); + }); + }) + .sorted(RewritePositionDeletesGroup.comparator(rewriteJobOrder)); + Map<StructLike, Integer> groupsInPartition = plan.transformValues(List::size); + int totalGroupCount = groupsInPartition.values().stream().reduce(Integer::sum).orElse(0); + return new FileRewritePlan<>( + CloseableIterable.of(groups.collect(Collectors.toList())), + totalGroupCount, + groupsInPartition); + } + + @Override + protected Iterable<PositionDeletesScanTask> filterFiles(Iterable<PositionDeletesScanTask> tasks) { + return Iterables.filter(tasks, this::wronglySized); + } + + @Override + protected Iterable<List<PositionDeletesScanTask>> filterFileGroups( + List<List<PositionDeletesScanTask>> groups) { + return Iterables.filter( + groups, group -> enoughInputFiles(group) || enoughContent(group) || tooMuchContent(group)); + } + + @Override + protected long defaultTargetFileSize() { + return PropertyUtil.propertyAsLong( + table().properties(), + TableProperties.DELETE_TARGET_FILE_SIZE_BYTES, + TableProperties.DELETE_TARGET_FILE_SIZE_BYTES_DEFAULT); + } + + private StructLikeMap<List<List<PositionDeletesScanTask>>> planFileGroups() { + Table deletesTable = + MetadataTableUtils.createMetadataTableInstance(table(), MetadataTableType.POSITION_DELETES); + CloseableIterable<PositionDeletesScanTask> fileTasks = planFiles(deletesTable); + + try { + Types.StructType partitionType = Partitioning.partitionType(deletesTable); + StructLikeMap<List<PositionDeletesScanTask>> fileTasksByPartition = + groupByPartition(partitionType, fileTasks); + return fileTasksByPartition.transformValues( + tasks -> ImmutableList.copyOf(planFileGroups(tasks))); + } finally { + try { + fileTasks.close(); + } catch (IOException io) { + LOG.error("Cannot properly close file iterable while planning for rewrite", io); + } + } + } + + private CloseableIterable<PositionDeletesScanTask> planFiles(Table deletesTable) { + PositionDeletesTable.PositionDeletesBatchScan scan = + (PositionDeletesTable.PositionDeletesBatchScan) deletesTable.newBatchScan(); + return CloseableIterable.transform( + scan.baseTableFilter(filter).caseSensitive(caseSensitive).ignoreResiduals().planFiles(), + PositionDeletesScanTask.class::cast); + } + + private StructLikeMap<List<PositionDeletesScanTask>> groupByPartition( Review Comment: I had the same feeling, and I tried it several times, but there are nuances which makes them different, and hard to generalize: - The input tasks are different - The partition handling is different (data file compaction handles partition evolution) - The file filtering logic is different - The group filterig logic is different - Result groups are different I see the partition handling as the main issue. When compacting data files we have this additional logic: ``` // If a task uses an incompatible partition spec the data inside could contain values // which belong to multiple partitions in the current spec. Treating all such files as // un-partitioned and grouping them together helps to minimize new files made. ``` When compacting position delete files just uses `coercePartition` to update the task partition to the current one. Based on these, I decided against the generalization. -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
