Address comments

apache · Jan 8, 2024 · e13e6d2 · e13e6d2
1 parent 50b23c9
commit e13e6d2
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/BaseFileRewriteCoordinator.java b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/BaseFileRewriteCoordinator.java
@@ -70,12 +70,12 @@ public void clearRewrite(Table table, String fileSetId) {
 
   public Set<String> fetchSetIds(Table table) {
     return resultMap.keySet().stream()
-        .filter(e -> e.first().equals(Spark3Util.tableUUID(table)))
+        .filter(e -> e.first().equals(Spark3Util.baseTableUUID(table)))
         .map(Pair::second)
         .collect(Collectors.toSet());
   }
 
   private Pair<String, String> toId(Table table, String setId) {
-    return Pair.of(Spark3Util.tableUUID(table), setId);
+    return Pair.of(Spark3Util.baseTableUUID(table), setId);
   }
 }
diff --git a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java
@@ -62,12 +62,12 @@ public <T extends ScanTask> List<T> removeTasks(Table table, String setId) {
 
   public Set<String> fetchSetIds(Table table) {
     return tasksMap.keySet().stream()
-        .filter(e -> e.first().equals(Spark3Util.tableUUID(table)))
+        .filter(e -> e.first().equals(Spark3Util.baseTableUUID(table)))
         .map(Pair::second)
         .collect(Collectors.toSet());
   }
 
   private Pair<String, String> toId(Table table, String setId) {
-    return Pair.of(Spark3Util.tableUUID(table), setId);
+    return Pair.of(Spark3Util.baseTableUUID(table), setId);
   }
 }
diff --git a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java
@@ -947,14 +947,14 @@ public static org.apache.spark.sql.catalyst.TableIdentifier toV1TableIdentifier(
     return org.apache.spark.sql.catalyst.TableIdentifier.apply(table, database);
   }
 
-  static String tableUUID(org.apache.iceberg.Table table) {
+  static String baseTableUUID(org.apache.iceberg.Table table) {
     if (table instanceof HasTableOperations) {
       TableOperations ops = ((HasTableOperations) table).operations();
       return ops.current().uuid();
     } else if (table instanceof BaseMetadataTable) {
       return ((BaseMetadataTable) table).table().operations().current().uuid();
     } else {
-      return null;
+      throw new UnsupportedOperationException("Cannot retrieve UUID for table " + table.name());
     }
   }
 

diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/BaseFileRewriteCoordinator.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/BaseFileRewriteCoordinator.java
@@ -70,12 +70,12 @@ public void clearRewrite(Table table, String fileSetId) {
 
   public Set<String> fetchSetIds(Table table) {
     return resultMap.keySet().stream()
-        .filter(e -> e.first().equals(Spark3Util.tableUUID(table)))
+        .filter(e -> e.first().equals(Spark3Util.baseTableUUID(table)))
         .map(Pair::second)
         .collect(Collectors.toSet());
   }
 
   private Pair<String, String> toId(Table table, String setId) {
-    return Pair.of(Spark3Util.tableUUID(table), setId);
+    return Pair.of(Spark3Util.baseTableUUID(table), setId);
   }
 }
diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java
@@ -62,12 +62,12 @@ public <T extends ScanTask> List<T> removeTasks(Table table, String setId) {
 
   public Set<String> fetchSetIds(Table table) {
     return tasksMap.keySet().stream()
-        .filter(e -> e.first().equals(Spark3Util.tableUUID(table)))
+        .filter(e -> e.first().equals(Spark3Util.baseTableUUID(table)))
         .map(Pair::second)
         .collect(Collectors.toSet());
   }
 
   private Pair<String, String> toId(Table table, String setId) {
-    return Pair.of(Spark3Util.tableUUID(table), setId);
+    return Pair.of(Spark3Util.baseTableUUID(table), setId);
   }
 }
diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java
@@ -950,14 +950,14 @@ public static org.apache.spark.sql.catalyst.TableIdentifier toV1TableIdentifier(
     return org.apache.spark.sql.catalyst.TableIdentifier.apply(table, database);
   }
 
-  static String tableUUID(org.apache.iceberg.Table table) {
+  static String baseTableUUID(org.apache.iceberg.Table table) {
     if (table instanceof HasTableOperations) {
       TableOperations ops = ((HasTableOperations) table).operations();
       return ops.current().uuid();
     } else if (table instanceof BaseMetadataTable) {
       return ((BaseMetadataTable) table).table().operations().current().uuid();
     } else {
-      return null;
+      throw new UnsupportedOperationException("Cannot retrieve UUID for table " + table.name());
     }
   }
 

diff --git a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/BaseFileRewriteCoordinator.java b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/BaseFileRewriteCoordinator.java
@@ -70,12 +70,12 @@ public void clearRewrite(Table table, String fileSetId) {
 
   public Set<String> fetchSetIds(Table table) {
     return resultMap.keySet().stream()
-        .filter(e -> e.first().equals(Spark3Util.tableUUID(table)))
+        .filter(e -> e.first().equals(Spark3Util.baseTableUUID(table)))
         .map(Pair::second)
         .collect(Collectors.toSet());
   }
 
   private Pair<String, String> toId(Table table, String setId) {
-    return Pair.of(Spark3Util.tableUUID(table), setId);
+    return Pair.of(Spark3Util.baseTableUUID(table), setId);
   }
 }
diff --git a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java
@@ -62,12 +62,12 @@ public <T extends ScanTask> List<T> removeTasks(Table table, String setId) {
 
   public Set<String> fetchSetIds(Table table) {
     return tasksMap.keySet().stream()
-        .filter(e -> e.first().equals(Spark3Util.tableUUID(table)))
+        .filter(e -> e.first().equals(Spark3Util.baseTableUUID(table)))
         .map(Pair::second)
         .collect(Collectors.toSet());
   }
 
   private Pair<String, String> toId(Table table, String setId) {
-    return Pair.of(Spark3Util.tableUUID(table), setId);
+    return Pair.of(Spark3Util.baseTableUUID(table), setId);
   }
 }
diff --git a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/Spark3Util.java
@@ -950,14 +950,14 @@ public static org.apache.spark.sql.catalyst.TableIdentifier toV1TableIdentifier(
     return org.apache.spark.sql.catalyst.TableIdentifier.apply(table, database);
   }
 
-  static String tableUUID(org.apache.iceberg.Table table) {
+  static String baseTableUUID(org.apache.iceberg.Table table) {
     if (table instanceof HasTableOperations) {
       TableOperations ops = ((HasTableOperations) table).operations();
       return ops.current().uuid();
     } else if (table instanceof BaseMetadataTable) {
       return ((BaseMetadataTable) table).table().operations().current().uuid();
     } else {
-      return null;
+      throw new UnsupportedOperationException("Cannot retrieve UUID for table " + table.name());
     }
   }