Skip to content
Merged
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
12 changes: 6 additions & 6 deletions encodings/datetime-parts/src/compute/compare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ use vortex_array::arrays::ConstantArray;
use vortex_array::compute::CompareKernel;
use vortex_array::compute::CompareKernelAdapter;
use vortex_array::compute::Operator;
use vortex_array::compute::and;
use vortex_array::compute::and_kleene;
use vortex_array::compute::cast;
use vortex_array::compute::compare;
use vortex_array::compute::or;
use vortex_array::compute::or_kleene;
use vortex_array::register_kernel;
use vortex_dtype::DType;
use vortex_dtype::Nullability;
Expand Down Expand Up @@ -84,7 +84,7 @@ fn compare_eq(
return Ok(Some(comparison));
}

comparison = and(
comparison = and_kleene(
&compare_dtp(lhs.seconds(), ts_parts.seconds, Operator::Eq, nullability)?,
&comparison,
)?;
Expand All @@ -94,7 +94,7 @@ fn compare_eq(
return Ok(Some(comparison));
}

comparison = and(
comparison = and_kleene(
&compare_dtp(
lhs.subseconds(),
ts_parts.subseconds,
Expand All @@ -118,7 +118,7 @@ fn compare_ne(
return Ok(Some(comparison));
}

comparison = or(
comparison = or_kleene(
&compare_dtp(
lhs.seconds(),
ts_parts.seconds,
Expand All @@ -133,7 +133,7 @@ fn compare_ne(
return Ok(Some(comparison));
}

comparison = or(
comparison = or_kleene(
&compare_dtp(
lhs.subseconds(),
ts_parts.subseconds,
Expand Down
136 changes: 0 additions & 136 deletions vortex-array/src/arrays/constant/compute/boolean.rs

This file was deleted.

1 change: 0 additions & 1 deletion vortex-array/src/arrays/constant/compute/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-FileCopyrightText: Copyright the Vortex contributors

mod binary_numeric;
mod boolean;
mod cast;
mod compare;
mod fill_null;
Expand Down
11 changes: 6 additions & 5 deletions vortex-array/src/compute/between.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use crate::compute::Kernel;
use crate::compute::Operator;
use crate::compute::Options;
use crate::compute::Output;
use crate::compute::boolean;
use crate::compute::arrow_boolean;
use crate::compute::compare;
use crate::vtable::VTable;

Expand Down Expand Up @@ -149,10 +149,11 @@ impl ComputeFnVTable for Between {

// Otherwise, fall back to the default Arrow implementation
// TODO(joe): should we try to canonicalize the array and try between
Ok(boolean(
&compare(lower, array, options.lower_strict.to_operator())?,
&compare(array, upper, options.upper_strict.to_operator())?,
BooleanOperator::And,
// TODO(joe): move to lazy execute!
Ok(arrow_boolean(
compare(lower, array, options.lower_strict.to_operator())?,
compare(array, upper, options.upper_strict.to_operator())?,
BooleanOperator::AndKleene,
)?
.into())
}
Expand Down
Loading
Loading