Skip to content

Commit 8f23c62

Browse files
gatesngatesn
committed
Merge develop
Signed-off-by: Nicholas Gates <[email protected]>
1 parent df60ed0 commit 8f23c62

File tree

53 files changed

+199
-170
lines changed

Some content is hidden

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

53 files changed

+199
-170
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use vortex_array::patches::{Patches, PatchesMetadata};
88
use vortex_array::serde::ArrayChildren;
99
use vortex_array::stats::{ArrayStats, StatsSetRef};
1010
use vortex_array::vtable::{
11-
ArrayId, ArrayVTable, BaseArrayVTable, CanonicalVTable, EncodeVTable, NotSupported, VTable,
12-
ValidityChild, ValidityVTableFromChild, VisitorVTable,
11+
ArrayId, ArrayVTable, ArrayVTableExt, BaseArrayVTable, CanonicalVTable, EncodeVTable,
12+
NotSupported, VTable, ValidityChild, ValidityVTableFromChild, VisitorVTable,
1313
};
1414
use vortex_array::{
1515
Array, ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical,
@@ -43,7 +43,7 @@ impl VTable for ALPVTable {
4343
}
4444

4545
fn encoding(_array: &Self::Array) -> ArrayVTable {
46-
ArrayVTable::new_ref(ALPVTable.as_ref())
46+
ALPVTable.as_vtable()
4747
}
4848

4949
fn metadata(array: &ALPArray) -> VortexResult<Self::Metadata> {

‎encodings/alp/src/alp/compute/cast.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ mod tests {
4848
use vortex_array::arrays::PrimitiveArray;
4949
use vortex_array::compute::cast;
5050
use vortex_array::compute::conformance::cast::test_cast_conformance;
51+
use vortex_array::vtable::ArrayVTableExt;
5152
use vortex_array::{IntoArray, assert_arrays_eq};
5253
use vortex_buffer::buffer;
5354
use vortex_dtype::{DType, Nullability, PType};
@@ -58,6 +59,7 @@ mod tests {
5859
fn test_cast_alp_f32_to_f64() {
5960
let values = buffer![1.5f32, 2.5, 3.5, 4.5].into_array();
6061
let alp = ALPVTable
62+
.as_vtable()
6163
.encode(&values.to_canonical(), None)
6264
.unwrap()
6365
.unwrap();
@@ -83,6 +85,7 @@ mod tests {
8385
fn test_cast_alp_to_int() {
8486
let values = buffer![1.0f32, 2.0, 3.0, 4.0].into_array();
8587
let alp = ALPVTable
88+
.as_vtable()
8689
.encode(&values.to_canonical(), None)
8790
.unwrap()
8891
.unwrap();
@@ -109,6 +112,7 @@ mod tests {
109112
#[case(buffer![0.0f32, -1.5, 2.5, -3.5, 4.5].into_array())]
110113
fn test_cast_alp_conformance(#[case] array: vortex_array::ArrayRef) {
111114
let alp = ALPVTable
115+
.as_vtable()
112116
.encode(&array.to_canonical(), None)
113117
.unwrap()
114118
.unwrap();

‎encodings/alp/src/alp/compute/filter.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ mod test {
3636
use rstest::rstest;
3737
use vortex_array::arrays::PrimitiveArray;
3838
use vortex_array::compute::conformance::filter::test_filter_conformance;
39+
use vortex_array::vtable::ArrayVTableExt;
3940
use vortex_array::{ArrayRef, IntoArray};
4041
use vortex_buffer::buffer;
4142

@@ -52,6 +53,7 @@ mod test {
5253
].into_array())]
5354
fn test_filter_alp_conformance(#[case] array: ArrayRef) {
5455
let alp = ALPVTable
56+
.as_vtable()
5557
.encode(&array.to_canonical(), None)
5658
.unwrap()
5759
.unwrap();

‎encodings/alp/src/alp/compute/mask.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ mod test {
3636
use vortex_array::IntoArray;
3737
use vortex_array::arrays::PrimitiveArray;
3838
use vortex_array::compute::conformance::mask::test_mask_conformance;
39+
use vortex_array::vtable::ArrayVTableExt;
3940
use vortex_buffer::buffer;
4041

4142
use crate::ALPVTable;
@@ -51,6 +52,7 @@ mod test {
5152
].into_array())]
5253
fn test_mask_alp_conformance(#[case] array: vortex_array::ArrayRef) {
5354
let alp = ALPVTable
55+
.as_vtable()
5456
.encode(&array.to_canonical(), None)
5557
.unwrap()
5658
.unwrap();

‎encodings/alp/src/alp/compute/take.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ mod test {
3535
use vortex_array::IntoArray;
3636
use vortex_array::arrays::PrimitiveArray;
3737
use vortex_array::compute::conformance::take::test_take_conformance;
38+
use vortex_array::vtable::ArrayVTableExt;
3839
use vortex_buffer::buffer;
3940

4041
use crate::ALPVTable;
@@ -46,6 +47,7 @@ mod test {
4647
#[case(buffer![42.42f64].into_array())]
4748
fn test_take_alp_conformance(#[case] array: vortex_array::ArrayRef) {
4849
let alp = ALPVTable
50+
.as_vtable()
4951
.encode(&array.to_canonical(), None)
5052
.unwrap()
5153
.unwrap();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use vortex_array::serde::ArrayChildren;
1111
use vortex_array::stats::{ArrayStats, StatsSetRef};
1212
use vortex_array::validity::Validity;
1313
use vortex_array::vtable::{
14-
ArrayId, ArrayVTable, BaseArrayVTable, CanonicalVTable, EncodeVTable, NotSupported, VTable,
15-
ValidityChild, ValidityVTableFromChild, VisitorVTable,
14+
ArrayId, ArrayVTable, ArrayVTableExt, BaseArrayVTable, CanonicalVTable, EncodeVTable,
15+
NotSupported, VTable, ValidityChild, ValidityVTableFromChild, VisitorVTable,
1616
};
1717
use vortex_array::{
1818
Array, ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical,
@@ -59,7 +59,7 @@ impl VTable for ALPRDVTable {
5959
}
6060

6161
fn encoding(_array: &Self::Array) -> ArrayVTable {
62-
ArrayVTable::new_ref(ALPRDVTable.as_ref())
62+
ALPRDVTable.as_vtable()
6363
}
6464

6565
fn metadata(array: &ALPRDArray) -> VortexResult<Self::Metadata> {

‎encodings/bytebool/src/array.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use vortex_array::serde::ArrayChildren;
1010
use vortex_array::stats::{ArrayStats, StatsSetRef};
1111
use vortex_array::validity::Validity;
1212
use vortex_array::vtable::{
13-
ArrayId, ArrayVTable, BaseArrayVTable, CanonicalVTable, NotSupported, OperationsVTable, VTable,
14-
ValidityHelper, ValidityVTableFromValidityHelper, VisitorVTable,
13+
ArrayId, ArrayVTable, ArrayVTableExt, BaseArrayVTable, CanonicalVTable, NotSupported,
14+
OperationsVTable, VTable, ValidityHelper, ValidityVTableFromValidityHelper, VisitorVTable,
1515
};
1616
use vortex_array::{
1717
ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical, EmptyMetadata,
@@ -43,7 +43,7 @@ impl VTable for ByteBoolVTable {
4343
}
4444

4545
fn encoding(_array: &Self::Array) -> ArrayVTable {
46-
ArrayVTable::new_ref(ByteBoolVTable.as_ref())
46+
ByteBoolVTable.as_vtable()
4747
}
4848

4949
fn metadata(_array: &ByteBoolArray) -> VortexResult<Self::Metadata> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use vortex_array::arrays::TemporalArray;
88
use vortex_array::serde::ArrayChildren;
99
use vortex_array::stats::{ArrayStats, StatsSetRef};
1010
use vortex_array::vtable::{
11-
ArrayId, ArrayVTable, BaseArrayVTable, EncodeVTable, NotSupported, VTable, ValidityChild,
12-
ValidityVTableFromChild, VisitorVTable,
11+
ArrayId, ArrayVTable, ArrayVTableExt, BaseArrayVTable, EncodeVTable, NotSupported, VTable,
12+
ValidityChild, ValidityVTableFromChild, VisitorVTable,
1313
};
1414
use vortex_array::{
1515
Array, ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical,
@@ -70,7 +70,7 @@ impl VTable for DateTimePartsVTable {
7070
}
7171

7272
fn encoding(_array: &Self::Array) -> ArrayVTable {
73-
ArrayVTable::new_ref(DateTimePartsVTable.as_ref())
73+
DateTimePartsVTable.as_vtable()
7474
}
7575

7676
fn metadata(array: &DateTimePartsArray) -> VortexResult<Self::Metadata> {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ use vortex_array::arrays::DecimalArray;
1111
use vortex_array::serde::ArrayChildren;
1212
use vortex_array::stats::{ArrayStats, StatsSetRef};
1313
use vortex_array::vtable::{
14-
ArrayId, ArrayVTable, BaseArrayVTable, CanonicalVTable, NotSupported, OperationsVTable, VTable,
15-
ValidityChild, ValidityHelper, ValidityVTableFromChild, VisitorVTable,
14+
ArrayId, ArrayVTable, ArrayVTableExt, BaseArrayVTable, CanonicalVTable, NotSupported,
15+
OperationsVTable, VTable, ValidityChild, ValidityHelper, ValidityVTableFromChild,
16+
VisitorVTable,
1617
};
1718
use vortex_array::{
1819
Array, ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical,
@@ -52,7 +53,7 @@ impl VTable for DecimalBytePartsVTable {
5253
}
5354

5455
fn encoding(_array: &Self::Array) -> ArrayVTable {
55-
ArrayVTable::new_ref(DecimalBytePartsVTable.as_ref())
56+
DecimalBytePartsVTable.as_vtable()
5657
}
5758

5859
fn metadata(array: &DecimalBytePartsArray) -> VortexResult<Self::Metadata> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use vortex_array::patches::{Patches, PatchesMetadata};
66
use vortex_array::serde::ArrayChildren;
77
use vortex_array::validity::Validity;
88
use vortex_array::vtable::{
9-
ArrayId, ArrayVTable, NotSupported, VTable, ValidityVTableFromValidityHelper,
9+
ArrayId, ArrayVTable, ArrayVTableExt, NotSupported, VTable, ValidityVTableFromValidityHelper,
1010
};
1111
use vortex_array::{DeserializeMetadata, ProstMetadata, SerializeMetadata, vtable};
1212
use vortex_buffer::ByteBuffer;
@@ -55,7 +55,7 @@ impl VTable for BitPackedVTable {
5555
}
5656

5757
fn encoding(_array: &Self::Array) -> ArrayVTable {
58-
ArrayVTable::new_ref(BitPackedVTable.as_ref())
58+
BitPackedVTable.as_vtable()
5959
}
6060

6161
fn metadata(array: &BitPackedArray) -> VortexResult<Self::Metadata> {

0 commit comments

Comments
 (0)