Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
orlp committed Feb 27, 2025
1 parent 2b2b63a commit 521eb17
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 32 deletions.
4 changes: 2 additions & 2 deletions crates/polars-arrow/src/array/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pub trait StaticArrayBuilder {
length: usize,
share: ShareStrategy,
);

/// The same as subslice_extend, but repeats the extension `repeats` times.
fn subslice_extend_repeated(
&mut self,
Expand Down Expand Up @@ -95,7 +95,7 @@ impl<T: StaticArrayBuilder> ArrayBuilder for T {
let other: &T::Array = other.as_any().downcast_ref().unwrap();
StaticArrayBuilder::subslice_extend(self, other, start, length, share);
}

fn subslice_extend_repeated(
&mut self,
other: &dyn Array,
Expand Down
17 changes: 10 additions & 7 deletions crates/polars-arrow/src/array/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -681,19 +681,22 @@ mod values;

pub use binary::{BinaryArray, BinaryValueIter, MutableBinaryArray, MutableBinaryValuesArray};
pub use binview::{
validate_utf8_view, BinaryViewArray, BinaryViewArrayGeneric, MutableBinaryViewArray,
MutablePlBinary, MutablePlString, Utf8ViewArray, View, ViewType,
BinaryViewArrayGenericBuilder
validate_utf8_view, BinaryViewArray, BinaryViewArrayGeneric, BinaryViewArrayGenericBuilder,
MutableBinaryViewArray, MutablePlBinary, MutablePlString, Utf8ViewArray, View, ViewType,
};
pub use boolean::{BooleanArray, MutableBooleanArray, BooleanArrayBuilder};
pub use boolean::{BooleanArray, BooleanArrayBuilder, MutableBooleanArray};
pub use dictionary::{DictionaryArray, DictionaryKey, MutableDictionaryArray};
pub use equal::equal;
pub use fixed_size_binary::{FixedSizeBinaryArray, MutableFixedSizeBinaryArray, FixedSizeBinaryArrayBuilder};
pub use fixed_size_list::{FixedSizeListArray, MutableFixedSizeListArray, FixedSizeListArrayBuilder};
pub use fixed_size_binary::{
FixedSizeBinaryArray, FixedSizeBinaryArrayBuilder, MutableFixedSizeBinaryArray,
};
pub use fixed_size_list::{
FixedSizeListArray, FixedSizeListArrayBuilder, MutableFixedSizeListArray,
};
pub use fmt::{get_display, get_value_display};
pub(crate) use iterator::ArrayAccessor;
pub use iterator::ArrayValuesIter;
pub use list::{ListArray, ListValuesIter, MutableListArray, ListArrayBuilder};
pub use list::{ListArray, ListArrayBuilder, ListValuesIter, MutableListArray};
pub use map::MapArray;
pub use null::{MutableNullArray, NullArray, NullArrayBuilder};
use polars_error::PolarsResult;
Expand Down
2 changes: 1 addition & 1 deletion crates/polars-arrow/src/array/null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ impl StaticArrayBuilder for NullArrayBuilder {
) {
self.length += length;
}

fn subslice_extend_repeated(
&mut self,
_other: &NullArray,
Expand Down
6 changes: 4 additions & 2 deletions crates/polars-compute/src/filter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mod scalar;
#[cfg(all(target_arch = "x86_64", feature = "simd"))]
mod avx512;

use arrow::array::builder::{make_builder, ShareStrategy, ArrayBuilder};
use arrow::array::builder::{make_builder, ArrayBuilder, ShareStrategy};
use arrow::array::{
new_empty_array, Array, BinaryViewArray, BooleanArray, PrimitiveArray, Utf8ViewArray,
};
Expand Down Expand Up @@ -100,7 +100,9 @@ pub fn filter_with_bitmap(array: &dyn Array, mask: &Bitmap) -> Box<dyn Array> {
_ => {
let iter = SlicesIterator::new(mask);
let mut mutable = make_builder(array.dtype());
iter.for_each(|(start, len)| mutable.subslice_extend(array, start, len, ShareStrategy::Always));
iter.for_each(|(start, len)| {
mutable.subslice_extend(array, start, len, ShareStrategy::Always)
});
mutable.freeze()
},
}
Expand Down
31 changes: 19 additions & 12 deletions crates/polars-compute/src/if_then_else/array.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use arrow::array::builder::{make_builder, StaticArrayBuilder, ShareStrategy};
use arrow::array::builder::{make_builder, ShareStrategy, StaticArrayBuilder};
use arrow::array::{Array, ArrayCollectIterExt, FixedSizeListArray, FixedSizeListArrayBuilder};
use arrow::bitmap::Bitmap;

Expand All @@ -9,7 +9,8 @@ impl IfThenElseKernel for FixedSizeListArray {

fn if_then_else(mask: &Bitmap, if_true: &Self, if_false: &Self) -> Self {
let inner_dt = if_true.dtype().inner_dtype().unwrap();
let mut builder = FixedSizeListArrayBuilder::new(if_true.dtype().clone(), make_builder(inner_dt));
let mut builder =
FixedSizeListArrayBuilder::new(if_true.dtype().clone(), make_builder(inner_dt));
if_then_else_extend(
&mut builder,
mask,
Expand All @@ -27,7 +28,8 @@ impl IfThenElseKernel for FixedSizeListArray {
let if_true_list: FixedSizeListArray =
std::iter::once(if_true).collect_arr_trusted_with_dtype(if_false.dtype().clone());
let inner_dt = if_false.dtype().inner_dtype().unwrap();
let mut builder = FixedSizeListArrayBuilder::new(if_false.dtype().clone(), make_builder(inner_dt));
let mut builder =
FixedSizeListArrayBuilder::new(if_false.dtype().clone(), make_builder(inner_dt));
if_then_else_extend(
&mut builder,
mask,
Expand All @@ -45,12 +47,15 @@ impl IfThenElseKernel for FixedSizeListArray {
let if_false_list: FixedSizeListArray =
std::iter::once(if_false).collect_arr_trusted_with_dtype(if_true.dtype().clone());
let inner_dt = if_true.dtype().inner_dtype().unwrap();
let mut builder = FixedSizeListArrayBuilder::new(if_true.dtype().clone(), make_builder(inner_dt));
let mut builder =
FixedSizeListArrayBuilder::new(if_true.dtype().clone(), make_builder(inner_dt));
if_then_else_extend(
&mut builder,
mask,
|b, off, len| b.subslice_extend(if_true, off, len, ShareStrategy::Always),
|b, _, len| b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always),
|b, _, len| {
b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always)
},
);
builder.freeze()
}
Expand All @@ -67,12 +72,14 @@ impl IfThenElseKernel for FixedSizeListArray {
std::iter::once(if_false).collect_arr_trusted_with_dtype(dtype.clone());
let inner_dt = dtype.inner_dtype().unwrap();
let mut builder = FixedSizeListArrayBuilder::new(dtype.clone(), make_builder(inner_dt));
if_then_else_extend(
&mut builder,
mask,
|b, _, len| b.subslice_extend_repeated(&if_true_list, 0, 1, len, ShareStrategy::Always),
|b, _, len| b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always),
);
builder.freeze()
if_then_else_extend(
&mut builder,
mask,
|b, _, len| b.subslice_extend_repeated(&if_true_list, 0, 1, len, ShareStrategy::Always),
|b, _, len| {
b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always)
},
);
builder.freeze()
}
}
20 changes: 12 additions & 8 deletions crates/polars-compute/src/if_then_else/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ impl IfThenElseKernel for ListArray<i64> {
&mut builder,
mask,
|b, off, len| b.subslice_extend(if_true, off, len, ShareStrategy::Always),
|b, _, len| b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always),
|b, _, len| {
b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always)
},
);
builder.freeze()
}
Expand All @@ -67,12 +69,14 @@ impl IfThenElseKernel for ListArray<i64> {
std::iter::once(if_false).collect_arr_trusted_with_dtype(dtype.clone());
let inner_dt = dtype.inner_dtype().unwrap();
let mut builder = ListArrayBuilder::new(dtype.clone(), make_builder(inner_dt));
if_then_else_extend(
&mut builder,
mask,
|b, _, len| b.subslice_extend_repeated(&if_true_list, 0, 1, len, ShareStrategy::Always),
|b, _, len| b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always),
);
builder.freeze()
if_then_else_extend(
&mut builder,
mask,
|b, _, len| b.subslice_extend_repeated(&if_true_list, 0, 1, len, ShareStrategy::Always),
|b, _, len| {
b.subslice_extend_repeated(&if_false_list, 0, 1, len, ShareStrategy::Always)
},
);
builder.freeze()
}
}

0 comments on commit 521eb17

Please sign in to comment.