This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/main by this push:
new d6837ed87 AVRO-3886: [Rust] Serialize attribute in schema to support
custom logical type (#2557)
d6837ed87 is described below
commit d6837ed8782331fd714ef65b269f77813c1f42a7
Author: ZENOTME <[email protected]>
AuthorDate: Wed Oct 18 15:55:26 2023 +0800
AVRO-3886: [Rust] Serialize attribute in schema to support custom logical
type (#2557)
* AVRO-3886: serialize attribute in schema to support custom logical type
* AVRO-3886: [Rust] Use all kinds of JSON values for the attributes to
serialize
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
---------
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
Co-authored-by: ZENOTME <[email protected]>
Co-authored-by: Martin Tzvetanov Grigorov <[email protected]>
---
lang/rust/avro/src/schema.rs | 84 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 77 insertions(+), 7 deletions(-)
diff --git a/lang/rust/avro/src/schema.rs b/lang/rust/avro/src/schema.rs
index 0f49a5308..914efe10e 100644
--- a/lang/rust/avro/src/schema.rs
+++ b/lang/rust/avro/src/schema.rs
@@ -1620,9 +1620,8 @@ impl Parser {
}
}
- let name = Name::parse(complex, enclosing_namespace)?;
- let fully_qualified_name = name.clone();
- let aliases = fix_aliases_namespace(complex.aliases(),
&name.namespace);
+ let fully_qualified_name = Name::parse(complex, enclosing_namespace)?;
+ let aliases = fix_aliases_namespace(complex.aliases(),
&fully_qualified_name.namespace);
let symbols: Vec<String> = symbols_opt
.and_then(|v| v.as_array())
@@ -1753,9 +1752,8 @@ impl Parser {
None => Err(Error::GetFixedSizeField),
}?;
- let name = Name::parse(complex, enclosing_namespace)?;
- let fully_qualified_name = name.clone();
- let aliases = fix_aliases_namespace(complex.aliases(),
&name.namespace);
+ let fully_qualified_name = Name::parse(complex, enclosing_namespace)?;
+ let aliases = fix_aliases_namespace(complex.aliases(),
&fully_qualified_name.namespace);
let schema = Schema::Fixed(FixedSchema {
name: fully_qualified_name.clone(),
@@ -1845,6 +1843,7 @@ impl Serialize for Schema {
ref aliases,
ref doc,
ref fields,
+ ref attributes,
..
}) => {
let mut map = serializer.serialize_map(None)?;
@@ -1860,12 +1859,16 @@ impl Serialize for Schema {
map.serialize_entry("aliases", aliases)?;
}
map.serialize_entry("fields", fields)?;
+ for attr in attributes {
+ map.serialize_entry(attr.0, attr.1)?;
+ }
map.end()
}
Schema::Enum(EnumSchema {
ref name,
ref symbols,
ref aliases,
+ ref attributes,
..
}) => {
let mut map = serializer.serialize_map(None)?;
@@ -1879,6 +1882,9 @@ impl Serialize for Schema {
if let Some(ref aliases) = aliases {
map.serialize_entry("aliases", aliases)?;
}
+ for attr in attributes {
+ map.serialize_entry(attr.0, attr.1)?;
+ }
map.end()
}
Schema::Fixed(FixedSchema {
@@ -1886,7 +1892,7 @@ impl Serialize for Schema {
ref doc,
ref size,
ref aliases,
- ..
+ ref attributes,
}) => {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("type", "fixed")?;
@@ -1902,6 +1908,10 @@ impl Serialize for Schema {
if let Some(ref aliases) = aliases {
map.serialize_entry("aliases", aliases)?;
}
+
+ for attr in attributes {
+ map.serialize_entry(attr.0, attr.1)?;
+ }
map.end()
}
Schema::Decimal(DecimalSchema {
@@ -6125,4 +6135,64 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn avro_3886_serialize_attributes() -> TestResult {
+ let attributes = BTreeMap::from([
+ ("string_key".into(), "value".into()),
+ ("number_key".into(), 1.23.into()),
+ ("null_key".into(), Value::Null),
+ (
+ "array_key".into(),
+ Value::Array(vec![1.into(), 2.into(), 3.into()]),
+ ),
+ ("object_key".into(), Value::Object(Map::default())),
+ ]);
+
+ // Test serialize enum attributes
+ let schema = Schema::Enum(EnumSchema {
+ name: Name::new("a")?,
+ aliases: None,
+ doc: None,
+ symbols: vec![],
+ default: None,
+ attributes: attributes.clone(),
+ });
+ let serialized = serde_json::to_string(&schema)?;
+ assert_eq!(
+
r#"{"type":"enum","name":"a","symbols":[],"array_key":[1,2,3],"null_key":null,"number_key":1.23,"object_key":{},"string_key":"value"}"#,
+ &serialized
+ );
+
+ // Test serialize fixed custom_attributes
+ let schema = Schema::Fixed(FixedSchema {
+ name: Name::new("a")?,
+ aliases: None,
+ doc: None,
+ size: 1,
+ attributes: attributes.clone(),
+ });
+ let serialized = serde_json::to_string(&schema)?;
+ assert_eq!(
+
r#"{"type":"fixed","name":"a","size":1,"array_key":[1,2,3],"null_key":null,"number_key":1.23,"object_key":{},"string_key":"value"}"#,
+ &serialized
+ );
+
+ // Test serialize record custom_attributes
+ let schema = Schema::Record(RecordSchema {
+ name: Name::new("a")?,
+ aliases: None,
+ doc: None,
+ fields: vec![],
+ lookup: BTreeMap::new(),
+ attributes,
+ });
+ let serialized = serde_json::to_string(&schema)?;
+ assert_eq!(
+
r#"{"type":"record","name":"a","fields":[],"array_key":[1,2,3],"null_key":null,"number_key":1.23,"object_key":{},"string_key":"value"}"#,
+ &serialized
+ );
+
+ Ok(())
+ }
}
