Skip to content

Add support for DECIMAL logical type in fixed-length byte arrays when parsing Parquet files #6369

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
san81 merged 1 commit into from
Jan 15, 2026
Merged

Add support for DECIMAL logical type in fixed-length byte arrays when parsing Parquet files #6369

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
22 changes: 19 additions & 3 deletions .../main/java/org/opensearch/dataprepper/plugins/codec/parquet/GenericRecordJsonEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.avro.generic.GenericContainer;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericEnumSymbol;
import org.apache.avro.generic.GenericFixed;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.IndexedRecord;
import org.apache.commons.text.StringEscapeUtils;
Expand Down Expand Up @@ -84,8 +85,8 @@ private void serialize(final Object datum, final StringBuilder buffer,
if (fieldSchema.getType() == Schema.Type.UNION) {
for (Schema s : fieldSchema.getTypes()) {
if (s.getType() != Schema.Type.NULL) {
if (s.getType() == Schema.Type.BYTES &&
s.getLogicalType() instanceof LogicalTypes.Decimal) {
if ((s.getType() == Schema.Type.BYTES || s.getType() == Schema.Type.FIXED)
&& s.getLogicalType() instanceof LogicalTypes.Decimal) {
serialize(logicalTypeConverter.apply(getField(datum, f.name(), f.pos())), buffer, seenObjects, ((LogicalTypes.Decimal) s.getLogicalType()).getScale());
serializedDecimal = true;
break;
Expand Down Expand Up @@ -172,7 +173,22 @@ private void serialize(final Object datum, final StringBuilder buffer,
buffer.append("\"");
buffer.append(datum);
buffer.append("\"");
} else if (datum instanceof GenericData) {
} else if (datum instanceof GenericFixed ) {
GenericFixed fixed = (GenericFixed) datum;
byte[] bytes = fixed.bytes();
if (decimalScale != null) {
BigInteger unscaledValue = new BigInteger(bytes);
BigDecimal decimal = new BigDecimal(unscaledValue, decimalScale);
buffer.append(decimal.toString());
}
//Fallback mechanism
else {
buffer.append("{\"bytes\": \"");
writeEscapedString(new String(bytes, StandardCharsets.ISO_8859_1), buffer);
buffer.append("\"}");
}
}
else if (datum instanceof GenericData) {
if (seenObjects.containsKey(datum)) {
buffer.append(TOSTRING_CIRCULAR_REFERENCE_ERROR_TEXT);
return;
Expand Down
65 changes: 65 additions & 0 deletions ...t/java/org/opensearch/dataprepper/plugins/codec/parquet/GenericRecordJsonEncoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,69 @@ void serialize_WithNullDecimalLogicalType_ReturnsNull() {
assertEquals("{\"amount\": null}", json);
}

@Test
void serialize_WithFixedDecimalLogicalType_UsesScaleFromSchema() {
BigDecimal value = new BigDecimal("12.34").setScale(2);
byte[] decimalBytes = value.unscaledValue().toByteArray();

Schema decimalSchema = new Schema.Parser().parse(
"{ \"type\": \"record\", \"name\": \"DecimalRecord\", \"fields\": [" +
"{\"name\": \"amount\", \"type\": [\"null\", {\"type\":\"fixed\",\"size\":" + decimalBytes.length +
",\"name\":\"DecimalFixed\",\"logicalType\":\"decimal\",\"precision\":4,\"scale\":2}]}" +
"] }"
);

GenericRecord record = new GenericData.Record(decimalSchema);

Schema fixedSchema = decimalSchema.getField("amount").schema().getTypes().get(1);
GenericData.Fixed fixedValue = new GenericData.Fixed(fixedSchema, decimalBytes);
record.put("amount", fixedValue);

String json = encoder.serialize(record);

assertEquals("{\"amount\": 12.34}", json);
}

@Test
void serialize_WithNonNullableFixedDecimalLogicalType_UsesScaleFromSchema() {
BigDecimal value = new BigDecimal("12.3456").setScale(4);
byte[] decimalBytes = value.unscaledValue().toByteArray();

Schema decimalSchema = new Schema.Parser().parse(
"{ \"type\": \"record\", \"name\": \"DecimalRecord\", \"fields\": [" +
"{\"name\": \"amount\", \"type\": {\"type\":\"fixed\",\"size\":" + decimalBytes.length +
",\"name\":\"DecimalFixed\",\"logicalType\":\"decimal\",\"precision\":6,\"scale\":4}}" +
"] }"
);

GenericRecord record = new GenericData.Record(decimalSchema);

Schema fixedSchema = decimalSchema.getField("amount").schema();
GenericData.Fixed fixedValue = new GenericData.Fixed(fixedSchema, decimalBytes);
record.put("amount", fixedValue);

String json = encoder.serialize(record);

assertEquals("{\"amount\": 12.3456}", json);
}

@Test
void serialize_WithNonDecimalFixedType_ReturnsEscapedString() {
byte[] tokenBytes = new byte[] { 34, 92, 13, 10, 9};
Schema tokenSchema = new Schema.Parser().parse(
"{ \"type\": \"record\", \"name\": \"MyRecord\", \"fields\": [" +
"{\"name\": \"token\", \"type\": {\"type\":\"fixed\",\"name\":\"TokenFixed\",\"size\":5}}" +
"] }"
);

GenericRecord record = new GenericData.Record(tokenSchema);

Schema fixedSchema = tokenSchema.getField("token").schema();
GenericData.Fixed fixedValue = new GenericData.Fixed(fixedSchema, tokenBytes);
record.put("token", fixedValue);

String json = encoder.serialize(record);

assertEquals("{\"token\": {\"bytes\": \"\\\"\\\\\\r\\n\\t\"}}", json);
}
}
Loading