Have UnionScalar hold a non-nullable value

jorgecarleitao · Apr 3, 2022 · 12bcdfc · 12bcdfc
1 parent 0529b67
commit 12bcdfc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/src/scalar/mod.rs b/src/scalar/mod.rs
@@ -148,17 +148,13 @@ pub fn new_scalar(array: &dyn Array, index: usize) -> Box<dyn Scalar> {
         }
         Union => {
             let array = array.as_any().downcast_ref::<UnionArray>().unwrap();
-            let type_ = array.types()[index];
+            let type_id = array.types()[index];
             let (field_index, index) = array.index(index);
             let field_value = new_scalar(&*array.fields()[field_index], index);
             Box::new(UnionScalar::new(
                 array.data_type().clone(),
-                type_,
-                if field_value.is_valid() {
-                    Some(field_value.into())
-                } else {
-                    None
-                },
+                type_id,
+                field_value.into(),
             ))
         }
         Map => todo!(),

diff --git a/src/scalar/union.rs b/src/scalar/union.rs
@@ -7,15 +7,15 @@ use super::Scalar;
 /// A single entry of a [`crate::array::UnionArray`].
 #[derive(Debug, Clone, PartialEq)]
 pub struct UnionScalar {
-    value: Option<Arc<dyn Scalar>>,
+    value: Arc<dyn Scalar>,
     type_: i8,
     data_type: DataType,
 }
 
 impl UnionScalar {
     /// Returns a new [`UnionScalar`]
     #[inline]
-    pub fn new(data_type: DataType, type_: i8, value: Option<Arc<dyn Scalar>>) -> Self {
+    pub fn new(data_type: DataType, type_: i8, value: Arc<dyn Scalar>) -> Self {
         Self {
             value,
             type_,
@@ -25,7 +25,7 @@ impl UnionScalar {
 
     /// Returns the values irrespectively of the validity.
     #[inline]
-    pub fn value(&self) -> &Option<Arc<dyn Scalar>> {
+    pub fn value(&self) -> &Arc<dyn Scalar> {
         &self.value
     }
 }
@@ -38,7 +38,7 @@ impl Scalar for UnionScalar {
 
     #[inline]
     fn is_valid(&self) -> bool {
-        self.value.is_some()
+        true
     }
 
     #[inline]

diff --git a/tests/it/array/union.rs b/tests/it/array/union.rs
@@ -19,8 +19,6 @@ where
         .downcast_ref::<UnionScalar>()
         .unwrap()
         .value()
-        .as_ref()
-        .unwrap()
         .as_any()
         .downcast_ref::<T>()
         .unwrap()
@@ -31,14 +29,14 @@ fn assert_next_is_none<I>(iter: &mut I)
 where
     I: Iterator<Item = Box<dyn Scalar>>,
 {
-    assert!(iter
+    assert!(!iter
         .next()
         .unwrap()
         .as_any()
         .downcast_ref::<UnionScalar>()
         .unwrap()
         .value()
-        .is_none())
+        .is_valid())
 }
 
 #[test]