ugh what a fight

spiraldb · Oct 30, 2024 · ae65a37 · ae65a37
1 parent f2ccd90
commit ae65a37
Show file tree

Hide file tree

Showing 7 changed files with 278 additions and 122 deletions.
diff --git a/vortex-buffer/src/string.rs b/vortex-buffer/src/string.rs
@@ -66,3 +66,9 @@ impl AsRef<str> for BufferString {
         self.as_str()
     }
 }
+
+impl AsRef<[u8]> for BufferString {
+    fn as_ref(&self) -> &[u8] {
+        self.as_str().as_bytes()
+    }
+}
diff --git a/vortex-scalar/src/binary.rs b/vortex-scalar/src/binary.rs
@@ -57,3 +57,36 @@ impl<'a> TryFrom<&'a Scalar> for Buffer {
             .ok_or_else(|| vortex_err!("Can't extract present value from null scalar"))
     }
 }
+
+impl TryFrom<&ScalarValue> for Buffer {
+    type Error = VortexError;
+
+    fn try_from(value: &ScalarValue) -> Result<Self, Self::Error> {
+        Option::<Buffer>::try_from(value)?
+            .ok_or_else(|| vortex_err!("Can't extract present value from null scalar"))
+    }
+}
+
+impl TryFrom<ScalarValue> for Buffer {
+    type Error = VortexError;
+
+    fn try_from(value: ScalarValue) -> Result<Self, Self::Error> {
+        Buffer::try_from(&value)
+    }
+}
+
+impl TryFrom<&ScalarValue> for Option<Buffer> {
+    type Error = VortexError;
+
+    fn try_from(value: &ScalarValue) -> Result<Self, Self::Error> {
+        value.as_buffer()
+    }
+}
+
+impl TryFrom<ScalarValue> for Option<Buffer> {
+    type Error = VortexError;
+
+    fn try_from(value: ScalarValue) -> Result<Self, Self::Error> {
+        Option::<Buffer>::try_from(&value)
+    }
+}
diff --git a/vortex-scalar/src/bool.rs b/vortex-scalar/src/bool.rs
@@ -73,16 +73,39 @@ impl From<bool> for Scalar {
     }
 }
 
+impl TryFrom<&ScalarValue> for Option<bool> {
+    type Error = VortexError;
+
+    fn try_from(value: &ScalarValue) -> VortexResult<Self> {
+        value.as_bool()
+    }
+}
+
+impl TryFrom<ScalarValue> for Option<bool> {
+    type Error = VortexError;
+
+    fn try_from(value: ScalarValue) -> VortexResult<Self> {
+        Option::<bool>::try_from(&value)
+    }
+}
+
 impl TryFrom<&ScalarValue> for bool {
     type Error = VortexError;
 
     fn try_from(value: &ScalarValue) -> VortexResult<Self> {
-        value
-            .as_bool()?
+        Option::<bool>::try_from(value)?
             .ok_or_else(|| vortex_err!("Can't extract present value from null scalar"))
     }
 }
 
+impl TryFrom<ScalarValue> for bool {
+    type Error = VortexError;
+
+    fn try_from(value: ScalarValue) -> VortexResult<Self> {
+        bool::try_from(&value)
+    }
+}
+
 impl From<bool> for ScalarValue {
     fn from(value: bool) -> Self {
         ScalarValue::Bool(value)

diff --git a/vortex-scalar/src/primitive.rs b/vortex-scalar/src/primitive.rs
@@ -154,19 +154,37 @@ macro_rules! primitive_scalar {
         impl TryFrom<&ScalarValue> for $T {
             type Error = VortexError;
 
+            fn try_from(value: &ScalarValue) -> Result<Self, Self::Error> {
+                Option::<$T>::try_from(value)?
+                    .ok_or_else(|| vortex_err!("Can't extract present value from null scalar"))
+            }
+        }
+
+        impl TryFrom<ScalarValue> for $T {
+            type Error = VortexError;
+
+            fn try_from(value: ScalarValue) -> Result<Self, Self::Error> {
+                <$T>::try_from(&value)
+            }
+        }
+
+        impl TryFrom<&ScalarValue> for Option<$T> {
+            type Error = VortexError;
+
             fn try_from(value: &ScalarValue) -> Result<Self, Self::Error> {
                 match value {
-                    ScalarValue::Primitive(pvalue) => <$T>::try_from(*pvalue),
+                    ScalarValue::Null => Ok(None),
+                    ScalarValue::Primitive(pvalue) => Ok(Some(<$T>::try_from(*pvalue)?)),
                     _ => vortex_bail!("expected primitive"),
                 }
             }
         }
 
-        impl TryFrom<ScalarValue> for $T {
+        impl TryFrom<ScalarValue> for Option<$T> {
             type Error = VortexError;
 
             fn try_from(value: ScalarValue) -> Result<Self, Self::Error> {
-                <$T>::try_from(&value)
+                Option::<$T>::try_from(&value)
             }
         }
     };

diff --git a/vortex-scalar/src/utf8.rs b/vortex-scalar/src/utf8.rs
@@ -88,3 +88,36 @@ impl From<&str> for Scalar {
         }
     }
 }
+
+impl TryFrom<&ScalarValue> for BufferString {
+    type Error = VortexError;
+
+    fn try_from(value: &ScalarValue) -> Result<Self, Self::Error> {
+        Option::<BufferString>::try_from(value)?
+            .ok_or_else(|| vortex_err!("Can't extract present value from null scalar"))
+    }
+}
+
+impl TryFrom<ScalarValue> for BufferString {
+    type Error = VortexError;
+
+    fn try_from(value: ScalarValue) -> Result<Self, Self::Error> {
+        BufferString::try_from(&value)
+    }
+}
+
+impl TryFrom<&ScalarValue> for Option<BufferString> {
+    type Error = VortexError;
+
+    fn try_from(value: &ScalarValue) -> Result<Self, Self::Error> {
+        value.as_buffer_string()
+    }
+}
+
+impl TryFrom<ScalarValue> for Option<BufferString> {
+    type Error = VortexError;
+
+    fn try_from(value: ScalarValue) -> Result<Self, Self::Error> {
+        Option::<BufferString>::try_from(&value)
+    }
+}
diff --git a/vortex-scalar/src/value.rs b/vortex-scalar/src/value.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use half::f16;
 use vortex_buffer::{Buffer, BufferString};
 use vortex_dtype::DType;
-use vortex_error::{vortex_err, VortexResult};
+use vortex_error::{vortex_err, VortexError, VortexResult};
 
 use crate::pvalue::PValue;
 
@@ -94,6 +94,13 @@ impl ScalarValue {
         }
     }
 
+    pub fn as_null(&self) -> VortexResult<Option<Empty>> {
+        match self {
+            Self::Null => Ok(None),
+            _ => Err(vortex_err!("Expected a Null scalar, found {:?}", self)),
+        }
+    }
+
     pub fn as_bool(&self) -> VortexResult<Option<bool>> {
         match self {
             Self::Null => Ok(None),
@@ -211,6 +218,24 @@ from_vec_for_scalar_value!(BufferString);
 from_vec_for_scalar_value!(bytes::Bytes);
 from_vec_for_scalar_value!(Buffer);
 
+pub enum Empty {}
+
+impl TryFrom<&ScalarValue> for Option<Empty> {
+    type Error = VortexError;
+
+    fn try_from(value: &ScalarValue) -> Result<Self, Self::Error> {
+        value.as_null()
+    }
+}
+
+impl TryFrom<ScalarValue> for Option<Empty> {
+    type Error = VortexError;
+
+    fn try_from(value: ScalarValue) -> Result<Self, Self::Error> {
+        Option::<Empty>::try_from(&value)
+    }
+}
+
 #[cfg(test)]
 mod test {
     use vortex_dtype::{DType, Nullability, PType, StructDType};