Skip to content

Commit c81221b

Browse files
committed
Import UnsignedPType in take helpers
Signed-off-by: Daniel King <dan@spiraldb.com>
1 parent 2ea44b6 commit c81221b

6 files changed

Lines changed: 19 additions & 13 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use crate::arrays::dict::TakeExecute;
2323
use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
2424
use crate::arrays::piecewise_sequence::validate_index_ranges;
2525
use crate::builtins::ArrayBuiltins;
26+
use crate::dtype::UnsignedPType;
2627
use crate::executor::ExecutionCtx;
2728
use crate::match_each_integer_ptype;
2829
use crate::match_each_unsigned_integer_ptype;
@@ -125,8 +126,8 @@ fn take_piecewise_bits<S, L>(
125126
output_len: usize,
126127
) -> VortexResult<BitBuffer>
127128
where
128-
S: crate::dtype::UnsignedPType,
129-
L: crate::dtype::UnsignedPType,
129+
S: UnsignedPType,
130+
L: UnsignedPType,
130131
{
131132
validate_index_ranges(source.len(), starts, lengths, output_len)?;
132133

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
1818
use crate::arrays::piecewise_sequence::validate_index_ranges;
1919
use crate::dtype::IntegerPType;
2020
use crate::dtype::NativeDecimalType;
21+
use crate::dtype::UnsignedPType;
2122
use crate::executor::ExecutionCtx;
2223
use crate::match_each_decimal_value_type;
2324
use crate::match_each_integer_ptype;
@@ -95,8 +96,8 @@ fn take_piecewise_to_buffer<S, L, T>(
9596
output_len: usize,
9697
) -> VortexResult<Buffer<T>>
9798
where
98-
S: crate::dtype::UnsignedPType,
99-
L: crate::dtype::UnsignedPType,
99+
S: UnsignedPType,
100+
L: UnsignedPType,
100101
T: NativeDecimalType,
101102
{
102103
validate_index_ranges(values.len(), starts, lengths, output_len)?;

vortex-array/src/arrays/piecewise_sequence/vtable.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ use crate::arrays::primitive::PrimitiveArrayExt;
3535
use crate::buffer::BufferHandle;
3636
use crate::dtype::DType;
3737
use crate::dtype::PType;
38+
use crate::dtype::UnsignedPType;
3839
use crate::match_each_unsigned_integer_ptype;
3940
use crate::scalar::Scalar;
4041
use crate::serde::ArrayChildren;
@@ -245,9 +246,9 @@ fn scalar_at<S, L, M>(
245246
index: usize,
246247
) -> VortexResult<u64>
247248
where
248-
S: crate::dtype::UnsignedPType,
249-
L: crate::dtype::UnsignedPType,
250-
M: crate::dtype::UnsignedPType,
249+
S: UnsignedPType,
250+
L: UnsignedPType,
251+
M: UnsignedPType,
251252
{
252253
let mut remaining = index;
253254
for ((&start, &length), &multiplier) in starts

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use crate::arrays::piecewise_sequence::validate_index_ranges;
2626
use crate::builtins::ArrayBuiltins;
2727
use crate::dtype::DType;
2828
use crate::dtype::IntegerPType;
29+
use crate::dtype::UnsignedPType;
2930
use crate::executor::ExecutionCtx;
3031
use crate::match_each_integer_ptype;
3132
use crate::match_each_native_ptype;
@@ -188,8 +189,8 @@ fn primitive_piecewise_values<T, S, L>(
188189
) -> VortexResult<Buffer<T>>
189190
where
190191
T: Copy,
191-
S: crate::dtype::UnsignedPType,
192-
L: crate::dtype::UnsignedPType,
192+
S: UnsignedPType,
193+
L: UnsignedPType,
193194
{
194195
validate_index_ranges(source.len(), starts, lengths, output_len)?;
195196

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use crate::arrays::varbin::VarBinArrayExt;
2727
use crate::dtype::DType;
2828
use crate::dtype::IntegerPType;
2929
use crate::dtype::PType;
30+
use crate::dtype::UnsignedPType;
3031
use crate::executor::ExecutionCtx;
3132
use crate::match_each_unsigned_integer_ptype;
3233
use crate::validity::Validity;
@@ -285,8 +286,8 @@ fn gather_piecewise_varbin<S, L, Offset, NewOffset>(
285286
out_offset_ptype: PType,
286287
) -> VortexResult<GatheredPiecewiseVarBin>
287288
where
288-
S: crate::dtype::UnsignedPType,
289-
L: crate::dtype::UnsignedPType,
289+
S: UnsignedPType,
290+
L: UnsignedPType,
290291
Offset: IntegerPType,
291292
NewOffset: IntegerPType,
292293
{

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
2424
use crate::arrays::piecewise_sequence::validate_index_ranges;
2525
use crate::arrays::varbinview::BinaryView;
2626
use crate::buffer::BufferHandle;
27+
use crate::dtype::UnsignedPType;
2728
use crate::executor::ExecutionCtx;
2829
use crate::match_each_integer_ptype;
2930
use crate::match_each_unsigned_integer_ptype;
@@ -140,8 +141,8 @@ fn gather_piecewise_views<S, L>(
140141
output_len: usize,
141142
) -> VortexResult<Buffer<BinaryView>>
142143
where
143-
S: crate::dtype::UnsignedPType,
144-
L: crate::dtype::UnsignedPType,
144+
S: UnsignedPType,
145+
L: UnsignedPType,
145146
{
146147
validate_index_ranges(source.len(), starts, lengths, output_len)?;
147148

0 commit comments

Comments
 (0)