StructArray::columns return slice

apache · Nov 24, 2022 · 98e0f16 · 98e0f16
1 parent 5640a5b
commit 98e0f16
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/arrow-array/src/array/struct_array.rs b/arrow-array/src/array/struct_array.rs
@@ -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

diff --git a/arrow-cast/src/display.rs b/arrow-cast/src/display.rs
@@ -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)?;
             }

diff --git a/arrow-ipc/src/writer.rs b/arrow-ipc/src/writer.rs
@@ -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,

diff --git a/parquet/src/arrow/arrow_writer/levels.rs b/parquet/src/arrow/arrow_writer/levels.rs
@@ -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())
             }
         };