Skip to content

fix: make replace no-op for empty search #22275

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

Open
nvphungdev wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −3
Open

fix: make replace no-op for empty search #22275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 39 additions & 3 deletions datafusion/functions/src/string/replace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,9 @@ fn apply_replace<B: BulkNullStringArrayBuilder>(
}

if from.is_empty() {
// Empty `from`: insert `to` before each character and at both ends.
builder.append_with(|w| {
w.write_str(to);
for ch in string.chars() {
w.write_char(ch);
w.write_str(to);
}
});
return;
Expand Down Expand Up @@ -316,6 +313,19 @@ mod tests {
StringArray
);

test_function!(
ReplaceFunc::new(),
vec![
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("abc")))),
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::new()))),
ColumnarValue::Scalar(ScalarValue::Utf8(Some(String::from("x")))),
],
Ok(Some("abc")),
&str,
Utf8,
StringArray
);

test_function!(
ReplaceFunc::new(),
vec![
Expand All @@ -331,6 +341,19 @@ mod tests {
LargeStringArray
);

test_function!(
ReplaceFunc::new(),
vec![
ColumnarValue::Scalar(ScalarValue::LargeUtf8(Some(String::from("abc")))),
ColumnarValue::Scalar(ScalarValue::LargeUtf8(Some(String::new()))),
ColumnarValue::Scalar(ScalarValue::LargeUtf8(Some(String::from("x")))),
],
Ok(Some("abc")),
&str,
LargeUtf8,
LargeStringArray
);

test_function!(
ReplaceFunc::new(),
vec![
Expand All @@ -346,6 +369,19 @@ mod tests {
StringArray
);

test_function!(
ReplaceFunc::new(),
vec![
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("abc")))),
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::new()))),
ColumnarValue::Scalar(ScalarValue::Utf8View(Some(String::from("x")))),
],
Ok(Some("abc")),
&str,
Utf8,
StringArray
);

Ok(())
}
}
5 changes: 5 additions & 0 deletions datafusion/sqllogictest/test_files/expr.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,11 @@ SELECT replace('abcdefabcdef', 'notmatch', 'XX')
----
abcdefabcdef

query T
SELECT replace('abc', '', 'x')
----
abc

query T
SELECT replace('abcdefabcdef', NULL, 'XX')
----
Expand Down