add constraint to fromJson, summary map must have operation key

apache · Oct 19, 2024 · 27beb98 · 27beb98
1 parent 86be2da
commit 27beb98
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/core/src/main/java/org/apache/iceberg/SnapshotParser.java b/core/src/main/java/org/apache/iceberg/SnapshotParser.java
@@ -142,6 +142,9 @@ static Snapshot fromJson(JsonNode node) {
         }
       }
       summary = builder.build();
+      Preconditions.checkArgument(
+        operation != null, 
+        "Operation must be present in summary if summary exists");
     }
 
     Integer schemaId = JsonUtil.getIntOrNull(SCHEMA_ID, node);

diff --git a/core/src/test/java/org/apache/iceberg/TestSnapshotJson.java b/core/src/test/java/org/apache/iceberg/TestSnapshotJson.java
@@ -20,6 +20,8 @@
 
 import static org.apache.iceberg.Files.localInput;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.io.IOException;
@@ -212,6 +214,31 @@ public void testJsonConversionWithV1Manifests() {
     assertThat(snapshot.schemaId()).isEqualTo(expected.schemaId());
   }
 
+  @Test
+  public void testJsonConversionSummaryWithoutOperationFails() {
+    // summary field without operation key should fail
+    String json =
+        String.format(
+            "{\n"
+                + "  \"snapshot-id\" : 2,\n"
+                + "  \"parent-snapshot-id\" : 1,\n"
+                + "  \"timestamp-ms\" : %s,\n"
+                + "  \"summary\" : {\n"
+                + "    \"files-added\" : \"4\",\n"
+                + "    \"files-deleted\" : \"100\"\n"
+                + "  },\n"
+                + "  \"manifests\" : [ \"/tmp/manifest1.avro\", \"/tmp/manifest2.avro\" ],\n"
+                + "  \"schema-id\" : 3\n"
+                + "}",
+                System.currentTimeMillis());
+
+    IllegalArgumentException exception = assertThrows(
+        IllegalArgumentException.class, 
+        () -> SnapshotParser.fromJson(json)
+    );
+    assertEquals("Operation must be present in summary if summary exists", exception.getMessage());
+  }
+
   private String createManifestListWithManifestFiles(long snapshotId, Long parentSnapshotId)
       throws IOException {
     File manifestList = File.createTempFile("manifests", null, temp.toFile());