You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by dw...@apache.org on 2023/04/04 17:37:51 UTC
[iceberg] 01/06: Core: Parse snapshot-id as long in remove-statistics update (#7235)
This is an automated email from the ASF dual-hosted git repository.
dweeks pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/iceberg.git
commit 527e8da6a09799a72dd510f226b1f91093e7fcae
Author: Eduard Tudenhöfner <et...@gmail.com>
AuthorDate: Thu Mar 30 17:10:54 2023 +0200
Core: Parse snapshot-id as long in remove-statistics update (#7235)
---
.../org/apache/iceberg/MetadataUpdateParser.java | 2 +-
.../apache/iceberg/TestMetadataUpdateParser.java | 22 ++++++++++++----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/core/src/main/java/org/apache/iceberg/MetadataUpdateParser.java b/core/src/main/java/org/apache/iceberg/MetadataUpdateParser.java
index 16bc5e685d..1ecf40cc40 100644
--- a/core/src/main/java/org/apache/iceberg/MetadataUpdateParser.java
+++ b/core/src/main/java/org/apache/iceberg/MetadataUpdateParser.java
@@ -436,7 +436,7 @@ public class MetadataUpdateParser {
}
private static MetadataUpdate readRemoveStatistics(JsonNode node) {
- int snapshotId = JsonUtil.getInt(SNAPSHOT_ID, node);
+ long snapshotId = JsonUtil.getLong(SNAPSHOT_ID, node);
return new MetadataUpdate.RemoveStatistics(snapshotId);
}
diff --git a/core/src/test/java/org/apache/iceberg/TestMetadataUpdateParser.java b/core/src/test/java/org/apache/iceberg/TestMetadataUpdateParser.java
index 80faccc5f2..c6baead8a7 100644
--- a/core/src/test/java/org/apache/iceberg/TestMetadataUpdateParser.java
+++ b/core/src/test/java/org/apache/iceberg/TestMetadataUpdateParser.java
@@ -773,24 +773,26 @@ public class TestMetadataUpdateParser {
@Test
public void testSetStatistics() {
String json =
- "{\"action\":\"set-statistics\",\"snapshot-id\":42,\"statistics\":{\"snapshot-id\":42,"
+ "{\"action\":\"set-statistics\",\"snapshot-id\":1940541653261589030,\"statistics\":{\"snapshot-id\":1940541653261589030,"
+ "\"statistics-path\":\"s3://bucket/warehouse/stats.puffin\",\"file-size-in-bytes\":124,"
+ "\"file-footer-size-in-bytes\":27,\"blob-metadata\":[{\"type\":\"boring-type\","
- + "\"snapshot-id\":42,\"sequence-number\":2,\"fields\":[1],"
+ + "\"snapshot-id\":1940541653261589030,\"sequence-number\":2,\"fields\":[1],"
+ "\"properties\":{\"prop-key\":\"prop-value\"}}]}}";
+
+ long snapshotId = 1940541653261589030L;
MetadataUpdate expected =
new MetadataUpdate.SetStatistics(
- 42,
+ snapshotId,
new GenericStatisticsFile(
- 42,
+ snapshotId,
"s3://bucket/warehouse/stats.puffin",
- 124,
- 27,
+ 124L,
+ 27L,
ImmutableList.of(
new GenericBlobMetadata(
"boring-type",
- 42,
- 2,
+ snapshotId,
+ 2L,
ImmutableList.of(1),
ImmutableMap.of("prop-key", "prop-value")))));
assertEquals(
@@ -803,8 +805,8 @@ public class TestMetadataUpdateParser {
@Test
public void testRemoveStatistics() {
- String json = "{\"action\":\"remove-statistics\",\"snapshot-id\":42}";
- MetadataUpdate expected = new MetadataUpdate.RemoveStatistics(42);
+ String json = "{\"action\":\"remove-statistics\",\"snapshot-id\":1940541653261589030}";
+ MetadataUpdate expected = new MetadataUpdate.RemoveStatistics(1940541653261589030L);
assertEquals(
MetadataUpdateParser.REMOVE_STATISTICS, expected, MetadataUpdateParser.fromJson(json));
Assert.assertEquals(