Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/between/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::Canonical;
Expand Down Expand Up @@ -176,7 +177,8 @@ impl ScalarFnVTable for Between {
type Options = BetweenOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.between")
static ID: CachedId = CachedId::new("vortex.between");
*ID
}

fn serialize(&self, instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/binary/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -52,7 +53,8 @@ impl ScalarFnVTable for Binary {
type Options = Operator;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.binary")
static ID: CachedId = CachedId::new("vortex.binary");
*ID
}

fn serialize(&self, instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/case_when.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use vortex_mask::AllOr;
use vortex_mask::Mask;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -79,7 +80,8 @@ impl ScalarFnVTable for CaseWhen {
type Options = CaseWhenOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.case_when")
static ID: CachedId = CachedId::new("vortex.case_when");
*ID
}

fn serialize(&self, _options: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/cast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use vortex_error::vortex_bail;
use vortex_error::vortex_err;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::AnyColumnar;
use crate::ArrayRef;
Expand Down Expand Up @@ -53,7 +54,8 @@ impl ScalarFnVTable for Cast {
type Options = DType;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.cast")
static ID: CachedId = CachedId::new("vortex.cast");
*ID
}

fn serialize(&self, dtype: &DType) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/dynamic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use parking_lot::Mutex;
use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -46,7 +47,8 @@ impl ScalarFnVTable for DynamicComparison {
type Options = DynamicComparisonExpr;

fn id(&self) -> ScalarFnId {
ScalarFnId::from("vortex.dynamic")
static ID: CachedId = CachedId::new("vortex.dynamic");
*ID
}

fn arity(&self, _options: &Self::Options) -> Arity {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/fill_null/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use vortex_error::vortex_bail;
use vortex_error::vortex_ensure;
use vortex_error::vortex_err;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::AnyColumnar;
use crate::ArrayRef;
Expand Down Expand Up @@ -37,7 +38,8 @@ impl ScalarFnVTable for FillNull {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.fill_null")
static ID: CachedId = CachedId::new("vortex.fill_null");
*ID
}

fn serialize(&self, _options: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/get_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use vortex_error::VortexResult;
use vortex_error::vortex_err;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -44,7 +45,8 @@ impl ScalarFnVTable for GetItem {
type Options = FieldName;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.get_item")
static ID: CachedId = CachedId::new("vortex.get_item");
*ID
}

fn serialize(&self, instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/is_not_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::fmt::Formatter;
use vortex_array::scalar_fn::internal::row_count::RowCount;
use vortex_error::VortexResult;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -34,7 +35,8 @@ impl ScalarFnVTable for IsNotNull {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.is_not_null")
static ID: CachedId = CachedId::new("vortex.is_not_null");
*ID
}

fn serialize(&self, _instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/is_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use vortex_error::VortexResult;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -32,7 +33,8 @@ impl ScalarFnVTable for IsNull {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::from("vortex.is_null")
static ID: CachedId = CachedId::new("vortex.is_null");
*ID
}

fn serialize(&self, _instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/like/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -63,7 +64,8 @@ impl ScalarFnVTable for Like {
type Options = LikeOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.like")
static ID: CachedId = CachedId::new("vortex.like");
*ID
}

fn serialize(&self, instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/list_contains/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_error::vortex_err;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;
use vortex_utils::iter::ReduceBalancedIterExt;

use crate::ArrayRef;
Expand Down Expand Up @@ -61,7 +62,8 @@ impl ScalarFnVTable for ListContains {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.list.contains")
static ID: CachedId = CachedId::new("vortex.list.contains");
*ID
}

fn serialize(&self, _instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/literal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use vortex_error::VortexResult;
use vortex_error::vortex_err;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -38,7 +39,8 @@ impl ScalarFnVTable for Literal {
type Options = Scalar;

fn id(&self) -> ScalarFnId {
ScalarFnId::from("vortex.literal")
static ID: CachedId = CachedId::new("vortex.literal");
*ID
}

fn serialize(&self, instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/mask/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_error::vortex_ensure;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::Canonical;
Expand Down Expand Up @@ -44,7 +45,8 @@ impl ScalarFnVTable for Mask {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.mask")
static ID: CachedId = CachedId::new("vortex.mask");
*ID
}

fn serialize(&self, _options: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/merge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;
use vortex_utils::aliases::hash_set::HashSet;

use crate::ArrayRef;
Expand Down Expand Up @@ -51,7 +52,8 @@ impl ScalarFnVTable for Merge {
type Options = DuplicateHandling;

fn id(&self) -> ScalarFnId {
ScalarFnId::from("vortex.merge")
static ID: CachedId = CachedId::new("vortex.merge");
*ID
}

fn serialize(&self, instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/not/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pub use kernel::*;
use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand All @@ -33,7 +34,8 @@ impl ScalarFnVTable for Not {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.not")
static ID: CachedId = CachedId::new("vortex.not");
*ID
}

fn serialize(&self, _options: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/pack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use prost::Message;
use vortex_error::VortexResult;
use vortex_proto::expr as pb;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -55,7 +56,8 @@ impl ScalarFnVTable for Pack {
type Options = PackOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::from("vortex.pack")
static ID: CachedId = CachedId::new("vortex.pack");
*ID
}

fn serialize(&self, instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/root.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::fmt::Formatter;
use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand All @@ -30,7 +31,8 @@ impl ScalarFnVTable for Root {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.root")
static ID: CachedId = CachedId::new("vortex.root");
*ID
}

fn serialize(&self, _instance: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use vortex_proto::expr::FieldNames as ProtoFieldNames;
use vortex_proto::expr::SelectOpts;
use vortex_proto::expr::select_opts::Opts;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -48,7 +49,8 @@ impl ScalarFnVTable for Select {
type Options = FieldSelection;

fn id(&self) -> ScalarFnId {
ScalarFnId::from("vortex.select")
static ID: CachedId = CachedId::new("vortex.select");
*ID
}

fn serialize(&self, instance: &FieldSelection) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/stat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::fmt::Formatter;

use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -82,7 +83,8 @@ impl ScalarFnVTable for StatFn {
type Options = StatOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.stat")
static ID: CachedId = CachedId::new("vortex.stat");
*ID
}

fn arity(&self, _options: &Self::Options) -> Arity {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/variant_get/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use vortex_error::vortex_err;
use vortex_proto::expr as pb;
use vortex_proto::expr::variant_path_element;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;
use vortex_utils::aliases::StringEscape;

use crate::ArrayRef;
Expand Down Expand Up @@ -45,7 +46,8 @@ impl ScalarFnVTable for VariantGet {
type Options = VariantGetOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.variant_get")
static ID: CachedId = CachedId::new("vortex.variant_get");
*ID
}

fn serialize(&self, options: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/fns/zip/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use vortex_error::vortex_ensure;
use vortex_mask::Mask;
use vortex_mask::MaskValues;
use vortex_session::VortexSession;
use vortex_session::registry::CachedId;

use crate::ArrayRef;
use crate::ExecutionCtx;
Expand Down Expand Up @@ -46,7 +47,8 @@ impl ScalarFnVTable for Zip {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::new("vortex.zip")
static ID: CachedId = CachedId::new("vortex.zip");
*ID
}

fn serialize(&self, _options: &Self::Options) -> VortexResult<Option<Vec<u8>>> {
Expand Down
4 changes: 3 additions & 1 deletion vortex-array/src/scalar_fn/internal/row_count.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use vortex_array::scalar_fn::ScalarFnVTable;
use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_error::vortex_ensure;
use vortex_session::registry::CachedId;

/// Zero-argument placeholder for the row count of the current evaluation scope.
///
Expand Down Expand Up @@ -48,7 +49,8 @@ impl ScalarFnVTable for RowCount {
type Options = EmptyOptions;

fn id(&self) -> ScalarFnId {
ScalarFnId::from("vortex.row_count")
static ID: CachedId = CachedId::new("vortex.row_count");
*ID
}

fn arity(&self, _options: &Self::Options) -> Arity {
Expand Down
Loading
Loading