add some snapshot-id validation

projectnessie · Dec 4, 2024 · e9d0abd · e9d0abd
1 parent 27af5d1
commit e9d0abd
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/...g/src/main/java/org/projectnessie/catalog/formats/iceberg/rest/IcebergMetadataUpdate.java b/...g/src/main/java/org/projectnessie/catalog/formats/iceberg/rest/IcebergMetadataUpdate.java
@@ -15,6 +15,7 @@
  */
 package org.projectnessie.catalog.formats.iceberg.rest;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singleton;
@@ -483,6 +484,19 @@ default void applyToTable(IcebergTableMetadataUpdateState state) {
       state.addCatalogOp(CatalogOps.META_ADD_SNAPSHOT);
       Map<String, String> summary = snapshot().summary();
 
+      Long currentSnapshotId = state.snapshot().icebergSnapshotId();
+      Long parentSnapshotId = snapshot().parentSnapshotId();
+      checkArgument(
+          parentSnapshotId == null || Objects.equals(currentSnapshotId, parentSnapshotId),
+          "Snapshot to be added must use the parent snapshot ID %s or null, but provided parent snapshot ID is %s",
+          currentSnapshotId,
+          parentSnapshotId);
+      checkArgument(
+          (currentSnapshotId == null || snapshot().snapshotId() != currentSnapshotId)
+              && !state.snapshot().previousIcebergSnapshotIds().contains(snapshot().snapshotId()),
+          "Provided snapshot ID %s is already used",
+          snapshot().snapshotId());
+
       String v = summary.get("added-data-files");
       if (v != null && Long.parseLong(v) > 0) {
         state.addCatalogOp(CatalogOps.SNAP_ADD_DATA_FILES);