Skip to content
Open
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
43 changes: 32 additions & 11 deletions vortex-array/src/arrays/bool/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,22 +285,28 @@ impl BoolData {
bits.len() * 8,
);

Ok(Self {
bits,
meta: BitBufferMeta::new(offset, len),
})
let meta = BitBufferMeta::new(offset, len);
let bits = if bits.len() == meta.byte_len() {
bits
} else {
bits.slice(0..meta.byte_len())
};

Ok(Self { bits, meta })
}

pub(super) unsafe fn new_unchecked(bits: BitBuffer, validity: Validity) -> Self {
let bits = bits.shrink_offset();

if cfg!(debug_assertions) {
Self::try_new(bits, validity).vortex_expect("Failed to create BoolData")
} else {
let (offset, len, buffer) = bits.into_inner();
Self::validate(&bits, &validity).vortex_expect("Failed to create BoolData");
}

Self {
bits: BufferHandle::new_host(buffer),
meta: BitBufferMeta::new(offset, len),
}
let (offset, len, buffer) = bits.into_inner();

Self {
bits: BufferHandle::new_host(buffer),
meta: BitBufferMeta::new(offset, len),
}
}

Expand Down Expand Up @@ -369,6 +375,7 @@ mod tests {

use vortex_buffer::Alignment;
use vortex_buffer::BitBuffer;
use vortex_buffer::BitBufferMeta;
use vortex_buffer::BitBufferMut;
use vortex_buffer::ByteBuffer;
use vortex_buffer::buffer;
Expand Down Expand Up @@ -494,6 +501,20 @@ mod tests {
Ok(())
}

#[test]
fn constructors_trim_oversized_backing_buffer() {
let bits = BitBuffer::new_set(8192).slice(3..11);
let expected_nbytes = BitBufferMeta::new(bits.offset(), bits.len()).byte_len() as u64;

let handle = BufferHandle::new_host(bits.inner().clone());
let from_handle =
BoolArray::new_handle(handle, bits.offset(), bits.len(), Validity::NonNullable);
let unchecked = unsafe { BoolArray::new_unchecked(bits, Validity::NonNullable) };

assert_eq!(from_handle.nbytes(), expected_nbytes);
assert_eq!(unchecked.nbytes(), expected_nbytes);
}

#[test]
fn patch_bools_owned() {
let mut ctx = array_session().create_execution_ctx();
Expand Down
Loading