API, Core: Add uuid API to Table

apache · Oct 28, 2023 · fdac953 · fdac953
1 parent b5ea0d5
commit fdac953
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 0 deletions.
diff --git a/api/src/main/java/org/apache/iceberg/Table.java b/api/src/main/java/org/apache/iceberg/Table.java
@@ -20,6 +20,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.apache.iceberg.encryption.EncryptionManager;
 import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.io.LocationProvider;
@@ -333,6 +334,15 @@ default UpdateStatistics updateStatistics() {
    */
   Map<String, SnapshotRef> refs();
 
+  /**
+   * Returns the UUID of the table
+   *
+   * @return the UUID of the table
+   */
+  default UUID uuid() {
+    throw new UnsupportedOperationException(this.getClass().getName() + " doesn't implement uuid");
+  }
+
   /**
    * Returns the snapshot referenced by the given name or null if no such reference exists.
    *

diff --git a/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java b/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java
@@ -21,6 +21,7 @@
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import org.apache.iceberg.encryption.EncryptionManager;
 import org.apache.iceberg.io.FileIO;
@@ -199,6 +200,11 @@ public Map<String, SnapshotRef> refs() {
     return table().refs();
   }
 
+  @Override
+  public UUID uuid() {
+    return UUID.randomUUID();
+  }
+
   @Override
   public String toString() {
     return name();

diff --git a/core/src/main/java/org/apache/iceberg/BaseTable.java b/core/src/main/java/org/apache/iceberg/BaseTable.java
@@ -21,6 +21,7 @@
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.apache.iceberg.encryption.EncryptionManager;
 import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.io.LocationProvider;
@@ -259,6 +260,11 @@ public Map<String, SnapshotRef> refs() {
     return ops.current().refs();
   }
 
+  @Override
+  public UUID uuid() {
+    return UUID.fromString(ops.current().uuid());
+  }
+
   @Override
   public String toString() {
     return name();

diff --git a/core/src/main/java/org/apache/iceberg/BaseTransaction.java b/core/src/main/java/org/apache/iceberg/BaseTransaction.java
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import org.apache.iceberg.encryption.EncryptionManager;
@@ -770,6 +771,11 @@ public Map<String, SnapshotRef> refs() {
       return current.refs();
     }
 
+    @Override
+    public UUID uuid() {
+      return UUID.fromString(current.uuid());
+    }
+
     @Override
     public String toString() {
       return name();

diff --git a/core/src/main/java/org/apache/iceberg/SerializableTable.java b/core/src/main/java/org/apache/iceberg/SerializableTable.java
@@ -21,6 +21,7 @@
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.iceberg.encryption.EncryptionManager;
 import org.apache.iceberg.hadoop.HadoopConfigurable;
@@ -67,6 +68,7 @@ public class SerializableTable implements Table, Serializable {
   private transient volatile Schema lazySchema = null;
   private transient volatile Map<Integer, PartitionSpec> lazySpecs = null;
   private transient volatile SortOrder lazySortOrder = null;
+  private final UUID uuid;
 
   protected SerializableTable(Table table) {
     this.name = table.name();
@@ -83,6 +85,7 @@ protected SerializableTable(Table table) {
     this.encryption = table.encryption();
     this.locationProvider = table.locationProvider();
     this.refs = SerializableMap.copyOf(table.refs());
+    this.uuid = table.uuid();
   }
 
   /**
@@ -247,6 +250,11 @@ public Map<String, SnapshotRef> refs() {
     return refs;
   }
 
+  @Override
+  public UUID uuid() {
+    return uuid;
+  }
+
   @Override
   public void refresh() {
     throw new UnsupportedOperationException(errorMsg("refresh"));

diff --git a/core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java b/core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import org.apache.iceberg.AppendFiles;
 import org.apache.iceberg.BaseTable;
@@ -634,6 +635,8 @@ public void testCompleteCreateTable() {
     Assertions.assertThat(table.properties().entrySet())
         .as("Table properties should be a superset of the requested properties")
         .containsAll(properties.entrySet());
+    Assertions.assertThat(table.uuid())
+        .isEqualTo(UUID.fromString(((BaseTable) table).operations().current().uuid()));
   }
 
   @Test