Run optimizer on root array only on (#5710)

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

encodings/alp/src/alp/array.rs

@@ -709,7 +709,7 @@ mod tests {
         let slice_len = slice_end - slice_start;
         let sliced_encoded = encoded.slice(slice_start..slice_end);
 
-        let result_vector = sliced_encoded.execute_vector_optimized(&SESSION).unwrap();
+        let result_vector = sliced_encoded.execute_vector(&SESSION).unwrap();
         let result_primitive = result_vector.into_primitive().into_f64();
 
         for idx in 0..slice_len {

encodings/fsst/src/array.rs

@@ -393,7 +393,7 @@ impl VisitorVTable<FSSTVTable> for FSSTVTable {
     }
 
     fn visit_children(array: &FSSTArray, visitor: &mut dyn ArrayChildVisitor) {
-        visitor.visit_child("codes", array.codes().as_ref());
+        visitor.visit_child("codes", &array.codes().to_array());
         visitor.visit_child("uncompressed_lengths", array.uncompressed_lengths());
     }
 }

vortex-array/src/array/mod.rs

@@ -680,8 +680,8 @@ impl<V: VTable> ArrayVisitor for ArrayAdapter<V> {
         }
 
         impl ArrayChildVisitor for ChildrenCollector {
-            fn visit_child(&mut self, _name: &str, array: &dyn Array) {
-                self.children.push(array.to_array());
+            fn visit_child(&mut self, _name: &str, array: &ArrayRef) {
+                self.children.push(array.clone());
             }
         }
 
@@ -702,7 +702,7 @@ impl<V: VTable> ArrayVisitor for ArrayAdapter<V> {
         }
 
         impl ArrayChildVisitor for ChildNameCollector {
-            fn visit_child(&mut self, name: &str, _array: &dyn Array) {
+            fn visit_child(&mut self, name: &str, _array: &ArrayRef) {
                 self.names.push(name.to_string());
             }
         }
@@ -718,7 +718,7 @@ impl<V: VTable> ArrayVisitor for ArrayAdapter<V> {
         }
 
         impl ArrayChildVisitor for NamedChildrenCollector {
-            fn visit_child(&mut self, name: &str, array: &dyn Array) {
+            fn visit_child(&mut self, name: &str, array: &ArrayRef) {
                 self.children.push((name.to_string(), array.to_array()));
             }
         }

vortex-array/src/array/visitor.rs

@@ -2,14 +2,14 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use std::fmt::Formatter;
-use std::ops::Deref;
 use std::sync::Arc;
 
 use vortex_buffer::ByteBuffer;
 use vortex_error::VortexResult;
 
 use crate::Array;
 use crate::ArrayRef;
+use crate::IntoArray;
 use crate::arrays::ConstantArray;
 use crate::patches::Patches;
 use crate::validity::Validity;
@@ -118,7 +118,7 @@ pub trait ArrayBufferVisitor {
 
 pub trait ArrayChildVisitor {
     /// Visit a child of this array.
-    fn visit_child(&mut self, _name: &str, _array: &dyn Array);
+    fn visit_child(&mut self, _name: &str, _array: &ArrayRef);
 
     /// Utility for visiting Array validity.
     fn visit_validity(&mut self, validity: &Validity, len: usize) {
@@ -135,7 +135,7 @@ pub trait ArrayChildVisitor {
                 //  * is_nullable & has_validity => Validity::Array (or Validity::AllInvalid)
                 //  * is_nullable & !has_validity => Validity::AllValid
                 //  * !is_nullable => Validity::NonNullable
-                self.visit_child("validity", ConstantArray::new(false, len).deref())
+                self.visit_child("validity", &ConstantArray::new(false, len).into_array())
             }
             Validity::Array(array) => {
                 self.visit_child("validity", array);

vortex-array/src/arrays/chunked/vtable/visitor.rs

@@ -11,7 +11,7 @@ impl VisitorVTable<ChunkedVTable> for ChunkedVTable {
     fn visit_buffers(_array: &ChunkedArray, _visitor: &mut dyn ArrayBufferVisitor) {}
 
     fn visit_children(array: &ChunkedArray, visitor: &mut dyn ArrayChildVisitor) {
-        visitor.visit_child("chunk_offsets", array.chunk_offsets.as_ref());
+        visitor.visit_child("chunk_offsets", &array.chunk_offsets.to_array());
 
         for (idx, chunk) in array.chunks().iter().enumerate() {
             visitor.visit_child(format!("chunks[{idx}]").as_str(), chunk);

vortex-array/src/arrays/extension/vtable/visitor.rs

@@ -11,6 +11,6 @@ impl VisitorVTable<ExtensionVTable> for ExtensionVTable {
     fn visit_buffers(_array: &ExtensionArray, _visitor: &mut dyn ArrayBufferVisitor) {}
 
     fn visit_children(array: &ExtensionArray, visitor: &mut dyn ArrayChildVisitor) {
-        visitor.visit_child("storage", array.storage.as_ref());
+        visitor.visit_child("storage", &array.storage);
     }
 }

vortex-array/src/arrays/filter/vtable.rs

@@ -126,7 +126,7 @@ impl VTable for FilterVTable {
                     return Ok(new_k);
                 }
                 PushDownResult::NotPushed(child) => {
-                    tracing::warn!(
+                    tracing::debug!(
                         "Filter pushdown was cheaper but not supported by child array {}",
                         array.child.display_tree()
                     );

vortex-array/src/arrays/masked/vtable/mod.rs

@@ -42,7 +42,7 @@ impl VisitorVTable<MaskedVTable> for MaskedVTable {
     fn visit_buffers(_array: &MaskedArray, _visitor: &mut dyn ArrayBufferVisitor) {}
 
     fn visit_children(array: &MaskedArray, visitor: &mut dyn ArrayChildVisitor) {
-        visitor.visit_child("child", array.child.as_ref());
+        visitor.visit_child("child", &array.child);
         visitor.visit_validity(&array.validity, array.child.len());
     }
 }

vortex-array/src/arrays/scalar_fn/vtable/canonical.rs

@@ -19,11 +19,9 @@ impl CanonicalVTable<ScalarFnVTable> for ScalarFnVTable {
 
         let mut child_datums = Vec::with_capacity(array.children.len());
         for child in array.children.iter() {
-            let datum = child
-                .execute_datum_optimized(&LEGACY_SESSION)
-                .vortex_expect(
-                    "Failed to execute child array during canonicalization of ScalarFnArray",
-                );
+            let datum = child.execute_datum(&LEGACY_SESSION).vortex_expect(
+                "Failed to execute child array during canonicalization of ScalarFnArray",
+            );
             child_datums.push(datum);
         }
 

vortex-array/src/arrays/scalar_fn/vtable/visitor.rs

@@ -13,7 +13,7 @@ impl VisitorVTable<ScalarFnVTable> for ScalarFnVTable {
     fn visit_children(array: &ScalarFnArray, visitor: &mut dyn ArrayChildVisitor) {
         for (idx, child) in array.children.iter().enumerate() {
             let name = array.scalar_fn.signature().child_name(idx);
-            visitor.visit_child(name.as_ref(), child.as_ref())
+            visitor.visit_child(name.as_ref(), child)
         }
     }
 }