CastFn

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

Author: gatesn

vortex-array/src/expr/expression.rs

@@ -91,25 +91,6 @@ impl Expression {
         Ok(this)
     }
 
-    /// Creates a new expression with the given encoding, metadata, and children.
-    ///
-    /// # Safety
-    ///
-    /// The caller must ensure that the provided `encoding` is compatible with the
-    /// `metadata` and `children`. Failure to do so may lead to undefined behavior
-    ///  when the expression is used.
-    pub(super) unsafe fn new_unchecked_erased(
-        vtable: ExprVTable,
-        data: Arc<dyn Any + Send + Sync>,
-        children: Arc<[Expression]>,
-    ) -> Self {
-        Self {
-            vtable,
-            data,
-            children,
-        }
-    }
-
     /// Returns if the expression is an instance of the given vtable.
     pub fn is<V: VTable>(&self) -> bool {
         self.vtable.is::<V>()

vortex-array/src/expr/functions/vtable.rs

@@ -331,3 +331,16 @@ impl fmt::Display for EmptyOptions {
         Ok(())
     }
 }
+
+pub trait ScalarFnVTableExt: VTable {
+    /// Creates a new ScalarFn instance with the given options.
+    fn new(self, options: Self::Options) -> ScalarFn {
+        ScalarFn::new(self, options)
+    }
+
+    /// Creates a new ScalarFn instance with the given options from a 'static vtable.
+    fn new_static(&'static self, options: Self::Options) -> ScalarFn {
+        ScalarFn::new_static(self, options)
+    }
+}
+impl<V: VTable> ScalarFnVTableExt for V {}

vortex-array/src/lib.rs

@@ -40,7 +40,7 @@ pub mod optimizer;
 mod partial_ord;
 pub mod patches;
 pub mod pipeline;
-mod scalar_fns;
+pub mod scalar_fns;
 pub mod search_sorted;
 pub mod serde;
 pub mod session;

vortex-array/src/scalar_fns/cast/array.rs

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright the Vortex contributors
+
+use crate::optimizer::rules::ArrayReduceRule;
+
+pub struct CastReduce;
+impl ArrayReduceRule {}

vortex-array/src/scalar_fns/cast/mod.rs

@@ -1,18 +1,19 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
+mod array;
+
 use crate::expr::functions::{ArgName, Arity, ExecutionCtx, FunctionId, NullHandling, VTable};
 use crate::expr::stats::Stat;
 use crate::expr::{Expression, StatsCatalog};
-use crate::scalar_fns::BuiltinFunctions;
+use crate::scalar_fns::BuiltinScalarFns;
 use prost::Message;
 use vortex_dtype::DType;
 use vortex_error::{vortex_err, vortex_panic, VortexExpect, VortexResult};
 use vortex_proto::expr as pb;
 use vortex_vector::Datum;
 
 pub struct CastFn;
-
 impl VTable for CastFn {
     type Options = DType;
 

vortex-array/src/scalar_fns/mod.rs

@@ -19,18 +19,18 @@ use vortex_error::VortexResult;
 mod cast;
 
 /// A collection of built-in scalar functions that can be applied to expressions or arrays.
-pub trait BuiltinFunctions: Sized {
+pub trait BuiltinScalarFns: Sized {
     /// Cast to the given data type.
     fn cast(&self, dtype: DType) -> VortexResult<Self>;
 }
 
-impl BuiltinFunctions for Expression {
+impl BuiltinScalarFns for Expression {
     fn cast(&self, dtype: DType) -> VortexResult<Expression> {
         CastFn.try_new_expr(dtype, [self.clone()])
     }
 }
 
-impl BuiltinFunctions for ArrayRef {
+impl BuiltinScalarFns for ArrayRef {
     fn cast(&self, dtype: DType) -> VortexResult<Self> {
         CastFn.try_new_array(self.len(), dtype, [self.clone()])
     }