Skip to content

Commit 69d2cfd

Browse files
authored
Fix semantic conflict in vortex-array (#8312)
## Summary Fixes a minor semantic conflict introduced by some recent PRs. Signed-off-by: Adam Gutglick <adam@spiraldb.com>
1 parent 9e3ae2f commit 69d2cfd

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

vortex-array/src/arrays/constant/vtable/canonical.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ mod tests {
787787
let element_validity = elements
788788
.validity()
789789
.vortex_expect("constant canonical element validity should be derivable");
790-
let mut ctx = LEGACY_SESSION.create_execution_ctx();
790+
791791
assert!(element_validity.execute_is_valid(0, &mut ctx).unwrap());
792792
assert!(!element_validity.execute_is_valid(1, &mut ctx).unwrap());
793793
assert!(element_validity.execute_is_valid(2, &mut ctx).unwrap());

vortex-array/src/arrays/listview/rebuild.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use vortex_error::VortexResult;
99
use crate::Canonical;
1010
use crate::ExecutionCtx;
1111
use crate::IntoArray;
12+
use crate::LEGACY_SESSION;
1213
use crate::arrays::ConstantArray;
1314
use crate::arrays::ListViewArray;
1415
use crate::arrays::PrimitiveArray;
@@ -19,6 +20,7 @@ use crate::builtins::ArrayBuiltins;
1920
use crate::dtype::IntegerPType;
2021
use crate::dtype::Nullability;
2122
use crate::dtype::PType;
23+
use crate::executor::VortexSessionExecute;
2224
use crate::match_each_integer_ptype;
2325
use crate::match_each_unsigned_integer_ptype;
2426
use crate::scalar::Scalar;
@@ -484,7 +486,7 @@ mod tests {
484486

485487
// Verify nullability is preserved
486488
assert_eq!(flattened.dtype().nullability(), Nullability::Nullable);
487-
let mut ctx = LEGACY_SESSION.create_execution_ctx();
489+
let mut ctx = SESSION.create_execution_ctx();
488490
assert!(flattened.validity()?.execute_is_valid(0, &mut ctx)?);
489491
assert!(!flattened.validity()?.execute_is_valid(1, &mut ctx)?);
490492
assert!(flattened.validity()?.execute_is_valid(2, &mut ctx)?);

0 commit comments

Comments
 (0)