Skip to content

Commit

Permalink
chore: Remove unneeded growable (pola-rs#18165)
Browse files Browse the repository at this point in the history
  • Loading branch information
ritchie46 authored Aug 14, 2024
1 parent 2e5bea3 commit 21f02a6
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 33 deletions.
6 changes: 2 additions & 4 deletions crates/polars-arrow/src/array/growable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ pub use dictionary::GrowableDictionary;

mod binview;
pub use binview::GrowableBinaryViewArray;

mod utils;

/// Describes a struct that can be extended from slices of other pre-existing [`Array`]s.
Expand Down Expand Up @@ -100,8 +101,6 @@ pub fn make_growable<'a>(
Primitive(primitive) => with_match_primitive_type_full!(primitive, |$T| {
dyn_growable!(primitive::GrowablePrimitive::<$T>, arrays, use_validity, capacity)
}),
Utf8 => dyn_growable!(utf8::GrowableUtf8::<i32>, arrays, use_validity, capacity),
LargeUtf8 => dyn_growable!(utf8::GrowableUtf8::<i64>, arrays, use_validity, capacity),
Binary => dyn_growable!(
binary::GrowableBinary::<i32>,
arrays,
Expand All @@ -120,7 +119,6 @@ pub fn make_growable<'a>(
use_validity,
capacity
),
List => dyn_growable!(list::GrowableList::<i32>, arrays, use_validity, capacity),
LargeList => dyn_growable!(list::GrowableList::<i64>, arrays, use_validity, capacity),
Struct => dyn_growable!(structure::GrowableStruct, arrays, use_validity, capacity),
FixedSizeList => dyn_growable!(
Expand Down Expand Up @@ -163,6 +161,6 @@ pub fn make_growable<'a>(
))
})
},
Union | Map => unimplemented!(),
Union | Map | Utf8 | LargeUtf8 | List => unimplemented!(),
}
}
14 changes: 0 additions & 14 deletions crates/polars-arrow/src/compute/concatenate.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
//r Contains the concatenate kernel
//!
//! Example:
//!
//! ```
//! use polars_arrow::array::Utf8Array;
//! use polars_arrow::compute::concatenate::concatenate;
//!
//! let arr = concatenate(&[
//! &Utf8Array::<i32>::from_slice(["hello", "world"]),
//! &Utf8Array::<i32>::from_slice(["!"]),
//! ]).unwrap();
//! assert_eq!(arr.len(), 3);
//! ```
use polars_error::{polars_bail, PolarsResult};

use crate::array::growable::make_growable;
Expand Down
10 changes: 5 additions & 5 deletions crates/polars/tests/it/arrow/array/growable/dictionary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ fn test_single() -> PolarsResult<()> {
let original_data = vec![Some("a"), Some("b"), Some("a")];

let data = original_data.clone();
let mut array = MutableDictionaryArray::<i32, MutableUtf8Array<i64>>::new();
let mut array = MutableDictionaryArray::<i32, MutableBinaryViewArray<str>>::new();
array.try_extend(data)?;
let array = array.into();

// same values, less keys
let expected = DictionaryArray::try_from_keys(
PrimitiveArray::from_vec(vec![1, 0]),
Box::new(Utf8Array::<i64>::from(&original_data)),
Box::new(Utf8ViewArray::from_slice(&original_data)),
)
.unwrap();

Expand All @@ -39,19 +39,19 @@ fn test_multi() -> PolarsResult<()> {
let data1 = original_data1.clone();
let data2 = original_data2.clone();

let mut array1 = MutableDictionaryArray::<i32, MutableUtf8Array<i64>>::new();
let mut array1 = MutableDictionaryArray::<i32, MutableBinaryViewArray<str>>::new();
array1.try_extend(data1)?;
let array1: DictionaryArray<i32> = array1.into();

let mut array2 = MutableDictionaryArray::<i32, MutableUtf8Array<i64>>::new();
let mut array2 = MutableDictionaryArray::<i32, MutableBinaryViewArray<str>>::new();
array2.try_extend(data2)?;
let array2: DictionaryArray<i32> = array2.into();

// same values, less keys
original_data1.extend(original_data2.iter().cloned());
let expected = DictionaryArray::try_from_keys(
PrimitiveArray::from(&[Some(1), None, Some(3), None]),
Utf8Array::<i64>::from_slice(["a", "b", "c", "b", "a"]).boxed(),
Utf8ViewArray::from_slice_values(["a", "b", "c", "b", "a"]).boxed(),
)
.unwrap();

Expand Down
6 changes: 0 additions & 6 deletions crates/polars/tests/it/arrow/array/growable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ fn test_make_growable() {
let array = Int32Array::from_slice([1, 2]);
make_growable(&[&array], false, 2);

let array = Utf8Array::<i32>::from_slice(["a", "aa"]);
make_growable(&[&array], false, 2);

let array = Utf8Array::<i64>::from_slice(["a", "aa"]);
make_growable(&[&array], false, 2);

let array = BinaryArray::<i32>::from_slice([b"a".as_ref(), b"aa".as_ref()]);
make_growable(&[&array], false, 2);

Expand Down
8 changes: 4 additions & 4 deletions crates/polars/tests/it/arrow/array/growable/struct_.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use arrow::array::growable::{Growable, GrowableStruct};
use arrow::array::{Array, PrimitiveArray, StructArray, Utf8Array};
use arrow::array::{Array, PrimitiveArray, StructArray, Utf8ViewArray};
use arrow::bitmap::Bitmap;
use arrow::datatypes::{ArrowDataType, Field};

fn some_values() -> (ArrowDataType, Vec<Box<dyn Array>>) {
let strings: Box<dyn Array> = Box::new(Utf8Array::<i32>::from([
let strings: Box<dyn Array> = Box::new(Utf8ViewArray::from_slice([
Some("a"),
Some("aa"),
None,
Expand All @@ -19,7 +19,7 @@ fn some_values() -> (ArrowDataType, Vec<Box<dyn Array>>) {
Some(5),
]));
let fields = vec![
Field::new("f1", ArrowDataType::Utf8, true),
Field::new("f1", ArrowDataType::Utf8View, true),
Field::new("f2", ArrowDataType::Int32, true),
];
(ArrowDataType::Struct(fields), vec![strings, ints])
Expand Down Expand Up @@ -115,7 +115,7 @@ fn many() {
assert_eq!(mutable.len(), 5);
let result = mutable.as_box();

let expected_string: Box<dyn Array> = Box::new(Utf8Array::<i32>::from([
let expected_string: Box<dyn Array> = Box::new(Utf8ViewArray::from_slice([
Some("aa"),
None,
Some("a"),
Expand Down

0 comments on commit 21f02a6

Please sign in to comment.