rdblue commented on code in PR #18699: URL: https://github.com/apache/iceberg/pull/18699#discussion_r4460733756
########## core/src/main/java/org/apache/iceberg/CommitValidator.java: ########## @@ -0,0 +1,575 @@ +/* + * 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.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.ManifestEvaluator; +import org.apache.iceberg.expressions.Projections; +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.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.Iterators; +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.CharSequenceSet; +import org.apache.iceberg.util.ContentFileUtil; +import org.apache.iceberg.util.PartitionSet; +import org.apache.iceberg.util.SnapshotUtil; +import org.apache.iceberg.util.Tasks; + +class CommitValidator { + // data is only added in "append" and "overwrite" operations + private static final Set<String> VALIDATE_ADDED_FILES_OPERATIONS = + ImmutableSet.of(DataOperations.APPEND, DataOperations.OVERWRITE); + // data files are removed in "overwrite", "replace", and "delete" + private static final Set<String> VALIDATE_DATA_FILES_EXIST_OPERATIONS = + ImmutableSet.of(DataOperations.OVERWRITE, DataOperations.REPLACE, DataOperations.DELETE); + private static final Set<String> VALIDATE_DATA_FILES_EXIST_SKIP_DELETE_OPERATIONS = + ImmutableSet.of(DataOperations.OVERWRITE, DataOperations.REPLACE); + // delete files can be added in "overwrite" or "delete" operations + private static final Set<String> VALIDATE_ADDED_DELETE_FILES_OPERATIONS = + ImmutableSet.of(DataOperations.OVERWRITE, DataOperations.DELETE); + // DVs can be added in "overwrite", "delete", and "replace" operations + private static final Set<String> VALIDATE_ADDED_DVS_OPERATIONS = + ImmutableSet.of(DataOperations.OVERWRITE, DataOperations.DELETE, DataOperations.REPLACE); + + static CommitValidator newValidator() { + return new CommitValidator(); + } + + private FileIO io; + private Long startingSnapshotId = null; + private boolean caseSensitive = true; + private Expression conflictDetectionFilter = null; + private PartitionSet partitionSet = null; + private ExecutorService workerPool = null; + + private TableMetadata base = null; + private Snapshot parent = null; + + private CommitValidator() {} + + CommitValidator io(FileIO newIo) { + this.io = newIo; + return this; + } + + CommitValidator startingSnapshotId(Long newStartingSnapshotId) { + this.startingSnapshotId = newStartingSnapshotId; + return this; + } + + CommitValidator caseSensitive(boolean isCaseSensitive) { + this.caseSensitive = isCaseSensitive; + return this; + } + + CommitValidator conflictDetectionFilter(Expression filter) { + Preconditions.checkState( + partitionSet == null, "Conflict detection filter and partition set are mutually exclusive"); + this.conflictDetectionFilter = filter; + return this; + } + + CommitValidator partitionSet(PartitionSet newPartitionSet) { + Preconditions.checkState( + conflictDetectionFilter == null, + "Conflict detection filter and partition set are mutually exclusive"); + this.partitionSet = newPartitionSet; + return this; + } + + CommitValidator scanWith(ExecutorService newWorkerPool) { + this.workerPool = newWorkerPool; + return this; + } + + /** + * Binds the base metadata and parent snapshot the checks run against. Needs to be invoked before + * running validations. + */ + CommitValidator setParent(TableMetadata newBase, Snapshot newParent) { + this.base = newBase; + this.parent = newParent; + return this; + } + + /** + * Validates that no data files matching the conflict detection scope have been added to the table + * since the starting snapshot. + */ + void validateNoConflictingAddedDataFiles() { + CloseableIterable<ManifestEntry<DataFile>> conflictEntries = + addedDataFiles(conflictDetectionFilter, partitionSet); + + try (CloseableIterator<ManifestEntry<DataFile>> conflicts = conflictEntries.iterator()) { + if (conflicts.hasNext()) { + throw new ValidationException( + "Found conflicting files that can contain records matching %s: %s", + partitionSet != null ? "partitions " + partitionSet : conflictDetectionFilter, + Iterators.toString( + Iterators.transform(conflicts, entry -> entry.file().location().toString()))); + } + + } catch (IOException e) { + throw new UncheckedIOException( + String.format("Failed to validate no appends matching %s", conflictScope()), e); + } + } + + private CloseableIterable<ManifestEntry<DataFile>> addedDataFiles( + Expression dataFilter, PartitionSet partitions) { + // if there is no current table state, no files have been added + if (parent == null) { + return CloseableIterable.empty(); + } + + List<ManifestFile> manifests = Lists.newArrayList(); + Set<Long> newSnapshots = + validationHistory( + VALIDATE_ADDED_FILES_OPERATIONS, + snapshot -> addNewManifests(snapshot, snapshot.dataManifests(io), manifests)); + + ManifestGroup manifestGroup = + new ManifestGroup(io, manifests, ImmutableList.of()) + .caseSensitive(caseSensitive) + .filterManifestEntries(entry -> newSnapshots.contains(entry.snapshotId())) + .specsById(base.specsById()) + .ignoreDeleted() + .ignoreExisting(); + + if (dataFilter != null) { + manifestGroup = manifestGroup.filterData(dataFilter); + } + + if (partitions != null) { + manifestGroup = + manifestGroup.filterManifestEntries( + entry -> partitions.contains(entry.file().specId(), entry.file().partition())); + } + + return manifestGroup.entries(); + } + + /** + * Validates that no data files matching the conflict detection scope have been deleted from the + * table since the starting snapshot. + */ + void validateNoConflictingDeletedDataFiles() { + CloseableIterable<ManifestEntry<DataFile>> conflictEntries = + deletedDataFiles(conflictDetectionFilter, partitionSet); + + try (CloseableIterator<ManifestEntry<DataFile>> conflicts = conflictEntries.iterator()) { Review Comment: I get a warning that `conflictEntries` is used outside of a try-with-resources block. That's an easy fix: ```java void validateNoConflictingDeletedDataFiles() { try (CloseableIterable<ManifestEntry<DataFile>> conflictEntries = deletedDataFiles()) { CloseableIterator<ManifestEntry<DataFile>> conflicts = conflictEntries.iterator(); if (conflicts.hasNext()) { throw new ValidationException( "Found conflicting deleted files that can %s: %s", partitionSet != null ? "apply to records matching " + partitionSet : "contain records matching " + conflictDetectionFilter, Iterators.toString( Iterators.transform(conflicts, entry -> entry.file().location().toString()))); } } catch (IOException e) { throw new UncheckedIOException( String.format("Failed to validate no deleted data files matching %s", conflictScope()), e); } } ``` -- 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]
