Skip to content
Open
Changes from all commits
Commits
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
77 changes: 77 additions & 0 deletions avro/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,20 @@ impl Value {
Ok(Value::Decimal(Decimal::from(bytes)))
}
}
// JSON string defaults per spec §Records: codepoints 0-255
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The comment talks about the field's default but the match arm would be used for any String->Decimal resolve.

Most probably we will need to update the error message for

#[error("Expected Value::Decimal, Value::Bytes or Value::Fixed, got: {0:?}")]

// map to byte values 0-255. No precision check — defaults
// need only be valid `bytes`, not fit the declared precision.
Value::String(s) => {
let mut bytes = Vec::with_capacity(s.len());
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
let mut bytes = Vec::with_capacity(s.len());
let mut bytes = Vec::with_capacity(s.chars().count());

for c in s.chars() {
let cp = c as u32;
if cp > 0xFF {
return Err(Details::ResolveDecimal(Value::String(s)).into());
}
bytes.push(cp as u8);
}
Ok(Value::Decimal(Decimal::from(bytes)))
}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit: Let's use the functional style:

Value::String(s) => {
    let bytes = s.chars()
        .map(|c| {
            let cp = c as u32;
            if cp > 0xFF {
                Err(Details::ResolveDecimal(Value::String(s.clone())).into())
            } else {
                Ok(cp as u8)
            }
        })
        .collect::<Result<Vec<u8>, Error>>()?;
    Ok(Value::Decimal(Decimal::from(bytes)))
}

other => Err(Details::ResolveDecimal(other).into()),
}
}
Expand Down Expand Up @@ -1776,6 +1790,69 @@ Field with name '"b"' is not a member of the map items"#,
Ok(())
}

#[test]
fn resolve_decimal_from_string_default() -> TestResult {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
fn resolve_decimal_from_string_default() -> TestResult {
fn avro_rs_533_resolve_decimal_from_string_default() -> TestResult {

let value = Value::String("\u{0000}".to_string());
let resolved = value.resolve(&Schema::Decimal(DecimalSchema {
precision: 10,
scale: 4,
inner: InnerDecimalSchema::Bytes,
}))?;
assert_eq!(resolved, Value::Decimal(Decimal::from(vec![0u8])));

let mut all_bytes_str = String::new();
for b in 0u8..=255u8 {
all_bytes_str.push(char::from_u32(b as u32).unwrap());
}
let resolved = Value::String(all_bytes_str).resolve(&Schema::Decimal(DecimalSchema {
precision: 10,
scale: 0,
inner: InnerDecimalSchema::Bytes,
}))?;
assert_eq!(
resolved,
Value::Decimal(Decimal::from((0u8..=255u8).collect::<Vec<_>>()))
);

let value = Value::String("\u{0100}".to_string());
assert!(
value
.resolve(&Schema::Decimal(DecimalSchema {
precision: 10,
scale: 4,
inner: InnerDecimalSchema::Bytes,
}))
.is_err()
);

Ok(())
}

#[test]
fn parse_schema_with_nullable_decimal_string_default() -> TestResult {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
fn parse_schema_with_nullable_decimal_string_default() -> TestResult {
fn avro_rs_533_parse_schema_with_nullable_decimal_string_default() -> TestResult {

let schema_json = r#"{
"type": "record",
"name": "NullableDecimal",
"fields": [
{
"name": "amount",
"type": [
{
"type": "bytes",
"scale": 4,
"precision": 10,
"logicalType": "decimal"
},
"null"
],
"default": "\u0000"
}
]
}"#;
Schema::parse_str(schema_json)?;
Ok(())
}

#[test]
fn resolve_decimal_invalid_scale() {
let value = Value::Decimal(Decimal::from(vec![1, 2]));
Expand Down
Loading