remove explicit compute have in a later PR

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

vortex-array/src/arrays/dict/execute.rs

@@ -10,9 +10,6 @@ mod array;
 pub use array::*;
 
 mod compute;
-mod execute;
-
-pub use execute::take_canonical;
 
 pub mod vtable;
 pub use vtable::*;

vortex-array/src/arrays/dict/mod.rs

@@ -11,7 +11,6 @@ use vortex_error::vortex_err;
 
 use super::DictArray;
 use super::DictMetadata;
-use super::take_canonical;
 use crate::ArrayRef;
 use crate::Canonical;
 use crate::DeserializeMetadata;
@@ -20,6 +19,7 @@ use crate::SerializeMetadata;
 use crate::VectorExecutor;
 use crate::arrays::vtable::rules::PARENT_RULES;
 use crate::buffer::BufferHandle;
+use crate::compute::take;
 use crate::executor::ExecutionCtx;
 use crate::serde::ArrayChildren;
 use crate::vtable;
@@ -132,9 +132,8 @@ impl VTable for DictVTable {
     }
 
     fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
-        let values = array.values().execute(ctx)?;
-        let codes = array.codes().execute(ctx)?.into_primitive();
-        Ok(take_canonical(values, &codes))
+        // TODO(joe): remove take compute fn
+        take(array.values(), array.codes()).and_then(|a| a.execute(ctx))
     }
 
     fn reduce_parent(

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

@@ -2,12 +2,8 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 mod array;
-mod execute;
 mod rules;
 mod vtable;
 
 pub use array::*;
-pub use execute::FILTER_SLICES_SELECTIVITY_THRESHOLD;
-pub use execute::filter_canonical;
-pub use execute::filter_slice;
 pub use vtable::*;

vortex-array/src/arrays/filter/execute.rs

@@ -15,7 +15,6 @@ use vortex_error::vortex_ensure;
 use vortex_mask::Mask;
 use vortex_scalar::Scalar;
 
-use super::execute::filter_canonical;
 use crate::Array;
 use crate::ArrayBufferVisitor;
 use crate::ArrayChildVisitor;
@@ -31,6 +30,7 @@ use crate::VortexSessionExecute;
 use crate::arrays::filter::array::FilterArray;
 use crate::arrays::filter::rules::PARENT_RULES;
 use crate::buffer::BufferHandle;
+use crate::compute::filter;
 use crate::executor::ExecutionCtx;
 use crate::serde::ArrayChildren;
 use crate::stats::StatsSetRef;
@@ -114,8 +114,7 @@ impl VTable for FilterVTable {
     }
 
     fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
-        let child = array.child.execute(ctx)?;
-        Ok(filter_canonical(child, &array.mask))
+        filter(array.child.as_ref(), &array.mask).and_then(|a| a.execute(ctx))
     }
 
     fn reduce_parent(