Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions vortex-array/src/arrays/filter/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,20 @@ use crate::arrays::filter::FilterArraySlotsExt;
use crate::arrays::filter::FilterReduce;
use crate::arrays::filter::FilterReduceAdaptor;
use crate::arrays::filter::execute::buffer::prepare_mask_for_reuse;
use crate::arrays::scalar_fn::ExactScalarFn;
use crate::arrays::scalar_fn::ScalarFnArrayView;
use crate::arrays::struct_::StructDataParts;
use crate::builtins::ArrayBuiltins;
use crate::optimizer::rules::ArrayParentReduceRule;
use crate::optimizer::rules::ArrayReduceRule;
use crate::optimizer::rules::ParentRuleSet;
use crate::optimizer::rules::ReduceRuleSet;
use crate::scalar_fn::fns::get_item::GetItem;

pub(super) const PARENT_RULES: ParentRuleSet<Filter> =
ParentRuleSet::new(&[ParentRuleSet::lift(&FilterReduceAdaptor(Filter))]);
pub(super) const PARENT_RULES: ParentRuleSet<Filter> = ParentRuleSet::new(&[
ParentRuleSet::lift(&FilterReduceAdaptor(Filter)),
ParentRuleSet::lift(&FilterGetItemRule),
]);

pub(super) const RULES: ReduceRuleSet<Filter> =
ReduceRuleSet::new(&[&TrivialFilterRule, &FilterStructRule]);
Expand All @@ -35,6 +42,23 @@ impl FilterReduce for Filter {
}
}

#[derive(Debug)]
struct FilterGetItemRule;

impl ArrayParentReduceRule<Filter> for FilterGetItemRule {
type Parent = ExactScalarFn<GetItem>;

fn reduce_parent(
&self,
array: ArrayView<'_, Filter>,
parent: ScalarFnArrayView<'_, GetItem>,
_child_idx: usize,
) -> VortexResult<Option<ArrayRef>> {
let field = array.child().get_item(parent.options.clone())?;
Ok(Some(field.filter(array.filter_mask().clone())?))
}
}

#[derive(Debug)]
struct TrivialFilterRule;

Expand Down
31 changes: 31 additions & 0 deletions vortex-array/src/arrays/masked/compute/rules.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,47 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_error::VortexResult;

use crate::ArrayRef;
use crate::array::ArrayView;
use crate::arrays::Masked;
use crate::arrays::dict::TakeReduceAdaptor;
use crate::arrays::filter::FilterReduceAdaptor;
use crate::arrays::masked::MaskedArrayExt;
use crate::arrays::masked::MaskedArraySlotsExt;
use crate::arrays::scalar_fn::ExactScalarFn;
use crate::arrays::scalar_fn::ScalarFnArrayView;
use crate::arrays::slice::SliceReduceAdaptor;
use crate::builtins::ArrayBuiltins;
use crate::optimizer::rules::ArrayParentReduceRule;
use crate::optimizer::rules::ParentRuleSet;
use crate::scalar_fn::fns::get_item::GetItem;
use crate::scalar_fn::fns::mask::MaskReduceAdaptor;

pub(crate) const PARENT_RULES: ParentRuleSet<Masked> = ParentRuleSet::new(&[
ParentRuleSet::lift(&FilterReduceAdaptor(Masked)),
ParentRuleSet::lift(&MaskedGetItemRule),
ParentRuleSet::lift(&MaskReduceAdaptor(Masked)),
ParentRuleSet::lift(&SliceReduceAdaptor(Masked)),
ParentRuleSet::lift(&TakeReduceAdaptor(Masked)),
]);

#[derive(Debug)]
struct MaskedGetItemRule;

impl ArrayParentReduceRule<Masked> for MaskedGetItemRule {
type Parent = ExactScalarFn<GetItem>;

fn reduce_parent(
&self,
array: ArrayView<'_, Masked>,
parent: ScalarFnArrayView<'_, GetItem>,
_child_idx: usize,
) -> VortexResult<Option<ArrayRef>> {
let field = array.child().get_item(parent.options.clone())?;
Ok(Some(
field.mask(array.masked_validity().to_array(array.len()))?,
))
}
}
33 changes: 31 additions & 2 deletions vortex-array/src/arrays/slice/rules.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,38 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright the Vortex contributors

use vortex_error::VortexResult;

use crate::ArrayRef;
use crate::array::ArrayView;
use crate::arrays::Slice;
use crate::arrays::scalar_fn::ExactScalarFn;
use crate::arrays::scalar_fn::ScalarFnArrayView;
use crate::arrays::slice::SliceArraySlotsExt;
use crate::arrays::slice::SliceReduceAdaptor;
use crate::builtins::ArrayBuiltins;
use crate::optimizer::rules::ArrayParentReduceRule;
use crate::optimizer::rules::ParentRuleSet;
use crate::scalar_fn::fns::get_item::GetItem;

pub(super) const PARENT_RULES: ParentRuleSet<Slice> = ParentRuleSet::new(&[
ParentRuleSet::lift(&SliceReduceAdaptor(Slice)),
ParentRuleSet::lift(&SliceGetItemRule),
]);

#[derive(Debug)]
struct SliceGetItemRule;

impl ArrayParentReduceRule<Slice> for SliceGetItemRule {
type Parent = ExactScalarFn<GetItem>;

pub(super) const PARENT_RULES: ParentRuleSet<Slice> =
ParentRuleSet::new(&[ParentRuleSet::lift(&SliceReduceAdaptor(Slice))]);
fn reduce_parent(
&self,
array: ArrayView<'_, Slice>,
parent: ScalarFnArrayView<'_, GetItem>,
_child_idx: usize,
) -> VortexResult<Option<ArrayRef>> {
let field = array.child().get_item(parent.options.clone())?;
Ok(Some(field.slice(array.slice_range().clone())?))
}
}
49 changes: 49 additions & 0 deletions vortex-array/src/scalar_fn/fns/get_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ mod tests {
use vortex_error::VortexResult;

use crate::IntoArray;
use crate::arrays::Filter;
use crate::arrays::Primitive;
use crate::arrays::ScalarFn;
use crate::arrays::Slice;
use crate::builtins::ArrayBuiltins;
use crate::dtype::DType;
use crate::dtype::FieldNames;
use crate::dtype::Nullability;
Expand Down Expand Up @@ -291,6 +296,50 @@ mod tests {
Ok(())
}

#[test]
fn get_item_pushes_through_filter() -> VortexResult<()> {
use vortex_mask::Mask;

let filtered = test_array()
.into_array()
.filter(Mask::from_iter([true, false, true]))?;

let item = filtered.get_item("a")?;

assert!(item.is::<Filter>());
assert!(!item.is::<ScalarFn>());
Ok(())
}

#[test]
fn get_item_pushes_through_slice() -> VortexResult<()> {
let sliced = test_array().into_array().slice(1..3)?;

let item = sliced.get_item("a")?;

assert!(item.is::<Primitive>());
assert!(!item.is::<Slice>());
assert!(!item.is::<ScalarFn>());
Ok(())
}

#[test]
fn get_item_pushes_through_masked() -> VortexResult<()> {
let masked = test_array()
.into_array()
.mask(Validity::from_iter([true, false, true]).to_array(3))?;

let item = masked.get_item("a")?;

assert!(item.is::<Primitive>());
assert_eq!(
item.dtype(),
&DType::Primitive(PType::I32, Nullability::Nullable)
);
assert!(!item.is::<ScalarFn>());
Ok(())
}

#[test]
fn test_pack_get_item_rule() {
// Create: pack(a: lit(1), b: lit(2)).get_item("b")
Expand Down
Loading