Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions arrow-schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ all-features = true
criterion = { workspace = true, default-features = false }
insta = { workspace = true, default-features = true }
postcard = { version = "1.0.10", default-features = false, features = ["use-std"] }
serde_json = "1.0"

[[bench]]
name = "ffi"
Expand Down
51 changes: 50 additions & 1 deletion arrow-schema/src/fields.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,23 @@ impl<'a> IntoIterator for &'a Fields {
/// - All type ids are unique
/// - All type ids are non-negative
#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
#[cfg_attr(feature = "serde", serde(transparent))]
pub struct UnionFields(Arc<[(i8, FieldRef)]>);

// Manual implementation to enforce invariants per docstring above
#[cfg(feature = "serde")]
impl<'de> serde::Deserialize<'de> for UnionFields {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
let entries = Vec::<(i8, FieldRef)>::deserialize(deserializer)?;
let (type_ids, fields): (Vec<i8>, Vec<FieldRef>) = entries.into_iter().unzip();
Self::try_new(type_ids, fields).map_err(serde::de::Error::custom)
}
}

impl std::fmt::Debug for UnionFields {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.0.as_ref().fmt(f)
Expand Down Expand Up @@ -1058,6 +1071,42 @@ mod tests {
assert_eq!(res.unwrap().len(), 3);
}

#[cfg(feature = "serde")]
#[test]
fn test_union_fields_serde_round_trip() {
let fields = UnionFields::try_new(
vec![1, 3],
vec![
Field::new("a", DataType::Int32, true),
Field::new("b", DataType::Utf8, true),
],
)
.unwrap();
let serialized = postcard::to_stdvec(&fields).unwrap();
let deserialized: UnionFields = postcard::from_bytes(&serialized).unwrap();
assert_eq!(fields, deserialized);
}

#[cfg(feature = "serde")]
#[test]
fn test_union_fields_deserialize_should_validate() {
let field = Arc::new(Field::new("a", DataType::Int32, true));

let duplicate: Vec<(i8, FieldRef)> = vec![(1, Arc::clone(&field)), (1, Arc::clone(&field))];
let serialized = serde_json::to_string(&duplicate).unwrap();
let err = serde_json::from_str::<UnionFields>(&serialized).unwrap_err();
assert!(err.to_string().contains("duplicate type id: 1"), "{err}");

let negative: Vec<(i8, FieldRef)> = vec![(0, Arc::clone(&field)), (-1, field)];
let serialized = serde_json::to_string(&negative).unwrap();
let err = serde_json::from_str::<UnionFields>(&serialized).unwrap_err();
assert!(
err.to_string()
.contains("type ids must be non-negative: -1"),
"{err}"
);
}

#[test]
#[should_panic(
expected = "invalid arguments passed: InvalidArgumentError(\"type ids must be non-negative: -1\")"
Expand Down
Loading