Skip to content

Commit a2cf571

Browse files
dankingdanking
committed
Rename contiguous PiecewiseSequence helpers
Signed-off-by: Daniel King <dan@spiraldb.com>
1 parent 699f48a commit a2cf571

6 files changed

Lines changed: 30 additions & 30 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use crate::arrays::PiecewiseSequence;
2222
use crate::arrays::PrimitiveArray;
2323
use crate::arrays::bool::BoolArrayExt;
2424
use crate::arrays::dict::TakeExecute;
25-
use crate::arrays::piecewise_sequence::UnitMultiplierLengths;
26-
use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
25+
use crate::arrays::piecewise_sequence::ConstantOrArray;
26+
use crate::arrays::piecewise_sequence::maybe_contiguous_slices;
2727
use crate::builtins::ArrayBuiltins;
2828
use crate::dtype::UnsignedPType;
2929
use crate::executor::ExecutionCtx;
@@ -75,13 +75,13 @@ fn take_contiguous_ranges(
7575
indices_ref: &ArrayRef,
7676
ctx: &mut ExecutionCtx,
7777
) -> VortexResult<Option<ArrayRef>> {
78-
let Some((starts, lengths)) = execute_unit_multiplier_index_arrays(indices, ctx)? else {
78+
let Some((starts, lengths)) = maybe_contiguous_slices(indices, ctx)? else {
7979
return Ok(None);
8080
};
8181
let source = array.to_bit_buffer();
8282
let output_len = indices_ref.len();
8383
let buffer = match &lengths {
84-
UnitMultiplierLengths::Constant(length) => {
84+
ConstantOrArray::Constant(length) => {
8585
match_each_unsigned_integer_ptype!(starts.ptype(), |S| {
8686
take_bit_slices_constant_length(
8787
&source,
@@ -91,7 +91,7 @@ fn take_contiguous_ranges(
9191
)?
9292
})
9393
}
94-
UnitMultiplierLengths::Array(lengths) => {
94+
ConstantOrArray::Array(lengths) => {
9595
match_each_unsigned_integer_ptype!(starts.ptype(), |S| {
9696
match_each_unsigned_integer_ptype!(lengths.ptype(), |L| {
9797
take_bit_slices(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ use crate::arrays::DecimalArray;
1616
use crate::arrays::PiecewiseSequence;
1717
use crate::arrays::PrimitiveArray;
1818
use crate::arrays::dict::TakeExecute;
19-
use crate::arrays::piecewise_sequence::UnitMultiplierLengths;
20-
use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
19+
use crate::arrays::piecewise_sequence::ConstantOrArray;
20+
use crate::arrays::piecewise_sequence::maybe_contiguous_slices;
2121
use crate::dtype::IntegerPType;
2222
use crate::dtype::NativeDecimalType;
2323
use crate::dtype::UnsignedPType;
@@ -64,16 +64,16 @@ fn take_contiguous_ranges(
6464
indices_ref: &ArrayRef,
6565
ctx: &mut ExecutionCtx,
6666
) -> VortexResult<Option<ArrayRef>> {
67-
let Some((starts, lengths)) = execute_unit_multiplier_index_arrays(indices, ctx)? else {
67+
let Some((starts, lengths)) = maybe_contiguous_slices(indices, ctx)? else {
6868
return Ok(None);
6969
};
7070
let validity = array.validity()?.take(indices_ref)?;
7171
let output_len = indices_ref.len();
7272
let taken = match lengths {
73-
UnitMultiplierLengths::Constant(length) => {
73+
ConstantOrArray::Constant(length) => {
7474
take_slices_constant_length(array, &starts, length, validity, output_len)?
7575
}
76-
UnitMultiplierLengths::Array(lengths) => {
76+
ConstantOrArray::Array(lengths) => {
7777
take_slices(array, &starts, &lengths, validity, output_len)?
7878
}
7979
};

‎vortex-array/src/arrays/piecewise_sequence/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ pub(crate) fn execute_index_arrays(
6767
Ok((starts, lengths, multipliers))
6868
}
6969

70-
pub(crate) enum UnitMultiplierLengths {
70+
pub(crate) enum ConstantOrArray {
7171
Constant(usize),
7272
Array(PrimitiveArray),
7373
}
7474

75-
pub(crate) fn execute_unit_multiplier_index_arrays(
75+
pub(crate) fn maybe_contiguous_slices(
7676
array: ArrayView<'_, PiecewiseSequence>,
7777
ctx: &mut ExecutionCtx,
78-
) -> VortexResult<Option<(PrimitiveArray, UnitMultiplierLengths)>> {
78+
) -> VortexResult<Option<(PrimitiveArray, ConstantOrArray)>> {
7979
if !is_constant_multiplier_one(array.multipliers()) {
8080
return Ok(None);
8181
}
@@ -84,12 +84,12 @@ pub(crate) fn execute_unit_multiplier_index_arrays(
8484
let starts = array.starts().clone().execute::<PrimitiveArray>(ctx)?;
8585
if let Some(length) = constant_unsigned_usize(array.lengths())? {
8686
check_index_arrays(starts.as_ref(), array.lengths(), array.multipliers())?;
87-
return Ok(Some((starts, UnitMultiplierLengths::Constant(length))));
87+
return Ok(Some((starts, ConstantOrArray::Constant(length))));
8888
}
8989

9090
let lengths = array.lengths().clone().execute::<PrimitiveArray>(ctx)?;
9191
check_index_arrays(starts.as_ref(), lengths.as_ref(), array.multipliers())?;
92-
Ok(Some((starts, UnitMultiplierLengths::Array(lengths))))
92+
Ok(Some((starts, ConstantOrArray::Array(lengths))))
9393
}
9494

9595
pub(crate) fn is_constant_multiplier_one(multipliers: &ArrayRef) -> bool {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ use crate::arrays::PiecewiseSequence;
2323
use crate::arrays::Primitive;
2424
use crate::arrays::PrimitiveArray;
2525
use crate::arrays::dict::TakeExecute;
26-
use crate::arrays::piecewise_sequence::UnitMultiplierLengths;
27-
use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
26+
use crate::arrays::piecewise_sequence::ConstantOrArray;
27+
use crate::arrays::piecewise_sequence::maybe_contiguous_slices;
2828
use crate::builtins::ArrayBuiltins;
2929
use crate::dtype::DType;
3030
use crate::dtype::IntegerPType;
@@ -144,16 +144,16 @@ fn take_contiguous_ranges(
144144
indices_ref: &ArrayRef,
145145
ctx: &mut ExecutionCtx,
146146
) -> VortexResult<Option<ArrayRef>> {
147-
let Some((starts, lengths)) = execute_unit_multiplier_index_arrays(indices, ctx)? else {
147+
let Some((starts, lengths)) = maybe_contiguous_slices(indices, ctx)? else {
148148
return Ok(None);
149149
};
150150
let validity = array.validity()?.take(indices_ref)?;
151151
let output_len = indices_ref.len();
152152
let taken = match lengths {
153-
UnitMultiplierLengths::Constant(length) => {
153+
ConstantOrArray::Constant(length) => {
154154
take_slices_constant_length(array, &starts, length, validity, output_len)?
155155
}
156-
UnitMultiplierLengths::Array(lengths) => {
156+
ConstantOrArray::Array(lengths) => {
157157
take_slices(array, &starts, &lengths, validity, output_len)?
158158
}
159159
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::arrays::PrimitiveArray;
2020
use crate::arrays::VarBin;
2121
use crate::arrays::VarBinArray;
2222
use crate::arrays::dict::TakeExecute;
23-
use crate::arrays::piecewise_sequence::UnitMultiplierLengths;
24-
use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
23+
use crate::arrays::piecewise_sequence::ConstantOrArray;
24+
use crate::arrays::piecewise_sequence::maybe_contiguous_slices;
2525
use crate::arrays::primitive::PrimitiveArrayExt;
2626
use crate::arrays::varbin::VarBinArrayExt;
2727
use crate::dtype::DType;
@@ -132,7 +132,7 @@ fn take_contiguous_ranges(
132132
indices_ref: &ArrayRef,
133133
ctx: &mut ExecutionCtx,
134134
) -> VortexResult<Option<ArrayRef>> {
135-
let Some((starts, lengths)) = execute_unit_multiplier_index_arrays(indices, ctx)? else {
135+
let Some((starts, lengths)) = maybe_contiguous_slices(indices, ctx)? else {
136136
return Ok(None);
137137
};
138138
let offsets = array.offsets().clone().execute::<PrimitiveArray>(ctx)?;
@@ -144,15 +144,15 @@ fn take_contiguous_ranges(
144144
let output_len = indices_ref.len();
145145

146146
let result = match &lengths {
147-
UnitMultiplierLengths::Constant(length) => gather_slices_constant_dispatch(
147+
ConstantOrArray::Constant(length) => gather_slices_constant_dispatch(
148148
&starts,
149149
*length,
150150
&offsets,
151151
data,
152152
output_len,
153153
out_offset_ptype,
154154
)?,
155-
UnitMultiplierLengths::Array(lengths) => gather_slices_dispatch(
155+
ConstantOrArray::Array(lengths) => gather_slices_dispatch(
156156
&starts,
157157
lengths,
158158
&offsets,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use crate::arrays::PrimitiveArray;
2222
use crate::arrays::VarBinView;
2323
use crate::arrays::VarBinViewArray;
2424
use crate::arrays::dict::TakeExecute;
25-
use crate::arrays::piecewise_sequence::UnitMultiplierLengths;
26-
use crate::arrays::piecewise_sequence::execute_unit_multiplier_index_arrays;
25+
use crate::arrays::piecewise_sequence::ConstantOrArray;
26+
use crate::arrays::piecewise_sequence::maybe_contiguous_slices;
2727
use crate::arrays::varbinview::BinaryView;
2828
use crate::buffer::BufferHandle;
2929
use crate::dtype::UnsignedPType;
@@ -78,13 +78,13 @@ fn take_contiguous_ranges(
7878
indices_ref: &ArrayRef,
7979
ctx: &mut ExecutionCtx,
8080
) -> VortexResult<Option<ArrayRef>> {
81-
let Some((starts, lengths)) = execute_unit_multiplier_index_arrays(indices, ctx)? else {
81+
let Some((starts, lengths)) = maybe_contiguous_slices(indices, ctx)? else {
8282
return Ok(None);
8383
};
8484
let source = array.views();
8585
let output_len = indices_ref.len();
8686
let views = match &lengths {
87-
UnitMultiplierLengths::Constant(length) => {
87+
ConstantOrArray::Constant(length) => {
8888
match_each_unsigned_integer_ptype!(starts.ptype(), |S| {
8989
gather_view_slices_constant_length(
9090
source,
@@ -94,7 +94,7 @@ fn take_contiguous_ranges(
9494
)?
9595
})
9696
}
97-
UnitMultiplierLengths::Array(lengths) => {
97+
ConstantOrArray::Array(lengths) => {
9898
match_each_unsigned_integer_ptype!(starts.ptype(), |S| {
9999
match_each_unsigned_integer_ptype!(lengths.ptype(), |L| {
100100
gather_view_slices(

0 commit comments

Comments
 (0)