From 912f6918487d1f047fb60d07a0a8e1c3413b729d Mon Sep 17 00:00:00 2001
From: Joe Isaacs <joe.isaacs@live.co.uk>
Date: Wed, 20 Nov 2024 11:44:33 +0000
Subject: [PATCH] fx

---
 datafusion/functions/benches/make_date.rs | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/datafusion/functions/benches/make_date.rs b/datafusion/functions/benches/make_date.rs
index a9844e4b2541..b05ce8802f64 100644
--- a/datafusion/functions/benches/make_date.rs
+++ b/datafusion/functions/benches/make_date.rs
@@ -19,7 +19,7 @@ extern crate criterion;
 
 use std::sync::Arc;
 
-use arrow::array::{ArrayRef, Int32Array};
+use arrow::array::{Array, ArrayRef, Int32Array};
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use rand::rngs::ThreadRng;
 use rand::Rng;
@@ -57,7 +57,9 @@ fn days(rng: &mut ThreadRng) -> Int32Array {
 fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("make_date_col_col_col_1000", |b| {
         let mut rng = rand::thread_rng();
-        let years = ColumnarValue::Array(Arc::new(years(&mut rng)) as ArrayRef);
+        let years_array = Arc::new(years(&mut rng)) as ArrayRef;
+        let batch_len = years_array.len();
+        let years = ColumnarValue::Array(years_array);
         let months = ColumnarValue::Array(Arc::new(months(&mut rng)) as ArrayRef);
         let days = ColumnarValue::Array(Arc::new(days(&mut rng)) as ArrayRef);
 
@@ -65,7 +67,10 @@ fn criterion_benchmark(c: &mut Criterion) {
             #[allow(deprecated)] // TODO use invoke_batch
             black_box(
                 make_date()
-                    .invoke(&[years.clone(), months.clone(), days.clone()])
+                    .invoke_batch(
+                        &[years.clone(), months.clone(), days.clone()],
+                        batch_len,
+                    )
                     .expect("make_date should work on valid values"),
             )
         })
@@ -74,14 +79,16 @@ fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("make_date_scalar_col_col_1000", |b| {
         let mut rng = rand::thread_rng();
         let year = ColumnarValue::Scalar(ScalarValue::Int32(Some(2025)));
-        let months = ColumnarValue::Array(Arc::new(months(&mut rng)) as ArrayRef);
+        let months_arr = Arc::new(months(&mut rng)) as ArrayRef;
+        let batch_len = months_arr.len();
+        let months = ColumnarValue::Array(months_arr);
         let days = ColumnarValue::Array(Arc::new(days(&mut rng)) as ArrayRef);
 
         b.iter(|| {
             #[allow(deprecated)] // TODO use invoke_batch
             black_box(
                 make_date()
-                    .invoke(&[year.clone(), months.clone(), days.clone()])
+                    .invoke_batch(&[year.clone(), months.clone(), days.clone()], batch_len)
                     .expect("make_date should work on valid values"),
             )
         })
@@ -91,13 +98,15 @@ fn criterion_benchmark(c: &mut Criterion) {
         let mut rng = rand::thread_rng();
         let year = ColumnarValue::Scalar(ScalarValue::Int32(Some(2025)));
         let month = ColumnarValue::Scalar(ScalarValue::Int32(Some(11)));
-        let days = ColumnarValue::Array(Arc::new(days(&mut rng)) as ArrayRef);
+        let day_arr =Arc::new(days(&mut rng)
+        let batch_len = day_arr.len();
+        let days = ColumnarValue::Array(day_arr);
 
         b.iter(|| {
             #[allow(deprecated)] // TODO use invoke_batch
             black_box(
                 make_date()
-                    .invoke(&[year.clone(), month.clone(), days.clone()])
+                    .invoke_batch(&[year.clone(), month.clone(), days.clone()], batch_len)
                     .expect("make_date should work on valid values"),
             )
         })
@@ -112,7 +121,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             #[allow(deprecated)] // TODO use invoke_batch
             black_box(
                 make_date()
-                    .invoke(&[year.clone(), month.clone(), day.clone()])
+                    .invoke_batch(&[year.clone(), month.clone(), day.clone()], 1)
                     .expect("make_date should work on valid values"),
             )
         })