Skip to content

Commit 5a764e6

Browse files
authored
assert_arrays_eq and assert_nth_scalar require ExecutionCtx (#8509)
Part of migration to populate execution context everywhere
1 parent d3da261 commit 5a764e6

239 files changed

Lines changed: 4011 additions & 2706 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.

encodings/alp/src/alp/array.rs

Lines changed: 50 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ mod tests {
471471
use rstest::rstest;
472472
use vortex_array::Canonical;
473473
use vortex_array::IntoArray;
474-
use vortex_array::LEGACY_SESSION;
475474
use vortex_array::VortexSessionExecute;
476475
use vortex_array::arrays::PrimitiveArray;
477476
use vortex_array::assert_arrays_eq;
@@ -482,7 +481,11 @@ mod tests {
482481
use crate::alp_encode;
483482
use crate::decompress_into_array;
484483

485-
static SESSION: LazyLock<VortexSession> = LazyLock::new(vortex_array::array_session);
484+
static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
485+
let session = vortex_array::array_session();
486+
crate::initialize(&session);
487+
session
488+
});
486489

487490
#[rstest]
488491
#[case(0)]
@@ -507,10 +510,9 @@ mod tests {
507510
.unwrap()
508511
};
509512
// Compare against the traditional array-based decompress path
510-
let expected =
511-
decompress_into_array(encoded, &mut LEGACY_SESSION.create_execution_ctx()).unwrap();
513+
let expected = decompress_into_array(encoded, &mut SESSION.create_execution_ctx()).unwrap();
512514

513-
assert_arrays_eq!(result_canonical.into_array(), expected);
515+
assert_arrays_eq!(result_canonical.into_array(), expected, &mut ctx);
514516
}
515517

516518
#[rstest]
@@ -525,26 +527,19 @@ mod tests {
525527
#[case(2049)]
526528
fn test_execute_f64(#[case] size: usize) {
527529
let values = PrimitiveArray::from_iter((0..size).map(|i| i as f64));
528-
let encoded = alp_encode(
529-
values.as_view(),
530-
None,
531-
&mut LEGACY_SESSION.create_execution_ctx(),
532-
)
533-
.unwrap();
530+
let encoded =
531+
alp_encode(values.as_view(), None, &mut SESSION.create_execution_ctx()).unwrap();
534532

535-
let result_canonical = {
536-
let mut ctx = SESSION.create_execution_ctx();
537-
encoded
538-
.clone()
539-
.into_array()
540-
.execute::<Canonical>(&mut ctx)
541-
.unwrap()
542-
};
533+
let mut ctx = SESSION.create_execution_ctx();
534+
let result_canonical = encoded
535+
.clone()
536+
.into_array()
537+
.execute::<Canonical>(&mut ctx)
538+
.unwrap();
543539
// Compare against the traditional array-based decompress path
544-
let expected =
545-
decompress_into_array(encoded, &mut LEGACY_SESSION.create_execution_ctx()).unwrap();
540+
let expected = decompress_into_array(encoded, &mut SESSION.create_execution_ctx()).unwrap();
546541

547-
assert_arrays_eq!(result_canonical.into_array(), expected);
542+
assert_arrays_eq!(result_canonical.into_array(), expected, &mut ctx);
548543
}
549544

550545
#[rstest]
@@ -564,27 +559,20 @@ mod tests {
564559
.collect();
565560

566561
let array = PrimitiveArray::from_iter(values);
567-
let encoded = alp_encode(
568-
array.as_view(),
569-
None,
570-
&mut LEGACY_SESSION.create_execution_ctx(),
571-
)
572-
.unwrap();
562+
let encoded =
563+
alp_encode(array.as_view(), None, &mut SESSION.create_execution_ctx()).unwrap();
573564
assert!(encoded.patches().unwrap().array_len() > 0);
574565

575-
let result_canonical = {
576-
let mut ctx = SESSION.create_execution_ctx();
577-
encoded
578-
.clone()
579-
.into_array()
580-
.execute::<Canonical>(&mut ctx)
581-
.unwrap()
582-
};
566+
let mut ctx = SESSION.create_execution_ctx();
567+
let result_canonical = encoded
568+
.clone()
569+
.into_array()
570+
.execute::<Canonical>(&mut ctx)
571+
.unwrap();
583572
// Compare against the traditional array-based decompress path
584-
let expected =
585-
decompress_into_array(encoded, &mut LEGACY_SESSION.create_execution_ctx()).unwrap();
573+
let expected = decompress_into_array(encoded, &mut SESSION.create_execution_ctx()).unwrap();
586574

587-
assert_arrays_eq!(result_canonical.into_array(), expected);
575+
assert_arrays_eq!(result_canonical.into_array(), expected, &mut ctx);
588576
}
589577

590578
#[rstest]
@@ -603,26 +591,19 @@ mod tests {
603591
.collect();
604592

605593
let array = PrimitiveArray::from_option_iter(values);
606-
let encoded = alp_encode(
607-
array.as_view(),
608-
None,
609-
&mut LEGACY_SESSION.create_execution_ctx(),
610-
)
611-
.unwrap();
594+
let encoded =
595+
alp_encode(array.as_view(), None, &mut SESSION.create_execution_ctx()).unwrap();
612596

613-
let result_canonical = {
614-
let mut ctx = SESSION.create_execution_ctx();
615-
encoded
616-
.clone()
617-
.into_array()
618-
.execute::<Canonical>(&mut ctx)
619-
.unwrap()
620-
};
597+
let mut ctx = SESSION.create_execution_ctx();
598+
let result_canonical = encoded
599+
.clone()
600+
.into_array()
601+
.execute::<Canonical>(&mut ctx)
602+
.unwrap();
621603
// Compare against the traditional array-based decompress path
622-
let expected =
623-
decompress_into_array(encoded, &mut LEGACY_SESSION.create_execution_ctx()).unwrap();
604+
let expected = decompress_into_array(encoded, &mut SESSION.create_execution_ctx()).unwrap();
624605

625-
assert_arrays_eq!(result_canonical.into_array(), expected);
606+
assert_arrays_eq!(result_canonical.into_array(), expected, &mut ctx);
626607
}
627608

628609
#[rstest]
@@ -643,27 +624,20 @@ mod tests {
643624
.collect();
644625

645626
let array = PrimitiveArray::from_option_iter(values);
646-
let encoded = alp_encode(
647-
array.as_view(),
648-
None,
649-
&mut LEGACY_SESSION.create_execution_ctx(),
650-
)
651-
.unwrap();
627+
let encoded =
628+
alp_encode(array.as_view(), None, &mut SESSION.create_execution_ctx()).unwrap();
652629
assert!(encoded.patches().unwrap().array_len() > 0);
653630

654-
let result_canonical = {
655-
let mut ctx = SESSION.create_execution_ctx();
656-
encoded
657-
.clone()
658-
.into_array()
659-
.execute::<Canonical>(&mut ctx)
660-
.unwrap()
661-
};
631+
let mut ctx = SESSION.create_execution_ctx();
632+
let result_canonical = encoded
633+
.clone()
634+
.into_array()
635+
.execute::<Canonical>(&mut ctx)
636+
.unwrap();
662637
// Compare against the traditional array-based decompress path
663-
let expected =
664-
decompress_into_array(encoded, &mut LEGACY_SESSION.create_execution_ctx()).unwrap();
638+
let expected = decompress_into_array(encoded, &mut SESSION.create_execution_ctx()).unwrap();
665639

666-
assert_arrays_eq!(result_canonical.into_array(), expected);
640+
assert_arrays_eq!(result_canonical.into_array(), expected, &mut ctx);
667641
}
668642

669643
#[rstest]
@@ -720,7 +694,7 @@ mod tests {
720694
#[case(1000, 200)]
721695
#[case(2048, 512)]
722696
fn test_sliced_to_primitive(#[case] size: usize, #[case] slice_start: usize) {
723-
let mut ctx = LEGACY_SESSION.create_execution_ctx();
697+
let mut ctx = SESSION.create_execution_ctx();
724698
let values: Vec<Option<f64>> = (0..size)
725699
.map(|i| {
726700
if i % 5 == 0 {
@@ -784,7 +758,7 @@ mod tests {
784758
let normally_encoded = alp_encode(
785759
original.as_view(),
786760
None,
787-
&mut LEGACY_SESSION.create_execution_ctx(),
761+
&mut SESSION.create_execution_ctx(),
788762
)
789763
.unwrap();
790764
assert!(
@@ -818,7 +792,7 @@ mod tests {
818792
// The legacy decompress_into_array path should work correctly.
819793
let result_legacy = decompress_into_array(
820794
alp_without_chunk_offsets.clone(),
821-
&mut LEGACY_SESSION.create_execution_ctx(),
795+
&mut SESSION.create_execution_ctx(),
822796
)
823797
.unwrap();
824798
let legacy_slice = result_legacy.as_slice::<f64>();

0 commit comments

Comments
 (0)