fix

spiraldb · Mar 26, 2024 · ae77ef6 · ae77ef6
1 parent 9bd5ba6
commit ae77ef6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/vortex-array/src/array/bool/mod.rs b/vortex-array/src/array/bool/mod.rs
@@ -170,13 +170,8 @@ impl FromIterator<Option<bool>> for BoolArray {
         let mut validity: Vec<bool> = Vec::with_capacity(lower);
         let values: Vec<bool> = iter
             .map(|i| {
-                if let Some(v) = i {
-                    validity.push(true);
-                    v
-                } else {
-                    validity.push(false);
-                    false
-                }
+                validity.push(i.is_some());
+                i.unwrap_or_default()
             })
             .collect::<Vec<_>>();
 

diff --git a/vortex-array/src/array/primitive/mod.rs b/vortex-array/src/array/primitive/mod.rs
@@ -261,13 +261,8 @@ impl<T: NativePType> FromIterator<Option<T>> for PrimitiveArray {
         let mut validity: Vec<bool> = Vec::with_capacity(lower);
         let values: Vec<T> = iter
             .map(|i| {
-                if let Some(v) = i {
-                    validity.push(true);
-                    v
-                } else {
-                    validity.push(false);
-                    T::default()
-                }
+                validity.push(i.is_some());
+                i.unwrap_or_default()
             })
             .collect::<Vec<_>>();
 
@@ -295,10 +290,11 @@ impl ArrayDisplay for PrimitiveArray {
 
 #[cfg(test)]
 mod test {
+    use crate::array::primitive::PrimitiveArray;
+    use crate::array::Array;
     use crate::compute::scalar_at::scalar_at;
-    use vortex_schema::{IntWidth, Nullability, Signedness};
-
-    use super::*;
+    use crate::ptype::PType;
+    use vortex_schema::{DType, IntWidth, Nullability, Signedness};
 
     #[test]
     fn from_arrow() {