Skip to content
Open
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
12 changes: 8 additions & 4 deletions encodings/parquet-variant/src/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use vortex_array::ArrayParts;
use vortex_array::ArrayRef;
use vortex_array::ExecutionCtx;
use vortex_array::IntoArray;
use vortex_array::LEGACY_SESSION;
use vortex_array::TypedArrayRef;
use vortex_array::arrays::VariantArray;
use vortex_array::arrow::ArrowArrayExecutor;
Expand Down Expand Up @@ -183,17 +184,20 @@ impl ParquetVariantData {
}
})
.unwrap_or(Validity::NonNullable);
let metadata =
ArrayRef::from_arrow(arrow_variant.metadata_field() as &dyn ArrowArray, false)?;
let metadata = ArrayRef::from_arrow_in(
arrow_variant.metadata_field() as &dyn ArrowArray,
false,
&LEGACY_SESSION,
)?;

let value = arrow_variant
.value_field()
.map(|v| ArrayRef::from_arrow(v as &dyn ArrowArray, value_nullable))
.map(|v| ArrayRef::from_arrow_in(v as &dyn ArrowArray, value_nullable, &LEGACY_SESSION))
.transpose()?;

let typed_value = arrow_variant
.typed_value_field()
.map(|tv| ArrayRef::from_arrow(tv.as_ref(), typed_value_nullable))
.map(|tv| ArrayRef::from_arrow_in(tv.as_ref(), typed_value_nullable, &LEGACY_SESSION))
.transpose()?;

let pv = ParquetVariant::try_new(validity, metadata, value, typed_value)?;
Expand Down
2 changes: 1 addition & 1 deletion encodings/runend/public-api.lock
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ pub fn vortex_runend::RunEndData::array_hash<H: core::hash::Hasher>(&self, &mut

impl<R: arrow_array::types::RunEndIndexType> vortex_array::arrow::FromArrowArray<&arrow_array::array::run_array::RunArray<R>> for vortex_runend::RunEndData where <R as arrow_array::types::ArrowPrimitiveType>::Native: vortex_array::dtype::ptype::NativePType

pub fn vortex_runend::RunEndData::from_arrow(&arrow_array::array::run_array::RunArray<R>, bool) -> vortex_error::VortexResult<Self>
pub fn vortex_runend::RunEndData::from_arrow_in(&arrow_array::array::run_array::RunArray<R>, bool, &vortex_session::VortexSession) -> vortex_error::VortexResult<Self>

pub struct vortex_runend::RunEndDataParts

Expand Down
11 changes: 8 additions & 3 deletions encodings/runend/src/arrow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use vortex_array::search_sorted::SearchSortedSide;
use vortex_array::validity::Validity;
use vortex_buffer::Buffer;
use vortex_error::VortexResult;
use vortex_session::VortexSession;

use crate::RunEndData;
use crate::ops::find_slice_end_index;
Expand All @@ -25,14 +26,18 @@ impl<R: RunEndIndexType> FromArrowArray<&RunArray<R>> for RunEndData
where
R::Native: NativePType,
{
fn from_arrow(array: &RunArray<R>, nullable: bool) -> VortexResult<Self> {
fn from_arrow_in(
array: &RunArray<R>,
nullable: bool,
session: &VortexSession,
) -> VortexResult<Self> {
let offset = array.run_ends().offset();
let len = array.run_ends().len();
let ends_buf =
Buffer::<R::Native>::from_arrow_scalar_buffer(array.run_ends().inner().clone());
let ends = PrimitiveArray::new(ends_buf, Validity::NonNullable)
.reinterpret_cast(R::Native::PTYPE.to_unsigned());
let values = ArrayRef::from_arrow(array.values().as_ref(), nullable)?;
let values = ArrayRef::from_arrow_in(array.values().as_ref(), nullable, session)?;

let ends_array = PrimitiveArray::from_buffer_handle(
ends.buffer_handle().clone(),
Expand Down Expand Up @@ -125,7 +130,7 @@ mod tests {
Buffer::<R::Native>::from_arrow_scalar_buffer(array.run_ends().inner().clone());
let ends = PrimitiveArray::new(ends_buf, Validity::NonNullable)
.reinterpret_cast(R::Native::PTYPE.to_unsigned());
let values = ArrayRef::from_arrow(array.values().as_ref(), nullable)?;
let values = ArrayRef::from_arrow_in(array.values().as_ref(), nullable, &SESSION)?;

let ends_array = PrimitiveArray::from_buffer_handle(
ends.buffer_handle().clone(),
Expand Down
342 changes: 257 additions & 85 deletions vortex-array/public-api.lock

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion vortex-array/src/arrays/filter/execute/varbinview.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ fn arrow_filter_fn(array: &ArrayRef, mask: &Mask) -> vortex_error::VortexResult<
let mask_array = BooleanArray::new(values.bit_buffer().clone().into(), None);
let filtered = arrow_select::filter::filter(array_ref.as_ref(), &mask_array)?;

ArrayRef::from_arrow(filtered.as_ref(), array.dtype().is_nullable())
ArrayRef::from_arrow_in(
filtered.as_ref(),
array.dtype().is_nullable(),
&LEGACY_SESSION,
)
}

#[cfg(test)]
Expand Down
Loading
Loading