update code

apache · Nov 22, 2024 · 4515c45 · 4515c45
1 parent 2c00e4a
commit 4515c45
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/SerializableTable.java b/core/src/main/java/org/apache/iceberg/SerializableTable.java
@@ -120,7 +120,7 @@ private FileIO fileIO(Table table) {
     return table.io();
   }
 
-  protected Table lazyTable() {
+  private Table lazyTable() {
     if (lazyTable == null) {
       synchronized (this) {
         if (lazyTable == null) {
@@ -143,6 +143,10 @@ protected Table newTable(TableOperations ops, String tableName) {
     return new BaseTable(ops, tableName);
   }
 
+  public Table underlyingTable() {
+    return lazyTable();
+  }
+
   @Override
   public String name() {
     return name;
@@ -428,10 +432,6 @@ public StaticTableOperations operations() {
           this.getClass().getName() + " does not support operations()");
     }
 
-    public BaseMetadataTable underlyingMetadataTable() {
-      return (BaseMetadataTable) lazyTable();
-    }
-
     public MetadataTableType type() {
       return type;
     }

diff --git a/core/src/main/java/org/apache/iceberg/TableUtil.java b/core/src/main/java/org/apache/iceberg/TableUtil.java
@@ -31,24 +31,13 @@ private TableUtil() {}
   public static int formatVersion(Table table) {
     Preconditions.checkArgument(null != table, "Invalid table: null");
 
-    // being able to read the format version from the PositionDeletesTable is mainly needed in
-    // SparkPositionDeletesRewrite when determining whether to rewrite V2 position deletes to DVs
-    if (table instanceof BaseMetadataTable) {
-      Preconditions.checkArgument(
-          table instanceof PositionDeletesTable,
-          "%s table does not have a format version",
-          ((BaseMetadataTable) table).metadataTableType());
-
-      return ((PositionDeletesTable) table).table().operations().current().formatVersion();
-    } else if (table instanceof SerializableTable.SerializableMetadataTable) {
-      SerializableTable.SerializableMetadataTable metadataTable =
-          (SerializableTable.SerializableMetadataTable) table;
-      Preconditions.checkArgument(
-          metadataTable.type() == MetadataTableType.POSITION_DELETES,
-          "%s table does not have a format version",
-          metadataTable.type());
-
-      return metadataTable.underlyingMetadataTable().table().operations().current().formatVersion();
+    if (table instanceof SerializableTable) {
+      return formatVersion(((SerializableTable) table).underlyingTable());
+    } else if (table instanceof PositionDeletesTable) {
+      // being able to read the format version from the PositionDeletesTable is mainly needed in
+      // SparkPositionDeletesRewrite when determining whether to rewrite V2 position deletes to DVs
+      PositionDeletesTable positionDeletesTable = (PositionDeletesTable) table;
+      return positionDeletesTable.table().operations().current().formatVersion();
     } else if (table instanceof HasTableOperations) {
       return ((HasTableOperations) table).operations().current().formatVersion();
     } else {

diff --git a/core/src/test/java/org/apache/iceberg/TestTableUtil.java b/core/src/test/java/org/apache/iceberg/TestTableUtil.java
@@ -101,11 +101,13 @@ public void formatVersionForMetadataTables() {
       Table metadataTable = MetadataTableUtils.createMetadataTableInstance(table, type);
       assertThatThrownBy(() -> TableUtil.formatVersion(metadataTable))
           .isInstanceOf(IllegalArgumentException.class)
-          .hasMessage("%s table does not have a format version", type);
+          .hasMessage(
+              "%s does not have a format version", metadataTable.getClass().getSimpleName());
 
       assertThatThrownBy(() -> TableUtil.formatVersion(SerializableTable.copyOf(metadataTable)))
           .isInstanceOf(IllegalArgumentException.class)
-          .hasMessage("%s table does not have a format version", type);
+          .hasMessage(
+              "%s does not have a format version", metadataTable.getClass().getSimpleName());
     }
   }
 }
diff --git a/core/src/test/java/org/apache/iceberg/hadoop/TestTableSerialization.java b/core/src/test/java/org/apache/iceberg/hadoop/TestTableSerialization.java
@@ -113,7 +113,7 @@ public void testSerializableMetadataTable() throws IOException, ClassNotFoundExc
       } else {
         assertThatThrownBy(() -> TableUtil.formatVersion(serializableTable))
             .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("%s table does not have a format version", type);
+            .hasMessageEndingWith("does not have a format version");
       }
     }
   }