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
2 changes: 1 addition & 1 deletion encodings/alp/src/alp/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ impl VTable for ALPVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
// TODO(joe): take by value
Ok(Canonical::Primitive(execute_decompress(
array.clone(),
Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/src/alp_rd/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ impl VTable for ALPRDVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
let left_parts = array.left_parts().clone().execute::<PrimitiveArray>(ctx)?;
let right_parts = array.right_parts().clone().execute::<PrimitiveArray>(ctx)?;

Expand Down
2 changes: 1 addition & 1 deletion encodings/bytebool/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ impl VTable for ByteBoolVTable {
))
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
let boolean_buffer = BitBuffer::from(array.as_slice());
let validity = array.validity().clone();
Ok(Canonical::Bool(BoolArray::new(boolean_buffer, validity)))
Expand Down
2 changes: 1 addition & 1 deletion encodings/datetime-parts/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ impl VTable for DateTimePartsVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Extension(decode_to_temporal(array, ctx)?.into()))
}

Expand Down
2 changes: 1 addition & 1 deletion encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl VTable for DecimalBytePartsVTable {
}))
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
to_canonical_decimal(array, ctx)
}
}
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/bitpacking/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ impl VTable for BitPackedVTable {
})
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Primitive(unpack_array(array, ctx)?))
}

Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/delta/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ impl VTable for DeltaVTable {
DeltaArray::try_new(bases, deltas, metadata.0.offset as usize, len)
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Primitive(delta_decompress(array, ctx)?))
}
}
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/for/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ impl VTable for FoRVTable {
}))
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Primitive(decompress(array, ctx)?))
}
}
Expand Down
2 changes: 1 addition & 1 deletion encodings/fastlanes/src/rle/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ impl VTable for RLEVTable {
PARENT_KERNELS.execute(array, parent, child_idx, ctx)
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Primitive(rle_decompress(array, ctx)?))
}

Expand Down
2 changes: 1 addition & 1 deletion encodings/fsst/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ impl VTable for FSSTVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
canonicalize_fsst(array, ctx)
}

Expand Down
2 changes: 1 addition & 1 deletion encodings/pco/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ impl VTable for PcoVTable {
Ok(Some(array._slice(range.start, range.end).into_array()))
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Primitive(array.decompress()?))
}
}
Expand Down
2 changes: 1 addition & 1 deletion encodings/runend/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ impl VTable for RunEndVTable {
PARENT_KERNELS.execute(array, parent, child_idx, ctx)
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
run_end_canonicalize(array, ctx)
}
}
Expand Down
2 changes: 1 addition & 1 deletion encodings/sequence/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ impl VTable for SequenceVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
let prim = match_each_native_ptype!(array.ptype(), |P| {
let base = array.base().cast::<P>();
let multiplier = array.multiplier().cast::<P>();
Expand Down
2 changes: 1 addition & 1 deletion encodings/sparse/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ impl VTable for SparseVTable {
))
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
canonicalize_sparse(array)
}
}
Expand Down
2 changes: 1 addition & 1 deletion encodings/zigzag/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl VTable for ZigZagVTable {
))
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Primitive(zigzag_decode(
array.encoded().clone().execute(ctx)?,
)))
Expand Down
2 changes: 1 addition & 1 deletion encodings/zstd/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ impl VTable for ZstdVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
array.decompress()?.execute(ctx)
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/array/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ impl<V: VTable> Array for ArrayAdapter<V> {
}

fn to_canonical(&self) -> VortexResult<Canonical> {
let canonical = V::execute(&self.0, &mut LEGACY_SESSION.create_execution_ctx())?;
let canonical = V::canonicalize(&self.0, &mut LEGACY_SESSION.create_execution_ctx())?;

assert_eq!(
self.len(),
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/bool/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ impl VTable for BoolVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Bool(array.clone()))
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/chunked/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl VTable for ChunkedVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
_canonicalize(array, ctx)
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/constant/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ impl VTable for ConstantVTable {
))
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
constant_canonicalize(array)
}
}
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/decimal/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ impl VTable for DecimalVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Decimal(array.clone()))
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/dict/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ impl VTable for DictVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
if let Some(canonical) = execute_fast_path(array, ctx)? {
return Ok(canonical);
}
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/extension/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ impl VTable for ExtensionVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Extension(array.clone()))
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/filter/vtable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl VTable for FilterVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
if let Some(canonical) = execute_filter_fast_paths(array, ctx)? {
return Ok(canonical);
}
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/fixed_size_list/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ impl VTable for FixedSizeListVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::FixedSizeList(array.clone()))
}
}
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/list/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl VTable for ListVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::List(list_view_from_list(array.clone(), ctx)?))
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/listview/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ impl VTable for ListViewVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::List(array.clone()))
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/masked/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ impl VTable for MaskedVTable {
MaskedArray::try_new(child, validity)
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
let validity_mask = array.validity_mask()?;

// Fast path: all masked means result is all nulls.
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/null/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl VTable for NullVTable {
Ok(Some(NullArray::new(range.len()).into_array()))
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Null(array.clone()))
}
}
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/primitive/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ impl VTable for PrimitiveVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Primitive(array.clone()))
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/scalar_fn/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl VTable for ScalarFnVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
let args = ExecutionArgs {
inputs: array.children.clone(),
row_count: array.len,
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/slice/vtable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl VTable for SliceVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
// Execute the child to get canonical form, then slice it
let canonical = array.child.clone().execute::<Canonical>(ctx)?;
let result = canonical.as_ref().slice(array.range.clone())?;
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/struct_/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ impl VTable for StructVTable {
Ok(())
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::Struct(array.clone()))
}

Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/varbin/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ impl VTable for VarBinVTable {
}))
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
varbin_to_canonical(array, ctx)
}
}
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/varbinview/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ impl VTable for VarBinViewVTable {
))
}

fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
Ok(Canonical::VarBinView(array.clone()))
}
}
2 changes: 1 addition & 1 deletion vortex-array/src/arrow/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl VTable for ArrowVTable {
Ok(())
}

fn execute(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(array: &Self::Array, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
ArrayRef::from_arrow(array.inner.as_ref(), array.dtype.is_nullable())?
.execute::<Canonical>(ctx)
}
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl Executable for Canonical {
}

// Otherwise fall back to the default execution.
array.vtable().execute_canonical(&array, ctx)
array.vtable().canonicalize(&array, ctx)
}
}

Expand Down
16 changes: 4 additions & 12 deletions vortex-array/src/vtable/dyn_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,8 @@ pub trait DynVTable: 'static + private::Sealed + Send + Sync + Debug {
child_idx: usize,
) -> VortexResult<Option<ArrayRef>>;

/// See [`VTable::execute`]
fn execute_canonical(
&self,
array: &ArrayRef,
ctx: &mut ExecutionCtx,
) -> VortexResult<Canonical>;
/// See [`VTable::canonicalize`]
fn canonicalize(&self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<Canonical>;

/// See [`VTable::execute_parent`]
fn execute_parent(
Expand Down Expand Up @@ -148,12 +144,8 @@ impl<V: VTable> DynVTable for ArrayVTableAdapter<V> {
Ok(Some(reduced))
}

fn execute_canonical(
&self,
array: &ArrayRef,
ctx: &mut ExecutionCtx,
) -> VortexResult<Canonical> {
let result = V::execute(downcast::<V>(array), ctx)?;
fn canonicalize(&self, array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
let result = V::canonicalize(downcast::<V>(array), ctx)?;

if cfg!(debug_assertions) {
vortex_ensure!(
Expand Down
4 changes: 2 additions & 2 deletions vortex-array/src/vtable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub trait VTable: 'static + Sized + Send + Sync + Debug {
builder: &mut dyn ArrayBuilder,
ctx: &mut ExecutionCtx,
) -> VortexResult<()> {
let canonical = Self::execute(array, ctx)?;
let canonical = Self::canonicalize(array, ctx)?;
builder.extend_from_array(canonical.as_ref());
Ok(())
}
Expand Down Expand Up @@ -145,7 +145,7 @@ pub trait VTable: 'static + Sized + Send + Sync + Debug {
///
/// Debug builds will panic if the returned array is of the wrong type, wrong length, or
/// incorrectly contains null values.
fn execute(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical>;
fn canonicalize(array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical>;

/// Attempt to execute the parent of this array to produce a [`Canonical`].
///
Expand Down
2 changes: 1 addition & 1 deletion vortex-python/src/arrays/py/vtable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ impl VTable for PythonVTable {
Ok(())
}

fn execute(_array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
fn canonicalize(_array: &Self::Array, _ctx: &mut ExecutionCtx) -> VortexResult<Canonical> {
todo!()
}
}
Expand Down
Loading