Skip to content

Commit 841c7cd

Browse files
authored
Remove ExprArray and ExprOptimizer (#5585)
In favor of using ScalarFnArray in the future --------- Signed-off-by: Nicholas Gates <[email protected]>
1 parent ef33c36 commit 841c7cd

File tree

46 files changed

+703
-1787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+703
-1787
lines changed

encodings/pco/src/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![allow(clippy::cast_possible_truncation)]
44

55
use vortex_array::ArrayContext;
6-
use vortex_array::ArraySession;
76
use vortex_array::IntoArray;
87
use vortex_array::ToCanonical;
98
use vortex_array::arrays::BoolArray;
@@ -12,6 +11,7 @@ use vortex_array::arrow::compute::to_arrow_preferred;
1211
use vortex_array::assert_arrays_eq;
1312
use vortex_array::serde::ArrayParts;
1413
use vortex_array::serde::SerializeOptions;
14+
use vortex_array::session::ArraySession;
1515
use vortex_array::validity::Validity;
1616
use vortex_array::vtable::ArrayVTableExt;
1717
use vortex_array::vtable::ValidityHelper;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ use crate::arrays::MaskedVTable;
1414
use crate::execution::BatchKernelRef;
1515
use crate::execution::BindCtx;
1616
use crate::execution::kernel;
17-
use crate::transform::ArrayParentReduceRule;
18-
use crate::transform::ArrayRuleContext;
17+
use crate::optimizer::rules::ArrayParentReduceRule;
1918
use crate::vtable::OperatorVTable;
2019
use crate::vtable::ValidityHelper;
2120

@@ -54,7 +53,6 @@ impl ArrayParentReduceRule<BoolVTable, MaskedVTable> for BoolMaskedValidityRule
5453
array: &BoolArray,
5554
parent: &MaskedArray,
5655
_child_idx: usize,
57-
_ctx: &ArrayRuleContext,
5856
) -> VortexResult<Option<ArrayRef>> {
5957
// Merge the parent's validity mask into the child's validity
6058
// TODO(joe): make this lazy

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ use crate::arrays::MaskedVTable;
1616
use crate::execution::BatchKernelRef;
1717
use crate::execution::BindCtx;
1818
use crate::execution::kernel;
19-
use crate::transform::ArrayParentReduceRule;
20-
use crate::transform::ArrayRuleContext;
19+
use crate::optimizer::rules::ArrayParentReduceRule;
2120
use crate::vtable::OperatorVTable;
2221
use crate::vtable::ValidityHelper;
2322

@@ -61,7 +60,6 @@ impl ArrayParentReduceRule<DecimalVTable, MaskedVTable> for DecimalMaskedValidit
6160
array: &DecimalArray,
6261
parent: &MaskedArray,
6362
_child_idx: usize,
64-
_ctx: &ArrayRuleContext,
6563
) -> VortexResult<Option<ArrayRef>> {
6664
// Merge the parent's validity mask into the child's validity
6765
// TODO(joe): make this lazy

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

Lines changed: 0 additions & 91 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 0 additions & 40 deletions
This file was deleted.

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 0 additions & 103 deletions
This file was deleted.

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

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)