rdblue commented on a change in pull request #3069:
URL: https://github.com/apache/iceberg/pull/3069#discussion_r706865999



##########
File path: core/src/main/java/org/apache/iceberg/BaseRowDelta.java
##########
@@ -81,23 +82,32 @@ public RowDelta validateDataFilesExist(Iterable<? extends 
CharSequence> referenc
   }
 
   @Override
-  public RowDelta validateNoConflictingAppends(Expression 
newConflictDetectionFilter) {
+  public RowDelta validateNoConflictingOperations(Expression 
newConflictDetectionFilter) {
     Preconditions.checkArgument(newConflictDetectionFilter != null, "Conflict 
detection filter cannot be null");
     this.conflictDetectionFilter = newConflictDetectionFilter;
     return this;
   }
 
+  @Override
+  public RowDelta validateNoConflictingDeleteFiles() {
+    this.validateNoConflictingDeleteFiles = true;
+    return this;
+  }
+
   @Override
   protected void validate(TableMetadata base) {
     if (base.currentSnapshot() != null) {
       if (!referencedDataFiles.isEmpty()) {
         validateDataFilesExist(base, startingSnapshotId, referencedDataFiles, 
!validateDeletes);
       }
 
-      // TODO: does this need to check new delete files?
       if (conflictDetectionFilter != null) {
         validateAddedDataFiles(base, startingSnapshotId, 
conflictDetectionFilter, caseSensitive);
       }
+
+      if (conflictDetectionFilter != null && validateNoConflictingDeleteFiles) 
{
+        validateAddedDeleteFiles(base, startingSnapshotId, 
conflictDetectionFilter, caseSensitive);

Review comment:
       The reason why we only have file locations in `RowDelta` is that we get 
the set of referenced files from writing position deletes, which are 
`(location, position)`. We don't require carrying `DataFile` through delta 
operations.
   
   We could probably wrap the location in a dummy `DataFile`, or add a way to 
query the `DeleteFileIndex` by location.




-- 
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]

Reply via email to