Skip to content
Merged
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
31 changes: 26 additions & 5 deletions arrow-schema/src/extension/canonical/uuid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,14 @@ impl ExtensionType for Uuid {
fn deserialize_metadata(metadata: Option<&str>) -> Result<Self::Metadata, ArrowError> {
metadata.map_or_else(
|| Ok(()),
|_| {
Err(ArrowError::InvalidArgumentError(
"Uuid extension type expects no metadata".to_owned(),
))
|v| {
if !v.is_empty() {
Err(ArrowError::InvalidArgumentError(
"Uuid extension type expects no metadata".to_owned(),
))
} else {
Ok(())
}
},
)
}
Expand Down Expand Up @@ -122,11 +126,28 @@ mod tests {
let field = Field::new("", DataType::FixedSizeBinary(16), false).with_metadata(
[
(EXTENSION_TYPE_NAME_KEY.to_owned(), Uuid::NAME.to_owned()),
(EXTENSION_TYPE_METADATA_KEY.to_owned(), "".to_owned()),
(
EXTENSION_TYPE_METADATA_KEY.to_owned(),
"unexpected".to_owned(),
),
]
.into_iter()
.collect(),
);
field.extension_type::<Uuid>();
}

#[test]
fn empty_metadata_string_is_treated_as_none() -> Result<(), ArrowError> {
let field = Field::new("", DataType::FixedSizeBinary(16), false).with_metadata(
[
(EXTENSION_TYPE_NAME_KEY.to_owned(), Uuid::NAME.to_owned()),
(EXTENSION_TYPE_METADATA_KEY.to_owned(), "".to_owned()),
]
.into_iter()
.collect(),
);
field.try_extension_type::<Uuid>()?;
Ok(())
}
}
Loading