Fix global and on-reference state

model/src/main/java/org/projectnessie/model/IcebergTable.java

@@ -28,14 +28,14 @@
  * Represents the state of an Iceberg table in Nessie. An Iceberg table is globally identified via
  * its {@link Contents#getId() unique ID}.
  *
- * <p>The Iceberg-table-state consists of the location to the table-metadata and the snapshot-ID.
+ * <p>The Iceberg-table-state consists of the location to the table-metadata and the state of the ID
+ * generators using the serialized version of Iceberg's {@code TableIdGenerators} object.
  *
- * <p>The table-metadata-location is managed globally within Nessie, which means that all versions
- * of the same table share the table-metadata across all named-references (branches and tags). There
- * is only one version, the current version, of Iceberg's table-metadata.
+ * <p>The table-metadata-location is managed on each Nessie reference, which means that all versions
+ * of the same table have distinct table-metadata across all named-references (branches and tags).
  *
- * <p>Within each named-reference (branch or tag), the (current) Iceberg-snapshot-ID will be
- * different. In other words: changes to an Iceberg table update the snapshot-ID.
+ * <p>The information needed to generate IDs for an Iceberg table that need to be globally unique,
+ * for example the last-column-ID, is managed globally within Nessie.
  *
  * <p>When adding a new table (aka contents-object identified by a contents-id), use a {@link
  * org.projectnessie.model.Operation.Put} without an expected-value. In all other cases (updating an
@@ -69,20 +69,20 @@ public abstract class IcebergTable extends Contents {
   @NotBlank
   public abstract String getMetadataLocation();
 
-  /** ID of the current Iceberg snapshot. This value is not present, if there is no snapshot. */
-  public abstract long getSnapshotId();
+  /** Opaque representation of Iceberg's {@code TableIdGenerators}. */
+  public abstract String getIdGenerators();
 
-  public static IcebergTable of(String metadataLocation, long snapshotId) {
+  public static IcebergTable of(String metadataLocation, String idGenerators) {
     return ImmutableIcebergTable.builder()
         .metadataLocation(metadataLocation)
-        .snapshotId(snapshotId)
+        .idGenerators(idGenerators)
         .build();
   }
 
-  public static IcebergTable of(String metadataLocation, long snapshotId, String contentsId) {
+  public static IcebergTable of(String metadataLocation, String idGenerators, String contentsId) {
     return ImmutableIcebergTable.builder()
         .metadataLocation(metadataLocation)
-        .snapshotId(snapshotId)
+        .idGenerators(idGenerators)
         .id(contentsId)
         .build();
   }

perftest/simulations/src/test/scala/org/projectnessie/perftest/gatling/CommitToBranchSimulation.scala

@@ -55,7 +55,7 @@ class CommitToBranchSimulation extends Simulation {
           val contentsId = tableName
 
           val tableMeta = IcebergTable
-            .of(s"path_on_disk_${tableName}_$commitNum", commitNum, contentsId)
+            .of(s"path_on_disk_${tableName}_$commitNum", "x", contentsId)
 
           // TODO the expectedContents is wrong!! commitNum is for the session, but we need the actual global state!!
           val op =
@@ -65,7 +65,7 @@ class CommitToBranchSimulation extends Simulation {
                 tableMeta,
                 IcebergTable.of(
                   s"path_on_disk_${tableName}_${commitNum - 1}",
-                  commitNum - 1,
+                  "x",
                   contentsId
                 )
               )

python/pynessie/model.py

@@ -30,15 +30,15 @@ class IcebergTable(Contents):
     """Dataclass for Nessie Contents."""
 
     metadata_location: str = desert.ib(fields.Str(data_key="metadataLocation"))
-    snapshot_id: int = desert.ib(fields.Int(data_key="snapshotId"))
+    id_generators: str = desert.ib(fields.Str(data_key="idGenerators"))
 
     def requires_expected_state(self: "IcebergTable") -> bool:
         """Returns True - expected state should be provided for Put operations on Iceberg tables."""
         return True
 
     def pretty_print(self: "IcebergTable") -> str:
         """Print out for cli."""
-        return "Iceberg table:\n\tmetadata-location:{}\n\tsnapshot-id:{}".format(self.metadata_location, self.snapshot_id)
+        return "Iceberg table:\n\tmetadata-location:{}\n\tid-generators:{}".format(self.metadata_location, self.id_generators)
 
 
 IcebergTableSchema = desert.schema_class(IcebergTable)