implement From<PrimitiveScalar> for Scalar

spiraldb · Dec 19, 2024 · 40fb896 · 40fb896
1 parent 530c2c0
commit 40fb896
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/vortex-array/src/array/constant/compute/binary_numeric.rs b/vortex-array/src/array/constant/compute/binary_numeric.rs
@@ -22,8 +22,7 @@ impl BinaryNumericFn<ConstantArray> for ConstantEncoding {
                     .scalar()
                     .as_primitive()
                     .checked_numeric_operator(rhs.as_primitive(), op)?
-                    .ok_or_else(|| vortex_err!("numeric overflow"))?
-                    .to_scalar(),
+                    .ok_or_else(|| vortex_err!("numeric overflow"))?,
                 array.len(),
             )
             .into_array(),

diff --git a/vortex-array/src/array/sparse/compute/binary_numeric.rs b/vortex-array/src/array/sparse/compute/binary_numeric.rs
@@ -24,7 +24,7 @@ impl BinaryNumericFn<SparseArray> for SparseEncoding {
             .as_primitive()
             .checked_numeric_operator(rhs_scalar.as_primitive(), op)?
             .ok_or_else(|| vortex_err!("numeric overflow"))?
-            .to_scalar();
+            .into();
         SparseArray::try_new_from_patches(
             new_patches,
             array.len(),

diff --git a/vortex-scalar/src/lib.rs b/vortex-scalar/src/lib.rs
@@ -241,6 +241,17 @@ where
     }
 }
 
+impl From<PrimitiveScalar<'_>> for Scalar {
+    fn from(pscalar: PrimitiveScalar) -> Self {
+        let dtype = pscalar.dtype().clone();
+        let value = pscalar
+            .pvalue()
+            .map(|pvalue| ScalarValue(InnerScalarValue::Primitive(pvalue)))
+            .unwrap_or_else(|| ScalarValue(InnerScalarValue::Null));
+        Self::new(dtype, value)
+    }
+}
+
 macro_rules! from_vec_for_scalar {
     ($T:ty) => {
         impl From<Vec<$T>> for Scalar {

diff --git a/vortex-scalar/src/primitive.rs b/vortex-scalar/src/primitive.rs
@@ -49,6 +49,11 @@ impl<'a> PrimitiveScalar<'a> {
         self.ptype
     }
 
+    #[inline]
+    pub fn pvalue(&self) -> Option<PValue> {
+        self.pvalue
+    }
+
     pub fn typed_value<T: NativePType + TryFrom<PValue, Error = VortexError>>(&self) -> Option<T> {
         assert_eq!(
             self.ptype,
@@ -109,15 +114,6 @@ impl<'a> PrimitiveScalar<'a> {
     pub fn checked_sub(self, other: PrimitiveScalar<'a>) -> VortexResult<Option<Self>> {
         self.checked_numeric_operator(other, BinaryNumericOperator::Sub)
     }
-
-    pub fn to_scalar(self) -> Scalar {
-        Scalar::new(
-            self.dtype().clone(),
-            self.pvalue
-                .map(|pvalue| ScalarValue(InnerScalarValue::Primitive(pvalue)))
-                .unwrap_or_else(|| ScalarValue(InnerScalarValue::Null)),
-        )
-    }
 }
 
 pub trait FromPrimitiveOrF16: FromPrimitive {