You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by gi...@apache.org on 2026/06/21 05:06:46 UTC

(datafusion) 01/01: minor: reuse ColumnarValue::into_array in map's expand_if_scalar and avoid uncessary clones (#22984)

This is an automated email from the ASF dual-hosted git repository.

github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-22984-2e8a1d968565c94b1e133caf144b4231ef4ef38a
in repository https://gitbox.apache.org/repos/asf/datafusion.git

commit f96a64c02de3719141519b26bc2dd57f6b9156dd
Author: Nathan <56...@users.noreply.github.com>
AuthorDate: Sun Jun 21 01:06:21 2026 -0400

    minor: reuse ColumnarValue::into_array in map's expand_if_scalar and avoid uncessary clones (#22984)
    
    Follow-up to #22934: per [@alamb's
    suggestion](https://github.com/apache/datafusion/pull/22934#issuecomment-4721530629),
    reuse the existing `ColumnarValue::to_array` in `map.rs`'s
    `expand_if_scalar` instead of hand-rolling the same logic. `to_array`
    (borrowing) is used over `into_array` to avoid an extra `ScalarValue`
    clone; no behavior change.
---
 datafusion/functions-nested/src/map.rs | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/datafusion/functions-nested/src/map.rs b/datafusion/functions-nested/src/map.rs
index 868f6dd290..147f051163 100644
--- a/datafusion/functions-nested/src/map.rs
+++ b/datafusion/functions-nested/src/map.rs
@@ -63,27 +63,19 @@ fn can_evaluate_to_const(args: &[ColumnarValue]) -> bool {
         .all(|arg| matches!(arg, ColumnarValue::Scalar(_)))
 }
 
-fn expand_if_scalar(arg: &ColumnarValue, rows: usize) -> Result<ColumnarValue> {
-    match arg {
-        ColumnarValue::Scalar(s) => Ok(ColumnarValue::Array(s.to_array_of_size(rows)?)),
-        ColumnarValue::Array(a) => Ok(ColumnarValue::Array(Arc::clone(a))),
-    }
+fn expand_if_scalar(arg: ColumnarValue, rows: usize) -> Result<ColumnarValue> {
+    Ok(ColumnarValue::Array(arg.into_array(rows)?))
 }
 
-fn make_map_batch(args: &[ColumnarValue], number_rows: usize) -> Result<ColumnarValue> {
-    let [keys_arg, values_arg] = take_function_args("make_map", args)?;
-
-    let can_evaluate_to_const = can_evaluate_to_const(args);
+fn make_map_batch(args: Vec<ColumnarValue>, number_rows: usize) -> Result<ColumnarValue> {
+    let can_evaluate_to_const = can_evaluate_to_const(&args);
+    let [mut keys_arg, mut values_arg] = take_function_args("make_map", args)?;
 
     // if we can't evaluate to const (inputs are not both scalar) then ensure they
     // are expanded to arrays which following logic expects
-    let (keys_arg, values_arg) = if !can_evaluate_to_const {
-        (
-            expand_if_scalar(keys_arg, number_rows)?,
-            expand_if_scalar(values_arg, number_rows)?,
-        )
-    } else {
-        (keys_arg.clone(), values_arg.clone())
+    if !can_evaluate_to_const {
+        keys_arg = expand_if_scalar(keys_arg, number_rows)?;
+        values_arg = expand_if_scalar(values_arg, number_rows)?;
     };
 
     let keys = get_first_array_ref(&keys_arg)?;
@@ -417,7 +409,7 @@ impl ScalarUDFImpl for MapFunc {
     }
 
     fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
-        make_map_batch(&args.args, args.number_rows)
+        make_map_batch(args.args, args.number_rows)
     }
 
     fn documentation(&self) -> Option<&Documentation> {
@@ -735,7 +727,7 @@ mod tests {
 
         // Call make_map_batch - should succeed
         let result = make_map_batch(
-            &[
+            vec![
                 ColumnarValue::Array(keys_array),
                 ColumnarValue::Array(values_array),
             ],
@@ -786,7 +778,7 @@ mod tests {
 
         // Call make_map_batch - should fail
         let result = make_map_batch(
-            &[
+            vec![
                 ColumnarValue::Array(keys_array),
                 ColumnarValue::Array(values_array),
             ],
@@ -837,7 +829,7 @@ mod tests {
 
         // Call make_map_batch - should succeed
         let result = make_map_batch(
-            &[
+            vec![
                 ColumnarValue::Array(keys_array),
                 ColumnarValue::Array(values_array),
             ],
@@ -910,7 +902,7 @@ mod tests {
 
         // Call make_map_batch - should succeed
         let result = make_map_batch(
-            &[
+            vec![
                 ColumnarValue::Array(keys_array),
                 ColumnarValue::Array(values_array),
             ],


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org