-
Notifications
You must be signed in to change notification settings - Fork 282
fix: replace() returns wrong result for empty-string search #3391
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.
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
wattt3
wants to merge
1
commit into
apache:main
Choose a base branch
from
wattt3:fix/replace-empty-string
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+150
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use arrow::array::{AsArray, StringArray}; | ||
| use arrow::datatypes::DataType; | ||
| use datafusion::common::{utils::take_function_args, Result}; | ||
| use datafusion::logical_expr::{ | ||
| ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, | ||
| }; | ||
| use std::{any::Any, sync::Arc}; | ||
|
|
||
| #[derive(Debug, PartialEq, Eq, Hash)] | ||
| pub struct SparkStringReplace { | ||
| signature: Signature, | ||
| aliases: Vec<String>, | ||
| } | ||
|
|
||
| impl Default for SparkStringReplace { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| } | ||
| } | ||
|
|
||
| impl SparkStringReplace { | ||
| pub fn new() -> Self { | ||
| Self { | ||
| signature: Signature::user_defined(Volatility::Immutable), | ||
| aliases: vec![], | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl ScalarUDFImpl for SparkStringReplace { | ||
| fn as_any(&self) -> &dyn Any { | ||
| self | ||
| } | ||
|
|
||
| fn name(&self) -> &str { | ||
| "spark_replace" | ||
| } | ||
|
|
||
| fn signature(&self) -> &Signature { | ||
| &self.signature | ||
| } | ||
|
|
||
| fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> { | ||
| Ok(arg_types[0].clone()) | ||
| } | ||
|
|
||
| fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> { | ||
| let args: [ColumnarValue; 3] = take_function_args(self.name(), args.args)?; | ||
| spark_string_replace(&args) | ||
| } | ||
|
|
||
| fn aliases(&self) -> &[String] { | ||
| &self.aliases | ||
| } | ||
| } | ||
|
|
||
| fn spark_string_replace(args: &[ColumnarValue]) -> Result<ColumnarValue> { | ||
| let arrays = ColumnarValue::values_to_arrays(args)?; | ||
| let src = arrays[0].as_string::<i32>(); | ||
| let search = arrays[1].as_string::<i32>(); | ||
| let replace = arrays[2].as_string::<i32>(); | ||
|
|
||
| let result: StringArray = src | ||
| .iter() | ||
| .zip(search.iter()) | ||
| .zip(replace.iter()) | ||
| .map(|((s, search), replace)| match (s, search, replace) { | ||
| (Some(s), Some(search), Some(replace)) => { | ||
| Some(spark_replace_string(s, search, replace)) | ||
| } | ||
| _ => None, | ||
| }) | ||
| .collect(); | ||
|
|
||
| Ok(ColumnarValue::Array(Arc::new(result))) | ||
| } | ||
|
|
||
| fn spark_replace_string(src: &str, search: &str, replace: &str) -> String { | ||
| if search.is_empty() { | ||
| let mut result = String::with_capacity(src.len() + replace.len() * (src.len() + 1)); | ||
| result.push_str(replace); | ||
| for c in src.chars() { | ||
| result.push(c); | ||
| result.push_str(replace); | ||
| } | ||
| result | ||
| } else { | ||
| src.replace(search, replace) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
| use arrow::array::Array; | ||
| use datafusion::common::ScalarValue; | ||
|
|
||
| #[test] | ||
| fn test_empty_search_string() { | ||
| let src = ColumnarValue::Array(Arc::new(StringArray::from(vec![ | ||
| Some("hello"), | ||
| Some("world"), | ||
| None, | ||
| ]))); | ||
| let search = ColumnarValue::Scalar(ScalarValue::Utf8(Some("".to_string()))); | ||
| let replace = ColumnarValue::Scalar(ScalarValue::Utf8(Some("x".to_string()))); | ||
|
|
||
| match spark_string_replace(&[src, search, replace]) { | ||
| Ok(ColumnarValue::Array(result)) => { | ||
| let string_arr = result.as_string::<i32>(); | ||
| assert_eq!(string_arr.value(0), "xhxexlxlxox"); | ||
| assert_eq!(string_arr.value(1), "xwxoxrxlxdx"); | ||
| assert!(string_arr.is_null(2)); | ||
| } | ||
| _ => unreachable!(), | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add these tests in the new sql file testing approach instead?
https://datafusion.apache.org/comet/contributor-guide/sql-file-tests.html