Skip to content

Core: Serialize statistics files in TableMetadata #5799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdblue merged 1 commit into from
Sep 21, 2022
Merged

Core: Serialize statistics files in TableMetadata #5799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions core/src/main/java/org/apache/iceberg/TableMetadataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public static String toJson(TableMetadata metadata) {
}
}

@SuppressWarnings("checkstyle:CyclomaticComplexity")
public static void toJson(TableMetadata metadata, JsonGenerator generator) throws IOException {
generator.writeStartObject();

Expand Down Expand Up @@ -225,6 +226,12 @@ public static void toJson(TableMetadata metadata, JsonGenerator generator) throw
}
generator.writeEndArray();

generator.writeArrayFieldStart(STATISTICS);
Copy link
Contributor

@rdblue rdblue Sep 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add deserialization? Generally when we update a parser we want to update both.

Copy link
Member Author

@findepi findepi Sep 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deserialization already exists.

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

Line 466 in fca6101

statisticsFiles = statisticsFilesFromJson(node.get(STATISTICS));

Was added in #5450

The fact serialization was not covered was an omission.

for (StatisticsFile statisticsFile : metadata.statisticsFiles()) {
StatisticsFileParser.toJson(statisticsFile, generator);
}
generator.writeEndArray();

generator.writeArrayFieldStart(SNAPSHOT_LOG);
for (HistoryEntry logEntry : metadata.snapshotLog()) {
generator.writeStartObject();
Expand Down
15 changes: 14 additions & 1 deletion core/src/test/java/org/apache/iceberg/TestTableMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,17 @@ public void testJsonConversion() throws Exception {
"previous", SnapshotRef.tagBuilder(previousSnapshotId).build(),
"test", SnapshotRef.branchBuilder(previousSnapshotId).build());

List<StatisticsFile> statisticsFiles =
ImmutableList.of(
new GenericStatisticsFile(
11L,
"/some/stats/file.puffin",
100,
42,
ImmutableList.of(
new GenericBlobMetadata(
"some-stats", 11L, 2, ImmutableList.of(4), ImmutableMap.of()))));

TableMetadata expected =
new TableMetadata(
null,
Expand All @@ -155,7 +166,7 @@ public void testJsonConversion() throws Exception {
snapshotLog,
ImmutableList.of(),
refs,
ImmutableList.of(),
statisticsFiles,
ImmutableList.of());

String asJson = TableMetadataParser.toJson(expected);
Expand Down Expand Up @@ -220,6 +231,8 @@ public void testJsonConversion() throws Exception {
Assert.assertNull(
"Previous snapshot's schema ID should be null",
metadata.snapshot(previousSnapshotId).schemaId());
Assert.assertEquals(
"Statistics files should match", statisticsFiles, metadata.statisticsFiles());
Assert.assertEquals("Refs map should match", refs, metadata.refs());
}

Expand Down