Skip to content

Commit 78d6bfd

Browse files
committed
Fix initialized sessions in encoding tests
Signed-off-by: Nicholas Gates <nick@nickgates.com>
1 parent 7953bdd commit 78d6bfd

2 files changed

Lines changed: 24 additions & 6 deletions

File tree

encodings/parquet-variant/src/kernel.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,17 @@ mod tests {
251251
use vortex_error::vortex_ensure;
252252
use vortex_error::vortex_err;
253253
use vortex_mask::Mask;
254+
use vortex_session::VortexSession;
254255

255256
use crate::ParquetVariant;
256257
use crate::ParquetVariantArrayExt;
257258

259+
fn session() -> VortexSession {
260+
let session = vortex_array::array_session();
261+
crate::initialize(&session);
262+
session
263+
}
264+
258265
fn make_unshredded_array() -> VortexResult<ArrayRef> {
259266
let mut builder = VariantArrayBuilder::new(4);
260267
builder.append_variant(PqVariant::from(42i32));
@@ -375,9 +382,10 @@ mod tests {
375382
dtype: Option<VortexDType>,
376383
) -> VortexResult<ArrayRef> {
377384
let expr = variant_get(root(), parse_path(path)?, dtype);
385+
let session = session();
378386
array
379387
.apply(&expr)?
380-
.execute::<ArrayRef>(&mut LEGACY_SESSION.create_execution_ctx())
388+
.execute::<ArrayRef>(&mut session.create_execution_ctx())
381389
}
382390

383391
macro_rules! assert_rows_eq {
@@ -826,7 +834,8 @@ mod tests {
826834
array: &ArrayRef,
827835
expected: impl IntoIterator<Item = Option<i32>>,
828836
) -> VortexResult<()> {
829-
let mut ctx = LEGACY_SESSION.create_execution_ctx();
837+
let session = session();
838+
let mut ctx = session.create_execution_ctx();
830839
let executed = array.clone().execute::<ArrayRef>(&mut ctx)?;
831840
let typed_value = executed
832841
.as_::<ParquetVariant>()

encodings/runend/src/compute/filter.rs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,27 @@ fn filter_run_end_primitive<R: NativePType + AddAssign + From<bool> + AsPrimitiv
116116
#[cfg(test)]
117117
mod tests {
118118
use vortex_array::IntoArray;
119-
use vortex_array::LEGACY_SESSION;
120119
use vortex_array::VortexSessionExecute;
121120
use vortex_array::arrays::PrimitiveArray;
122121
use vortex_array::assert_arrays_eq;
123122
use vortex_error::VortexResult;
124123
use vortex_mask::Mask;
124+
use vortex_session::VortexSession;
125125

126126
use crate::RunEnd;
127127
use crate::RunEndArray;
128128

129+
fn session() -> VortexSession {
130+
let session = vortex_array::array_session();
131+
crate::initialize(&session);
132+
session
133+
}
134+
129135
fn ree_array() -> RunEndArray {
136+
let session = session();
130137
RunEnd::encode(
131138
PrimitiveArray::from_iter([1, 1, 1, 4, 4, 4, 2, 2, 5, 5, 5, 5]).into_array(),
132-
&mut LEGACY_SESSION.create_execution_ctx(),
139+
&mut session.create_execution_ctx(),
133140
)
134141
.unwrap()
135142
}
@@ -139,7 +146,8 @@ mod tests {
139146
let arr = ree_array().slice(2..7)?;
140147
let filtered = arr.filter(Mask::from_iter([true, false, false, true, true]))?;
141148

142-
let mut ctx = LEGACY_SESSION.create_execution_ctx();
149+
let session = session();
150+
let mut ctx = session.create_execution_ctx();
143151
assert_arrays_eq!(
144152
filtered,
145153
RunEnd::new(
@@ -157,7 +165,8 @@ mod tests {
157165
/// Filter unwrap one layer at a time so RunEnd's FilterKernel can fire.
158166
#[test]
159167
fn filter_sliced_run_end_preserves_encoding() -> VortexResult<()> {
160-
let mut ctx = LEGACY_SESSION.create_execution_ctx();
168+
let session = session();
169+
let mut ctx = session.create_execution_ctx();
161170

162171
// 4 runs of 32 each = 128 rows. Large enough that FilterKernel takes
163172
// the run-preserving path (true_count >= 25).

0 commit comments

Comments
 (0)