You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by mg...@apache.org on 2022/02/01 11:51:31 UTC
[avro] 16/30: AVRO-3232: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git
commit 5d1e525ef00f84d28929633e4400b356a74f1000
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Jan 7 16:11:09 2022 +0200
AVRO-3232: Fix formatting
Issue #1368
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
(cherry picked from commit c0bfb88abebff7ec754c20b7797cbbe6a548495b)
---
lang/rust/src/de.rs | 132 +++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 104 insertions(+), 28 deletions(-)
diff --git a/lang/rust/src/de.rs b/lang/rust/src/de.rs
index 4593a5d..6d89686 100644
--- a/lang/rust/src/de.rs
+++ b/lang/rust/src/de.rs
@@ -264,7 +264,10 @@ impl<'a, 'de> de::Deserializer<'de> for &'a Deserializer<'de> {
Value::Array(ref fields) => visitor.visit_seq(SeqDeserializer::new(fields)),
Value::String(ref s) => visitor.visit_str(s),
Value::Map(ref items) => visitor.visit_map(MapDeserializer::new(items)),
- _ => Err(de::Error::custom(format!("unsupported union: {:?}", self.input))),
+ _ => Err(de::Error::custom(format!(
+ "unsupported union: {:?}",
+ self.input
+ ))),
},
Value::Record(ref fields) => visitor.visit_map(StructDeserializer::new(fields)),
Value::Array(ref fields) => visitor.visit_seq(SeqDeserializer::new(fields)),
@@ -931,44 +934,117 @@ mod tests {
("time_micros_a".to_string(), 123),
("timestamp_millis_b".to_string(), 234),
("timestamp_micros_c".to_string(), 345),
- ].iter().cloned().collect();
+ ]
+ .iter()
+ .cloned()
+ .collect();
- let value_map = raw_map.iter()
+ let value_map = raw_map
+ .iter()
.map(|(k, v)| match k {
- key if key.starts_with("long_") => {(k.clone(), Value::Long(*v))}
- key if key.starts_with("time_micros_") => {(k.clone(), Value::TimeMicros(*v))}
- key if key.starts_with("timestamp_millis_") => {(k.clone(), Value::TimestampMillis(*v))}
- key if key.starts_with("timestamp_micros_") => {(k.clone(), Value::TimestampMicros(*v))}
- _ => unreachable!(""),
+ key if key.starts_with("long_") => (k.clone(), Value::Long(*v)),
+ key if key.starts_with("time_micros_") => (k.clone(), Value::TimeMicros(*v)),
+ key if key.starts_with("timestamp_millis_") => {
+ (k.clone(), Value::TimestampMillis(*v))
+ }
+ key if key.starts_with("timestamp_micros_") => {
+ (k.clone(), Value::TimestampMicros(*v))
+ }
+ _ => unreachable!("unexpected key: {:?}", k),
})
.collect();
let record = Value::Record(vec![
- ("a_string".to_string(), Value::String("a valid message field".to_string())),
- ("a_non_existing_string".to_string(), Value::String("a string".to_string())),
- ("a_union_string".to_string(), Value::Union(Box::new(Value::String("a union string".to_string())))),
- ("a_union_long".to_string(), Value::Union(Box::new(Value::Long(412)))),
- ("a_union_long".to_string(), Value::Union(Box::new(Value::Long(412)))),
- ("a_time_micros".to_string(), Value::Union(Box::new(Value::TimeMicros(123)))),
- ("a_non_existing_time_micros".to_string(), Value::Union(Box::new(Value::TimeMicros(-123)))),
- ("a_timestamp_millis".to_string(), Value::Union(Box::new(Value::TimestampMillis(234)))),
- ("a_non_existing_timestamp_millis".to_string(), Value::Union(Box::new(Value::TimestampMillis(-234)))),
- ("a_timestamp_micros".to_string(), Value::Union(Box::new(Value::TimestampMicros(345)))),
- ("a_non_existing_timestamp_micros".to_string(), Value::Union(Box::new(Value::TimestampMicros(-345)))),
- ("a_record".to_string(), Value::Union(Box::new(Value::Record(vec!(("record_in_union".to_string(), Value::Int(-2))))))),
- ("a_non_existing_record".to_string(), Value::Union(Box::new(Value::Record(vec!(("blah".to_string(), Value::Int(-22))))))),
- ("an_array".to_string(), Value::Union(Box::new(Value::Array(vec!(Value::Boolean(true), Value::Boolean(false)))))),
- ("a_non_existing_array".to_string(), Value::Union(Box::new(Value::Array(vec!(Value::Boolean(false), Value::Boolean(true)))))),
- ("a_union_map".to_string(), Value::Union(Box::new(Value::Map(value_map)))),
- ("a_non_existing_union_map".to_string(), Value::Union(Box::new(Value::Map(HashMap::new())))),
+ (
+ "a_string".to_string(),
+ Value::String("a valid message field".to_string()),
+ ),
+ (
+ "a_non_existing_string".to_string(),
+ Value::String("a string".to_string()),
+ ),
+ (
+ "a_union_string".to_string(),
+ Value::Union(Box::new(Value::String("a union string".to_string()))),
+ ),
+ (
+ "a_union_long".to_string(),
+ Value::Union(Box::new(Value::Long(412))),
+ ),
+ (
+ "a_union_long".to_string(),
+ Value::Union(Box::new(Value::Long(412))),
+ ),
+ (
+ "a_time_micros".to_string(),
+ Value::Union(Box::new(Value::TimeMicros(123))),
+ ),
+ (
+ "a_non_existing_time_micros".to_string(),
+ Value::Union(Box::new(Value::TimeMicros(-123))),
+ ),
+ (
+ "a_timestamp_millis".to_string(),
+ Value::Union(Box::new(Value::TimestampMillis(234))),
+ ),
+ (
+ "a_non_existing_timestamp_millis".to_string(),
+ Value::Union(Box::new(Value::TimestampMillis(-234))),
+ ),
+ (
+ "a_timestamp_micros".to_string(),
+ Value::Union(Box::new(Value::TimestampMicros(345))),
+ ),
+ (
+ "a_non_existing_timestamp_micros".to_string(),
+ Value::Union(Box::new(Value::TimestampMicros(-345))),
+ ),
+ (
+ "a_record".to_string(),
+ Value::Union(Box::new(Value::Record(vec![(
+ "record_in_union".to_string(),
+ Value::Int(-2),
+ )]))),
+ ),
+ (
+ "a_non_existing_record".to_string(),
+ Value::Union(Box::new(Value::Record(vec![(
+ "blah".to_string(),
+ Value::Int(-22),
+ )]))),
+ ),
+ (
+ "an_array".to_string(),
+ Value::Union(Box::new(Value::Array(vec![
+ Value::Boolean(true),
+ Value::Boolean(false),
+ ]))),
+ ),
+ (
+ "a_non_existing_array".to_string(),
+ Value::Union(Box::new(Value::Array(vec![
+ Value::Boolean(false),
+ Value::Boolean(true),
+ ]))),
+ ),
+ (
+ "a_union_map".to_string(),
+ Value::Union(Box::new(Value::Map(value_map))),
+ ),
+ (
+ "a_non_existing_union_map".to_string(),
+ Value::Union(Box::new(Value::Map(HashMap::new()))),
+ ),
]);
let deserialized: StructWithMissingFields = crate::from_value(&record)?;
- let reference = StructWithMissingFields{
+ let reference = StructWithMissingFields {
a_string: "a valid message field".to_string(),
- a_record: Some(RecordInUnion { record_in_union: -2 }),
+ a_record: Some(RecordInUnion {
+ record_in_union: -2,
+ }),
an_array: Some([true, false]),
- a_union_map: Some(raw_map)
+ a_union_map: Some(raw_map),
};
assert_eq!(deserialized, reference);
Ok(())