alamb commented on code in PR #12070:
URL: https://github.com/apache/datafusion/pull/12070#discussion_r1725289838
##########
datafusion/functions/src/unicode/rpad.rs:
##########
@@ -84,170 +87,182 @@ impl ScalarUDFImpl for RPadFunc {
}
fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue> {
- match args.len() {
- 2 => match args[0].data_type() {
- DataType::Utf8 | DataType::Utf8View => {
- make_scalar_function(rpad::<i32, i32>, vec![])(args)
- }
- DataType::LargeUtf8 => {
- make_scalar_function(rpad::<i64, i64>, vec![])(args)
- }
- other => exec_err!("Unsupported data type {other:?} for
function rpad"),
- },
- 3 => match (args[0].data_type(), args[2].data_type()) {
- (
- DataType::Utf8 | DataType::Utf8View,
- DataType::Utf8 | DataType::Utf8View,
- ) => make_scalar_function(rpad::<i32, i32>, vec![])(args),
- (DataType::LargeUtf8, DataType::LargeUtf8) => {
- make_scalar_function(rpad::<i64, i64>, vec![])(args)
- }
- (DataType::LargeUtf8, DataType::Utf8View | DataType::Utf8) => {
- make_scalar_function(rpad::<i64, i32>, vec![])(args)
- }
- (DataType::Utf8View | DataType::Utf8, DataType::LargeUtf8) => {
- make_scalar_function(rpad::<i32, i64>, vec![])(args)
- }
- (first_type, last_type) => {
- exec_err!("unsupported arguments type for rpad, first
argument type is {}, last argument type is {}", first_type, last_type)
- }
- },
- number => {
- exec_err!("unsupported arguments number {} for rpad", number)
+ match (
+ args.len(),
+ args[0].data_type(),
+ args.get(2).map(|arg| arg.data_type()),
+ ) {
+ (2, Utf8 | Utf8View, _) => {
+ make_scalar_function(rpad::<i32, i32>, vec![])(args)
+ }
+ (2, LargeUtf8, _) => make_scalar_function(rpad::<i64, i64>,
vec![])(args),
+ (3, Utf8 | Utf8View, Some(Utf8 | Utf8View)) => {
+ make_scalar_function(rpad::<i32, i32>, vec![])(args)
+ }
+ (3, LargeUtf8, Some(LargeUtf8)) => {
+ make_scalar_function(rpad::<i64, i64>, vec![])(args)
+ }
+ (3, Utf8 | Utf8View, Some(LargeUtf8)) => {
+ make_scalar_function(rpad::<i32, i64>, vec![])(args)
+ }
+ (3, LargeUtf8, Some(Utf8 | Utf8View)) => {
+ make_scalar_function(rpad::<i64, i32>, vec![])(args)
+ }
+ (_, _, _) => {
+ exec_err!("Unsupported combination of data types for function
rpad")
}
}
}
}
-macro_rules! process_rpad {
- // For the two-argument case
- ($string_array:expr, $length_array:expr) => {{
- $string_array
- .iter()
- .zip($length_array.iter())
- .map(|(string, length)| match (string, length) {
- (Some(string), Some(length)) => {
- if length > i32::MAX as i64 {
- return exec_err!("rpad requested length {} too large",
length);
- }
-
- let length = if length < 0 { 0 } else { length as usize };
- if length == 0 {
- Ok(Some("".to_string()))
- } else {
- let graphemes =
string.graphemes(true).collect::<Vec<&str>>();
- if length < graphemes.len() {
- Ok(Some(graphemes[..length].concat()))
- } else {
- let mut s = string.to_string();
- s.push_str(" ".repeat(length -
graphemes.len()).as_str());
- Ok(Some(s))
- }
- }
- }
- _ => Ok(None),
- })
- .collect::<Result<GenericStringArray<StringArrayLen>>>()
- }};
-
- // For the three-argument case
- ($string_array:expr, $length_array:expr, $fill_array:expr) => {{
- $string_array
- .iter()
- .zip($length_array.iter())
- .zip($fill_array.iter())
- .map(|((string, length), fill)| match (string, length, fill) {
- (Some(string), Some(length), Some(fill)) => {
- if length > i32::MAX as i64 {
- return exec_err!("rpad requested length {} too large",
length);
- }
-
- let length = if length < 0 { 0 } else { length as usize };
- let graphemes =
string.graphemes(true).collect::<Vec<&str>>();
- let fill_chars = fill.chars().collect::<Vec<char>>();
+pub fn rpad<StringArrayLen: OffsetSizeTrait, FillArrayLen: OffsetSizeTrait>(
Review Comment:
😍 -- 100% for no more macros!
--
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
