make default

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

Author: connortsui20

vortex-array/public-api.lock

@@ -11070,10 +11070,6 @@ 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
@@ -11084,6 +11080,10 @@ impl core::cmp::PartialEq for vortex_array::extension::uuid::UuidMetadata
 
 pub fn vortex_array::extension::uuid::UuidMetadata::eq(&self, other: &Self) -> bool
 
+impl core::default::Default for vortex_array::extension::uuid::UuidMetadata
+
+pub fn vortex_array::extension::uuid::UuidMetadata::default() -> vortex_array::extension::uuid::UuidMetadata
+
 impl core::fmt::Debug for vortex_array::extension::uuid::UuidMetadata
 
 pub fn vortex_array::extension::uuid::UuidMetadata::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result

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

@@ -30,24 +30,17 @@ pub(crate) fn u8_to_version(b: u8) -> VortexResult<Version> {
 ///
 /// 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)]
+#[derive(Clone, Debug, Default)]
 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),
+            None => write!(f, ""),
+            Some(v) => write!(f, "v{}", v as u8),
         }
     }
 }

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

@@ -165,27 +165,27 @@ mod tests {
     #[test]
     fn metadata_display_no_version() {
         let metadata = UuidMetadata { version: None };
-        assert_eq!(metadata.to_string(), "UUID");
+        assert_eq!(metadata.to_string(), "");
     }
 
     #[test]
     fn metadata_display_with_version() {
         let metadata = UuidMetadata {
             version: Some(Version::Random),
         };
-        assert_eq!(metadata.to_string(), "UUID(v4)");
+        assert_eq!(metadata.to_string(), "v4");
 
         let metadata = UuidMetadata {
             version: Some(Version::SortRand),
         };
-        assert_eq!(metadata.to_string(), "UUID(v7)");
+        assert_eq!(metadata.to_string(), "v7");
     }
 
     #[rstest]
     #[case::non_nullable(Nullability::NonNullable)]
     #[case::nullable(Nullability::Nullable)]
     fn validate_correct_storage_dtype(#[case] nullability: Nullability) -> VortexResult<()> {
-        let metadata = UuidMetadata::any();
+        let metadata = UuidMetadata::default();
         let storage_dtype = uuid_storage_dtype(nullability);
         Uuid.validate_dtype(&metadata, &storage_dtype)
     }
@@ -198,7 +198,7 @@ mod tests {
             Nullability::NonNullable,
         );
         assert!(
-            Uuid.validate_dtype(&UuidMetadata::any(), &storage_dtype)
+            Uuid.validate_dtype(&UuidMetadata::default(), &storage_dtype)
                 .is_err()
         );
     }
@@ -211,7 +211,7 @@ mod tests {
             Nullability::NonNullable,
         );
         assert!(
-            Uuid.validate_dtype(&UuidMetadata::any(), &storage_dtype)
+            Uuid.validate_dtype(&UuidMetadata::default(), &storage_dtype)
                 .is_err()
         );
     }
@@ -224,7 +224,7 @@ mod tests {
             Nullability::NonNullable,
         );
         assert!(
-            Uuid.validate_dtype(&UuidMetadata::any(), &storage_dtype)
+            Uuid.validate_dtype(&UuidMetadata::default(), &storage_dtype)
                 .is_err()
         );
     }
@@ -233,7 +233,7 @@ mod tests {
     fn validate_rejects_non_fsl() {
         let storage_dtype = DType::Primitive(PType::U8, Nullability::NonNullable);
         assert!(
-            Uuid.validate_dtype(&UuidMetadata::any(), &storage_dtype)
+            Uuid.validate_dtype(&UuidMetadata::default(), &storage_dtype)
                 .is_err()
         );
     }
@@ -243,7 +243,7 @@ mod tests {
         let expected = uuid::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000")
             .map_err(|e| vortex_error::vortex_err!("{e}"))?;
 
-        let metadata = UuidMetadata::any();
+        let metadata = UuidMetadata::default();
         let storage_dtype = uuid_storage_dtype(Nullability::NonNullable);
         let children: Vec<Scalar> = expected
             .as_bytes()
@@ -336,7 +336,7 @@ mod tests {
         let v4_uuid = uuid::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000")
             .map_err(|e| vortex_error::vortex_err!("{e}"))?;
 
-        let metadata = UuidMetadata::any();
+        let metadata = UuidMetadata::default();
         let storage_value = uuid_storage_scalar(&v4_uuid);
         let storage_dtype = uuid_storage_dtype(Nullability::NonNullable);