Skip to content

Commit 627e496

Browse files
gatesngatesn
committed
Use session method for legacy execution contexts
Signed-off-by: Nicholas Gates <nick@nickgates.com>
1 parent 157ea2b commit 627e496

46 files changed

Lines changed: 476 additions & 1619 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎vortex-array/src/array/typed.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use vortex_error::VortexResult;
1717
use crate::ArrayRef;
1818
use crate::ExecutionCtx;
1919
use crate::IntoArray;
20+
use crate::LEGACY_SESSION;
2021
use crate::VortexSessionExecute;
2122
use crate::array::ArrayId;
2223
use crate::array::ArrayView;
@@ -352,7 +353,7 @@ impl<V: VTable> Array<V> {
352353
)]
353354
pub fn scalar_at(&self, index: usize) -> VortexResult<crate::scalar::Scalar> {
354355
self.inner
355-
.execute_scalar(index, &mut crate::LEGACY_SESSION.create_execution_ctx())
356+
.execute_scalar(index, &mut LEGACY_SESSION.create_execution_ctx())
356357
}
357358

358359
/// Execute the array to extract a scalar at the given index.

‎vortex-array/src/arrays/assertions.rs‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,12 @@ fn find_mismatched_indices(left: &ArrayRef, right: &ArrayRef) -> Vec<usize> {
5353
macro_rules! assert_nth_scalar {
5454
($arr:expr, $n:expr, $expected:expr) => {{
5555
use $crate::IntoArray as _;
56+
use $crate::LEGACY_SESSION;
57+
use $crate::VortexSessionExecute as _;
5658
let arr_ref: $crate::ArrayRef = $crate::IntoArray::into_array($arr.clone());
5759
assert_eq!(
5860
arr_ref
59-
.execute_scalar(
60-
$n,
61-
&mut $crate::VortexSessionExecute::create_execution_ctx(
62-
&*$crate::LEGACY_SESSION
63-
),
64-
)
61+
.execute_scalar($n, &mut LEGACY_SESSION.create_execution_ctx())
6562
.unwrap(),
6663
$expected.try_into().unwrap()
6764
);
@@ -79,26 +76,18 @@ macro_rules! assert_nth_scalar {
7976
#[macro_export]
8077
macro_rules! assert_nth_scalar_is_null {
8178
($arr:expr, $n:expr) => {{
79+
use $crate::LEGACY_SESSION;
80+
use $crate::VortexSessionExecute as _;
8281
let arr_ref: $crate::ArrayRef = $crate::IntoArray::into_array($arr.clone());
8382
assert!(
8483
arr_ref
85-
.execute_scalar(
86-
$n,
87-
&mut $crate::VortexSessionExecute::create_execution_ctx(
88-
&*$crate::LEGACY_SESSION
89-
),
90-
)
84+
.execute_scalar($n, &mut LEGACY_SESSION.create_execution_ctx())
9185
.unwrap()
9286
.is_null(),
9387
"expected scalar at index {} to be null, but was {:?}",
9488
$n,
9589
arr_ref
96-
.execute_scalar(
97-
$n,
98-
&mut $crate::VortexSessionExecute::create_execution_ctx(
99-
&*$crate::LEGACY_SESSION
100-
),
101-
)
90+
.execute_scalar($n, &mut LEGACY_SESSION.create_execution_ctx())
10291
.unwrap()
10392
);
10493
}};

‎vortex-array/src/arrays/bool/array.rs‎

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,8 @@ mod tests {
371371
fn bool_array() {
372372
let arr = BoolArray::from_iter([true, false, true]);
373373
let scalar = bool::try_from(
374-
&arr.execute_scalar(
375-
0,
376-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
377-
)
378-
.unwrap(),
374+
&arr.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
375+
.unwrap(),
379376
)
380377
.unwrap();
381378
assert!(scalar);
@@ -388,20 +385,14 @@ mod tests {
388385
assert!(matches!(arr.validity(), Ok(Validity::AllValid)));
389386

390387
let scalar = bool::try_from(
391-
&arr.execute_scalar(
392-
0,
393-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
394-
)
395-
.unwrap(),
388+
&arr.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
389+
.unwrap(),
396390
)
397391
.unwrap();
398392
assert!(scalar);
399393
let scalar = bool::try_from(
400-
&arr.execute_scalar(
401-
1,
402-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
403-
)
404-
.unwrap(),
394+
&arr.execute_scalar(1, &mut LEGACY_SESSION.create_execution_ctx())
395+
.unwrap(),
405396
)
406397
.unwrap();
407398
assert!(!scalar);
@@ -412,48 +403,33 @@ mod tests {
412403
let arr = BoolArray::from_iter([Some(true), Some(true), None, Some(false), None]);
413404

414405
let scalar = bool::try_from(
415-
&arr.execute_scalar(
416-
0,
417-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
418-
)
419-
.unwrap(),
406+
&arr.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
407+
.unwrap(),
420408
)
421409
.unwrap();
422410
assert!(scalar);
423411

424412
let scalar = bool::try_from(
425-
&arr.execute_scalar(
426-
1,
427-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
428-
)
429-
.unwrap(),
413+
&arr.execute_scalar(1, &mut LEGACY_SESSION.create_execution_ctx())
414+
.unwrap(),
430415
)
431416
.unwrap();
432417
assert!(scalar);
433418

434419
let scalar = arr
435-
.execute_scalar(
436-
2,
437-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
438-
)
420+
.execute_scalar(2, &mut LEGACY_SESSION.create_execution_ctx())
439421
.unwrap();
440422
assert!(scalar.is_null());
441423

442424
let scalar = bool::try_from(
443-
&arr.execute_scalar(
444-
3,
445-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
446-
)
447-
.unwrap(),
425+
&arr.execute_scalar(3, &mut LEGACY_SESSION.create_execution_ctx())
426+
.unwrap(),
448427
)
449428
.unwrap();
450429
assert!(!scalar);
451430

452431
let scalar = arr
453-
.execute_scalar(
454-
4,
455-
&mut VortexSessionExecute::create_execution_ctx(&*LEGACY_SESSION),
456-
)
432+
.execute_scalar(4, &mut LEGACY_SESSION.create_execution_ctx())
457433
.unwrap();
458434
assert!(scalar.is_null());
459435
}

‎vortex-array/src/arrays/chunked/tests.rs‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use vortex_buffer::Buffer;
77
use vortex_buffer::buffer;
88

99
use crate::IntoArray;
10+
use crate::LEGACY_SESSION;
11+
use crate::VortexSessionExecute;
1012
use crate::accessor::ArrayAccessor;
1113
use crate::arrays::Chunked;
1214
use crate::arrays::ChunkedArray;
@@ -225,29 +227,17 @@ pub fn pack_nested_lists() {
225227
let canon_values = chunked_list.unwrap().as_array().to_listview();
226228

227229
assert_eq!(
228-
l1.execute_scalar(
229-
0,
230-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
231-
)
232-
.unwrap(),
230+
l1.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
231+
.unwrap(),
233232
canon_values
234-
.execute_scalar(
235-
0,
236-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
237-
)
233+
.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
238234
.unwrap()
239235
);
240236
assert_eq!(
241-
l2.execute_scalar(
242-
0,
243-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
244-
)
245-
.unwrap(),
237+
l2.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
238+
.unwrap(),
246239
canon_values
247-
.execute_scalar(
248-
1,
249-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
250-
)
240+
.execute_scalar(1, &mut LEGACY_SESSION.create_execution_ctx())
251241
.unwrap()
252242
);
253243
}

‎vortex-array/src/arrays/chunked/vtable/canonical.rs‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ mod tests {
219219
use crate::Canonical;
220220
use crate::ExecutionCtx;
221221
use crate::IntoArray;
222+
use crate::LEGACY_SESSION;
222223
use crate::ToCanonical;
224+
use crate::VortexSessionExecute;
223225
use crate::accessor::ArrayAccessor;
224226
use crate::arrays::ChunkedArray;
225227
use crate::arrays::ListArray;
@@ -306,29 +308,17 @@ mod tests {
306308
let canon_values = chunked_list.unwrap().as_array().to_listview();
307309

308310
assert_eq!(
309-
l1.execute_scalar(
310-
0,
311-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
312-
)
313-
.unwrap(),
311+
l1.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
312+
.unwrap(),
314313
canon_values
315-
.execute_scalar(
316-
0,
317-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
318-
)
314+
.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
319315
.unwrap()
320316
);
321317
assert_eq!(
322-
l2.execute_scalar(
323-
0,
324-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
325-
)
326-
.unwrap(),
318+
l2.execute_scalar(0, &mut LEGACY_SESSION.create_execution_ctx())
319+
.unwrap(),
327320
canon_values
328-
.execute_scalar(
329-
1,
330-
&mut crate::VortexSessionExecute::create_execution_ctx(&*crate::LEGACY_SESSION)
331-
)
321+
.execute_scalar(1, &mut LEGACY_SESSION.create_execution_ctx())
332322
.unwrap()
333323
);
334324
}

0 commit comments

Comments
 (0)