CastFn

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

Author: gatesn

Cargo.lock

@@ -206,6 +206,7 @@ tpchgen-arrow = { version = "2" }
 tracing = { version = "0.1.41" }
 tracing-perfetto = "0.1.5"
 tracing-subscriber = "0.3.20"
+type-map = "0.5.1"
 url = "2.5.7"
 uuid = { version = "1.18", features = ["js"] }
 walkdir = "2.5.0"

Cargo.toml

@@ -61,6 +61,7 @@ tabled = { workspace = true, optional = true, default-features = false, features
     "std",
 ] }
 termtree = { workspace = true }
+type-map = { workspace = true }
 vortex-buffer = { workspace = true, features = ["arrow"] }
 vortex-compute = { workspace = true, default-features = true }
 vortex-dtype = { workspace = true, features = ["arrow", "serde"] }

vortex-array/Cargo.toml

@@ -15,6 +15,7 @@ use crate::execution::BatchKernelRef;
 use crate::execution::BindCtx;
 use crate::execution::kernel;
 use crate::optimizer::rules::ArrayParentReduceRule;
+use crate::optimizer::rules::Exact;
 use crate::vtable::OperatorVTable;
 use crate::vtable::ValidityHelper;
 
@@ -47,7 +48,7 @@ impl OperatorVTable<BoolVTable> for BoolVTable {
 #[derive(Default, Debug)]
 pub struct BoolMaskedValidityRule;
 
-impl ArrayParentReduceRule<BoolVTable, MaskedVTable> for BoolMaskedValidityRule {
+impl ArrayParentReduceRule<Exact<BoolVTable>, Exact<MaskedVTable>> for BoolMaskedValidityRule {
     fn reduce_parent(
         &self,
         array: &BoolArray,

vortex-array/src/arrays/bool/vtable/operator.rs

@@ -17,6 +17,7 @@ use crate::execution::BatchKernelRef;
 use crate::execution::BindCtx;
 use crate::execution::kernel;
 use crate::optimizer::rules::ArrayParentReduceRule;
+use crate::optimizer::rules::Exact;
 use crate::vtable::OperatorVTable;
 use crate::vtable::ValidityHelper;
 
@@ -54,7 +55,9 @@ impl OperatorVTable<DecimalVTable> for DecimalVTable {
 #[derive(Default, Debug)]
 pub struct DecimalMaskedValidityRule;
 
-impl ArrayParentReduceRule<DecimalVTable, MaskedVTable> for DecimalMaskedValidityRule {
+impl ArrayParentReduceRule<Exact<DecimalVTable>, Exact<MaskedVTable>>
+    for DecimalMaskedValidityRule
+{
     fn reduce_parent(
         &self,
         array: &DecimalArray,

vortex-array/src/arrays/decimal/vtable/operator.rs

@@ -17,6 +17,7 @@ use crate::execution::BatchKernelRef;
 use crate::execution::BindCtx;
 use crate::execution::kernel;
 use crate::optimizer::rules::ArrayParentReduceRule;
+use crate::optimizer::rules::Exact;
 use crate::vtable::OperatorVTable;
 use crate::vtable::ValidityHelper;
 
@@ -52,7 +53,9 @@ impl OperatorVTable<PrimitiveVTable> for PrimitiveVTable {
 #[derive(Default, Debug)]
 pub struct PrimitiveMaskedValidityRule;
 
-impl ArrayParentReduceRule<PrimitiveVTable, MaskedVTable> for PrimitiveMaskedValidityRule {
+impl ArrayParentReduceRule<Exact<PrimitiveVTable>, Exact<MaskedVTable>>
+    for PrimitiveMaskedValidityRule
+{
     fn reduce_parent(
         &self,
         array: &PrimitiveArray,

vortex-array/src/arrays/primitive/vtable/operator.rs

@@ -52,7 +52,7 @@ impl Expression {
     ) -> VortexResult<Self> {
         let vtable = ExprVTable::new::<V>(vtable);
         let data = Arc::new(data);
-        Self::try_new_erased(vtable, data.clone(), children.into())
+        Self::try_new_erased(vtable, data, children.into())
     }
 
     /// Create a new expression from a static vtable.

vortex-array/src/expr/expression.rs

@@ -334,12 +334,12 @@ impl fmt::Display for EmptyOptions {
 
 pub trait ScalarFnVTableExt: VTable {
     /// Creates a new ScalarFn instance with the given options.
-    fn new(self, options: Self::Options) -> ScalarFn {
+    fn new_fn(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 {
+    fn new_fn_static(&'static self, options: Self::Options) -> ScalarFn {
         ScalarFn::new_static(self, options)
     }
 }