alamb commented on code in PR #11676:
URL: https://github.com/apache/datafusion/pull/11676#discussion_r1693945276
##########
datafusion/functions/src/unicode/character_length.rs:
##########
@@ -116,55 +122,54 @@ where
mod tests {
use crate::unicode::character_length::CharacterLengthFunc;
use crate::utils::test::test_function;
- use arrow::array::{Array, Int32Array};
- use arrow::datatypes::DataType::Int32;
+ use arrow::array::{Array, Int32Array, Int64Array};
+ use arrow::datatypes::DataType::{Int32, Int64};
use datafusion_common::{Result, ScalarValue};
use datafusion_expr::{ColumnarValue, ScalarUDFImpl};
+ macro_rules! test_character_length {
+ ($INPUT:expr, $EXPECTED:expr) => {
+ test_function!(
+ CharacterLengthFunc::new(),
+ &[ColumnarValue::Scalar(ScalarValue::Utf8($INPUT))],
+ $EXPECTED,
+ i32,
+ Int32,
+ Int32Array
+ );
+
+ test_function!(
+ CharacterLengthFunc::new(),
+ &[ColumnarValue::Scalar(ScalarValue::LargeUtf8($INPUT))],
+ $EXPECTED,
+ i64,
+ Int64,
+ Int64Array
+ );
+
+ test_function!(
+ CharacterLengthFunc::new(),
+ &[ColumnarValue::Scalar(ScalarValue::Utf8View($INPUT))],
+ $EXPECTED,
+ i32,
+ Int32,
+ Int32Array
+ );
+ };
+ }
+
#[test]
fn test_functions() -> Result<()> {
#[cfg(feature = "unicode_expressions")]
- test_function!(
- CharacterLengthFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("chars")
- )))],
- Ok(Some(5)),
- i32,
- Int32,
- Int32Array
- );
- #[cfg(feature = "unicode_expressions")]
- test_function!(
- CharacterLengthFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("josé")
- )))],
- Ok(Some(4)),
- i32,
- Int32,
- Int32Array
- );
- #[cfg(feature = "unicode_expressions")]
- test_function!(
- CharacterLengthFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(Some(
- String::from("")
- )))],
- Ok(Some(0)),
- i32,
- Int32,
- Int32Array
- );
- #[cfg(feature = "unicode_expressions")]
- test_function!(
- CharacterLengthFunc::new(),
- &[ColumnarValue::Scalar(ScalarValue::Utf8(None))],
- Ok(None),
- i32,
- Int32,
- Int32Array
- );
+ {
+ test_character_length!(Some(String::from("chars")), Ok(Some(5)));
+ test_character_length!(Some(String::from("josé")), Ok(Some(4)));
+ // test long strings
+ test_character_length!(Some(String::from("joséjoséjoséjosé")),
Ok(Some(16)));
Review Comment:
ole!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
