Skip to content

fix: binaryExpr not supported for LargeUtf8 #5896

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

Merged
merged 2 commits into from
Apr 10, 2023
Merged

fix: binaryExpr not supported for LargeUtf8 #5896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
871bb1b
fix: like and ilike not supported for LargeUtf8
jackwener Apr 6, 2023
2bac5a2
add test
jackwener Apr 7, 2023
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
25 changes: 25 additions & 0 deletions datafusion/core/tests/sqllogictests/test_files/select.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,28 @@ select CASE
END;
----
2

# Binary Expression for LargeUtf8
# issue: https://github.com/apache/arrow-datafusion/issues/5893
statement ok
CREATE TABLE t as select arrow_cast('Bar', 'LargeUtf8') as column1, 'B%' as column2;

query B
select column1 like column2 from t;
----
true

query B
select column1 ilike column2 from t;
----
true

query B
select column1 not like column2 from t;
----
false

query B
select column1 not ilike column2 from t;
----
false
7 changes: 5 additions & 2 deletions datafusion/physical-expr/src/expressions/binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ macro_rules! compute_utf8_op_scalar {
.as_any()
.downcast_ref::<$DT>()
.expect("compute_op failed to downcast left side array");
if let ScalarValue::Utf8(Some(string_value)) = $RIGHT {
if let ScalarValue::Utf8(Some(string_value))
| ScalarValue::LargeUtf8(Some(string_value)) = $RIGHT
{
Ok(Arc::new(paste::expr! {[<$OP _utf8_scalar>]}(
&ll,
&string_value,
Expand Down Expand Up @@ -415,6 +417,7 @@ macro_rules! binary_string_array_op {
($LEFT:expr, $RIGHT:expr, $OP:ident) => {{
match $LEFT.data_type() {
DataType::Utf8 => compute_utf8_op!($LEFT, $RIGHT, $OP, StringArray),
DataType::LargeUtf8 => compute_utf8_op!($LEFT, $RIGHT, $OP, LargeStringArray),
other => Err(DataFusionError::Internal(format!(
"Data type {:?} not supported for binary operation '{}' on string arrays",
other, stringify!($OP)
Expand Down Expand Up @@ -610,7 +613,7 @@ macro_rules! compute_utf8_flag_op_scalar {
.downcast_ref::<$ARRAYTYPE>()
.expect("compute_utf8_flag_op_scalar failed to downcast array");

if let ScalarValue::Utf8(Some(string_value)) = $RIGHT {
if let ScalarValue::Utf8(Some(string_value))|ScalarValue::LargeUtf8(Some(string_value)) = $RIGHT {
let flag = if $FLAG { Some("i") } else { None };
let mut array =
paste::expr! {[<$OP _utf8_scalar>]}(&ll, &string_value, flag)?;
Expand Down
3 changes: 2 additions & 1 deletion datafusion/physical-expr/src/expressions/like.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use std::{any::Any, sync::Arc};

use arrow::{
array::{new_null_array, Array, ArrayRef, StringArray},
array::{new_null_array, Array, ArrayRef, LargeStringArray, StringArray},
record_batch::RecordBatch,
};
use arrow_schema::{DataType, Schema};
Expand Down Expand Up @@ -206,6 +206,7 @@ macro_rules! binary_string_array_op_scalar {
($LEFT:expr, $RIGHT:expr, $OP:ident, $OP_TYPE:expr) => {{
let result: Result<Arc<dyn Array>> = match $LEFT.data_type() {
DataType::Utf8 => compute_utf8_op_scalar!($LEFT, $RIGHT, $OP, StringArray, $OP_TYPE),
DataType::LargeUtf8 => compute_utf8_op_scalar!($LEFT, $RIGHT, $OP, LargeStringArray, $OP_TYPE),
other => Err(DataFusionError::Internal(format!(
"Data type {:?} not supported for scalar operation '{}' on string array",
other, stringify!($OP)
Expand Down