This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch branch-44
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/branch-44 by this push:
new 608ee580fb Correct return type for initcap scalar function with
utf8view (#13909) (#13934)
608ee580fb is described below
commit 608ee580fb48cb52943f799dada89a4e251ae292
Author: Andrew Lamb <[email protected]>
AuthorDate: Sat Dec 28 10:16:34 2024 -0500
Correct return type for initcap scalar function with utf8view (#13909)
(#13934)
* Set utf8view as return type when input type is the same
* Verify that the returned type from call to scalar function matches the
return type specified in the return_type function
* Match return type to utf8view
Co-authored-by: Tim Saucer <[email protected]>
---
datafusion/functions/src/unicode/initcap.rs | 18 +++++++++++-------
datafusion/functions/src/utils.rs | 1 +
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/datafusion/functions/src/unicode/initcap.rs
b/datafusion/functions/src/unicode/initcap.rs
index e9f966b958..c21fb77c9e 100644
--- a/datafusion/functions/src/unicode/initcap.rs
+++ b/datafusion/functions/src/unicode/initcap.rs
@@ -63,7 +63,11 @@ impl ScalarUDFImpl for InitcapFunc {
}
fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> {
- utf8_to_str_type(&arg_types[0], "initcap")
+ if let DataType::Utf8View = arg_types[0] {
+ Ok(DataType::Utf8View)
+ } else {
+ utf8_to_str_type(&arg_types[0], "initcap")
+ }
}
fn invoke_batch(
@@ -188,7 +192,7 @@ mod tests {
use crate::unicode::initcap::InitcapFunc;
use crate::utils::test::test_function;
use arrow::array::{Array, StringArray, StringViewArray};
- use arrow::datatypes::DataType::Utf8;
+ use arrow::datatypes::DataType::{Utf8, Utf8View};
use datafusion_common::{Result, ScalarValue};
use datafusion_expr::{ColumnarValue, ScalarUDFImpl};
@@ -247,7 +251,7 @@ mod tests {
)))],
Ok(Some("Hi Thomas")),
&str,
- Utf8,
+ Utf8View,
StringViewArray
);
test_function!(
@@ -257,7 +261,7 @@ mod tests {
)))],
Ok(Some("Hi Thomas With M0re Than 12 Chars")),
&str,
- Utf8,
+ Utf8View,
StringViewArray
);
test_function!(
@@ -270,7 +274,7 @@ mod tests {
"Đẹp Đẽ Êm Ả Ñandú Árbol Олег Иванович Íslensku Þjóðarinnar
Ελληνική"
)),
&str,
- Utf8,
+ Utf8View,
StringViewArray
);
test_function!(
@@ -280,7 +284,7 @@ mod tests {
)))],
Ok(Some("")),
&str,
- Utf8,
+ Utf8View,
StringViewArray
);
test_function!(
@@ -288,7 +292,7 @@ mod tests {
vec![ColumnarValue::Scalar(ScalarValue::Utf8View(None))],
Ok(None),
&str,
- Utf8,
+ Utf8View,
StringViewArray
);
diff --git a/datafusion/functions/src/utils.rs
b/datafusion/functions/src/utils.rs
index 53f6074922..39d8aeeda4 100644
--- a/datafusion/functions/src/utils.rs
+++ b/datafusion/functions/src/utils.rs
@@ -154,6 +154,7 @@ pub mod test {
let result =
result.unwrap().to_array(cardinality).expect("Failed to convert to array");
let result =
result.as_any().downcast_ref::<$ARRAY_TYPE>().expect("Failed to convert to
type");
+ assert_eq!(result.data_type(), &$EXPECTED_DATA_TYPE);
// value is correct
match expected {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
