mxm commented on code in PR #15996: URL: https://github.com/apache/iceberg/pull/15996#discussion_r3138061141
########## flink/v2.1/flink/src/main/java/org/apache/iceberg/flink/maintenance/operator/EqualityConvertPlanner.java: ########## @@ -0,0 +1,601 @@ +/* + * 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.flink.maintenance.operator; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.state.ListState; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.typeinfo.Types; +import org.apache.flink.metrics.Counter; +import org.apache.flink.metrics.MetricGroup; +import org.apache.flink.runtime.state.StateInitializationContext; +import org.apache.flink.runtime.state.StateSnapshotContext; +import org.apache.flink.streaming.api.operators.AbstractStreamOperator; +import org.apache.flink.streaming.api.operators.OneInputStreamOperator; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.flink.util.OutputTag; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.DataOperations; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileContent; +import org.apache.iceberg.ManifestFile; +import org.apache.iceberg.ManifestFiles; +import org.apache.iceberg.ManifestReader; +import org.apache.iceberg.Snapshot; +import org.apache.iceberg.SnapshotChanges; +import org.apache.iceberg.Table; +import org.apache.iceberg.flink.TableLoader; +import org.apache.iceberg.flink.maintenance.api.Trigger; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.util.SnapshotUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Scans the staging branch for new data files and equality delete files, and emits {@link + * ReadCommand}s for parallel readers to process. Assigns phase-based event timestamps and emits + * watermarks between phases to guarantee ordering: data rows from prior phases are fully processed + * before equality deletes are resolved. + * + * <p>An {@link EqualityConvertPlanResult} with the new data files is emitted via the {@link + * #METADATA_STREAM} side output. + * + * <p>Processes each staging snapshot individually in order (oldest first), so that equality deletes + * are scoped to data files visible at that snapshot. Supports multiple equality field sets. + */ +@Internal +public class EqualityConvertPlanner extends AbstractStreamOperator<ReadCommand> Review Comment: I tried to use the `IncrementalChangelogScan` API in #14264. This is what I ended up with: ```diff @@ -365,13 +370,31 @@ public class EqualityConvertPlanner extends AbstractStreamOperator<ReadCommand> List<DeleteFile> stagingDVFiles = Lists.newArrayList(); List<DeleteFile> posDeleteFiles = Lists.newArrayList(); Map<List<Integer>, List<DeleteFile>> deletesByFieldIds = Maps.newHashMap(); - SnapshotChanges changes = SnapshotChanges.builderFor(table).snapshot(snapshot).build(); - - for (DataFile dataFile : changes.addedDataFiles()) { - newDataFiles.add(dataFile.copy()); + Map<String, DeleteFile> addedDeletes = Maps.newHashMap(); + + IncrementalChangelogScan scan = + table.newIncrementalChangelogScan().toSnapshot(snapshot.snapshotId()); + if (snapshot.parentId() != null) { + scan = scan.fromSnapshotExclusive(snapshot.parentId()); + } + + try (CloseableIterable<ChangelogScanTask> tasks = scan.planFiles()) { + for (ChangelogScanTask task : tasks) { + if (task instanceof AddedRowsScanTask addedTask) { + newDataFiles.add(addedTask.file().copy()); + for (DeleteFile df : addedTask.deletes()) { + addedDeletes.putIfAbsent(df.location(), df); + } + } else if (task instanceof DeletedRowsScanTask deletedTask) { + for (DeleteFile df : deletedTask.addedDeletes()) { + addedDeletes.putIfAbsent(df.location(), df); + } + } + } } - for (DeleteFile deleteFile : changes.addedDeleteFiles()) { + for (DeleteFile deleteFile : addedDeletes.values()) { if (deleteFile.content() == FileContent.EQUALITY_DELETES) { deletesByFieldIds .computeIfAbsent(deleteFile.equalityFieldIds(), k -> Lists.newArrayList()) ``` This has benefits like parallel manifest scanning and partition pruning, but doesn't fundamentally change the rest of the code. -- 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]
