Skip to content
Merged
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
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ parquet = "59.2"
parquet-variant = "59.2"
parquet-variant-compute = "59.2"
paste = "1.0.15"
pco = "1.0.1"
pco = "1.1.0"
percent-encoding = "2.3.2"
pin-project-lite = "0.2.15"
primitive-types = { version = "0.14.0" }
Expand Down
12 changes: 8 additions & 4 deletions encodings/pco/src/array/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -604,9 +604,6 @@ impl PcoData {
let old_len = decompressed_values.len();
let new_len = old_len + page_n_values;
decompressed_values.reserve(page_n_values);
unsafe {
decompressed_values.set_len(new_len);
}
let page: &[u8] = self
.pages
.get(page_idx)
Expand All @@ -626,8 +623,15 @@ impl PcoData {
let mut pd = cd
.page_decompressor(page, page_n_values)
.map_err(vortex_err_from_pco)?;
pd.read(&mut decompressed_values[old_len..new_len])
let progress = pd
.read_uninit(&mut decompressed_values.spare_capacity_mut()[..page_n_values])
.map_err(vortex_err_from_pco)?;
vortex_ensure_eq!(progress.n_processed, page_n_values);
// SAFETY: `read_uninit` initialized all `page_n_values` spare elements,
// as confirmed by the processed count above.
unsafe {
decompressed_values.set_len(new_len);
}

chunk_decompressor = Some(cd);
} else {
Expand Down
10 changes: 7 additions & 3 deletions encodings/pco/src/probe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use vortex_array::validity::Validity;
use vortex_buffer::BufferMut;
use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_error::vortex_ensure_eq;
use vortex_mask::Mask;

use crate::Pco;
Expand Down Expand Up @@ -156,10 +157,13 @@ fn decode_page<T: Number + NativePType>(
.page_decompressor(buffer, n_values)
.map_err(vortex_err_from_pco)?;
let mut values = BufferMut::<T>::with_capacity_in(n_values, ctx.allocator().clone());
// SAFETY: the buffer reserves `n_values` elements, and the page decompressor was built for
// exactly that count, so `read` writes every element before anything observes it.
let progress = decoder
.read_uninit(&mut values.spare_capacity_mut()[..n_values])
.map_err(vortex_err_from_pco)?;
vortex_ensure_eq!(progress.n_processed, n_values);
// SAFETY: `read_uninit` initialized all `n_values` spare elements, as confirmed by the
// processed count above.
unsafe { values.set_len(n_values) };
decoder.read(&mut values).map_err(vortex_err_from_pco)?;
Ok(PrimitiveArray::new(values.freeze(), Validity::NonNullable))
}

Expand Down
Loading
Loading