Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix nested struct append #4217

Merged
merged 1 commit into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions polars/polars-core/src/chunked_array/logical/struct_/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ impl StructChunked {
}
}

pub(crate) fn arrow_array(&self) -> &ArrayRef {
&self.chunks[0]
}

pub(crate) fn chunks(&self) -> &Vec<ArrayRef> {
&self.chunks
}
Expand Down
11 changes: 1 addition & 10 deletions polars/polars-core/src/series/into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@ use polars_arrow::compute::cast::cast;
impl Series {
/// Returns a reference to the Arrow ArrayRef
pub fn array_ref(&self, chunk_idx: usize) -> &ArrayRef {
match self.dtype() {
#[cfg(feature = "dtype-struct")]
DataType::Struct(_) => {
let ca = self.struct_().unwrap();
ca.arrow_array()
}
_ => &self.chunks()[chunk_idx] as &ArrayRef,
}
&self.chunks()[chunk_idx] as &ArrayRef
}

/// Convert a chunk in the Series to the correct Arrow type.
Expand Down Expand Up @@ -78,8 +71,6 @@ impl Series {
}
#[cfg(feature = "dtype-time")]
DataType::Time => cast(&*self.chunks()[chunk_idx], &DataType::Time.to_arrow()).unwrap(),
#[cfg(feature = "dtype-struct")]
DataType::Struct(_) => self.array_ref(chunk_idx).clone(),
_ => self.array_ref(chunk_idx).clone(),
}
}
Expand Down
17 changes: 6 additions & 11 deletions polars/polars-core/src/series/iterator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,14 @@ impl FromIterator<String> for Series {

#[cfg(any(feature = "rows", feature = "dtype-struct"))]
impl Series {
/// iterate over [`Series`] as [`AnyValue`].
///
/// # Panics
/// This will panic if the array is not rechunked first.
pub fn iter(&self) -> SeriesIter<'_> {
let dtype = self.dtype();
let arr = match dtype {
#[cfg(feature = "dtype-struct")]
DataType::Struct(_) => {
let ca = self.struct_().unwrap();
&**ca.arrow_array()
}
_ => {
assert_eq!(self.chunks().len(), 1, "impl error");
&*self.chunks()[0]
}
};
assert_eq!(self.chunks().len(), 1, "impl error");
let arr = &*self.chunks()[0];
let len = arr.len();
SeriesIter {
arr,
Expand Down
3 changes: 3 additions & 0 deletions py-polars/src/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,9 @@ impl ToPyObject for Wrap<&Utf8Chunked> {
impl ToPyObject for Wrap<&StructChunked> {
fn to_object(&self, py: Python) -> PyObject {
let s = self.0.clone().into_series();
// todo! iterate its chunks and flatten.
// make series::iter() accept a chunk index.
let s = s.rechunk();
let iter = s.iter().map(|av| {
if let AnyValue::Struct(vals, flds) = av {
struct_dict(py, vals, flds)
Expand Down
41 changes: 41 additions & 0 deletions py-polars/tests/test_struct.py
Original file line number Diff line number Diff line change
Expand Up @@ -566,3 +566,44 @@ def test_nested_explode_4026() -> None:
],
"day": ["monday", "monday"],
}


def test_nested_struct_sliced_append() -> None:
s = pl.Series(
[
{
"_experience": {
"aaid": {
"id": "A",
"namespace": {"code": "alpha"},
}
}
},
{
"_experience": {
"aaid": {
"id": "B",
"namespace": {"code": "bravo"},
},
}
},
{
"_experience": {
"aaid": {
"id": "D",
"namespace": {"code": "delta"},
}
}
},
]
)
s2 = s[1:]
s.append(s2)

assert s.to_list() == [
{"_experience": {"aaid": {"id": "A", "namespace": {"code": "alpha"}}}},
{"_experience": {"aaid": {"id": "B", "namespace": {"code": "bravo"}}}},
{"_experience": {"aaid": {"id": "D", "namespace": {"code": "delta"}}}},
{"_experience": {"aaid": {"id": "B", "namespace": {"code": "bravo"}}}},
{"_experience": {"aaid": {"id": "D", "namespace": {"code": "delta"}}}},
]