Skip to content

Commit 6f291c7

Browse files
joseph-isaacsjoseph-isaacs
authored
break[array]: remove old vtable! macro (#7317)
This is now unneeded --------- Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
1 parent 7a144d3 commit 6f291c7

File tree

43 files changed

+80
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+80
-121
lines changed

‎encodings/alp/src/alp/array.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use vortex_array::patches::PatchesMetadata;
2727
use vortex_array::require_child;
2828
use vortex_array::require_patches;
2929
use vortex_array::serde::ArrayChildren;
30-
use vortex_array::vtable;
3130
use vortex_array::vtable::VTable;
3231
use vortex_array::vtable::ValidityChild;
3332
use vortex_array::vtable::ValidityVTableFromChild;
@@ -44,7 +43,8 @@ use crate::alp::decompress::execute_decompress;
4443
use crate::alp::rules::PARENT_KERNELS;
4544
use crate::alp::rules::RULES;
4645

47-
vtable!(ALP, ALP, ALPData);
46+
/// A [`ALP`]-encoded Vortex array.
47+
pub type ALPArray = Array<ALP>;
4848

4949
impl ArrayHash for ALPData {
5050
fn array_hash<H: Hasher>(&self, state: &mut H, _precision: Precision) {

‎encodings/alp/src/alp_rd/array.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ use vortex_array::require_child;
3131
use vortex_array::require_patches;
3232
use vortex_array::serde::ArrayChildren;
3333
use vortex_array::validity::Validity;
34-
use vortex_array::vtable;
3534
use vortex_array::vtable::VTable;
3635
use vortex_array::vtable::ValidityChild;
3736
use vortex_array::vtable::ValidityVTableFromChild;
@@ -48,7 +47,8 @@ use crate::alp_rd::kernel::PARENT_KERNELS;
4847
use crate::alp_rd::rules::RULES;
4948
use crate::alp_rd_decode;
5049

51-
vtable!(ALPRD, ALPRD, ALPRDData);
50+
/// A [`ALPRD`]-encoded Vortex array.
51+
pub type ALPRDArray = Array<ALPRD>;
5252

5353
#[derive(Clone, prost::Message)]
5454
pub struct ALPRDMetadata {

‎encodings/bytebool/src/array.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use vortex_array::dtype::DType;
2222
use vortex_array::scalar::Scalar;
2323
use vortex_array::serde::ArrayChildren;
2424
use vortex_array::validity::Validity;
25-
use vortex_array::vtable;
2625
use vortex_array::vtable::OperationsVTable;
2726
use vortex_array::vtable::VTable;
2827
use vortex_array::vtable::ValidityVTable;
@@ -39,7 +38,8 @@ use vortex_session::VortexSession;
3938

4039
use crate::kernel::PARENT_KERNELS;
4140

42-
vtable!(ByteBool, ByteBool, ByteBoolData);
41+
/// A [`ByteBool`]-encoded Vortex array.
42+
pub type ByteBoolArray = Array<ByteBool>;
4343

4444
impl ArrayHash for ByteBoolData {
4545
fn array_hash<H: Hasher>(&self, state: &mut H, precision: Precision) {

‎encodings/datetime-parts/src/array.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use vortex_array::dtype::DType;
2323
use vortex_array::dtype::Nullability;
2424
use vortex_array::dtype::PType;
2525
use vortex_array::serde::ArrayChildren;
26-
use vortex_array::vtable;
2726
use vortex_array::vtable::VTable;
2827
use vortex_array::vtable::ValidityChild;
2928
use vortex_array::vtable::ValidityVTableFromChild;
@@ -41,7 +40,8 @@ use crate::compute::kernel::PARENT_KERNELS;
4140
use crate::compute::rules::PARENT_RULES;
4241
use crate::split_temporal;
4342

44-
vtable!(DateTimeParts, DateTimeParts, DateTimePartsData);
43+
/// A [`DateTimeParts`]-encoded Vortex array.
44+
pub type DateTimePartsArray = Array<DateTimeParts>;
4545

4646
impl ArrayHash for DateTimePartsData {
4747
fn array_hash<H: Hasher>(&self, _state: &mut H, _precision: Precision) {}

‎encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ use vortex_array::scalar::DecimalValue;
3131
use vortex_array::scalar::Scalar;
3232
use vortex_array::scalar::ScalarValue;
3333
use vortex_array::serde::ArrayChildren;
34-
use vortex_array::vtable;
3534
use vortex_array::vtable::OperationsVTable;
3635
use vortex_array::vtable::VTable;
3736
use vortex_array::vtable::ValidityChild;
@@ -46,7 +45,8 @@ use vortex_session::VortexSession;
4645
use crate::decimal_byte_parts::compute::kernel::PARENT_KERNELS;
4746
use crate::decimal_byte_parts::rules::PARENT_RULES;
4847

49-
vtable!(DecimalByteParts, DecimalByteParts, DecimalBytePartsData);
48+
/// A [`DecimalByteParts`]-encoded Vortex array.
49+
pub type DecimalBytePartsArray = Array<DecimalByteParts>;
5050

5151
impl ArrayHash for DecimalBytePartsData {
5252
fn array_hash<H: Hasher>(&self, _state: &mut H, _precision: Precision) {}

‎encodings/fastlanes/src/bitpacking/vtable/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ use vortex_array::require_patches;
2828
use vortex_array::require_validity;
2929
use vortex_array::serde::ArrayChildren;
3030
use vortex_array::validity::Validity;
31-
use vortex_array::vtable;
3231
use vortex_array::vtable::VTable;
3332
use vortex_array::vtable::child_to_validity;
3433
use vortex_array::vtable::validity_to_child;
@@ -56,7 +55,8 @@ mod operations;
5655
mod rules;
5756
mod validity;
5857

59-
vtable!(BitPacked, BitPacked, BitPackedData);
58+
/// A [`BitPacked`]-encoded Vortex array.
59+
pub type BitPackedArray = Array<BitPacked>;
6060

6161
#[derive(Clone, prost::Message)]
6262
pub struct BitPackedMetadata {

‎encodings/fastlanes/src/delta/vtable/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use vortex_array::dtype::DType;
2323
use vortex_array::dtype::PType;
2424
use vortex_array::match_each_unsigned_integer_ptype;
2525
use vortex_array::serde::ArrayChildren;
26-
use vortex_array::vtable;
2726
use vortex_array::vtable::VTable;
2827
use vortex_error::VortexExpect;
2928
use vortex_error::VortexResult;
@@ -45,7 +44,8 @@ mod rules;
4544
mod slice;
4645
mod validity;
4746

48-
vtable!(Delta, Delta, DeltaData);
47+
/// A [`Delta`]-encoded Vortex array.
48+
pub type DeltaArray = Array<Delta>;
4949

5050
#[derive(Clone, prost::Message)]
5151
#[repr(C)]

‎encodings/fastlanes/src/for/vtable/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use vortex_array::dtype::DType;
2222
use vortex_array::scalar::Scalar;
2323
use vortex_array::scalar::ScalarValue;
2424
use vortex_array::serde::ArrayChildren;
25-
use vortex_array::vtable;
2625
use vortex_array::vtable::VTable;
2726
use vortex_array::vtable::ValidityVTableFromChild;
2827
use vortex_error::VortexExpect;
@@ -45,7 +44,8 @@ mod rules;
4544
mod slice;
4645
mod validity;
4746

48-
vtable!(FoR, FoR, FoRData);
47+
/// A [`FoR`]-encoded Vortex array.
48+
pub type FoRArray = Array<FoR>;
4949

5050
impl ArrayHash for FoRData {
5151
fn array_hash<H: Hasher>(&self, state: &mut H, _precision: Precision) {

‎encodings/fastlanes/src/rle/vtable/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use vortex_array::dtype::DType;
2222
use vortex_array::dtype::Nullability;
2323
use vortex_array::dtype::PType;
2424
use vortex_array::serde::ArrayChildren;
25-
use vortex_array::vtable;
2625
use vortex_array::vtable::VTable;
2726
use vortex_error::VortexExpect;
2827
use vortex_error::VortexResult;
@@ -43,7 +42,8 @@ mod operations;
4342
mod rules;
4443
mod validity;
4544

46-
vtable!(RLE, RLE, RLEData);
45+
/// A [`RLE`]-encoded Vortex array.
46+
pub type RLEArray = Array<RLE>;
4747

4848
#[derive(Clone, prost::Message)]
4949
pub struct RLEMetadata {

‎encodings/fsst/src/array.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use vortex_array::dtype::Nullability;
3535
use vortex_array::dtype::PType;
3636
use vortex_array::serde::ArrayChildren;
3737
use vortex_array::validity::Validity;
38-
use vortex_array::vtable;
3938
use vortex_array::vtable::VTable;
4039
use vortex_array::vtable::ValidityVTable;
4140
use vortex_array::vtable::child_to_validity;
@@ -55,7 +54,8 @@ use crate::canonical::fsst_decode_views;
5554
use crate::kernel::PARENT_KERNELS;
5655
use crate::rules::RULES;
5756

58-
vtable!(FSST, FSST, FSSTData);
57+
/// A [`FSST`]-encoded Vortex array.
58+
pub type FSSTArray = Array<FSST>;
5959

6060
#[derive(Clone, prost::Message)]
6161
pub struct FSSTMetadata {

0 commit comments

Comments
 (0)