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

StructArray::columns return slice #3186

Merged
merged 1 commit into from Nov 25, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions arrow-array/src/array/struct_array.rs
Expand Up @@ -67,13 +67,14 @@ impl StructArray {
}

/// Returns the fields of the struct array
pub fn columns(&self) -> Vec<&ArrayRef> {
self.boxed_fields.iter().collect()
pub fn columns(&self) -> &[ArrayRef] {
&self.boxed_fields
}

/// Returns child array refs of the struct array
#[deprecated(note = "Use columns().to_vec()")]
pub fn columns_ref(&self) -> Vec<ArrayRef> {
self.boxed_fields.clone()
self.columns().to_vec()
}

/// Return field names in this struct array
Expand Down
2 changes: 1 addition & 1 deletion arrow-cast/src/display.rs
Expand Up @@ -459,7 +459,7 @@ pub fn array_value_to_string(

let mut s = String::new();
s.push('{');
let mut kv_iter = st.columns().into_iter().zip(st.column_names().into_iter());
let mut kv_iter = st.columns().iter().zip(st.column_names());
if let Some((col, name)) = kv_iter.next() {
append_struct_field_string(&mut s, name, col, row)?;
}
Expand Down
2 changes: 1 addition & 1 deletion arrow-ipc/src/writer.rs
Expand Up @@ -177,7 +177,7 @@ impl IpcDataGenerator {
match column.data_type() {
DataType::Struct(fields) => {
let s = as_struct_array(column);
for (field, &column) in fields.iter().zip(s.columns().iter()) {
for (field, column) in fields.iter().zip(s.columns()) {
self.encode_dictionaries(
field,
column,
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/arrow/arrow_writer/levels.rs
Expand Up @@ -324,7 +324,7 @@ impl LevelInfoBuilder {
};

let write_non_null = |children: &mut [LevelInfoBuilder], range: Range<usize>| {
for (child_array, child) in array.columns().into_iter().zip(children) {
for (child_array, child) in array.columns().iter().zip(children) {
child.write(child_array, range.clone())
}
};
Expand Down