Skip to content

Commit d4dc27f

Browse files
committed
deprecate
Signed-off-by: Baris Palaska <barispalaska@gmail.com>
1 parent c16bf46 commit d4dc27f

35 files changed

Lines changed: 582 additions & 437 deletions

File tree

encodings/parquet-variant/src/array.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ use vortex_array::ArrayParts;
1414
use vortex_array::ArrayRef;
1515
use vortex_array::ExecutionCtx;
1616
use vortex_array::IntoArray;
17-
use vortex_array::LEGACY_SESSION;
1817
use vortex_array::TypedArrayRef;
1918
use vortex_array::arrays::VariantArray;
2019
use vortex_array::arrow::ArrowArrayExecutor;
@@ -184,20 +183,17 @@ impl ParquetVariantData {
184183
}
185184
})
186185
.unwrap_or(Validity::NonNullable);
187-
let metadata = ArrayRef::from_arrow(
188-
arrow_variant.metadata_field() as &dyn ArrowArray,
189-
false,
190-
&LEGACY_SESSION,
191-
)?;
186+
let metadata =
187+
ArrayRef::from_arrow(arrow_variant.metadata_field() as &dyn ArrowArray, false)?;
192188

193189
let value = arrow_variant
194190
.value_field()
195-
.map(|v| ArrayRef::from_arrow(v as &dyn ArrowArray, value_nullable, &LEGACY_SESSION))
191+
.map(|v| ArrayRef::from_arrow(v as &dyn ArrowArray, value_nullable))
196192
.transpose()?;
197193

198194
let typed_value = arrow_variant
199195
.typed_value_field()
200-
.map(|tv| ArrayRef::from_arrow(tv.as_ref(), typed_value_nullable, &LEGACY_SESSION))
196+
.map(|tv| ArrayRef::from_arrow(tv.as_ref(), typed_value_nullable))
201197
.transpose()?;
202198

203199
let pv = ParquetVariant::try_new(validity, metadata, value, typed_value)?;

encodings/runend/public-api.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub fn vortex_runend::RunEndData::array_hash<H: core::hash::Hasher>(&self, &mut
130130

131131
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
132132

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

135135
pub struct vortex_runend::RunEndDataParts
136136

encodings/runend/src/arrow.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl<R: RunEndIndexType> FromArrowArray<&RunArray<R>> for RunEndData
2626
where
2727
R::Native: NativePType,
2828
{
29-
fn from_arrow(
29+
fn from_arrow_with_session(
3030
array: &RunArray<R>,
3131
nullable: bool,
3232
session: &VortexSession,
@@ -37,7 +37,7 @@ where
3737
Buffer::<R::Native>::from_arrow_scalar_buffer(array.run_ends().inner().clone());
3838
let ends = PrimitiveArray::new(ends_buf, Validity::NonNullable)
3939
.reinterpret_cast(R::Native::PTYPE.to_unsigned());
40-
let values = ArrayRef::from_arrow(array.values().as_ref(), nullable, session)?;
40+
let values = ArrayRef::from_arrow_with_session(array.values().as_ref(), nullable, session)?;
4141

4242
let ends_array = PrimitiveArray::from_buffer_handle(
4343
ends.buffer_handle().clone(),
@@ -69,6 +69,7 @@ where
6969
}
7070

7171
#[cfg(test)]
72+
#[allow(deprecated)]
7273
mod tests {
7374
use std::sync::Arc;
7475
use std::sync::LazyLock;
@@ -130,7 +131,7 @@ mod tests {
130131
Buffer::<R::Native>::from_arrow_scalar_buffer(array.run_ends().inner().clone());
131132
let ends = PrimitiveArray::new(ends_buf, Validity::NonNullable)
132133
.reinterpret_cast(R::Native::PTYPE.to_unsigned());
133-
let values = ArrayRef::from_arrow(array.values().as_ref(), nullable, &SESSION)?;
134+
let values = ArrayRef::from_arrow(array.values().as_ref(), nullable)?;
134135

135136
let ends_array = PrimitiveArray::from_buffer_handle(
136137
ends.buffer_handle().clone(),

vortex-array/public-api.lock

Lines changed: 258 additions & 86 deletions
Large diffs are not rendered by default.

vortex-array/src/arrays/filter/execute/varbinview.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ fn arrow_filter_fn(array: &ArrayRef, mask: &Mask) -> vortex_error::VortexResult<
3737
let mask_array = BooleanArray::new(values.bit_buffer().clone().into(), None);
3838
let filtered = arrow_select::filter::filter(array_ref.as_ref(), &mask_array)?;
3939

40-
ArrayRef::from_arrow(
41-
filtered.as_ref(),
42-
array.dtype().is_nullable(),
43-
&LEGACY_SESSION,
44-
)
40+
ArrayRef::from_arrow(filtered.as_ref(), array.dtype().is_nullable())
4541
}
4642

4743
#[cfg(test)]

0 commit comments

Comments
 (0)