rdblue commented on code in PR #11369:
URL: https://github.com/apache/iceberg/pull/11369#discussion_r1925973465
##########
core/src/main/java/org/apache/iceberg/ContentFileParser.java:
##########
@@ -48,6 +48,97 @@ class ContentFileParser {
private ContentFileParser() {}
+ public static void unboundContentFileToJson(
+ ContentFile<?> contentFile, PartitionSpec spec, JsonGenerator generator)
throws IOException {
+ Preconditions.checkArgument(contentFile != null, "Invalid content file:
null");
+ Preconditions.checkArgument(spec != null, "Invalid partition spec: null");
+ Preconditions.checkArgument(generator != null, "Invalid JSON generator:
null");
+ Preconditions.checkArgument(
+ contentFile.specId() == spec.specId(),
+ "Invalid partition spec id from content file: expected = %s, actual =
%s",
+ spec.specId(),
+ contentFile.specId());
+
+ generator.writeStartObject();
+ // ignore the ordinal position (ContentFile#pos) of the file in a manifest,
+ // as it isn't used and BaseFile constructor doesn't support it.
+
+ generator.writeNumberField(SPEC_ID, contentFile.specId());
+ generator.writeStringField(CONTENT, contentFile.content().name());
+ generator.writeStringField(FILE_PATH, contentFile.path().toString());
+ generator.writeStringField(FILE_FORMAT, contentFile.format().name());
+
+ if (contentFile.partition() != null) {
+ generator.writeFieldName(PARTITION);
+ SingleValueParser.toJson(spec.partitionType(), contentFile.partition(),
generator);
+ }
+
+ generator.writeNumberField(FILE_SIZE, contentFile.fileSizeInBytes());
+
+ metricsToJson(contentFile, generator);
+
+ if (contentFile.keyMetadata() != null) {
+ generator.writeFieldName(KEY_METADATA);
+ SingleValueParser.toJson(DataFile.KEY_METADATA.type(),
contentFile.keyMetadata(), generator);
+ }
+
+ if (contentFile.splitOffsets() != null) {
+ JsonUtil.writeLongArray(SPLIT_OFFSETS, contentFile.splitOffsets(),
generator);
+ }
+
+ if (contentFile.equalityFieldIds() != null) {
+ JsonUtil.writeIntegerArray(EQUALITY_IDS, contentFile.equalityFieldIds(),
generator);
+ }
+
+ if (contentFile.sortOrderId() != null) {
+ generator.writeNumberField(SORT_ORDER_ID, contentFile.sortOrderId());
+ }
+
+ generator.writeEndObject();
+ }
+
+ public static ContentFile<?> unboundContentFileFromJson(JsonNode jsonNode) {
+ Preconditions.checkArgument(jsonNode != null, "Invalid JSON node for
content file: null");
+
+ int specId = JsonUtil.getInt(SPEC_ID, jsonNode);
+ FileContent fileContent = FileContent.valueOf(JsonUtil.getString(CONTENT,
jsonNode));
+ String filePath = JsonUtil.getString(FILE_PATH, jsonNode);
+ FileFormat fileFormat =
FileFormat.fromString(JsonUtil.getString(FILE_FORMAT, jsonNode));
+
+ long fileSizeInBytes = JsonUtil.getLong(FILE_SIZE, jsonNode);
+ Metrics metrics = metricsFromJson(jsonNode);
+ ByteBuffer keyMetadata = JsonUtil.getByteBufferOrNull(KEY_METADATA,
jsonNode);
Review Comment:
This doesn't match the write side, which uses `SingleValueParser`. Can you
also use `SingleValueParser` here? Or use `JsonUtil` above?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
