Allow nullable children of MaskedArray

Signed-off-by: Nicholas Gates <nick@nickgates.com>

Author: gatesn

vortex-array/src/arrays/bool/vtable/mod.rs

@@ -3,12 +3,15 @@
 
 use vortex_buffer::BufferHandle;
 use vortex_dtype::DType;
-use vortex_error::vortex_bail;
 use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
-use vortex_vector::bool::BoolVector;
+use vortex_error::vortex_bail;
 use vortex_vector::Vector;
+use vortex_vector::bool::BoolVector;
 
+use crate::DeserializeMetadata;
+use crate::ProstMetadata;
+use crate::SerializeMetadata;
 use crate::arrays::BoolArray;
 use crate::execution::ExecutionCtx;
 use crate::serde::ArrayChildren;
@@ -18,9 +21,6 @@ use crate::vtable::ArrayVTableExt;
 use crate::vtable::NotSupported;
 use crate::vtable::VTable;
 use crate::vtable::ValidityVTableFromValidityHelper;
-use crate::DeserializeMetadata;
-use crate::ProstMetadata;
-use crate::SerializeMetadata;
 
 mod array;
 mod canonical;

vortex-array/src/arrays/decimal/vtable/mod.rs

@@ -4,17 +4,20 @@
 use vortex_buffer::Alignment;
 use vortex_buffer::Buffer;
 use vortex_buffer::BufferHandle;
-use vortex_dtype::match_each_decimal_value_type;
 use vortex_dtype::DType;
 use vortex_dtype::NativeDecimalType;
 use vortex_dtype::PrecisionScale;
+use vortex_dtype::match_each_decimal_value_type;
+use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_ensure;
-use vortex_error::VortexResult;
 use vortex_scalar::DecimalType;
-use vortex_vector::decimal::DVector;
 use vortex_vector::Vector;
+use vortex_vector::decimal::DVector;
 
+use crate::DeserializeMetadata;
+use crate::ProstMetadata;
+use crate::SerializeMetadata;
 use crate::arrays::DecimalArray;
 use crate::execution::ExecutionCtx;
 use crate::serde::ArrayChildren;
@@ -24,9 +27,6 @@ use crate::vtable::ArrayVTableExt;
 use crate::vtable::NotSupported;
 use crate::vtable::VTable;
 use crate::vtable::ValidityVTableFromValidityHelper;
-use crate::DeserializeMetadata;
-use crate::ProstMetadata;
-use crate::SerializeMetadata;
 
 mod array;
 mod canonical;
@@ -139,18 +139,18 @@ pub struct DecimalVTable;
 
 #[cfg(test)]
 mod tests {
-    use vortex_buffer::buffer;
     use vortex_buffer::ByteBufferMut;
+    use vortex_buffer::buffer;
     use vortex_dtype::DecimalDType;
 
+    use crate::ArrayContext;
+    use crate::IntoArray;
     use crate::arrays::DecimalArray;
     use crate::arrays::DecimalVTable;
     use crate::serde::ArrayParts;
     use crate::serde::SerializeOptions;
     use crate::validity::Validity;
     use crate::vtable::ArrayVTableExt;
-    use crate::ArrayContext;
-    use crate::IntoArray;
 
     #[test]
     fn test_array_serde() {

vortex-array/src/arrays/masked/array.rs

@@ -1,15 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-use std::ops::{BitAnd, Not};
+use std::ops::BitAnd;
+use std::ops::Not;
+
 use vortex_dtype::DType;
-use vortex_error::vortex_bail;
 use vortex_error::VortexResult;
+use vortex_error::vortex_bail;
 
+use crate::Array;
+use crate::ArrayRef;
 use crate::compute::mask;
 use crate::stats::ArrayStats;
 use crate::validity::Validity;
-use crate::{Array, ArrayRef};
 
 #[derive(Clone, Debug)]
 pub struct MaskedArray {

vortex-array/src/arrays/masked/compute/compare.rs

@@ -3,19 +3,19 @@
 
 use vortex_error::VortexResult;
 
+use crate::Array;
+use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::BoolArray;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
 use crate::canonical::ToCanonical;
-use crate::compute::compare;
 use crate::compute::CompareKernel;
 use crate::compute::CompareKernelAdapter;
 use crate::compute::Operator;
+use crate::compute::compare;
 use crate::register_kernel;
 use crate::vtable::ValidityHelper;
-use crate::Array;
-use crate::ArrayRef;
-use crate::IntoArray;
 
 impl CompareKernel for MaskedVTable {
     fn compare(
@@ -47,14 +47,14 @@ mod tests {
     use vortex_mask::Mask;
     use vortex_scalar::Scalar;
 
+    use crate::IntoArray;
+    use crate::ToCanonical;
     use crate::arrays::ConstantArray;
     use crate::arrays::MaskedArray;
     use crate::arrays::PrimitiveArray;
-    use crate::compute::compare;
     use crate::compute::Operator;
+    use crate::compute::compare;
     use crate::validity::Validity;
-    use crate::IntoArray;
-    use crate::ToCanonical;
 
     #[test]
     fn test_compare_value() {

vortex-array/src/arrays/masked/compute/filter.rs

@@ -4,14 +4,14 @@
 use vortex_error::VortexResult;
 use vortex_mask::Mask;
 
+use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
-use crate::compute::filter;
 use crate::compute::FilterKernel;
 use crate::compute::FilterKernelAdapter;
+use crate::compute::filter;
 use crate::register_kernel;
-use crate::ArrayRef;
-use crate::IntoArray;
 
 impl FilterKernel for MaskedVTable {
     fn filter(&self, array: &MaskedArray, mask: &Mask) -> VortexResult<ArrayRef> {
@@ -33,11 +33,11 @@ register_kernel!(FilterKernelAdapter(MaskedVTable).lift());
 mod tests {
     use rstest::rstest;
 
+    use crate::IntoArray;
     use crate::arrays::MaskedArray;
     use crate::arrays::PrimitiveArray;
     use crate::compute::conformance::filter::test_filter_conformance;
     use crate::validity::Validity;
-    use crate::IntoArray;
 
     #[rstest]
     #[case(

vortex-array/src/arrays/masked/compute/mask.rs

@@ -4,13 +4,13 @@
 use vortex_error::VortexResult;
 use vortex_mask::Mask as MaskType;
 
+use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
 use crate::compute::MaskKernel;
 use crate::compute::MaskKernelAdapter;
 use crate::register_kernel;
-use crate::ArrayRef;
-use crate::IntoArray;
 
 impl MaskKernel for MaskedVTable {
     fn mask(&self, array: &MaskedArray, mask_arg: &MaskType) -> VortexResult<ArrayRef> {
@@ -28,11 +28,11 @@ register_kernel!(MaskKernelAdapter(MaskedVTable).lift());
 mod tests {
     use rstest::rstest;
 
+    use crate::IntoArray;
     use crate::arrays::MaskedArray;
     use crate::arrays::PrimitiveArray;
     use crate::compute::conformance::mask::test_mask_conformance;
     use crate::validity::Validity;
-    use crate::IntoArray;
 
     #[rstest]
     #[case(

vortex-array/src/arrays/masked/compute/take.rs

@@ -4,16 +4,16 @@
 use vortex_error::VortexResult;
 use vortex_scalar::Scalar;
 
+use crate::Array;
+use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
-use crate::compute::fill_null;
-use crate::compute::take;
 use crate::compute::TakeKernel;
 use crate::compute::TakeKernelAdapter;
+use crate::compute::fill_null;
+use crate::compute::take;
 use crate::register_kernel;
-use crate::Array;
-use crate::ArrayRef;
-use crate::IntoArray;
 
 impl TakeKernel for MaskedVTable {
     fn take(&self, array: &MaskedArray, indices: &dyn Array) -> VortexResult<ArrayRef> {
@@ -42,11 +42,11 @@ register_kernel!(TakeKernelAdapter(MaskedVTable).lift());
 mod tests {
     use rstest::rstest;
 
+    use crate::IntoArray;
     use crate::arrays::MaskedArray;
     use crate::arrays::PrimitiveArray;
     use crate::compute::conformance::take::test_take_conformance;
     use crate::validity::Validity;
-    use crate::IntoArray;
 
     #[rstest]
     #[case(

vortex-array/src/arrays/masked/vtable/canonical.rs

@@ -2,15 +2,16 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use std::ops::Not;
+
 use vortex_error::VortexExpect;
 
+use crate::Array;
+use crate::Canonical;
 use crate::arrays::ConstantVTable;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
 use crate::compute::mask;
 use crate::vtable::CanonicalVTable;
-use crate::Array;
-use crate::Canonical;
 
 impl CanonicalVTable<MaskedVTable> for MaskedVTable {
     fn canonicalize(array: &MaskedArray) -> Canonical {
@@ -37,10 +38,10 @@ mod tests {
     use vortex_dtype::Nullability;
 
     use super::*;
-    use crate::arrays::PrimitiveArray;
-    use crate::validity::Validity;
     use crate::IntoArray;
     use crate::ToCanonical;
+    use crate::arrays::PrimitiveArray;
+    use crate::validity::Validity;
 
     #[rstest]
     #[case(

vortex-array/src/arrays/masked/vtable/mod.rs

@@ -10,10 +10,12 @@ use prost::Message;
 use vortex_buffer::BufferHandle;
 use vortex_compute::mask::MaskValidity;
 use vortex_dtype::DType;
-use vortex_error::vortex_bail;
 use vortex_error::VortexResult;
+use vortex_error::vortex_bail;
 use vortex_vector::Vector;
 
+use crate::ArrayBufferVisitor;
+use crate::ArrayChildVisitor;
 use crate::arrays::masked::MaskedArray;
 use crate::execution::ExecutionCtx;
 use crate::serde::ArrayChildren;
@@ -25,8 +27,6 @@ use crate::vtable::ArrayVTableExt;
 use crate::vtable::NotSupported;
 use crate::vtable::VTable;
 use crate::vtable::VisitorVTable;
-use crate::ArrayBufferVisitor;
-use crate::ArrayChildVisitor;
 
 vtable!(Masked);
 
@@ -134,15 +134,15 @@ mod tests {
     use rstest::rstest;
     use vortex_buffer::ByteBufferMut;
 
+    use crate::ArrayContext;
+    use crate::IntoArray;
     use crate::arrays::MaskedArray;
     use crate::arrays::MaskedVTable;
     use crate::arrays::PrimitiveArray;
     use crate::serde::ArrayParts;
     use crate::serde::SerializeOptions;
     use crate::validity::Validity;
     use crate::vtable::ArrayVTableExt;
-    use crate::ArrayContext;
-    use crate::IntoArray;
 
     #[rstest]
     #[case(

vortex-array/src/arrays/masked/vtable/validity.rs

@@ -1,13 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-use crate::arrays::masked::MaskedArray;
-use crate::arrays::MaskedVTable;
-use crate::vtable::ValidityVTable;
-use crate::Array;
 use std::ops::BitAnd;
+
 use vortex_mask::Mask;
 
+use crate::Array;
+use crate::arrays::MaskedVTable;
+use crate::arrays::masked::MaskedArray;
+use crate::vtable::ValidityVTable;
+
 impl ValidityVTable<MaskedVTable> for MaskedVTable {
     fn is_valid(array: &MaskedArray, index: usize) -> bool {
         array.child.is_valid(index) && array.validity.is_valid(index)