Vector Scalars

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

vortex-vector/src/binaryview/scalar.rs

@@ -16,7 +16,7 @@ impl<T: BinaryViewType> From<Option<T::Scalar>> for BinaryViewScalar<T> {
 }
 
 impl<T: BinaryViewType> BinaryViewScalar<T> {
-    /// Returns the scalar value as [`T::Scalar`], or `None` if the scalar is null.
+    /// Returns the scalar value as [`BinaryViewType::Scalar`], or `None` if the scalar is null.
     pub fn value(&self) -> Option<&T::Scalar> {
         self.0.as_ref()
     }
@@ -49,8 +49,8 @@ impl BinaryViewTypeUpcast for Scalar {
     }
 }
 
-impl<T: BinaryViewType> Into<Scalar> for BinaryViewScalar<T> {
-    fn into(self) -> Scalar {
-        T::upcast(self)
+impl<T: BinaryViewType> From<BinaryViewScalar<T>> for Scalar {
+    fn from(val: BinaryViewScalar<T>) -> Self {
+        T::upcast(val)
     }
 }

vortex-vector/src/bool/scalar.rs

@@ -28,8 +28,8 @@ impl ScalarOps for BoolScalar {
     }
 }
 
-impl Into<Scalar> for BoolScalar {
-    fn into(self) -> Scalar {
-        Scalar::Bool(self)
+impl From<BoolScalar> for Scalar {
+    fn from(val: BoolScalar) -> Self {
+        Scalar::Bool(val)
     }
 }

vortex-vector/src/bool/vector.rs

@@ -88,11 +88,7 @@ impl VectorOps for BoolVector {
         debug_assert!(index < self.len());
 
         let is_valid = self.validity.value(index);
-        let value = if is_valid {
-            Some(self.bits.value(index))
-        } else {
-            None
-        };
+        let value = is_valid.then(|| self.bits.value(index));
 
         Scalar::Bool(value.into())
     }

vortex-vector/src/decimal/generic.rs

@@ -162,11 +162,7 @@ impl<D: NativeDecimalType> VectorOps for DVector<D> {
         debug_assert!(index < self.len());
 
         let is_valid = self.validity.value(index);
-        let value = if is_valid {
-            Some(self.elements[index])
-        } else {
-            None
-        };
+        let value = is_valid.then(|| self.elements[index]);
 
         // SAFETY: We have already checked the validity on construction of the vector
         Scalar::Decimal(unsafe { DScalar::<D>::new_unchecked(self.ps, value) }.into())

vortex-vector/src/decimal/scalar.rs

@@ -47,9 +47,9 @@ impl ScalarOps for DecimalScalar {
     }
 }
 
-impl Into<Scalar> for DecimalScalar {
-    fn into(self) -> Scalar {
-        Scalar::Decimal(self)
+impl From<DecimalScalar> for Scalar {
+    fn from(val: DecimalScalar) -> Self {
+        Scalar::Decimal(val)
     }
 }
 

vortex-vector/src/decimal/vector.rs

@@ -42,7 +42,7 @@ impl VectorOps for DecimalVector {
     }
 
     fn scalar_at(&self, index: usize) -> Scalar {
-        match_each_dvector!(self, |v| { v.scalar_at(index).into() })
+        match_each_dvector!(self, |v| { v.scalar_at(index) })
     }
 
     fn slice(&self, range: impl RangeBounds<usize> + Clone + Debug) -> Self {

vortex-vector/src/fixed_size_list/scalar.rs

@@ -35,8 +35,8 @@ impl ScalarOps for FixedSizeListScalar {
     }
 }
 
-impl Into<Scalar> for FixedSizeListScalar {
-    fn into(self) -> Scalar {
-        Scalar::FixedSizeList(self)
+impl From<FixedSizeListScalar> for Scalar {
+    fn from(val: FixedSizeListScalar) -> Self {
+        Scalar::FixedSizeList(val)
     }
 }

vortex-vector/src/listview/scalar.rs

@@ -31,8 +31,8 @@ impl ScalarOps for ListViewScalar {
     }
 }
 
-impl Into<Scalar> for ListViewScalar {
-    fn into(self) -> Scalar {
-        Scalar::List(self)
+impl From<ListViewScalar> for Scalar {
+    fn from(val: ListViewScalar) -> Self {
+        Scalar::List(val)
     }
 }

vortex-vector/src/listview/vector.rs

@@ -213,7 +213,7 @@ impl VectorOps for ListViewVector {
 
     fn scalar_at(&self, index: usize) -> Scalar {
         assert!(index < self.len());
-        ListViewScalar::new(self.slice(index..index + 1).into()).into()
+        ListViewScalar::new(self.slice(index..index + 1)).into()
     }
 
     fn slice(&self, _range: impl RangeBounds<usize> + Clone + Debug) -> Self {

vortex-vector/src/null/scalar.rs

@@ -17,8 +17,8 @@ impl ScalarOps for NullScalar {
     }
 }
 
-impl Into<Scalar> for NullScalar {
-    fn into(self) -> Scalar {
-        Scalar::Null(self)
+impl From<NullScalar> for Scalar {
+    fn from(val: NullScalar) -> Self {
+        Scalar::Null(val)
     }
 }