Core: Remove deprecated RemoveSnapshot

Author: manuzhang

.palantir/revapi.yml

@@ -1178,6 +1178,9 @@ acceptedBreaks:
       new: "class org.apache.iceberg.Metrics"
       justification: "Java serialization across versions is not guaranteed"
     org.apache.iceberg:iceberg-core:
+    - code: "java.class.removed"
+      old: "class org.apache.iceberg.MetadataUpdate.RemoveSnapshot"
+      justification: "Removing deprecations for 1.10.0"
     - code: "java.method.removed"
       old: "method java.lang.String[] org.apache.iceberg.hadoop.Util::blockLocations(org.apache.iceberg.CombinedScanTask,\
         \ org.apache.hadoop.conf.Configuration)"

core/src/main/java/org/apache/iceberg/MetadataUpdate.java

@@ -328,31 +328,13 @@ public void applyTo(TableMetadata.Builder metadataBuilder) {
     }
   }
 
-  /**
-   * @deprecated since 1.9.0, will be removed in 1.10.0; Use {@link MetadataUpdate.RemoveSnapshots}
-   *     instead.
-   */
-  @Deprecated
-  class RemoveSnapshot implements MetadataUpdate {
-    private final long snapshotId;
-
-    public RemoveSnapshot(long snapshotId) {
-      this.snapshotId = snapshotId;
-    }
-
-    public long snapshotId() {
-      return snapshotId;
-    }
-
-    @Override
-    public void applyTo(TableMetadata.Builder metadataBuilder) {
-      metadataBuilder.removeSnapshots(ImmutableSet.of(snapshotId));
-    }
-  }
-
   class RemoveSnapshots implements MetadataUpdate {
     private final Set<Long> snapshotIds;
 
+    public RemoveSnapshots(Long snapshotId) {
+      this.snapshotIds = ImmutableSet.of(snapshotId);
+    }
+
     public RemoveSnapshots(Set<Long> snapshotIds) {
       this.snapshotIds = snapshotIds;
     }

core/src/main/java/org/apache/iceberg/MetadataUpdateParser.java

@@ -26,7 +26,6 @@
 import java.util.Set;
 import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
-import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
 import org.apache.iceberg.relocated.com.google.common.collect.Iterables;
 import org.apache.iceberg.util.JsonUtil;
 import org.apache.iceberg.view.ViewVersionParser;
@@ -149,7 +148,6 @@ private MetadataUpdateParser() {}
           .put(MetadataUpdate.SetPartitionStatistics.class, SET_PARTITION_STATISTICS)
           .put(MetadataUpdate.RemovePartitionStatistics.class, REMOVE_PARTITION_STATISTICS)
           .put(MetadataUpdate.AddSnapshot.class, ADD_SNAPSHOT)
-          .put(MetadataUpdate.RemoveSnapshot.class, REMOVE_SNAPSHOTS)
           .put(MetadataUpdate.RemoveSnapshots.class, REMOVE_SNAPSHOTS)
           .put(MetadataUpdate.RemoveSnapshotRef.class, REMOVE_SNAPSHOT_REF)
           .put(MetadataUpdate.SetSnapshotRef.class, SET_SNAPSHOT_REF)
@@ -229,12 +227,7 @@ public static void toJson(MetadataUpdate metadataUpdate, JsonGenerator generator
         break;
       case REMOVE_SNAPSHOTS:
         MetadataUpdate.RemoveSnapshots removeSnapshots;
-        if (metadataUpdate instanceof MetadataUpdate.RemoveSnapshot) {
-          Long snapshotId = ((MetadataUpdate.RemoveSnapshot) metadataUpdate).snapshotId();
-          removeSnapshots = new MetadataUpdate.RemoveSnapshots(ImmutableSet.of(snapshotId));
-        } else {
-          removeSnapshots = (MetadataUpdate.RemoveSnapshots) metadataUpdate;
-        }
+        removeSnapshots = (MetadataUpdate.RemoveSnapshots) metadataUpdate;
         writeRemoveSnapshots(removeSnapshots, generator);
         break;
       case REMOVE_SNAPSHOT_REF:
@@ -563,7 +556,7 @@ private static MetadataUpdate readRemoveSnapshots(JsonNode node) {
     MetadataUpdate metadataUpdate;
     if (snapshotIds.size() == 1) {
       Long snapshotId = Iterables.getOnlyElement(snapshotIds);
-      metadataUpdate = new MetadataUpdate.RemoveSnapshot(snapshotId);
+      metadataUpdate = new MetadataUpdate.RemoveSnapshots(snapshotId);
     } else {
       metadataUpdate = new MetadataUpdate.RemoveSnapshots(snapshotIds);
     }

core/src/main/java/org/apache/iceberg/TableMetadata.java

@@ -1838,11 +1838,7 @@ private static List<HistoryEntry> updateSnapshotLog(
       Set<Long> intermediateSnapshotIds = intermediateSnapshotIdSet(changes, currentSnapshotId);
       boolean hasIntermediateSnapshots = !intermediateSnapshotIds.isEmpty();
       boolean hasRemovedSnapshots =
-          changes.stream()
-              .anyMatch(
-                  change ->
-                      change instanceof MetadataUpdate.RemoveSnapshots
-                          || change instanceof MetadataUpdate.RemoveSnapshot);
+          changes.stream().anyMatch(change -> change instanceof MetadataUpdate.RemoveSnapshots);
 
       if (!hasIntermediateSnapshots && !hasRemovedSnapshots) {
         return snapshotLog;

core/src/test/java/org/apache/iceberg/TestMetadataUpdateParser.java

@@ -422,7 +422,7 @@ public void testRemoveSnapshotFromJson() {
     String action = MetadataUpdateParser.REMOVE_SNAPSHOTS;
     long snapshotId = 2L;
     String json = String.format("{\"action\":\"%s\",\"snapshot-ids\":[2]}", action);
-    MetadataUpdate expected = new MetadataUpdate.RemoveSnapshot(snapshotId);
+    MetadataUpdate expected = new MetadataUpdate.RemoveSnapshots(snapshotId);
     assertEquals(action, expected, MetadataUpdateParser.fromJson(json));
   }
 
@@ -431,7 +431,7 @@ public void testRemoveSnapshotToJson() {
     String action = MetadataUpdateParser.REMOVE_SNAPSHOTS;
     long snapshotId = 2L;
     String expected = String.format("{\"action\":\"%s\",\"snapshot-ids\":[2]}", action);
-    MetadataUpdate update = new MetadataUpdate.RemoveSnapshot(snapshotId);
+    MetadataUpdate update = new MetadataUpdate.RemoveSnapshots(snapshotId);
     String actual = MetadataUpdateParser.toJson(update);
     assertThat(actual)
         .as("Remove snapshots should serialize to the correct JSON value")
@@ -1030,15 +1030,9 @@ public void assertEquals(
             (MetadataUpdate.AddSnapshot) expectedUpdate, (MetadataUpdate.AddSnapshot) actualUpdate);
         break;
       case MetadataUpdateParser.REMOVE_SNAPSHOTS:
-        if (actualUpdate instanceof MetadataUpdate.RemoveSnapshot) {
-          assertEqualsRemoveSnapshot(
-              (MetadataUpdate.RemoveSnapshot) expectedUpdate,
-              (MetadataUpdate.RemoveSnapshot) actualUpdate);
-        } else {
-          assertEqualsRemoveSnapshots(
-              (MetadataUpdate.RemoveSnapshots) expectedUpdate,
-              (MetadataUpdate.RemoveSnapshots) actualUpdate);
-        }
+        assertEqualsRemoveSnapshot(
+            (MetadataUpdate.RemoveSnapshots) expectedUpdate,
+            (MetadataUpdate.RemoveSnapshots) actualUpdate);
         break;
       case MetadataUpdateParser.REMOVE_SNAPSHOT_REF:
         assertEqualsRemoveSnapshotRef(
@@ -1240,10 +1234,10 @@ private static void assertEqualsAddSnapshot(
   }
 
   private static void assertEqualsRemoveSnapshot(
-      MetadataUpdate.RemoveSnapshot expected, MetadataUpdate.RemoveSnapshot actual) {
-    assertThat(actual.snapshotId())
+      MetadataUpdate.RemoveSnapshots expected, MetadataUpdate.RemoveSnapshots actual) {
+    assertThat(actual.snapshotIds())
         .as("Snapshot to remove should be the same")
-        .isEqualTo(expected.snapshotId());
+        .isEqualTo(expected.snapshotIds());
   }
 
   private static void assertEqualsRemoveSnapshots(

core/src/test/java/org/apache/iceberg/TestUpdateRequirements.java

@@ -704,7 +704,7 @@ public void addAndRemoveSnapshot() {
 
     requirements =
         UpdateRequirements.forUpdateTable(
-            metadata, ImmutableList.of(new MetadataUpdate.RemoveSnapshot(0L)));
+            metadata, ImmutableList.of(new MetadataUpdate.RemoveSnapshots(0L)));
 
     assertThat(requirements)
         .hasSize(1)

core/src/test/java/org/apache/iceberg/rest/requests/TestCommitTransactionRequestParser.java

@@ -97,7 +97,7 @@ public void roundTripSerde() {
                 new UpdateRequirement.AssertDefaultSpecID(4),
                 new UpdateRequirement.AssertCurrentSchemaID(24)),
             ImmutableList.of(
-                new MetadataUpdate.RemoveSnapshot(101L), new MetadataUpdate.SetCurrentSchema(25)));
+                new MetadataUpdate.RemoveSnapshots(101L), new MetadataUpdate.SetCurrentSchema(25)));
 
     CommitTransactionRequest request =
         new CommitTransactionRequest(