Clarify docs in session accessors

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

Author: gatesn

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

@@ -13,18 +13,15 @@ use std::ops::Deref;
 use itertools::Itertools;
 use vortex_buffer::BufferHandle;
 use vortex_dtype::DType;
-use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_ensure;
+use vortex_error::VortexResult;
 
-use crate::Array;
-use crate::ArrayRef;
-use crate::IntoArray;
-use crate::arrays::ConstantVTable;
 use crate::arrays::scalar_fn::array::ScalarFnArray;
 use crate::arrays::scalar_fn::kernel::KernelInput;
 use crate::arrays::scalar_fn::kernel::ScalarFnKernel;
 use crate::arrays::scalar_fn::metadata::ScalarFnMetadata;
+use crate::arrays::ConstantVTable;
 use crate::expr;
 use crate::expr::ExprVTable;
 use crate::expr::ScalarFn;
@@ -39,6 +36,9 @@ use crate::vtable::ArrayVTable;
 use crate::vtable::ArrayVTableExt;
 use crate::vtable::NotSupported;
 use crate::vtable::VTable;
+use crate::Array;
+use crate::ArrayRef;
+use crate::IntoArray;
 
 vtable!(ScalarFn);
 

vortex-array/src/arrays/struct_/rules.rs

@@ -21,7 +21,7 @@ use crate::ArrayRef;
 use crate::IntoArray;
 
 #[derive(Debug)]
-pub struct StructGetItemRule;
+pub(crate) struct StructGetItemRule;
 impl ArrayParentReduceRule<Exact<StructVTable>, ExactScalarFn<GetItem>> for StructGetItemRule {
     fn child(&self) -> Exact<StructVTable> {
         Exact::from(&StructVTable)

vortex-array/src/executor.rs

@@ -36,8 +36,6 @@ impl VectorExecutor for ArrayRef {
     }
 
     fn execute_datum(&self, session: &VortexSession) -> VortexResult<Datum> {
-        log::error!("Executing array: {}", self.display_tree());
-
         // Attempt to short-circuit constant arrays.
         if let Some(constant) = self.as_opt::<ConstantVTable>() {
             return Ok(Datum::Scalar(constant.scalar().to_vector_scalar()));

vortex-array/src/expr/exprs/binary.rs

@@ -8,14 +8,14 @@ use prost::Message;
 use vortex_compute::arrow::IntoArrow;
 use vortex_compute::arrow::IntoVector;
 use vortex_dtype::DType;
-use vortex_error::VortexExpect;
-use vortex_error::VortexResult;
 use vortex_error::vortex_bail;
 use vortex_error::vortex_err;
+use vortex_error::VortexExpect;
+use vortex_error::VortexResult;
 use vortex_proto::expr as pb;
 use vortex_vector::Datum;
+use vortex_vector::VectorOps;
 
-use crate::ArrayRef;
 use crate::compute;
 use crate::compute::add;
 use crate::compute::and_kleene;
@@ -24,17 +24,18 @@ use crate::compute::div;
 use crate::compute::mul;
 use crate::compute::or_kleene;
 use crate::compute::sub;
+use crate::expr::expression::Expression;
+use crate::expr::exprs::literal::lit;
+use crate::expr::exprs::operators::Operator;
+use crate::expr::stats::Stat;
 use crate::expr::Arity;
 use crate::expr::ChildName;
 use crate::expr::ExecutionArgs;
 use crate::expr::ExprId;
 use crate::expr::StatsCatalog;
 use crate::expr::VTable;
 use crate::expr::VTableExt;
-use crate::expr::expression::Expression;
-use crate::expr::exprs::literal::lit;
-use crate::expr::exprs::operators::Operator;
-use crate::expr::stats::Stat;
+use crate::ArrayRef;
 
 pub struct Binary;
 
@@ -187,6 +188,11 @@ impl VTable for Binary {
             }
         };
 
+        // Arrow computed over scalar datums
+        if vector.len() == 1 && args.row_count != 1 {
+            return Ok(Datum::Scalar(vector.scalar_at(0)));
+        }
+
         Ok(Datum::Vector(vector))
     }
 
@@ -583,10 +589,10 @@ mod tests {
     use super::lt_eq;
     use super::not_eq;
     use super::or;
-    use crate::expr::Expression;
     use crate::expr::exprs::get_item::col;
     use crate::expr::exprs::literal::lit;
     use crate::expr::test_harness;
+    use crate::expr::Expression;
 
     #[test]
     fn and_collect_left_assoc() {

vortex-array/src/expr/vtable.rs

@@ -8,7 +8,6 @@ use std::fmt::Display;
 use std::fmt::Formatter;
 use std::hash::Hash;
 use std::hash::Hasher;
-use std::ops::Deref;
 use std::sync::Arc;
 
 use arcref::ArcRef;
@@ -344,7 +343,7 @@ pub struct VTableAdapter<V>(V);
 impl<V: VTable> DynExprVTable for VTableAdapter<V> {
     #[inline(always)]
     fn as_any(&self) -> &dyn Any {
-        self
+        &self.0
     }
 
     #[inline(always)]
@@ -422,7 +421,8 @@ impl<V: VTable> DynExprVTable for VTableAdapter<V> {
             assert_eq!(
                 v.len(),
                 expected_row_count,
-                "Expression execution returned vector of length {}, but expected {}",
+                "Expression execution {} returned vector of length {}, but expected {}",
+                self.0.id(),
                 v.len(),
                 expected_row_count,
             );
@@ -431,7 +431,6 @@ impl<V: VTable> DynExprVTable for VTableAdapter<V> {
         // In debug mode, validate that the output dtype matches the expected return dtype.
         #[cfg(debug_assertions)]
         {
-            use vortex_error::vortex_ensure;
             use vortex_vector::datum_matches_dtype;
 
             if !datum_matches_dtype(&result, &expected_dtype) {
@@ -441,12 +440,6 @@ impl<V: VTable> DynExprVTable for VTableAdapter<V> {
                     result
                 );
             }
-
-            vortex_ensure!(
-                datum_matches_dtype(&result, &expected_dtype),
-                "Expression execution invalid for dtype {}",
-                expected_dtype
-            );
         }
 
         Ok(result)
@@ -537,7 +530,7 @@ impl ExprVTable {
 
     /// Return the vtable as an Any reference.
     pub fn as_any(&self) -> &dyn Any {
-        self.0.deref().as_any()
+        self.0.as_any()
     }
 
     /// Creates a new [`ExprVTable`] from a vtable.
@@ -560,7 +553,7 @@ impl ExprVTable {
 
     /// Returns whether this vtable is of a given type.
     pub fn is<V: VTable>(&self) -> bool {
-        self.0.as_any().is::<VTableAdapter<V>>()
+        self.0.as_any().is::<V>()
     }
 
     /// Deserialize an options of this expression vtable from metadata.