Skip to content

Commit d844099

Browse files
committed
fix
1 parent e5ebaf4 commit d844099

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

encodings/alp/src/alp/compute/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ mod between;
22
mod compare;
33
mod nan_count;
44

5-
use std::fmt::Debug;
6-
7-
use vortex_array::compute::{FilterKernel, NanCountFn, ScalarAtFn, SliceFn, TakeFn, scalar_at, slice, take};
5+
use vortex_array::compute::{NaNCountFn, ScalarAtFn, SliceFn, TakeFn, scalar_at, slice, take};
86
use vortex_array::variants::PrimitiveArrayTrait;
97
use vortex_array::vtable::ComputeVTable;
108
use vortex_array::{Array, ArrayRef};
@@ -14,7 +12,7 @@ use vortex_scalar::Scalar;
1412
use crate::{ALPArray, ALPEncoding, ALPFloat, match_each_alp_float_ptype};
1513

1614
impl ComputeVTable for ALPEncoding {
17-
fn nan_count_fn(&self) -> Option<&dyn NanCountFn<&dyn Array>> {
15+
fn nan_count_fn(&self) -> Option<&dyn NaNCountFn<&dyn Array>> {
1816
Some(self)
1917
}
2018
fn scalar_at_fn(&self) -> Option<&dyn ScalarAtFn<&dyn Array>> {

encodings/runend/src/compute/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ pub(crate) mod filter;
55
mod invert;
66
mod is_sorted;
77
mod min_max;
8-
mod nan_count;
98
mod scalar_at;
109
mod slice;
1110
pub(crate) mod take;

vortex-array/src/arrays/chunked/compute/take.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ use vortex_scalar::Scalar;
66

77
use crate::arrays::ChunkedEncoding;
88
use crate::arrays::chunked::ChunkedArray;
9-
use crate::compute::{SearchSortedSide, TakeFn, cast, scalar_at, search_sorted_usize, slice, take};
9+
use crate::compute::{
10+
SearchSortedSide, TakeFn, cast, scalar_at, search_sorted_usize, slice, sub_scalar, take,
11+
};
1012
use crate::{Array, ArrayRef, IntoArray, ToCanonical};
1113

1214
impl TakeFn<&ChunkedArray> for ChunkedEncoding {

vortex-array/src/arrays/constant/compute/binary_numeric.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use vortex_error::{VortexResult, vortex_err};
22
use vortex_scalar::NumericOperator;
33

44
use crate::arrays::{ConstantArray, ConstantEncoding};
5+
use crate::compute::{NumericKernel, NumericKernelAdapter};
56
use crate::{Array, ArrayRef, register_kernel};
67

78
impl NumericKernel for ConstantEncoding {

vortex-array/src/arrays/primitive/compute/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use crate::Array;
22
use crate::arrays::PrimitiveEncoding;
3-
use crate::compute::{FillNullFn, IsConstantFn, IsSortedFn, MaskFn, MinMaxFn, NaNCountFn, ScalarAtFn, SearchSortedFn, SearchSortedUsizeFn, SliceFn, TakeFn, ToArrowFn, UncompressedSizeFn};
3+
use crate::compute::{
4+
FillNullFn, IsConstantFn, IsSortedFn, MaskFn, MinMaxFn, NaNCountFn, ScalarAtFn, SearchSortedFn,
5+
SearchSortedUsizeFn, SliceFn, TakeFn, ToArrowFn, UncompressedSizeFn,
6+
};
47
use crate::vtable::ComputeVTable;
58

69
mod between;

vortex-array/src/builders/list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use vortex_scalar::{ListScalar, NumericOperator};
1010
use crate::arrays::{ConstantArray, ListArray, OffsetPType};
1111
use crate::builders::lazy_validity_builder::LazyNullBufferBuilder;
1212
use crate::builders::{ArrayBuilder, ArrayBuilderExt, PrimitiveBuilder, builder_with_capacity};
13-
use crate::compute::{cast, slice};
13+
use crate::compute::{cast, numeric, slice};
1414
use crate::{Array, ArrayRef, ToCanonical};
1515

1616
pub struct ListBuilder<O: NativePType> {

vortex-array/src/compute/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pub use like::{LikeFn, LikeOptions, like};
2424
pub use mask::{MaskFn, mask};
2525
pub use min_max::{MinMaxFn, MinMaxResult, min_max};
2626
pub use nan_count::*;
27+
pub use numeric::*;
2728
pub use optimize::*;
2829
pub use scalar_at::{ScalarAtFn, scalar_at};
2930
pub use search_sorted::*;

vortex-array/src/stream/take_rows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use vortex_dtype::match_each_integer_ptype;
77
use vortex_error::{VortexResult, vortex_bail};
88
use vortex_scalar::Scalar;
99

10-
use crate::compute::{SearchSortedSide, search_sorted_usize, slice, take};
10+
use crate::compute::{SearchSortedSide, search_sorted_usize, slice, sub_scalar, take};
1111
use crate::stats::Stat;
1212
use crate::stream::ArrayStream;
1313
use crate::variants::PrimitiveArrayTrait;

0 commit comments

Comments
 (0)