openinx commented on a change in pull request #2216: URL: https://github.com/apache/iceberg/pull/2216#discussion_r589970470
########## File path: spark/src/main/java/org/apache/iceberg/actions/ReplaceDeleteAction.java ########## @@ -0,0 +1,225 @@ +/* + * 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.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; +import org.apache.iceberg.CombinedScanTask; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileContent; +import org.apache.iceberg.FileScanTask; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.RewriteFiles; +import org.apache.iceberg.StructLike; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.encryption.EncryptionManager; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.CloseableIterator; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.ListMultimap; +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.Multimaps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.spark.SparkUtil; +import org.apache.iceberg.spark.source.DeleteRewriter; +import org.apache.iceberg.util.Pair; +import org.apache.iceberg.util.PropertyUtil; +import org.apache.iceberg.util.StructLikeWrapper; +import org.apache.iceberg.util.TableScanUtil; +import org.apache.iceberg.util.Tasks; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; +import org.apache.spark.broadcast.Broadcast; +import org.apache.spark.sql.SparkSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ReplaceDeleteAction extends + BaseSnapshotUpdateAction<ReplaceDeleteAction, DeleteRewriteActionResult> { + private static final Logger LOG = LoggerFactory.getLogger(ReplaceDeleteAction.class); + private final Table table; + private final JavaSparkContext sparkContext; + private FileIO fileIO; + private final EncryptionManager encryptionManager; + private final boolean caseSensitive; + private final PartitionSpec spec; + private final long targetSizeInBytes; + private final int splitLookback; + private final long splitOpenFileCost; + + public ReplaceDeleteAction(SparkSession spark, Table table) { + this.table = table; + this.sparkContext = new JavaSparkContext(spark.sparkContext()); + this.fileIO = fileIO(); + this.encryptionManager = table.encryption(); + this.caseSensitive = false; + this.spec = table.spec(); + + long splitSize = PropertyUtil.propertyAsLong( + table.properties(), + TableProperties.SPLIT_SIZE, + TableProperties.SPLIT_SIZE_DEFAULT); + long targetFileSize = PropertyUtil.propertyAsLong( + table.properties(), + TableProperties.WRITE_TARGET_FILE_SIZE_BYTES, + TableProperties.WRITE_TARGET_FILE_SIZE_BYTES_DEFAULT); + this.targetSizeInBytes = Math.min(splitSize, targetFileSize); + + this.splitLookback = PropertyUtil.propertyAsInt( + table.properties(), + TableProperties.SPLIT_LOOKBACK, + TableProperties.SPLIT_LOOKBACK_DEFAULT); + this.splitOpenFileCost = PropertyUtil.propertyAsLong( + table.properties(), + TableProperties.SPLIT_OPEN_FILE_COST, + TableProperties.SPLIT_OPEN_FILE_COST_DEFAULT); + } + + protected FileIO fileIO() { + if (this.fileIO == null) { + this.fileIO = SparkUtil.serializableFileIO(table()); + } + return this.fileIO; + } + + @Override + protected Table table() { + return table; + } + + @Override + public DeleteRewriteActionResult execute() { + CloseableIterable<FileScanTask> fileScanTasks = null; + try { + fileScanTasks = table.newScan() + .caseSensitive(caseSensitive) + .ignoreResiduals() + .planFiles(); + } finally { + try { + if (fileScanTasks != null) { + fileScanTasks.close(); + } + } catch (IOException ioe) { + LOG.warn("Failed to close task iterable", ioe); + } + } + + CloseableIterable<FileScanTask> tasksWithEqDelete = CloseableIterable.filter(fileScanTasks, scan -> + scan.deletes().stream().anyMatch(delete -> delete.content().equals(FileContent.EQUALITY_DELETES)) + ); + + Set<DeleteFile> eqDeletes = Sets.newHashSet(); + tasksWithEqDelete.forEach(task -> { + eqDeletes.addAll(task.deletes().stream() + .filter(deleteFile -> deleteFile.content().equals(FileContent.EQUALITY_DELETES)) + .collect(Collectors.toList())); + }); + + Map<StructLikeWrapper, Collection<FileScanTask>> groupedTasks = groupTasksByPartition(tasksWithEqDelete.iterator()); + + // Split and combine tasks under each partition + // TODO: can we split task? + List<Pair<StructLike, CombinedScanTask>> combinedScanTasks = groupedTasks.entrySet().stream() + .map(entry -> { + CloseableIterable<FileScanTask> splitTasks = TableScanUtil.splitFiles( + CloseableIterable.withNoopClose(entry.getValue()), targetSizeInBytes); + return Pair.of(entry.getKey().get(), + TableScanUtil.planTasks(splitTasks, targetSizeInBytes, splitLookback, splitOpenFileCost)); + }) + .flatMap(pair -> StreamSupport.stream(CloseableIterable + .transform(pair.second(), task -> Pair.of(pair.first(), task)).spliterator(), false) + ) + .collect(Collectors.toList()); + + if (!combinedScanTasks.isEmpty()) { + JavaRDD<Pair<StructLike, CombinedScanTask>> taskRDD = sparkContext.parallelize(combinedScanTasks, + combinedScanTasks.size()); + Broadcast<FileIO> io = sparkContext.broadcast(fileIO()); + Broadcast<EncryptionManager> encryption = sparkContext.broadcast(encryptionManager()); + + DeleteRewriter deleteRewriter = new DeleteRewriter(table, caseSensitive, io, encryption); + List<DeleteFile> posDeletes = deleteRewriter.toPosDeletes(taskRDD); + + if (!eqDeletes.isEmpty() && !posDeletes.isEmpty()) { + rewriteDeletes(Lists.newArrayList(eqDeletes), posDeletes); + return new DeleteRewriteActionResult(Lists.newArrayList(eqDeletes), posDeletes); + } + } + + return new DeleteRewriteActionResult(Collections.emptyList(), Collections.emptyList()); + } + + protected EncryptionManager encryptionManager() { + return encryptionManager; + } + + private Map<StructLikeWrapper, Collection<FileScanTask>> groupTasksByPartition( + CloseableIterator<FileScanTask> tasksIter) { + ListMultimap<StructLikeWrapper, FileScanTask> tasksGroupedByPartition = Multimaps.newListMultimap( + Maps.newHashMap(), Lists::newArrayList); + try (CloseableIterator<FileScanTask> iterator = tasksIter) { + iterator.forEachRemaining(task -> { + StructLikeWrapper structLike = StructLikeWrapper.forType(spec.partitionType()).set(task.file().partition()); + if (TableScanUtil.hasDeletes(task)) { Review comment: Here the `task` must have at least one delete files because the `Collection<FileScanTask>` has been got by filtering the EQUALITY_DELETES delete files. ########## File path: spark/src/main/java/org/apache/iceberg/spark/source/DeleteRewriter.java ########## @@ -0,0 +1,163 @@ +/* + * 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.spark.source; + +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; +import org.apache.iceberg.CombinedScanTask; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.MetadataColumns; +import org.apache.iceberg.PartitionKey; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Schema; +import org.apache.iceberg.StructLike; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.encryption.EncryptionManager; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.io.LocationProvider; +import org.apache.iceberg.io.OutputFileFactory; +import org.apache.iceberg.io.SortedPosDeleteWriter; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.spark.SparkSchemaUtil; +import org.apache.iceberg.types.TypeUtil; +import org.apache.iceberg.util.Pair; +import org.apache.iceberg.util.Tasks; +import org.apache.spark.TaskContext; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.broadcast.Broadcast; +import org.apache.spark.sql.catalyst.InternalRow; +import org.apache.spark.sql.types.StructType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.iceberg.TableProperties.DEFAULT_NAME_MAPPING; + +public class DeleteRewriter implements Serializable { + private static final Logger LOG = LoggerFactory.getLogger(DeleteRewriter.class); + private final PartitionSpec spec; + private final Map<String, String> properties; + private final Schema schema; + private final FileFormat format; + private final Broadcast<FileIO> io; + private final Broadcast<EncryptionManager> encryptionManager; + private final LocationProvider locations; + private final String nameMapping; + private final boolean caseSensitive; + + public DeleteRewriter(Table table, boolean caseSensitive, + Broadcast<FileIO> io, Broadcast<EncryptionManager> encryptionManager) { + this.spec = table.spec(); + this.schema = table.schema(); + this.locations = table.locationProvider(); + this.caseSensitive = caseSensitive; + this.io = io; + this.encryptionManager = encryptionManager; + this.properties = table.properties(); + this.nameMapping = table.properties().get(DEFAULT_NAME_MAPPING); + + String formatString = table.properties().getOrDefault( + TableProperties.DEFAULT_FILE_FORMAT, TableProperties.DEFAULT_FILE_FORMAT_DEFAULT); + this.format = FileFormat.valueOf(formatString.toUpperCase(Locale.ENGLISH)); + } + + public List<DeleteFile> toPosDeletes(JavaRDD<Pair<StructLike, CombinedScanTask>> taskRDD) { + JavaRDD<List<DeleteFile>> dataFilesRDD = taskRDD.map(this::toPosDeletes); + + return dataFilesRDD.collect().stream() + .flatMap(Collection::stream) + .collect(Collectors.toList()); + } + + public List<DeleteFile> toPosDeletes(Pair<StructLike, CombinedScanTask> task) throws Exception { + TaskContext context = TaskContext.get(); + int partitionId = context.partitionId(); + long taskId = context.taskAttemptId(); + + Schema metaSchema = new Schema(MetadataColumns.FILE_PATH, MetadataColumns.ROW_POSITION); + Schema expectedSchema = TypeUtil.join(metaSchema, schema); + + DeleteRowReader deleteRowReader = new DeleteRowReader(task.second(), schema, expectedSchema, nameMapping, + io.value(), encryptionManager.value(), caseSensitive); + + StructType structType = SparkSchemaUtil.convert(schema); + SparkAppenderFactory appenderFactory = new SparkAppenderFactory(properties, schema, structType, spec); + + OutputFileFactory fileFactory = new OutputFileFactory( + spec, format, locations, io.value(), encryptionManager.value(), partitionId, taskId); + + PartitionKey key = new PartitionKey(spec, schema); + key.partition(task.first()); + SortedPosDeleteWriter<InternalRow> posDeleteWriter = + new SortedPosDeleteWriter<>(appenderFactory, fileFactory, format, key); + + try { + while (deleteRowReader.next()) { + InternalRow row = deleteRowReader.get(); + posDeleteWriter.delete(row.getString(0), row.getLong(1)); + } + + deleteRowReader.close(); + deleteRowReader = null; + + posDeleteWriter.close(); Review comment: Don't have to close the `posDeleteWriter` here because the following `complete()` will close it inside automatically. ########## File path: spark/src/main/java/org/apache/iceberg/spark/source/DeleteRewriter.java ########## @@ -0,0 +1,163 @@ +/* + * 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.spark.source; + +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; +import org.apache.iceberg.CombinedScanTask; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.MetadataColumns; +import org.apache.iceberg.PartitionKey; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Schema; +import org.apache.iceberg.StructLike; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.encryption.EncryptionManager; +import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.io.LocationProvider; +import org.apache.iceberg.io.OutputFileFactory; +import org.apache.iceberg.io.SortedPosDeleteWriter; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.spark.SparkSchemaUtil; +import org.apache.iceberg.types.TypeUtil; +import org.apache.iceberg.util.Pair; +import org.apache.iceberg.util.Tasks; +import org.apache.spark.TaskContext; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.broadcast.Broadcast; +import org.apache.spark.sql.catalyst.InternalRow; +import org.apache.spark.sql.types.StructType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.iceberg.TableProperties.DEFAULT_NAME_MAPPING; + +public class DeleteRewriter implements Serializable { + private static final Logger LOG = LoggerFactory.getLogger(DeleteRewriter.class); + private final PartitionSpec spec; + private final Map<String, String> properties; + private final Schema schema; + private final FileFormat format; + private final Broadcast<FileIO> io; + private final Broadcast<EncryptionManager> encryptionManager; + private final LocationProvider locations; + private final String nameMapping; + private final boolean caseSensitive; + + public DeleteRewriter(Table table, boolean caseSensitive, + Broadcast<FileIO> io, Broadcast<EncryptionManager> encryptionManager) { + this.spec = table.spec(); + this.schema = table.schema(); + this.locations = table.locationProvider(); + this.caseSensitive = caseSensitive; + this.io = io; + this.encryptionManager = encryptionManager; + this.properties = table.properties(); + this.nameMapping = table.properties().get(DEFAULT_NAME_MAPPING); + + String formatString = table.properties().getOrDefault( + TableProperties.DEFAULT_FILE_FORMAT, TableProperties.DEFAULT_FILE_FORMAT_DEFAULT); + this.format = FileFormat.valueOf(formatString.toUpperCase(Locale.ENGLISH)); + } + + public List<DeleteFile> toPosDeletes(JavaRDD<Pair<StructLike, CombinedScanTask>> taskRDD) { + JavaRDD<List<DeleteFile>> dataFilesRDD = taskRDD.map(this::toPosDeletes); + + return dataFilesRDD.collect().stream() + .flatMap(Collection::stream) + .collect(Collectors.toList()); + } + + public List<DeleteFile> toPosDeletes(Pair<StructLike, CombinedScanTask> task) throws Exception { + TaskContext context = TaskContext.get(); + int partitionId = context.partitionId(); + long taskId = context.taskAttemptId(); + + Schema metaSchema = new Schema(MetadataColumns.FILE_PATH, MetadataColumns.ROW_POSITION); + Schema expectedSchema = TypeUtil.join(metaSchema, schema); + + DeleteRowReader deleteRowReader = new DeleteRowReader(task.second(), schema, expectedSchema, nameMapping, + io.value(), encryptionManager.value(), caseSensitive); + + StructType structType = SparkSchemaUtil.convert(schema); + SparkAppenderFactory appenderFactory = new SparkAppenderFactory(properties, schema, structType, spec); + + OutputFileFactory fileFactory = new OutputFileFactory( + spec, format, locations, io.value(), encryptionManager.value(), partitionId, taskId); + + PartitionKey key = new PartitionKey(spec, schema); + key.partition(task.first()); Review comment: Could we just pass the `PartitionKey` when `groupTasksByPartition` in `ReplaceDeleteAction` ? then we don't have to partition it again here , actually it's really partition value for the current task.first(). ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
