fix delete conidition test failures and apply spotless

apache · Mar 6, 2023 · e05464d · e05464d
1 parent 4446d8f
commit e05464d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java b/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java
@@ -443,6 +443,10 @@ public static Snapshot latestSnapshot(TableMetadata metadata, String branch) {
    * @return schema of the specific snapshot at the given branch
    */
   public static Schema snapshotSchema(Table table, String branch) {
-    return branch == null ? table.schema() : table.schemas().get(table.snapshot(branch).schemaId());
+    if (branch == null || branch.equals(SnapshotRef.MAIN_BRANCH)) {
+      return table.schema();
+    }
+
+    return table.schemas().get(table.snapshot(branch).schemaId());
   }
 }
diff --git a/...k/v3.3/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestDelete.java b/...k/v3.3/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestDelete.java
@@ -306,7 +306,6 @@ public void testDeleteWithoutCondition() {
 
   @Test
   public void testDeleteUsingMetadataWithComplexCondition() {
-    Assume.assumeTrue("test".equals(branch));
     createAndInitPartitionedTable();
 
     sql("INSERT INTO %s VALUES (1, 'dep1')", queryTarget());

diff --git a/...k-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadDelete.java b/...k-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadDelete.java
@@ -100,7 +100,6 @@ public void testCommitUnknownException() {
     when(spyTable.newRowDelta()).thenReturn(spyNewRowDelta);
     SparkTable sparkTable =
         branch == null ? new SparkTable(spyTable, false) : new SparkTable(spyTable, branch, false);
-    ;
 
     ImmutableMap<String, String> config =
         ImmutableMap.of(

diff --git a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/source/SparkTable.java b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/source/SparkTable.java
@@ -26,6 +26,7 @@
 import java.util.Set;
 import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.DataFile;
+import org.apache.iceberg.DeleteFiles;
 import org.apache.iceberg.FileScanTask;
 import org.apache.iceberg.MetadataColumns;
 import org.apache.iceberg.PartitionSpec;
@@ -295,7 +296,8 @@ public boolean canDeleteWhere(Filter[] filters) {
       }
     }
 
-    return canDeleteUsingMetadata(deleteExpr);
+    boolean result = canDeleteUsingMetadata(deleteExpr);
+    return result;
   }
 
   // a metadata delete is possible iff matching files can be deleted entirely
@@ -352,11 +354,17 @@ public void deleteWhere(Filter[] filters) {
       return;
     }
 
-    icebergTable
-        .newDelete()
-        .set("spark.app.id", sparkSession().sparkContext().applicationId())
-        .deleteFromRowFilter(deleteExpr)
-        .commit();
+    DeleteFiles deleteFiles =
+        icebergTable
+            .newDelete()
+            .set("spark.app.id", sparkSession().sparkContext().applicationId())
+            .deleteFromRowFilter(deleteExpr);
+
+    if (branch != null) {
+      deleteFiles.toBranch(branch);
+    }
+
+    deleteFiles.commit();
   }
 
   @Override