This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
The following commit(s) were added to refs/heads/master by this push:
new e430f5e Add kernel and tests (#1121)
e430f5e is described below
commit e430f5e4c4196efe0b9891c004f8ad7021072825
Author: Matthew Turner <[email protected]>
AuthorDate: Sun Jan 2 06:25:00 2022 -0500
Add kernel and tests (#1121)
---
arrow/src/compute/kernels/comparison.rs | 56 +++++++++++++++++++++++++++++++--
1 file changed, 54 insertions(+), 2 deletions(-)
diff --git a/arrow/src/compute/kernels/comparison.rs
b/arrow/src/compute/kernels/comparison.rs
index 8b0c5ff..17617fb 100644
--- a/arrow/src/compute/kernels/comparison.rs
+++ b/arrow/src/compute/kernels/comparison.rs
@@ -1166,7 +1166,7 @@ pub fn eq_dyn_utf8_scalar(left: Arc<dyn Array>, right:
&str) -> Result<BooleanAr
dyn_compare_utf8_scalar!(&left, right, key_type,
eq_utf8_scalar)
}
_ => Err(ArrowError::ComputeError(
- "Kernel only supports Utf8 or LargeUtf8 arrays or
DictionaryArray with Utf8 or LargeUtf8 values".to_string(),
+ "eq_dyn_utf8_scalar only supports Utf8 or LargeUtf8 arrays or
DictionaryArray with Utf8 or LargeUtf8 values".to_string(),
)),
},
DataType::Utf8 | DataType::LargeUtf8 => {
@@ -1174,7 +1174,30 @@ pub fn eq_dyn_utf8_scalar(left: Arc<dyn Array>, right:
&str) -> Result<BooleanAr
eq_utf8_scalar(left, right)
}
_ => Err(ArrowError::ComputeError(
- "Kernel only supports Utf8 or LargeUtf8 arrays".to_string(),
+ "eq_dyn_utf8_scalar only supports Utf8 or LargeUtf8
arrays".to_string(),
+ )),
+ };
+ result
+}
+
+/// Perform `left < right` operation on an array and a numeric scalar
+/// value. Supports StringArrays, and DictionaryArrays that have string values
+pub fn lt_dyn_utf8_scalar(left: Arc<dyn Array>, right: &str) ->
Result<BooleanArray> {
+ let result = match left.data_type() {
+ DataType::Dictionary(key_type, value_type) => match
value_type.as_ref() {
+ DataType::Utf8 | DataType::LargeUtf8 => {
+ dyn_compare_utf8_scalar!(&left, right, key_type,
lt_utf8_scalar)
+ }
+ _ => Err(ArrowError::ComputeError(
+ "lt_dyn_utf8_scalar only supports Utf8 or LargeUtf8 arrays or
DictionaryArray with Utf8 or LargeUtf8 values".to_string(),
+ )),
+ },
+ DataType::Utf8 | DataType::LargeUtf8 => {
+ let left = as_string_array(&left);
+ lt_utf8_scalar(left, right)
+ }
+ _ => Err(ArrowError::ComputeError(
+ "lt_dyn_utf8_scalar only supports Utf8 or LargeUtf8
arrays".to_string(),
)),
};
result
@@ -3087,6 +3110,35 @@ mod tests {
)
);
}
+ #[test]
+ fn test_lt_dyn_utf8_scalar() {
+ let array = StringArray::from(vec!["abc", "def", "xyz"]);
+ let array = Arc::new(array);
+ let a_eq = lt_dyn_utf8_scalar(array, "xyz").unwrap();
+ assert_eq!(
+ a_eq,
+ BooleanArray::from(vec![Some(true), Some(true), Some(false)])
+ );
+ }
+ #[test]
+ fn test_lt_dyn_utf8_scalar_with_dict() {
+ let key_builder = PrimitiveBuilder::<Int8Type>::new(3);
+ let value_builder = StringBuilder::new(100);
+ let mut builder = StringDictionaryBuilder::new(key_builder,
value_builder);
+ builder.append("abc").unwrap();
+ builder.append_null().unwrap();
+ builder.append("def").unwrap();
+ builder.append("def").unwrap();
+ builder.append("abc").unwrap();
+ let array = Arc::new(builder.finish());
+ let a_eq = lt_dyn_utf8_scalar(array, "def").unwrap();
+ assert_eq!(
+ a_eq,
+ BooleanArray::from(
+ vec![Some(true), None, Some(false), Some(false), Some(true)]
+ )
+ );
+ }
#[test]
fn test_gt_eq_dyn_utf8_scalar() {
