Spark 3.4, 3.5: Enable drop table with purge in tests (apache#9548)

adnanhemani · Jan 30, 2024 · b624f06 · b624f06
1 parent 439774b
commit b624f06
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRemoveOrphanFilesProcedure.java b/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRemoveOrphanFilesProcedure.java
@@ -82,9 +82,7 @@ public TestRemoveOrphanFilesProcedure(
 
   @After
   public void removeTable() {
-    // TODO: use the Iceberg catalog to drop the table until SPARK-43203 is fixed
-    validationCatalog.dropTable(tableIdent, true /* purge */);
-    sql("DROP TABLE IF EXISTS %s", tableName);
+    sql("DROP TABLE IF EXISTS %s PURGE", tableName);
     sql("DROP TABLE IF EXISTS p PURGE");
   }
 

diff --git a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/sql/TestDropTable.java b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/sql/TestDropTable.java
@@ -33,7 +33,6 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class TestDropTable extends SparkCatalogTestBase {
@@ -86,8 +85,7 @@ private void dropTableInternal() throws IOException {
     }
   }
 
-  // TODO: enable once SPARK-43203 is fixed
-  @Ignore
+  @Test
   public void testPurgeTable() throws IOException {
     assertEquals(
         "Should have expected rows",
@@ -104,8 +102,7 @@ public void testPurgeTable() throws IOException {
     Assert.assertTrue("All files should be deleted", checkFilesExist(manifestAndFiles, false));
   }
 
-  // TODO: enable once SPARK-43203 is fixed
-  @Ignore
+  @Test
   public void testPurgeTableGCDisabled() throws IOException {
     sql("ALTER TABLE %s SET TBLPROPERTIES (gc.enabled = false)", tableName);
 

diff --git a/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRemoveOrphanFilesProcedure.java b/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRemoveOrphanFilesProcedure.java
@@ -82,9 +82,7 @@ public TestRemoveOrphanFilesProcedure(
 
   @After
   public void removeTable() {
-    // TODO: use the Iceberg catalog to drop the table until SPARK-43203 is fixed
-    validationCatalog.dropTable(tableIdent, true /* purge */);
-    sql("DROP TABLE IF EXISTS %s", tableName);
+    sql("DROP TABLE IF EXISTS %s PURGE", tableName);
     sql("DROP TABLE IF EXISTS p PURGE");
   }
 

diff --git a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestDropTable.java b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestDropTable.java
@@ -33,7 +33,6 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.TestTemplate;
 
 public class TestDropTable extends CatalogTestBase {
@@ -85,8 +84,7 @@ private void dropTableInternal() throws IOException {
     }
   }
 
-  // TODO: enable once SPARK-43203 is fixed
-  @Disabled
+  @TestTemplate
   public void testPurgeTable() throws IOException {
     assertEquals(
         "Should have expected rows",
@@ -102,8 +100,7 @@ public void testPurgeTable() throws IOException {
     assertThat(checkFilesExist(manifestAndFiles, false)).as("All files should be deleted").isTrue();
   }
 
-  // TODO: enable once SPARK-43203 is fixed
-  @Disabled
+  @TestTemplate
   public void testPurgeTableGCDisabled() throws IOException {
     sql("ALTER TABLE %s SET TBLPROPERTIES (gc.enabled = false)", tableName);