fixes

Signed-off-by: Robert Kruszewski <github@robertk.io>

Author: robert3005

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

@@ -270,10 +270,10 @@ fn append_value_or_nulls<B: ArrayBuilder + 'static>(
 mod tests {
     use rstest::rstest;
     use vortex_error::VortexResult;
-    use vortex_session::VortexSession;
 
     use crate::IntoArray;
     use crate::VortexSessionExecute;
+    use crate::array_session;
     use crate::arrays::ConstantArray;
     use crate::arrays::constant::vtable::canonical::constant_canonicalize;
     use crate::assert_arrays_eq;
@@ -286,7 +286,7 @@ mod tests {
 
     /// Appends `array` into a fresh builder and asserts the result matches `constant_canonicalize`.
     fn assert_append_matches_canonical(array: ConstantArray) -> VortexResult<()> {
-        let mut ctx = VortexSession::empty().create_execution_ctx();
+        let mut ctx = array_session().create_execution_ctx();
 
         let expected = constant_canonicalize(array.as_view(), &mut ctx)?.into_array();
         let mut builder = builder_with_capacity(array.dtype(), array.len());

vortex-array/src/arrays/patched/compute/take.rs

@@ -133,11 +133,11 @@ mod tests {
 
     use vortex_buffer::buffer;
     use vortex_error::VortexResult;
-    use vortex_session::VortexSession;
 
     use crate::ArrayRef;
     use crate::ExecutionCtx;
     use crate::IntoArray;
+    use crate::array_session;
     use crate::arrays::Patched;
     use crate::arrays::PrimitiveArray;
     use crate::assert_arrays_eq;
@@ -158,7 +158,7 @@ mod tests {
             None,
         )?;
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         Patched::from_array_and_patches(values, &patches, &mut ctx)?

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

@@ -354,7 +354,6 @@ mod tests {
     use vortex_buffer::buffer;
     use vortex_buffer::buffer_mut;
     use vortex_error::VortexResult;
-    use vortex_session::VortexSession;
     use vortex_session::registry::ReadContext;
 
     use crate::ArrayContext;
@@ -363,6 +362,7 @@ mod tests {
     use crate::ExecutionCtx;
     use crate::IntoArray;
     use crate::LEGACY_SESSION;
+    use crate::array_session;
     use crate::arrays::Patched;
     use crate::arrays::PatchedArray;
     use crate::arrays::PrimitiveArray;
@@ -389,7 +389,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)
@@ -422,7 +422,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)
@@ -455,7 +455,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)
@@ -488,7 +488,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)
@@ -525,7 +525,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)
@@ -569,7 +569,7 @@ mod tests {
 
         let patches = Patches::new(len, 0, indices, patch_vals, None)?;
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         Patched::from_array_and_patches(array, &patches, &mut ctx)
@@ -646,7 +646,7 @@ mod tests {
         assert_eq!(array_ref.dtype(), new_array.dtype());
 
         // Execute both and compare results
-        let mut ctx = ExecutionCtx::new(VortexSession::empty());
+        let mut ctx = ExecutionCtx::new(array_session());
         let original_executed = array_ref.execute::<Canonical>(&mut ctx)?.into_primitive();
         let new_executed = new_array.execute::<Canonical>(&mut ctx)?.into_primitive();
 
@@ -672,7 +672,7 @@ mod tests {
         let new_array = array_ref.with_slots(slots.into_slots())?;
 
         // Execute and verify the inner values changed (except at patch positions)
-        let mut ctx = ExecutionCtx::new(VortexSession::empty());
+        let mut ctx = ExecutionCtx::new(array_session());
         let executed = new_array.execute::<Canonical>(&mut ctx)?.into_primitive();
 
         // Expected: all 5s except indices 1, 2, 3 which are patched to 10, 20, 30

vortex-array/src/arrays/patched/vtable/operations.rs

@@ -58,12 +58,12 @@ impl OperationsVTable<Patched> for Patched {
 #[cfg(test)]
 mod tests {
     use vortex_buffer::buffer;
-    use vortex_session::VortexSession;
 
     use crate::ExecutionCtx;
     use crate::IntoArray;
     use crate::LEGACY_SESSION;
     use crate::VortexSessionExecute;
+    use crate::array_session;
     use crate::arrays::Patched;
     use crate::dtype::Nullability;
     use crate::optimizer::ArrayOptimizer;
@@ -82,7 +82,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)
@@ -127,7 +127,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)
@@ -159,7 +159,7 @@ mod tests {
         )
         .unwrap();
 
-        let session = VortexSession::empty();
+        let session = array_session();
         let mut ctx = ExecutionCtx::new(session);
 
         let array = Patched::from_array_and_patches(values, &patches, &mut ctx)

vortex-array/src/executor.rs

@@ -26,7 +26,6 @@ use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_ensure;
 use vortex_error::vortex_panic;
-use vortex_session::SessionExt;
 use vortex_session::VortexSession;
 
 use crate::AnyCanonical;
@@ -203,7 +202,7 @@ impl ArrayRef {
                 && let Some(result) = try_execute_parent(
                     &frame.parent_array,
                     std::iter::once((frame.slot_idx, &current_array)),
-                    &kernels,
+                    kernels,
                     ctx,
                 )?
             {
@@ -215,8 +214,12 @@ impl ArrayRef {
 
             // Step 2b: execute_parent against current_array's own children.
             if current_builder.is_none()
-                && let Some(rewritten) =
-                    try_execute_parent(&current_array, occupied_slots(&current_array), &kernels, ctx)?
+                && let Some(rewritten) = try_execute_parent(
+                    &current_array,
+                    occupied_slots(&current_array),
+                    kernels,
+                    ctx,
+                )?
             {
                 current_array = rewritten.optimize_ctx(ctx.session())?;
                 continue;
@@ -427,7 +430,7 @@ impl Executable for ArrayRef {
         let kernels = session.get::<ArrayKernels>();
 
         if let Some(executed_parent) =
-            try_execute_parent(&array, occupied_slots(&array), &kernels, ctx)?
+            try_execute_parent(&array, occupied_slots(&array), kernels, ctx)?
         {
             return Ok(executed_parent);
         }