Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement ord for FixedSizeBinary types #2905

Merged
merged 2 commits into from
Oct 21, 2022
Merged

Implement ord for FixedSizeBinary types #2905

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fac8fc
implement ord for FixedSizeBinary types
maxburke Oct 20, 2022
edc745e
add ord test
maxburke Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion arrow/src/array/ord.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,14 @@ pub fn build_compare(left: &dyn Array, right: &dyn Array) -> Result<DynComparato
let right: Decimal128Array = Decimal128Array::from(right.data().clone());
Box::new(move |i, j| left.value(i).cmp(&right.value(j)))
}
(FixedSizeBinary(_), FixedSizeBinary(_)) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI the comparison and sort kernels do not make use of this DynComparator, and I actually hope to at some point deprecate it in favor of the row format.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That may be but we were running into the unhandled case in this match firing when testing apache/datafusion#3911

let left: FixedSizeBinaryArray =
FixedSizeBinaryArray::from(left.data().clone());
let right: FixedSizeBinaryArray =
FixedSizeBinaryArray::from(right.data().clone());

Box::new(move |i, j| left.value(i).cmp(right.value(j)))
}
(lhs, _) => {
return Err(ArrowError::InvalidArgumentError(format!(
"The data type type {:?} has no natural order",
Expand All @@ -307,10 +315,34 @@ pub fn build_compare(left: &dyn Array, right: &dyn Array) -> Result<DynComparato
#[cfg(test)]
pub mod tests {
use super::*;
use crate::array::{Float64Array, Int32Array};
use crate::array::{FixedSizeBinaryArray, Float64Array, Int32Array};
use crate::error::Result;
use std::cmp::Ordering;

#[test]
Copy link
Contributor

@tustvold tustvold Oct 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even better would be some tests with more than one value in the list, and some tests of more than just Ordering::Less, but don't feel strongly 😅

fn test_fixed_size_binary() -> Result<()> {
let items = vec![vec![1u8], vec![2u8]];
let array = FixedSizeBinaryArray::try_from_iter(items.into_iter()).unwrap();

let cmp = build_compare(&array, &array)?;

assert_eq!(Ordering::Less, (cmp)(0, 1));
Ok(())
}

#[test]
fn test_fixed_size_binary_fixed_size_binary() -> Result<()> {
let items = vec![vec![1u8]];
let array1 = FixedSizeBinaryArray::try_from_iter(items.into_iter()).unwrap();
let items = vec![vec![2u8]];
let array2 = FixedSizeBinaryArray::try_from_iter(items.into_iter()).unwrap();

let cmp = build_compare(&array1, &array2)?;

assert_eq!(Ordering::Less, (cmp)(0, 0));
Ok(())
}

#[test]
fn test_i32() -> Result<()> {
let array = Int32Array::from(vec![1, 2]);
Expand Down