Merge

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

Author: gatesn

encodings/pco/src/test.rs

@@ -2,6 +2,9 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 #![allow(clippy::cast_possible_truncation)]
 
+use vortex_array::ArrayContext;
+use vortex_array::IntoArray;
+use vortex_array::ToCanonical;
 use vortex_array::arrays::BoolArray;
 use vortex_array::arrays::PrimitiveArray;
 use vortex_array::arrow::compute::to_arrow_preferred;
@@ -12,9 +15,6 @@ use vortex_array::session::ArraySession;
 use vortex_array::validity::Validity;
 use vortex_array::vtable::ArrayVTableExt;
 use vortex_array::vtable::ValidityHelper;
-use vortex_array::ArrayContext;
-use vortex_array::IntoArray;
-use vortex_array::ToCanonical;
 use vortex_buffer::Buffer;
 use vortex_buffer::BufferMut;
 use vortex_dtype::DType;

vortex-array/src/array/evaluate.rs

@@ -6,17 +6,23 @@
 //!
 //! This module stores expression evaluation logic in the VortexSession.
 
-use crate::expr::functions::scalar::ScalarFn;
-use crate::expr::functions::FunctionId;
-use crate::expr::{functions, ExprId, Expression, ExpressionView};
-use crate::{expr, ArrayRef};
 use std::any::Any;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::sync::Arc;
+
 use vortex_error::VortexResult;
 use vortex_utils::aliases::hash_map::HashMap;
 
+use crate::ArrayRef;
+use crate::expr;
+use crate::expr::ExprId;
+use crate::expr::Expression;
+use crate::expr::ExpressionView;
+use crate::expr::functions;
+use crate::expr::functions::FunctionId;
+use crate::expr::functions::scalar::ScalarFn;
+
 /// Evaluate an expression against a Vortex array.
 ///
 /// For now, the evaluation logic preserves the existing semi-eager execution model.

vortex-array/src/array/mod.rs

@@ -3,7 +3,6 @@
 
 pub mod evaluate;
 mod operator;
-pub mod optimizer;
 mod visitor;
 
 use std::any::Any;
@@ -19,13 +18,18 @@ pub use visitor::*;
 use vortex_buffer::ByteBuffer;
 use vortex_dtype::DType;
 use vortex_dtype::Nullability;
-use vortex_error::vortex_bail;
-use vortex_error::vortex_panic;
 use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
+use vortex_error::vortex_bail;
+use vortex_error::vortex_panic;
 use vortex_mask::Mask;
 use vortex_scalar::Scalar;
 
+use crate::ArrayEq;
+use crate::ArrayHash;
+use crate::Canonical;
+use crate::DynArrayEq;
+use crate::DynArrayHash;
 use crate::arrays::BoolVTable;
 use crate::arrays::ConstantVTable;
 use crate::arrays::DecimalVTable;
@@ -38,15 +42,16 @@ use crate::arrays::StructVTable;
 use crate::arrays::VarBinVTable;
 use crate::arrays::VarBinViewVTable;
 use crate::builders::ArrayBuilder;
-use crate::compute::is_constant_opts;
 use crate::compute::ComputeFn;
 use crate::compute::Cost;
 use crate::compute::InvocationArgs;
 use crate::compute::IsConstantOpts;
 use crate::compute::Output;
+use crate::compute::is_constant_opts;
 use crate::expr::stats::Precision;
 use crate::expr::stats::Stat;
 use crate::expr::stats::StatsProviderExt;
+use crate::hash;
 use crate::serde::ArrayChildren;
 use crate::stats::StatsSetRef;
 use crate::vtable::ArrayId;
@@ -58,11 +63,6 @@ use crate::vtable::OperationsVTable;
 use crate::vtable::VTable;
 use crate::vtable::ValidityVTable;
 use crate::vtable::VisitorVTable;
-use crate::ArrayHash;
-use crate::Canonical;
-use crate::DynArrayEq;
-use crate::DynArrayHash;
-use crate::{hash, ArrayEq};
 
 /// The public API trait for all Vortex arrays.
 pub trait Array:

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

@@ -5,18 +5,18 @@ use vortex_compute::filter::Filter;
 use vortex_error::VortexResult;
 use vortex_vector::bool::BoolVector;
 
-use crate::array::optimizer::rules::ArrayParentReduceRule;
+use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::BoolArray;
 use crate::arrays::BoolVTable;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
-use crate::execution::kernel;
 use crate::execution::BatchKernelRef;
 use crate::execution::BindCtx;
+use crate::execution::kernel;
+use crate::optimizer::rules::ArrayParentReduceRule;
 use crate::vtable::OperatorVTable;
 use crate::vtable::ValidityHelper;
-use crate::ArrayRef;
-use crate::IntoArray;
 
 impl OperatorVTable<BoolVTable> for BoolVTable {
     fn bind(

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

@@ -2,23 +2,23 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use vortex_compute::filter::Filter;
-use vortex_dtype::match_each_decimal_value_type;
 use vortex_dtype::PrecisionScale;
+use vortex_dtype::match_each_decimal_value_type;
 use vortex_error::VortexResult;
 use vortex_vector::decimal::DVector;
 
-use crate::array::optimizer::rules::ArrayParentReduceRule;
+use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::DecimalArray;
 use crate::arrays::DecimalVTable;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
-use crate::execution::kernel;
 use crate::execution::BatchKernelRef;
 use crate::execution::BindCtx;
+use crate::execution::kernel;
+use crate::optimizer::rules::ArrayParentReduceRule;
 use crate::vtable::OperatorVTable;
 use crate::vtable::ValidityHelper;
-use crate::ArrayRef;
-use crate::IntoArray;
 
 impl OperatorVTable<DecimalVTable> for DecimalVTable {
     fn bind(

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

@@ -10,10 +10,12 @@ use std::fmt::Debug;
 
 use vortex_buffer::BufferHandle;
 use vortex_dtype::DType;
-use vortex_error::vortex_bail;
 use vortex_error::VortexResult;
+use vortex_error::vortex_bail;
 use vortex_vector::Vector;
 
+use crate::Array;
+use crate::ArrayOperator;
 use crate::arrays::expr::ExprArray;
 use crate::execution::ExecutionCtx;
 use crate::expr::Expression;
@@ -24,8 +26,6 @@ use crate::vtable::ArrayVTable;
 use crate::vtable::ArrayVTableExt;
 use crate::vtable::NotSupported;
 use crate::vtable::VTable;
-use crate::Array;
-use crate::ArrayOperator;
 
 vtable!(Expr);
 

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

@@ -10,10 +10,14 @@ mod validity;
 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::ArrayOperator;
+use crate::EmptyMetadata;
 use crate::arrays::masked::MaskedArray;
 use crate::execution::ExecutionCtx;
 use crate::serde::ArrayChildren;
@@ -26,10 +30,6 @@ use crate::vtable::NotSupported;
 use crate::vtable::VTable;
 use crate::vtable::ValidityVTableFromValidityHelper;
 use crate::vtable::VisitorVTable;
-use crate::ArrayBufferVisitor;
-use crate::ArrayChildVisitor;
-use crate::ArrayOperator;
-use crate::EmptyMetadata;
 
 vtable!(Masked);
 
@@ -119,15 +119,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/primitive/vtable/operator.rs

@@ -7,18 +7,18 @@ use vortex_dtype::match_each_native_ptype;
 use vortex_error::VortexResult;
 use vortex_vector::primitive::PVector;
 
-use crate::array::optimizer::rules::ArrayParentReduceRule;
+use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::MaskedArray;
 use crate::arrays::MaskedVTable;
 use crate::arrays::PrimitiveArray;
 use crate::arrays::PrimitiveVTable;
-use crate::execution::kernel;
 use crate::execution::BatchKernelRef;
 use crate::execution::BindCtx;
+use crate::execution::kernel;
+use crate::optimizer::rules::ArrayParentReduceRule;
 use crate::vtable::OperatorVTable;
 use crate::vtable::ValidityHelper;
-use crate::ArrayRef;
-use crate::IntoArray;
 
 impl OperatorVTable<PrimitiveVTable> for PrimitiveVTable {
     fn bind(

vortex-array/src/arrays/struct_/vtable/operator.rs

@@ -4,23 +4,23 @@
 use std::sync::Arc;
 
 use vortex_error::VortexResult;
-use vortex_vector::struct_::StructVector;
 use vortex_vector::Vector;
+use vortex_vector::struct_::StructVector;
 
-use crate::array::optimizer::rules::ArrayParentReduceRule;
+use crate::ArrayRef;
+use crate::arrays::StructArray;
+use crate::arrays::StructVTable;
 use crate::arrays::expr::ExprArray;
 use crate::arrays::expr::ExprVTable;
 use crate::arrays::struct_::vtable::reduce::apply_partitioned_expr;
 use crate::arrays::struct_::vtable::reduce::partition_struct_expr;
-use crate::arrays::StructArray;
-use crate::arrays::StructVTable;
-use crate::execution::kernel;
 use crate::execution::BatchKernelRef;
 use crate::execution::BindCtx;
+use crate::execution::kernel;
 use crate::expr::session::ExprSession;
+use crate::optimizer::rules::ArrayParentReduceRule;
 use crate::vtable::OperatorVTable;
 use crate::vtable::ValidityHelper;
-use crate::ArrayRef;
 
 impl OperatorVTable<StructVTable> for StructVTable {
     fn bind(
@@ -82,10 +82,6 @@ impl ArrayParentReduceRule<StructVTable, ExprVTable> for StructExprPartitionRule
 
 #[cfg(test)]
 mod tests {
-<<<<<<< HEAD
-    use crate::session::ArraySession;
-=======
->>>>>>> develop
     use vortex_dtype::FieldNames;
     use vortex_dtype::Nullability::NonNullable;
     use vortex_dtype::PTypeDowncast;
@@ -94,11 +90,13 @@ mod tests {
     use vortex_vector::VectorOps;
 
     use super::*;
-    use crate::arrays::expr::ExprVTable;
+    use crate::Array;
+    use crate::IntoArray;
     use crate::arrays::BoolArray;
     use crate::arrays::ExprArray;
     use crate::arrays::PrimitiveArray;
     use crate::arrays::StructArray;
+    use crate::arrays::expr::ExprVTable;
     use crate::assert_arrays_eq;
     use crate::expr::and;
     use crate::expr::col;
@@ -109,9 +107,8 @@ mod tests {
     use crate::expr::lt;
     use crate::expr::pack;
     use crate::expr::root;
+    use crate::session::ArraySession;
     use crate::validity::Validity;
-    use crate::Array;
-    use crate::IntoArray;
 
     #[test]
     fn test_struct_operator_basic() {

vortex-array/src/expr/exprs/cast/mod.rs

@@ -6,24 +6,24 @@ use std::ops::Deref;
 
 use prost::Message;
 use vortex_dtype::DType;
-use vortex_error::vortex_bail;
-use vortex_error::vortex_err;
 use vortex_error::VortexExpect;
 use vortex_error::VortexResult;
+use vortex_error::vortex_bail;
+use vortex_error::vortex_err;
 use vortex_proto::expr as pb;
 use vortex_vector::Vector;
 
+use crate::ArrayRef;
 use crate::compute::cast as compute_cast;
-use crate::expr::expression::Expression;
-use crate::expr::stats::Stat;
 use crate::expr::ChildName;
 use crate::expr::ExecutionArgs;
 use crate::expr::ExprId;
 use crate::expr::ExpressionView;
 use crate::expr::StatsCatalog;
 use crate::expr::VTable;
 use crate::expr::VTableExt;
-use crate::ArrayRef;
+use crate::expr::expression::Expression;
+use crate::expr::stats::Stat;
 
 /// A cast expression that converts values to a target data type.
 pub struct Cast;
@@ -166,12 +166,12 @@ mod tests {
     use vortex_error::VortexUnwrap as _;
 
     use super::cast;
+    use crate::IntoArray;
     use crate::arrays::StructArray;
+    use crate::expr::Expression;
     use crate::expr::exprs::get_item::get_item;
     use crate::expr::exprs::root::root;
     use crate::expr::test_harness;
-    use crate::expr::Expression;
-    use crate::IntoArray;
 
     #[test]
     fn dtype() {