[Iceberg]Fix tests failure caused by concurrently handle the same table

prestodb · Aug 1, 2024 · 7640fe6 · 7640fe6
1 parent 90d1c0d
commit 7640fe6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/...c/test/java/com/facebook/presto/iceberg/procedure/TestRemoveOrphanFilesProcedureBase.java b/...c/test/java/com/facebook/presto/iceberg/procedure/TestRemoveOrphanFilesProcedureBase.java
@@ -62,6 +62,7 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+@Test(singleThreaded = true)
 public abstract class TestRemoveOrphanFilesProcedureBase
         extends AbstractTestQueryFramework
 {
@@ -97,7 +98,7 @@ public Object[][] timezones()
     @Test
     public void testRemoveOrphanFilesInEmptyTable()
     {
-        String tableName = "test_empty_table";
+        String tableName = "test_empty_remove_orphan_files_table";
         Session session = getQueryRunner().getDefaultSession();
         try {
             assertUpdate(format("create table %s (a int, b varchar)", tableName));
@@ -121,7 +122,7 @@ public void testRemoveOrphanFilesInEmptyTable()
     @Test(dataProvider = "timezones")
     public void testRemoveOrphanFilesInMetadataAndDataFolder(String zoneId, boolean legacyTimestamp)
     {
-        String tableName = "test_table";
+        String tableName = "test_remove_orphan_files_table";
         Session session = sessionForTimezone(zoneId, legacyTimestamp);
         try {
             assertUpdate(session, format("create table %s (a int, b varchar)", tableName));
@@ -172,8 +173,8 @@ public void testRemoveOrphanFilesInMetadataAndDataFolder(String zoneId, boolean
     public void testRemoveOrphanFilesWithNonDefaultMetadataPath(String zoneId, boolean legacyTimestamp)
     {
         Session session = sessionForTimezone(zoneId, legacyTimestamp);
-        String tempTableName = "temp_test_table";
-        String tableName = "test_table";
+        String tempTableName = "temp_test_table_with_specified_metadata_path";
+        String tableName = "test_table_with_specified_metadata_path";
         String tableTargetPath = createTempDir().toURI().toString();
         File metadataDir = new File(createTempDir().getAbsolutePath(), "metadata");
         metadataDir.mkdir();
@@ -223,8 +224,8 @@ public void testRemoveOrphanFilesWithNonDefaultMetadataPath(String zoneId, boole
     public void testRemoveOrphanFilesWithNonDefaultDataPath(String zoneId, boolean legacyTimestamp)
     {
         Session session = sessionForTimezone(zoneId, legacyTimestamp);
-        String tempTableName = "temp_test_table";
-        String tableName = "test_table";
+        String tempTableName = "temp_test_table_with_specified_data_path";
+        String tableName = "test_table_with_specified_data_path";
         String tableTargetPath = createTempDir().toURI().toString();
         File dataDir = new File(createTempDir().getAbsolutePath(), "metadata");
         dataDir.mkdir();

diff --git a/...test/java/com/facebook/presto/iceberg/procedure/TestRemoveOrphanFilesProcedureHadoop.java b/...test/java/com/facebook/presto/iceberg/procedure/TestRemoveOrphanFilesProcedureHadoop.java
@@ -21,6 +21,7 @@
 import org.apache.iceberg.Table;
 import org.apache.iceberg.catalog.Catalog;
 import org.apache.iceberg.catalog.TableIdentifier;
+import org.testng.annotations.Test;
 
 import java.io.File;
 import java.util.Map;
@@ -42,10 +43,10 @@ public TestRemoveOrphanFilesProcedureHadoop()
         super(HADOOP, ImmutableMap.of());
     }
 
-    @Override
+    @Test(dataProvider = "timezones")
     public void testRemoveOrphanFilesWithNonDefaultMetadataPath(String zoneId, boolean legacyTimestamp)
     {
-        String tempTableName = "temp_test_table";
+        String tempTableName = "temp_test_table_with_specified_metadata_path";
         String tableTargetPath = createTempDir().toURI().toString();
         String specifiedMetadataPath = createTempDir().getAbsolutePath();