Skip to content

Commit 3b34859

Browse files
committed
import paths
Signed-off-by: Connor Tsui <[email protected]>
1 parent a51c461 commit 3b34859

5 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎vortex-array/src/arrays/filter/execute/bitbuffer.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn filter_bitbuffer_by_slices(bb: &BitBuffer, slices: &[(usize, usize)]) -> BitB
5454
mod tests {
5555
use vortex_buffer::bitbuffer;
5656

57-
use super::*;
57+
use crate::arrays::filter::execute::bitbuffer::filter_bitbuffer_by_indices;
5858

5959
#[test]
6060
fn filter_bool_by_index_test() {

‎vortex-array/src/arrays/filter/execute/bool.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ use vortex_error::VortexExpect;
77
use vortex_mask::MaskValues;
88

99
use crate::arrays::BoolArray;
10+
use crate::arrays::filter::execute::bitbuffer;
1011
use crate::arrays::filter::execute::filter_validity;
1112

1213
pub fn filter_bool(array: &BoolArray, mask: &Arc<MaskValues>) -> BoolArray {
1314
let validity = array.validity().vortex_expect("missing BoolArray validity");
1415
let filtered_validity = filter_validity(validity, mask);
1516

1617
let bit_buffer = array.to_bit_buffer();
17-
let filtered_buffer = super::bitbuffer::filter_bit_buffer(&bit_buffer, mask.as_ref());
18+
let filtered_buffer = bitbuffer::filter_bit_buffer(&bit_buffer, mask.as_ref());
1819

1920
BoolArray::new(filtered_buffer, filtered_validity)
2021
}

‎vortex-array/src/arrays/filter/execute/buffer.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use vortex_buffer::Buffer;
1010
use vortex_mask::MaskValues;
1111

12-
use super::slice;
12+
use crate::arrays::filter::execute::slice;
1313

1414
/// Filter a [`Buffer<T>`] by [`MaskValues`], returning a new buffer.
1515
///

‎vortex-array/src/arrays/filter/execute/decimal.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ use vortex_dtype::match_each_decimal_value_type;
77
use vortex_mask::MaskValues;
88

99
use crate::arrays::DecimalArray;
10+
use crate::arrays::filter::execute::buffer;
1011
use crate::arrays::filter::execute::filter_validity;
1112
use crate::vtable::ValidityHelper;
1213

1314
pub fn filter_decimal(array: &DecimalArray, mask: &Arc<MaskValues>) -> DecimalArray {
1415
let filtered_validity = filter_validity(array.validity().clone(), mask);
1516

1617
match_each_decimal_value_type!(array.values_type(), |T| {
17-
let filtered_buffer = super::buffer::filter_buffer(array.buffer::<T>(), mask.as_ref());
18+
let filtered_buffer = buffer::filter_buffer(array.buffer::<T>(), mask.as_ref());
1819

1920
// SAFETY: We filter both the validity and the buffer with the same mask, so they must have
2021
// the same length, and since the buffer came from an existing and valid `DecimalArray` the

‎vortex-array/src/arrays/filter/execute/primitive.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use vortex_error::VortexExpect;
88
use vortex_mask::MaskValues;
99

1010
use crate::arrays::PrimitiveArray;
11+
use crate::arrays::filter::execute::buffer;
1112
use crate::arrays::filter::execute::filter_validity;
1213

1314
pub fn filter_primitive(array: &PrimitiveArray, mask: &Arc<MaskValues>) -> PrimitiveArray {
@@ -17,7 +18,7 @@ pub fn filter_primitive(array: &PrimitiveArray, mask: &Arc<MaskValues>) -> Primi
1718
let filtered_validity = filter_validity(validity, mask);
1819

1920
match_each_native_ptype!(array.ptype(), |T| {
20-
let filtered_buffer = super::buffer::filter_buffer(array.to_buffer::<T>(), mask.as_ref());
21+
let filtered_buffer = buffer::filter_buffer(array.to_buffer::<T>(), mask.as_ref());
2122

2223
// SAFETY: We filter both the validity and the buffer with the same mask, so they must have
2324
// the same length.

0 commit comments

Comments
 (0)