Skip to content

Commit 2865fc1

Browse files
committed
fix
Signed-off-by: Robert Kruszewski <[email protected]>
1 parent 12b2420 commit 2865fc1

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

‎encodings/dict/src/compute/is_sorted.rs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,15 @@ use crate::{DictArray, DictVTable};
99

1010
impl IsSortedKernel for DictVTable {
1111
fn is_sorted(&self, array: &DictArray) -> VortexResult<Option<bool>> {
12-
if let Some((values_sorted, codes_sorted)) =
13-
is_sorted(array.values())?.zip(is_sorted(array.codes())?)
14-
&& values_sorted
15-
&& codes_sorted
16-
{
12+
if Some((true, true)) == is_sorted(array.values())?.zip(is_sorted(array.codes())?) {
1713
return Ok(Some(true));
1814
}
1915
Ok(None)
2016
}
2117

2218
fn is_strict_sorted(&self, array: &DictArray) -> VortexResult<Option<bool>> {
23-
if let Some((values_sorted, codes_sorted)) =
24-
is_strict_sorted(array.values())?.zip(is_strict_sorted(array.codes())?)
25-
&& values_sorted
26-
&& codes_sorted
19+
if Some((true, true))
20+
== is_strict_sorted(array.values())?.zip(is_strict_sorted(array.codes())?)
2721
{
2822
return Ok(Some(true));
2923
}

‎vortex-array/src/compute/is_sorted.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl ComputeFnVTable for IsSorted {
5353

5454
// We currently don't support sorting struct arrays.
5555
if array.dtype().is_struct() {
56-
return Ok(Scalar::from(false).into());
56+
return Ok(Scalar::from(Some(false)).into());
5757
}
5858

5959
let is_sorted = if strict {

0 commit comments

Comments
 (0)