wip

Signed-off-by: Joe Isaacs <[email protected]>

Author: joseph-isaacs

vortex-array/src/array/transform/optimizer.rs

@@ -64,8 +64,9 @@ impl ArrayOptimizer {
         let mut children_changed = false;
 
         for child in children.iter() {
+            let child = child.to_array();
             let optimized_child = self.apply_parent_rules(child.clone(), ctx)?;
-            children_changed |= !std::sync::Arc::ptr_eq(&optimized_child, child);
+            children_changed |= !std::sync::Arc::ptr_eq(&optimized_child, &child);
             optimized_children.push(optimized_child);
         }
 
@@ -128,8 +129,9 @@ impl ArrayOptimizer {
             let mut changed = false;
 
             for child in children.iter() {
+                let child = child.to_array();
                 let optimized_child = self.apply_reduce_rules(child.clone(), ctx)?;
-                changed |= !std::sync::Arc::ptr_eq(&optimized_child, child);
+                changed |= !std::sync::Arc::ptr_eq(&optimized_child, &child);
                 new_children.push(optimized_child);
             }
 

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

@@ -3,7 +3,7 @@
 
 use crate::arrays::{ChunkedArray, ChunkedVTable};
 use crate::vtable::VisitorVTable;
-use crate::{Array, ArrayBufferVisitor, ArrayChildVisitor};
+use crate::{ArrayBufferVisitor, ArrayChildVisitor};
 
 impl VisitorVTable<ChunkedVTable> for ChunkedVTable {
     fn visit_buffers(_array: &ChunkedArray, _visitor: &mut dyn ArrayBufferVisitor) {}

vortex-array/src/encoding.rs

@@ -47,12 +47,6 @@ pub trait Encoding: 'static + private::Sealed + Send + Sync + Debug {
         children: &dyn ArrayChildren,
     ) -> VortexResult<ArrayRef>;
 
-    fn with_children(
-        &self,
-        array: &dyn Array,
-        children: &dyn ArrayChildren,
-    ) -> VortexResult<ArrayRef>;
-
     /// Encode the canonical array into this encoding implementation.
     /// Returns `None` if this encoding does not support the given canonical array, for example
     /// if the data type is incompatible.