Skip to content
Draft
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
1 change: 1 addition & 0 deletions fuzz/src/array/fill_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use vortex_array::arrays::DecimalArray;
use vortex_array::arrays::PrimitiveArray;
use vortex_array::arrays::VarBinViewArray;
use vortex_array::arrays::bool::BoolArrayExt;
use vortex_array::arrays::decimal::DecimalArrayExt;
use vortex_array::builtins::ArrayBuiltins;
use vortex_array::dtype::DType;
use vortex_array::dtype::Nullability;
Expand Down
1 change: 1 addition & 0 deletions fuzz/src/array/mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use vortex_array::arrays::PrimitiveArray;
use vortex_array::arrays::StructArray;
use vortex_array::arrays::VarBinViewArray;
use vortex_array::arrays::bool::BoolArrayExt;
use vortex_array::arrays::decimal::DecimalArrayExt;
use vortex_array::arrays::extension::ExtensionArrayExt;
use vortex_array::arrays::fixed_size_list::FixedSizeListArrayExt;
use vortex_array::arrays::listview::ListViewArrayExt;
Expand Down
1 change: 1 addition & 0 deletions fuzz/src/array/scalar_at.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use vortex_array::Canonical;
use vortex_array::ExecutionCtx;
use vortex_array::IntoArray;
use vortex_array::arrays::bool::BoolArrayExt;
use vortex_array::arrays::decimal::DecimalArrayExt;
use vortex_array::arrays::extension::ExtensionArrayExt;
use vortex_array::arrays::fixed_size_list::FixedSizeListArrayExt;
use vortex_array::arrays::listview::ListViewArrayExt;
Expand Down
1 change: 1 addition & 0 deletions vortex-array/src/aggregate_fn/fns/min_max/decimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use super::MinMaxPartial;
use super::MinMaxResult;
use crate::ExecutionCtx;
use crate::arrays::DecimalArray;
use crate::arrays::decimal::DecimalArrayExt;
use crate::dtype::DecimalDType;
use crate::dtype::NativeDecimalType;
use crate::dtype::Nullability::NonNullable;
Expand Down
4 changes: 2 additions & 2 deletions vortex-array/src/aggregate_fn/fns/sum/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ impl AggregateFnVTable for Sum {

let result = match batch {
Columnar::Canonical(c) => match c {
Canonical::Primitive(p) => accumulate_primitive(&mut inner, p, ctx, skip_nans),
Canonical::Primitive(a) => accumulate_primitive(&mut inner, a, ctx, skip_nans),
Canonical::Decimal(a) => accumulate_decimal(&mut inner, a, ctx),
Canonical::Bool(b) => accumulate_bool(&mut inner, b, ctx),
Canonical::Decimal(d) => accumulate_decimal(&mut inner, d, ctx),
_ => vortex_bail!("Unsupported canonical type for sum: {}", batch.dtype()),
},
Columnar::Constant(_) => unreachable!(),
Expand Down
41 changes: 27 additions & 14 deletions vortex-array/src/array/erased.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,10 @@ use crate::array::ArrayId;
use crate::array::ArrayInner;
use crate::array::ArraySlots;
use crate::array::DynArrayData;
use crate::arrays::Bool;
use crate::arrays::Constant;
use crate::arrays::DictArray;
use crate::arrays::FilterArray;
use crate::arrays::Null;
use crate::arrays::Primitive;
use crate::arrays::SliceArray;
use crate::arrays::VarBin;
use crate::arrays::VarBinView;
use crate::buffer::BufferHandle;
use crate::builders::ArrayBuilder;
use crate::dtype::DType;
Expand Down Expand Up @@ -443,15 +438,6 @@ impl ArrayRef {
nbytes
}

/// Returns whether this array is an arrow encoding.
pub fn is_arrow(&self) -> bool {
self.is::<Null>()
|| self.is::<Bool>()
|| self.is::<Primitive>()
|| self.is::<VarBin>()
|| self.is::<VarBinView>()
}

/// Whether the array is of a canonical encoding.
pub fn is_canonical(&self) -> bool {
self.is::<AnyCanonical>()
Expand Down Expand Up @@ -801,3 +787,30 @@ impl<V: VTable> Matcher for V {
Some(unsafe { ArrayView::new_unchecked(array, &inner.data) })
}
}

#[cfg(test)]
mod tests {
use vortex_buffer::buffer;

use super::*;
use crate::arrays::Decimal;
use crate::arrays::DecimalArray;
use crate::arrays::Primitive;
use crate::dtype::DecimalDType;

#[test]
fn fixed_width_arrays_match_their_logical_vtable() {
let primitive = buffer![1i32].into_array();
let decimal = DecimalArray::new(
buffer![1i32],
DecimalDType::new(1, 0),
Validity::NonNullable,
)
.into_array();

assert!(primitive.is::<Primitive>());
assert!(!primitive.is::<Decimal>());
assert!(decimal.is::<Decimal>());
assert!(!decimal.is::<Primitive>());
}
}
Loading
Loading