Skip to content

Commit 7aa1e80

Browse files
committed
fix: array correctly update their validity
Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
1 parent 3d8c1f9 commit 7aa1e80

3 files changed

Lines changed: 8 additions & 41 deletions

File tree

encodings/fsst/public-api.lock

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,18 @@ pub struct vortex_fsst::FSSTData
8484

8585
impl vortex_fsst::FSSTData
8686

87-
pub fn vortex_fsst::FSSTData::codes_bytes(&self) -> &vortex_array::buffer::BufferHandle
87+
pub fn vortex_fsst::FSSTData::codes(&self) -> &vortex_array::arrays::varbin::vtable::VarBinArray
88+
89+
pub fn vortex_fsst::FSSTData::codes_dtype(&self) -> &vortex_array::dtype::DType
8890

8991
pub fn vortex_fsst::FSSTData::compressor(&self) -> &fsst::Compressor
9092

9193
pub fn vortex_fsst::FSSTData::decompressor(&self) -> fsst::Decompressor<'_>
9294

95+
pub fn vortex_fsst::FSSTData::is_empty(&self) -> bool
96+
97+
pub fn vortex_fsst::FSSTData::len(&self) -> usize
98+
9399
pub fn vortex_fsst::FSSTData::symbol_lengths(&self) -> &vortex_buffer::buffer::Buffer<u8>
94100

95101
pub fn vortex_fsst::FSSTData::symbols(&self) -> &vortex_buffer::buffer::Buffer<fsst::Symbol>
@@ -150,20 +156,12 @@ pub fn vortex_fsst::FSSTMetadata::encoded_len(&self) -> usize
150156

151157
pub trait vortex_fsst::FSSTArrayExt: vortex_array::array::typed::TypedArrayRef<vortex_fsst::FSST>
152158

153-
pub fn vortex_fsst::FSSTArrayExt::codes(&self) -> vortex_array::arrays::varbin::vtable::VarBinArray
154-
155-
pub fn vortex_fsst::FSSTArrayExt::codes_dtype(&self) -> vortex_array::dtype::DType
156-
157159
pub fn vortex_fsst::FSSTArrayExt::uncompressed_lengths(&self) -> &vortex_array::array::erased::ArrayRef
158160

159161
pub fn vortex_fsst::FSSTArrayExt::uncompressed_lengths_dtype(&self) -> &vortex_array::dtype::DType
160162

161163
impl<T: vortex_array::array::typed::TypedArrayRef<vortex_fsst::FSST>> vortex_fsst::FSSTArrayExt for T
162164

163-
pub fn T::codes(&self) -> vortex_array::arrays::varbin::vtable::VarBinArray
164-
165-
pub fn T::codes_dtype(&self) -> vortex_array::dtype::DType
166-
167165
pub fn T::uncompressed_lengths(&self) -> &vortex_array::array::erased::ArrayRef
168166

169167
pub fn T::uncompressed_lengths_dtype(&self) -> &vortex_array::dtype::DType

encodings/fsst/src/array.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ pub(crate) const SLOT_NAMES: [&str; NUM_SLOTS] =
319319
pub struct FSSTData {
320320
symbols: Buffer<Symbol>,
321321
symbol_lengths: Buffer<u8>,
322+
// TODO(joe): this was broken by a previous pr. This will not be updated if a slot is replaced.
322323
codes: VarBinArray,
323324

324325
/// Memoized compressor used for push-down of compute by compressing the RHS.

vortex-array/public-api.lock

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18846,12 +18846,6 @@ impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::
1884618846

1884718847
pub fn vortex_array::ValidityVTableFromChildSliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
1884818848

18849-
pub struct vortex_array::vtable::ValidityVTableFromValiditySliceHelper
18850-
18851-
impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::ValidityVTableFromValiditySliceHelper where <V as vortex_array::VTable>::ArrayData: vortex_array::ValiditySliceHelper
18852-
18853-
pub fn vortex_array::ValidityVTableFromValiditySliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
18854-
1885518849
pub trait vortex_array::vtable::ArrayPlugin: 'static + core::marker::Send + core::marker::Sync
1885618850

1885718851
pub fn vortex_array::vtable::ArrayPlugin::deserialize(&self, dtype: &vortex_array::dtype::DType, len: usize, metadata: &[u8], buffers: &[vortex_array::buffer::BufferHandle], children: &dyn vortex_array::serde::ArrayChildren, session: &vortex_session::VortexSession) -> vortex_error::VortexResult<vortex_array::ArrayRef>
@@ -20822,12 +20816,6 @@ pub fn vortex_array::vtable::ValidityChildSliceHelper::sliced_child_array(&self)
2082220816

2082320817
pub fn vortex_array::vtable::ValidityChildSliceHelper::unsliced_child_and_slice(&self) -> (&vortex_array::ArrayRef, usize, usize)
2082420818

20825-
pub trait vortex_array::vtable::ValiditySliceHelper
20826-
20827-
pub fn vortex_array::vtable::ValiditySliceHelper::sliced_validity(&self) -> vortex_error::VortexResult<vortex_array::validity::Validity>
20828-
20829-
pub fn vortex_array::vtable::ValiditySliceHelper::unsliced_validity_and_slice(&self) -> (&vortex_array::validity::Validity, usize, usize)
20830-
2083120819
pub trait vortex_array::vtable::ValidityVTable<V: vortex_array::VTable>
2083220820

2083320821
pub fn vortex_array::vtable::ValidityVTable::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
@@ -20912,10 +20900,6 @@ impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::
2091220900

2091320901
pub fn vortex_array::ValidityVTableFromChildSliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
2091420902

20915-
impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::ValidityVTableFromValiditySliceHelper where <V as vortex_array::VTable>::ArrayData: vortex_array::ValiditySliceHelper
20916-
20917-
pub fn vortex_array::ValidityVTableFromValiditySliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
20918-
2091920903
impl<V> vortex_array::ValidityVTable<V> for vortex_array::ValidityVTableFromChild where V: vortex_array::ValidityChild<V> + vortex_array::VTable
2092020904

2092120905
pub fn vortex_array::ValidityVTableFromChild::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
@@ -22330,12 +22314,6 @@ impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::
2233022314

2233122315
pub fn vortex_array::ValidityVTableFromChildSliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
2233222316

22333-
pub struct vortex_array::ValidityVTableFromValiditySliceHelper
22334-
22335-
impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::ValidityVTableFromValiditySliceHelper where <V as vortex_array::VTable>::ArrayData: vortex_array::ValiditySliceHelper
22336-
22337-
pub fn vortex_array::ValidityVTableFromValiditySliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
22338-
2233922317
pub static vortex_array::LEGACY_SESSION: std::sync::lazy_lock::LazyLock<vortex_session::VortexSession>
2234022318

2234122319
pub trait vortex_array::ArrayEq
@@ -24808,12 +24786,6 @@ pub fn vortex_array::ValidityChildSliceHelper::sliced_child_array(&self) -> vort
2480824786

2480924787
pub fn vortex_array::ValidityChildSliceHelper::unsliced_child_and_slice(&self) -> (&vortex_array::ArrayRef, usize, usize)
2481024788

24811-
pub trait vortex_array::ValiditySliceHelper
24812-
24813-
pub fn vortex_array::ValiditySliceHelper::sliced_validity(&self) -> vortex_error::VortexResult<vortex_array::validity::Validity>
24814-
24815-
pub fn vortex_array::ValiditySliceHelper::unsliced_validity_and_slice(&self) -> (&vortex_array::validity::Validity, usize, usize)
24816-
2481724789
pub trait vortex_array::ValidityVTable<V: vortex_array::VTable>
2481824790

2481924791
pub fn vortex_array::ValidityVTable::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
@@ -24898,10 +24870,6 @@ impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::
2489824870

2489924871
pub fn vortex_array::ValidityVTableFromChildSliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
2490024872

24901-
impl<V: vortex_array::VTable> vortex_array::ValidityVTable<V> for vortex_array::ValidityVTableFromValiditySliceHelper where <V as vortex_array::VTable>::ArrayData: vortex_array::ValiditySliceHelper
24902-
24903-
pub fn vortex_array::ValidityVTableFromValiditySliceHelper::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>
24904-
2490524873
impl<V> vortex_array::ValidityVTable<V> for vortex_array::ValidityVTableFromChild where V: vortex_array::ValidityChild<V> + vortex_array::VTable
2490624874

2490724875
pub fn vortex_array::ValidityVTableFromChild::validity(array: vortex_array::ArrayView<'_, V>) -> vortex_error::VortexResult<vortex_array::validity::Validity>

0 commit comments

Comments
 (0)