Merge remote-tracking branch 'origin/ngates/expr-reduce-rules' into ji/expr-reduce-rules

# Conflicts:
#	vortex-gpu/benches/gpu_bitunpack.rs
#	vortex-layout/src/layouts/dict/reader.rs

Author: joseph-isaacs

vortex-file/src/file.rs

@@ -85,7 +85,7 @@ impl VortexFile {
         self.footer
             .layout()
             // TODO(ngates): we may want to allow the user pass in a name here?
-            .new_reader("".into(), segment_source)
+            .new_reader("".into(), segment_source, &self.session)
     }
 
     /// Initiate a scan of the file, returning a builder for configuring the scan.

vortex-file/src/footer/mod.rs

@@ -86,8 +86,7 @@ impl Footer {
             .map(|encoding| encoding.id());
         let array_ctx = ArrayContext::try_from_registry(session.arrays().registry(), array_ids)?;
 
-        let root_layout =
-            layout_from_flatbuffer(layout_bytes, &dtype, &layout_ctx, &array_ctx, session)?;
+        let root_layout = layout_from_flatbuffer(layout_bytes, &dtype, &layout_ctx, &array_ctx)?;
 
         let segments: Arc<[SegmentSpec]> = fb_footer
             .segment_specs()

vortex-file/src/writer.rs

@@ -150,7 +150,7 @@ impl VortexWriteOptions {
         let layout_fut = self.session.handle().spawn_nested(|h| async move {
             let layout = self
                 .strategy
-                .write_stream(ctx2, &self.session, segments.clone(), stream, eof, h)
+                .write_stream(ctx2, segments.clone(), stream, eof, h)
                 .await?;
             Ok::<_, VortexError>((layout, segments.segment_specs()))
         });

vortex-gpu/benches/gpu_bitunpack.rs

@@ -4,7 +4,6 @@
 #![allow(clippy::unwrap_used)]
 #![allow(dead_code)]
 
-
 use rand::prelude::StdRng;
 use rand::{Rng, SeedableRng};
 use vortex_alp::{ALPArray, Exponents};

vortex-layout/src/children.rs

@@ -10,7 +10,6 @@ use vortex_array::ArrayContext;
 use vortex_dtype::DType;
 use vortex_error::{VortexResult, vortex_bail, vortex_err};
 use vortex_flatbuffers::{FlatBuffer, layout as fbl};
-use vortex_session::VortexSession;
 
 use crate::segments::SegmentId;
 use crate::{LayoutContext, LayoutRef};
@@ -98,7 +97,6 @@ pub(crate) struct ViewedLayoutChildren {
     flatbuffer_loc: usize,
     array_ctx: ArrayContext,
     layout_ctx: LayoutContext,
-    session: VortexSession,
 }
 
 impl ViewedLayoutChildren {
@@ -112,14 +110,12 @@ impl ViewedLayoutChildren {
         flatbuffer_loc: usize,
         array_ctx: ArrayContext,
         layout_ctx: LayoutContext,
-        session: VortexSession,
     ) -> Self {
         Self {
             flatbuffer,
             flatbuffer_loc,
             array_ctx,
             layout_ctx,
-            session,
         }
     }
 
@@ -148,7 +144,6 @@ impl LayoutChildren for ViewedLayoutChildren {
             flatbuffer_loc: fb_child._tab.loc(),
             array_ctx: self.array_ctx.clone(),
             layout_ctx: self.layout_ctx.clone(),
-            session: self.session.clone(),
         };
         let encoding = self
             .layout_ctx
@@ -170,7 +165,6 @@ impl LayoutChildren for ViewedLayoutChildren {
                 .collect_vec(),
             &viewed_children,
             self.array_ctx.clone(),
-            &self.session,
         )
     }
 

vortex-layout/src/encoding.rs

@@ -8,7 +8,6 @@ use arcref::ArcRef;
 use vortex_array::{ArrayContext, DeserializeMetadata};
 use vortex_dtype::DType;
 use vortex_error::{VortexExpect, VortexResult, vortex_panic};
-use vortex_session::VortexSession;
 
 use crate::segments::SegmentId;
 use crate::{IntoLayout, LayoutChildren, LayoutRef, VTable};
@@ -30,7 +29,6 @@ pub trait LayoutEncoding: 'static + Send + Sync + Debug + private::Sealed {
         segment_ids: Vec<SegmentId>,
         children: &dyn LayoutChildren,
         ctx: ArrayContext,
-        session: &VortexSession,
     ) -> VortexResult<LayoutRef>;
 }
 
@@ -54,7 +52,6 @@ impl<V: VTable> LayoutEncoding for LayoutEncodingAdapter<V> {
         segment_ids: Vec<SegmentId>,
         children: &dyn LayoutChildren,
         ctx: ArrayContext,
-        session: &VortexSession,
     ) -> VortexResult<LayoutRef> {
         let metadata = <V::Metadata as DeserializeMetadata>::deserialize(metadata)?;
         let layout = V::build(
@@ -65,7 +62,6 @@ impl<V: VTable> LayoutEncoding for LayoutEncodingAdapter<V> {
             segment_ids,
             children,
             ctx,
-            session,
         )?;
 
         // Validate that the builder function returned the expected values.

vortex-layout/src/flatbuffers.rs

@@ -9,7 +9,6 @@ use vortex_array::ArrayContext;
 use vortex_dtype::DType;
 use vortex_error::{VortexExpect, VortexResult, vortex_err};
 use vortex_flatbuffers::{FlatBuffer, FlatBufferRoot, WriteFlatBuffer, layout};
-use vortex_session::VortexSession;
 
 use crate::children::ViewedLayoutChildren;
 use crate::segments::SegmentId;
@@ -38,7 +37,6 @@ pub fn layout_from_flatbuffer(
     dtype: &DType,
     layout_ctx: &LayoutContext,
     array_ctx: &ArrayContext,
-    session: &VortexSession,
 ) -> VortexResult<LayoutRef> {
     let fb_layout = root_with_opts::<layout::Layout>(&LAYOUT_VERIFIER, &flatbuffer)?;
     let encoding = layout_ctx
@@ -52,7 +50,6 @@ pub fn layout_from_flatbuffer(
             fb_layout._tab.loc(),
             array_ctx.clone(),
             layout_ctx.clone(),
-            session.clone(),
         )
     };
 
@@ -71,7 +68,6 @@ pub fn layout_from_flatbuffer(
             .collect(),
         &viewed_children,
         array_ctx.clone(),
-        session,
     )?;
 
     Ok(layout)

vortex-layout/src/layout.rs

@@ -10,6 +10,7 @@ use itertools::Itertools;
 use vortex_array::SerializeMetadata;
 use vortex_dtype::{DType, FieldName};
 use vortex_error::{VortexExpect, VortexResult, vortex_err};
+use vortex_session::VortexSession;
 
 use crate::display::DisplayLayoutTree;
 use crate::segments::{SegmentId, SegmentSource};
@@ -63,6 +64,7 @@ pub trait Layout: 'static + Send + Sync + Debug + private::Sealed {
         &self,
         name: Arc<str>,
         segment_source: Arc<dyn SegmentSource>,
+        session: &VortexSession,
     ) -> VortexResult<LayoutReaderRef>;
 }
 
@@ -273,8 +275,9 @@ impl<V: VTable> Layout for LayoutAdapter<V> {
         &self,
         name: Arc<str>,
         segment_source: Arc<dyn SegmentSource>,
+        session: &VortexSession,
     ) -> VortexResult<LayoutReaderRef> {
-        V::new_reader(&self.0, name, segment_source)
+        V::new_reader(&self.0, name, segment_source, session)
     }
 }
 

vortex-layout/src/layouts/buffered.rs

@@ -11,7 +11,6 @@ use futures::StreamExt as _;
 use vortex_array::ArrayContext;
 use vortex_error::VortexResult;
 use vortex_io::runtime::Handle;
-use vortex_session::VortexSession;
 
 use crate::segments::SegmentSinkRef;
 use crate::sequence::{
@@ -41,7 +40,6 @@ impl LayoutStrategy for BufferedStrategy {
     async fn write_stream(
         &self,
         ctx: ArrayContext,
-        session: &VortexSession,
         segment_sink: SegmentSinkRef,
         mut stream: SendableSequentialStream,
         mut eof: SequencePointer,
@@ -96,7 +94,6 @@ impl LayoutStrategy for BufferedStrategy {
         self.child
             .write_stream(
                 ctx,
-                session,
                 segment_sink,
                 SequentialStreamAdapter::new(dtype, buffered_stream).sendable(),
                 eof,

vortex-layout/src/layouts/chunked/mod.rs

@@ -65,11 +65,13 @@ impl VTable for ChunkedVTable {
         layout: &Self::Layout,
         name: Arc<str>,
         segment_source: Arc<dyn SegmentSource>,
+        session: &VortexSession,
     ) -> VortexResult<LayoutReaderRef> {
         Ok(Arc::new(ChunkedReader::new(
             layout.clone(),
             name,
             segment_source,
+            session,
         )))
     }
 
@@ -98,7 +100,6 @@ impl VTable for ChunkedVTable {
         _segment_ids: Vec<SegmentId>,
         children: &dyn LayoutChildren,
         _ctx: ArrayContext,
-        _session: &VortexSession,
     ) -> VortexResult<Self::Layout> {
         Ok(ChunkedLayout::new(
             row_count,