Skip to content

Commit c334e95

Browse files
committed
Filter pushdown
Signed-off-by: Nicholas Gates <[email protected]>
1 parent 813aff7 commit c334e95

File tree

4 files changed

+6
-377
lines changed

4 files changed

+6
-377
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub trait ScalarFnArrayExt: expr::VTable {
161161
options: Self::Options,
162162
children: impl Into<Vec<ArrayRef>>,
163163
) -> VortexResult<ArrayRef> {
164-
let bound = ScalarFn::new_static(self, options);
164+
let scalar_fn = ScalarFn::new_static(self, options);
165165

166166
let children = children.into();
167167
vortex_ensure!(
@@ -170,16 +170,16 @@ pub trait ScalarFnArrayExt: expr::VTable {
170170
);
171171

172172
let child_dtypes = children.iter().map(|c| c.dtype().clone()).collect_vec();
173-
let dtype = bound.return_dtype(&child_dtypes)?;
173+
let dtype = scalar_fn.return_dtype(&child_dtypes)?;
174174

175175
let array_vtable: ArrayVTable = ScalarFnVTable {
176-
vtable: bound.vtable().clone(),
176+
vtable: scalar_fn.vtable().clone(),
177177
}
178178
.into_vtable();
179179

180180
Ok(ScalarFnArray {
181181
vtable: array_vtable,
182-
scalar_fn: bound,
182+
scalar_fn,
183183
dtype,
184184
len,
185185
children,

vortex-array/src/expr/display.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ impl Display for DisplayTreeExpr<'_> {
1919
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
2020
pub use termtree::Tree;
2121
fn make_tree(expr: &Expression) -> Result<Tree<String>, std::fmt::Error> {
22-
let bound: &ScalarFn = expr.deref();
23-
let node_name = format!("{}", bound);
22+
let scalar_fn: &ScalarFn = expr.deref();
23+
let node_name = format!("{}", scalar_fn);
2424

2525
// Get child names for display purposes
2626
let child_names = (0..expr.children().len()).map(|i| expr.signature().child_name(i));
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4-
// mod rewrite;
5-
64
use vortex_session::Ref;
75
use vortex_session::SessionExt;
86
use vortex_session::registry::Registry;

0 commit comments

Comments
 (0)