address comments

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

Author: connortsui20

vortex-array/public-api.lock

@@ -7044,13 +7044,13 @@ pub type vortex_array::extension::uuid::Uuid::Metadata = vortex_array::extension
 
 pub type vortex_array::extension::uuid::Uuid::NativeValue<'a> = uuid::Uuid
 
-pub fn vortex_array::extension::uuid::Uuid::deserialize_metadata(&self, _metadata: &[u8]) -> vortex_error::VortexResult<Self::Metadata>
+pub fn vortex_array::extension::uuid::Uuid::deserialize_metadata(&self, metadata: &[u8]) -> vortex_error::VortexResult<Self::Metadata>
 
 pub fn vortex_array::extension::uuid::Uuid::id(&self) -> vortex_array::dtype::extension::ExtId
 
-pub fn vortex_array::extension::uuid::Uuid::serialize_metadata(&self, _metadata: &Self::Metadata) -> vortex_error::VortexResult<alloc::vec::Vec<u8>>
+pub fn vortex_array::extension::uuid::Uuid::serialize_metadata(&self, metadata: &Self::Metadata) -> vortex_error::VortexResult<alloc::vec::Vec<u8>>
 
-pub fn vortex_array::extension::uuid::Uuid::unpack_native<'a>(&self, _metadata: &'a Self::Metadata, _storage_dtype: &'a vortex_array::dtype::DType, storage_value: &'a vortex_array::scalar::ScalarValue) -> vortex_error::VortexResult<Self::NativeValue>
+pub fn vortex_array::extension::uuid::Uuid::unpack_native<'a>(&self, metadata: &'a Self::Metadata, _storage_dtype: &'a vortex_array::dtype::DType, storage_value: &'a vortex_array::scalar::ScalarValue) -> vortex_error::VortexResult<Self::NativeValue>
 
 pub fn vortex_array::extension::uuid::Uuid::validate_dtype(&self, _metadata: &Self::Metadata, storage_dtype: &vortex_array::dtype::DType) -> vortex_error::VortexResult<()>
 
@@ -11054,20 +11054,26 @@ pub type vortex_array::extension::uuid::Uuid::Metadata = vortex_array::extension
 
 pub type vortex_array::extension::uuid::Uuid::NativeValue<'a> = uuid::Uuid
 
-pub fn vortex_array::extension::uuid::Uuid::deserialize_metadata(&self, _metadata: &[u8]) -> vortex_error::VortexResult<Self::Metadata>
+pub fn vortex_array::extension::uuid::Uuid::deserialize_metadata(&self, metadata: &[u8]) -> vortex_error::VortexResult<Self::Metadata>
 
 pub fn vortex_array::extension::uuid::Uuid::id(&self) -> vortex_array::dtype::extension::ExtId
 
-pub fn vortex_array::extension::uuid::Uuid::serialize_metadata(&self, _metadata: &Self::Metadata) -> vortex_error::VortexResult<alloc::vec::Vec<u8>>
+pub fn vortex_array::extension::uuid::Uuid::serialize_metadata(&self, metadata: &Self::Metadata) -> vortex_error::VortexResult<alloc::vec::Vec<u8>>
 
-pub fn vortex_array::extension::uuid::Uuid::unpack_native<'a>(&self, _metadata: &'a Self::Metadata, _storage_dtype: &'a vortex_array::dtype::DType, storage_value: &'a vortex_array::scalar::ScalarValue) -> vortex_error::VortexResult<Self::NativeValue>
+pub fn vortex_array::extension::uuid::Uuid::unpack_native<'a>(&self, metadata: &'a Self::Metadata, _storage_dtype: &'a vortex_array::dtype::DType, storage_value: &'a vortex_array::scalar::ScalarValue) -> vortex_error::VortexResult<Self::NativeValue>
 
 pub fn vortex_array::extension::uuid::Uuid::validate_dtype(&self, _metadata: &Self::Metadata, storage_dtype: &vortex_array::dtype::DType) -> vortex_error::VortexResult<()>
 
 pub fn vortex_array::extension::uuid::Uuid::validate_scalar_value(&self, metadata: &Self::Metadata, storage_dtype: &vortex_array::dtype::DType, storage_value: &vortex_array::scalar::ScalarValue) -> vortex_error::VortexResult<()>
 
 pub struct vortex_array::extension::uuid::UuidMetadata
 
+pub vortex_array::extension::uuid::UuidMetadata::version: core::option::Option<uuid::Version>
+
+impl vortex_array::extension::uuid::UuidMetadata
+
+pub fn vortex_array::extension::uuid::UuidMetadata::any() -> Self
+
 impl core::clone::Clone for vortex_array::extension::uuid::UuidMetadata
 
 pub fn vortex_array::extension::uuid::UuidMetadata::clone(&self) -> vortex_array::extension::uuid::UuidMetadata
@@ -11076,11 +11082,7 @@ impl core::cmp::Eq for vortex_array::extension::uuid::UuidMetadata
 
 impl core::cmp::PartialEq for vortex_array::extension::uuid::UuidMetadata
 
-pub fn vortex_array::extension::uuid::UuidMetadata::eq(&self, other: &vortex_array::extension::uuid::UuidMetadata) -> bool
-
-impl core::default::Default for vortex_array::extension::uuid::UuidMetadata
-
-pub fn vortex_array::extension::uuid::UuidMetadata::default() -> vortex_array::extension::uuid::UuidMetadata
+pub fn vortex_array::extension::uuid::UuidMetadata::eq(&self, other: &Self) -> bool
 
 impl core::fmt::Debug for vortex_array::extension::uuid::UuidMetadata
 
@@ -11092,9 +11094,7 @@ pub fn vortex_array::extension::uuid::UuidMetadata::fmt(&self, f: &mut core::fmt
 
 impl core::hash::Hash for vortex_array::extension::uuid::UuidMetadata
 
-pub fn vortex_array::extension::uuid::UuidMetadata::hash<__H: core::hash::Hasher>(&self, state: &mut __H)
-
-impl core::marker::StructuralPartialEq for vortex_array::extension::uuid::UuidMetadata
+pub fn vortex_array::extension::uuid::UuidMetadata::hash<H: core::hash::Hasher>(&self, state: &mut H)
 
 pub struct vortex_array::extension::EmptyMetadata
 
@@ -15192,50 +15192,6 @@ pub fn vortex_array::scalar_fn::fns::select::Select::stat_falsification(&self, o
 
 pub fn vortex_array::scalar_fn::fns::select::Select::validity(&self, options: &Self::Options, expression: &vortex_array::expr::Expression) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
 
-pub mod vortex_array::scalar_fn::fns::uuid_from_string
-
-pub struct vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString
-
-impl core::clone::Clone for vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::clone(&self) -> vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString
-
-impl vortex_array::scalar_fn::ScalarFnVTable for vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString
-
-pub type vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::Options = vortex_array::scalar_fn::EmptyOptions
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::arity(&self, _options: &Self::Options) -> vortex_array::scalar_fn::Arity
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::child_name(&self, _options: &Self::Options, child_idx: usize) -> vortex_array::scalar_fn::ChildName
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::deserialize(&self, _metadata: &[u8], _session: &vortex_session::VortexSession) -> vortex_error::VortexResult<Self::Options>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::execute(&self, _options: &Self::Options, args: &dyn vortex_array::scalar_fn::ExecutionArgs, _ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<vortex_array::ArrayRef>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::fmt_sql(&self, _options: &Self::Options, expr: &vortex_array::expr::Expression, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::id(&self) -> vortex_array::scalar_fn::ScalarFnId
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::is_fallible(&self, _options: &Self::Options) -> bool
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::is_null_sensitive(&self, _options: &Self::Options) -> bool
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::reduce(&self, options: &Self::Options, node: &dyn vortex_array::scalar_fn::ReduceNode, ctx: &dyn vortex_array::scalar_fn::ReduceCtx) -> vortex_error::VortexResult<core::option::Option<vortex_array::scalar_fn::ReduceNodeRef>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::return_dtype(&self, _options: &Self::Options, arg_dtypes: &[vortex_array::dtype::DType]) -> vortex_error::VortexResult<vortex_array::dtype::DType>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::serialize(&self, options: &Self::Options) -> vortex_error::VortexResult<core::option::Option<alloc::vec::Vec<u8>>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::simplify(&self, options: &Self::Options, expr: &vortex_array::expr::Expression, ctx: &dyn vortex_array::scalar_fn::SimplifyCtx) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::simplify_untyped(&self, options: &Self::Options, expr: &vortex_array::expr::Expression) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::stat_expression(&self, options: &Self::Options, expr: &vortex_array::expr::Expression, stat: vortex_array::expr::stats::Stat, catalog: &dyn vortex_array::expr::pruning::StatsCatalog) -> core::option::Option<vortex_array::expr::Expression>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::stat_falsification(&self, options: &Self::Options, expr: &vortex_array::expr::Expression, catalog: &dyn vortex_array::expr::pruning::StatsCatalog) -> core::option::Option<vortex_array::expr::Expression>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::validity(&self, _options: &Self::Options, expression: &vortex_array::expr::Expression) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
-
 pub mod vortex_array::scalar_fn::fns::zip
 
 pub struct vortex_array::scalar_fn::fns::zip::Zip
@@ -16264,42 +16220,6 @@ pub fn vortex_array::scalar_fn::fns::select::Select::stat_falsification(&self, o
 
 pub fn vortex_array::scalar_fn::fns::select::Select::validity(&self, options: &Self::Options, expression: &vortex_array::expr::Expression) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
 
-impl vortex_array::scalar_fn::ScalarFnVTable for vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString
-
-pub type vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::Options = vortex_array::scalar_fn::EmptyOptions
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::arity(&self, _options: &Self::Options) -> vortex_array::scalar_fn::Arity
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::child_name(&self, _options: &Self::Options, child_idx: usize) -> vortex_array::scalar_fn::ChildName
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::deserialize(&self, _metadata: &[u8], _session: &vortex_session::VortexSession) -> vortex_error::VortexResult<Self::Options>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::execute(&self, _options: &Self::Options, args: &dyn vortex_array::scalar_fn::ExecutionArgs, _ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<vortex_array::ArrayRef>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::fmt_sql(&self, _options: &Self::Options, expr: &vortex_array::expr::Expression, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::id(&self) -> vortex_array::scalar_fn::ScalarFnId
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::is_fallible(&self, _options: &Self::Options) -> bool
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::is_null_sensitive(&self, _options: &Self::Options) -> bool
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::reduce(&self, options: &Self::Options, node: &dyn vortex_array::scalar_fn::ReduceNode, ctx: &dyn vortex_array::scalar_fn::ReduceCtx) -> vortex_error::VortexResult<core::option::Option<vortex_array::scalar_fn::ReduceNodeRef>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::return_dtype(&self, _options: &Self::Options, arg_dtypes: &[vortex_array::dtype::DType]) -> vortex_error::VortexResult<vortex_array::dtype::DType>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::serialize(&self, options: &Self::Options) -> vortex_error::VortexResult<core::option::Option<alloc::vec::Vec<u8>>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::simplify(&self, options: &Self::Options, expr: &vortex_array::expr::Expression, ctx: &dyn vortex_array::scalar_fn::SimplifyCtx) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::simplify_untyped(&self, options: &Self::Options, expr: &vortex_array::expr::Expression) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::stat_expression(&self, options: &Self::Options, expr: &vortex_array::expr::Expression, stat: vortex_array::expr::stats::Stat, catalog: &dyn vortex_array::expr::pruning::StatsCatalog) -> core::option::Option<vortex_array::expr::Expression>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::stat_falsification(&self, options: &Self::Options, expr: &vortex_array::expr::Expression, catalog: &dyn vortex_array::expr::pruning::StatsCatalog) -> core::option::Option<vortex_array::expr::Expression>
-
-pub fn vortex_array::scalar_fn::fns::uuid_from_string::UuidFromString::validity(&self, _options: &Self::Options, expression: &vortex_array::expr::Expression) -> vortex_error::VortexResult<core::option::Option<vortex_array::expr::Expression>>
-
 impl vortex_array::scalar_fn::ScalarFnVTable for vortex_array::scalar_fn::fns::zip::Zip
 
 pub type vortex_array::scalar_fn::fns::zip::Zip::Options = vortex_array::scalar_fn::EmptyOptions

vortex-array/src/extension/uuid/metadata.rs

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright the Vortex contributors
+
+use std::fmt;
+use std::hash::Hash;
+use std::hash::Hasher;
+
+use uuid::Version;
+use vortex_error::VortexResult;
+use vortex_error::vortex_bail;
+
+/// Converts a `u8` discriminant back to a [`uuid::Version`].
+pub(crate) fn u8_to_version(b: u8) -> VortexResult<Version> {
+    match b {
+        0 => Ok(Version::Nil),
+        1 => Ok(Version::Mac),
+        2 => Ok(Version::Dce),
+        3 => Ok(Version::Md5),
+        4 => Ok(Version::Random),
+        5 => Ok(Version::Sha1),
+        6 => Ok(Version::SortMac),
+        7 => Ok(Version::SortRand),
+        8 => Ok(Version::Custom),
+        0xff => Ok(Version::Max),
+        _ => vortex_bail!("unknown UUID version discriminant: {b}"),
+    }
+}
+
+/// Metadata for the UUID extension type.
+///
+/// Optionally records which UUID version the column contains (e.g. v4 random, v7
+/// sort-random). When `None`, the column may contain any mix of versions.
+#[derive(Clone, Debug)]
+pub struct UuidMetadata {
+    /// The UUID version, if known.
+    pub version: Option<Version>,
+}
+
+impl UuidMetadata {
+    /// Creates metadata with no version constraint.
+    pub fn any() -> Self {
+        Self { version: None }
+    }
+}
+
+impl fmt::Display for UuidMetadata {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.version {
+            None => write!(f, "UUID"),
+            Some(v) => write!(f, "UUID(v{})", v as u8),
+        }
+    }
+}
+
+// `uuid::Version` derives `PartialEq` but not `Eq` or `Hash`, so we implement these
+// manually using the `#[repr(u8)]` discriminant.
+
+impl PartialEq for UuidMetadata {
+    fn eq(&self, other: &Self) -> bool {
+        self.version.map(|v| v as u8) == other.version.map(|v| v as u8)
+    }
+}
+
+impl Eq for UuidMetadata {}
+
+impl Hash for UuidMetadata {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.version.map(|v| v as u8).hash(state);
+    }
+}

vortex-array/src/extension/uuid/mod.rs

@@ -10,6 +10,9 @@
 //! [RFC 4122]: https://www.rfc-editor.org/rfc/rfc4122
 //! [canonical UUID extension]: https://arrow.apache.org/docs/format/CanonicalExtensions.html#uuid
 
+mod metadata;
+pub use metadata::UuidMetadata;
+
 pub(crate) mod vtable;
 
 /// The VTable for the UUID extension type.