Skip to content

Commit 0f6645b

Browse files
committed
add imports
Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
1 parent 2672e1b commit 0f6645b

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

vortex-array/src/scalar_fn/fns/binary/compare.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use arrow_ord::cmp;
99
use arrow_ord::ord::make_comparator;
1010
use arrow_schema::SortOptions;
1111
use vortex_error::VortexResult;
12+
use vortex_error::vortex_err;
1213

1314
use crate::ArrayRef;
1415
use crate::Canonical;
@@ -196,7 +197,7 @@ pub fn scalar_cmp(lhs: &Scalar, rhs: &Scalar, operator: CompareOperator) -> Vort
196197

197198
// We do this instead of `<` and `>` to ensure we do not lose a type mismatch error.
198199
let ordering = lhs.partial_cmp(rhs).ok_or_else(|| {
199-
vortex_error::vortex_err!(
200+
vortex_err!(
200201
"Cannot compare scalars with incompatible types: {} and {}",
201202
lhs.dtype(),
202203
rhs.dtype()
@@ -275,6 +276,7 @@ mod tests {
275276
use crate::extension::datetime::TimestampOptions;
276277
use crate::scalar::Scalar;
277278
use crate::scalar_fn::fns::binary::compare::ConstantArray;
279+
use crate::scalar_fn::fns::binary::scalar_cmp;
278280
use crate::scalar_fn::fns::operators::CompareOperator;
279281
use crate::scalar_fn::fns::operators::Operator;
280282
use crate::test_harness::to_int_indices;
@@ -523,21 +525,21 @@ mod tests {
523525
);
524526

525527
// Ordering comparisons must error on incompatible types.
526-
assert!(super::scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Gt).is_err());
527-
assert!(super::scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Lt).is_err());
528-
assert!(super::scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Gte).is_err());
529-
assert!(super::scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Lte).is_err());
528+
assert!(scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Gt).is_err());
529+
assert!(scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Lt).is_err());
530+
assert!(scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Gte).is_err());
531+
assert!(scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Lte).is_err());
530532

531533
// Equality comparisons should succeed (and return false since the types differ).
532534
assert_eq!(
533-
super::scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Eq)
535+
scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::Eq)
534536
.unwrap()
535537
.as_bool()
536538
.value(),
537539
Some(false),
538540
);
539541
assert_eq!(
540-
super::scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::NotEq)
542+
scalar_cmp(&ms_scalar, &s_scalar, CompareOperator::NotEq)
541543
.unwrap()
542544
.as_bool()
543545
.value(),

0 commit comments

Comments
 (0)