No expr for now

Signed-off-by: Adam Gutglick <adam@spiraldb.com>

Author: AdamGS

vortex-array/public-api.lock

@@ -2,7 +2,6 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 mod operations;
-mod rules;
 mod validity;
 
 use std::hash::Hasher;
@@ -12,7 +11,6 @@ use vortex_error::VortexResult;
 use vortex_error::vortex_ensure;
 use vortex_error::vortex_panic;
 
-use self::rules::PARENT_RULES;
 use crate::ArrayEq;
 use crate::ArrayHash;
 use crate::ArrayRef;
@@ -156,12 +154,4 @@ impl VTable for Variant {
         // VariantArray is the canonical variant representation.
         Ok(ExecutionStep::done(array.clone().into_array()))
     }
-
-    fn reduce_parent(
-        array: &Self::Array,
-        parent: &ArrayRef,
-        child_idx: usize,
-    ) -> VortexResult<Option<ArrayRef>> {
-        PARENT_RULES.evaluate(array, parent, child_idx)
-    }
 }

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

@@ -33,9 +33,6 @@ use crate::scalar_fn::fns::list_contains::ListContains;
 use crate::scalar_fn::fns::mask::Mask;
 use crate::scalar_fn::fns::not::Not;
 use crate::scalar_fn::fns::operators::Operator;
-use crate::scalar_fn::fns::variant_get::VariantGet;
-use crate::scalar_fn::fns::variant_get::VariantGetOptions;
-use crate::scalar_fn::fns::variant_get::VariantPath;
 use crate::scalar_fn::fns::zip::Zip;
 
 /// A collection of built-in scalar functions that can be applied to expressions or arrays.
@@ -66,9 +63,6 @@ pub trait ExprBuiltins: Sized {
     /// Conditional selection: `result[i] = if mask[i] then if_true[i] else if_false[i]`.
     fn zip(&self, if_true: Expression, if_false: Expression) -> VortexResult<Expression>;
 
-    /// Extract data by path and dtype from a variant expression.
-    fn variant_get(&self, path: Option<VariantPath>, dtype: DType) -> VortexResult<Expression>;
-
     /// Apply a binary operator to this expression and another.
     fn binary(&self, rhs: Expression, op: Operator) -> VortexResult<Expression>;
 }
@@ -106,10 +100,6 @@ impl ExprBuiltins for Expression {
         Zip.try_new_expr(EmptyOptions, [if_true, if_false, self.clone()])
     }
 
-    fn variant_get(&self, path: Option<VariantPath>, dtype: DType) -> VortexResult<Expression> {
-        VariantGet.try_new_expr(VariantGetOptions::new(path, dtype), [self.clone()])
-    }
-
     fn binary(&self, rhs: Expression, op: Operator) -> VortexResult<Expression> {
         Binary.try_new_expr(op, [self.clone(), rhs])
     }
@@ -142,9 +132,6 @@ pub trait ArrayBuiltins: Sized {
     /// Check if a list contains a value.
     fn list_contains(&self, value: ArrayRef) -> VortexResult<ArrayRef>;
 
-    /// Extract data by path and dtype from a variant array.
-    fn variant_get(&self, path: Option<VariantPath>, dtype: DType) -> VortexResult<ArrayRef>;
-
     /// Apply a binary operator to this array and another.
     fn binary(&self, rhs: ArrayRef, op: Operator) -> VortexResult<ArrayRef>;
 
@@ -215,16 +202,6 @@ impl ArrayBuiltins for ArrayRef {
             .optimize()
     }
 
-    fn variant_get(&self, path: Option<VariantPath>, dtype: DType) -> VortexResult<ArrayRef> {
-        VariantGet
-            .try_new_array(
-                self.len(),
-                VariantGetOptions::new(path, dtype),
-                [self.clone()],
-            )?
-            .optimize()
-    }
-
     fn binary(&self, rhs: ArrayRef, op: Operator) -> VortexResult<ArrayRef> {
         Binary
             .try_new_array(self.len(), op, [self.clone(), rhs])?

vortex-array/src/arrays/variant/vtable/rules.rs

@@ -45,9 +45,6 @@ use crate::scalar_fn::fns::pack::PackOptions;
 use crate::scalar_fn::fns::root::Root;
 use crate::scalar_fn::fns::select::FieldSelection;
 use crate::scalar_fn::fns::select::Select;
-use crate::scalar_fn::fns::variant_get::VariantGet;
-use crate::scalar_fn::fns::variant_get::VariantGetOptions;
-use crate::scalar_fn::fns::variant_get::VariantPath;
 use crate::scalar_fn::fns::zip::Zip;
 
 // ---- Root ----
@@ -666,13 +663,6 @@ pub fn dynamic(
     )
 }
 
-// ---- VariantGet ----
-
-/// Creates an expression that extracts data by path and dtype from a variant expression.
-pub fn variant_get(path: Option<VariantPath>, dtype: DType, child: Expression) -> Expression {
-    VariantGet.new_expr(VariantGetOptions::new(path, dtype), vec![child])
-}
-
 // ---- ListContains ----
 
 /// Creates an expression that checks if a value is contained in a list.

vortex-array/src/builtins.rs

@@ -19,5 +19,4 @@ pub mod operators;
 pub mod pack;
 pub mod root;
 pub mod select;
-pub mod variant_get;
 pub mod zip;

vortex-array/src/expr/exprs.rs

@@ -23,7 +23,6 @@ use crate::scalar_fn::fns::not::Not;
 use crate::scalar_fn::fns::pack::Pack;
 use crate::scalar_fn::fns::root::Root;
 use crate::scalar_fn::fns::select::Select;
-use crate::scalar_fn::fns::variant_get::VariantGet;
 
 /// Registry of scalar function vtables.
 /// Registry of scalar function vtables.
@@ -68,7 +67,6 @@ impl Default for ScalarFnSession {
         this.register(Pack);
         this.register(Root);
         this.register(Select);
-        this.register(VariantGet);
 
         this
     }

vortex-array/src/scalar_fn/fns/mod.rs

@@ -89,8 +89,3 @@ message SelectOpts {
 message CaseWhenOpts {
   uint32 num_children = 1;
 }
-
-// Options for `vortex.variant_get`
-message VariantGetOpts {
-  vortex.dtype.DType dtype = 1;
-}

vortex-array/src/scalar_fn/fns/variant_get.rs

@@ -1152,34 +1152,6 @@ pub fn vortex_proto::expr::SelectOpts::clear(&mut self)
 
 pub fn vortex_proto::expr::SelectOpts::encoded_len(&self) -> usize
 
-pub struct vortex_proto::expr::VariantGetOpts
-
-pub vortex_proto::expr::VariantGetOpts::dtype: core::option::Option<vortex_proto::dtype::DType>
-
-impl core::clone::Clone for vortex_proto::expr::VariantGetOpts
-
-pub fn vortex_proto::expr::VariantGetOpts::clone(&self) -> vortex_proto::expr::VariantGetOpts
-
-impl core::cmp::PartialEq for vortex_proto::expr::VariantGetOpts
-
-pub fn vortex_proto::expr::VariantGetOpts::eq(&self, other: &vortex_proto::expr::VariantGetOpts) -> bool
-
-impl core::default::Default for vortex_proto::expr::VariantGetOpts
-
-pub fn vortex_proto::expr::VariantGetOpts::default() -> Self
-
-impl core::fmt::Debug for vortex_proto::expr::VariantGetOpts
-
-pub fn vortex_proto::expr::VariantGetOpts::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-
-impl core::marker::StructuralPartialEq for vortex_proto::expr::VariantGetOpts
-
-impl prost::message::Message for vortex_proto::expr::VariantGetOpts
-
-pub fn vortex_proto::expr::VariantGetOpts::clear(&mut self)
-
-pub fn vortex_proto::expr::VariantGetOpts::encoded_len(&self) -> usize
-
 pub mod vortex_proto::scalar
 
 pub mod vortex_proto::scalar::scalar_value