Fixed Migrate Datetime functions to invoke_with_args Issue 14705

datafusion/functions/src/datetime/current_date.rs

@@ -81,10 +81,9 @@ impl ScalarUDFImpl for CurrentDateFunc {
         Ok(Date32)
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        _args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         internal_err!(
             "invoke should not be called on a simplified current_date() function"

datafusion/functions/src/datetime/current_time.rs

@@ -78,14 +78,12 @@ impl ScalarUDFImpl for CurrentTimeFunc {
         Ok(Time64(Nanosecond))
     }
 
-    fn invoke_batch(
+  fn invoke_with_args(
         &self,
-        _args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
-        internal_err!(
-            "invoke should not be called on a simplified current_time() function"
-        )
+       let args = &args.args;
+
     }
 
     fn simplify(

datafusion/functions/src/datetime/date_bin.rs

@@ -187,10 +187,9 @@ impl ScalarUDFImpl for DateBinFunc {
         }
     }
 
-    fn invoke_batch(
+     fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.len() == 2 {
             // Default to unix EPOCH
@@ -516,7 +515,7 @@ mod tests {
     #[test]
     #[allow(deprecated)] // TODO migrate UDF invoke from invoke_batch
     fn test_date_bin() {
-        let res = DateBinFunc::new().invoke_batch(
+        let res = DateBinFunc::new().invoke_with_args(
             &[
                 ColumnarValue::Scalar(ScalarValue::IntervalDayTime(Some(
                     IntervalDayTime {

datafusion/functions/src/datetime/date_part.rs

@@ -167,10 +167,10 @@ impl ScalarUDFImpl for DatePartFunc {
             )
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
+
     ) -> Result<ColumnarValue> {
         let [part, array] = take_function_args(self.name(), args)?;
 

datafusion/functions/src/datetime/date_trunc.rs

@@ -160,10 +160,10 @@ impl ScalarUDFImpl for DateTruncFunc {
         }
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
+
     ) -> Result<ColumnarValue> {
         let (granularity, array) = (&args[0], &args[1]);
 

datafusion/functions/src/datetime/from_unixtime.rs

@@ -117,10 +117,9 @@ impl ScalarUDFImpl for FromUnixtimeFunc {
         internal_err!("call return_type_from_args instead")
     }
 
-    fn invoke_batch(
+     fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         let len = args.len();
         if len != 1 && len != 2 {

datafusion/functions/src/datetime/make_date.rs

@@ -106,10 +106,9 @@ impl ScalarUDFImpl for MakeDateFunc {
         Ok(Date32)
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         // first, identify if any of the arguments is an Array. If yes, store its `len`,
         // as any scalar will need to be converted to an array of len `len`.

datafusion/functions/src/datetime/now.rs

@@ -88,10 +88,9 @@ impl ScalarUDFImpl for NowFunc {
         internal_err!("return_type_from_args should be called instead")
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        _args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         internal_err!("invoke should not be called on a simplified now() function")
     }

datafusion/functions/src/datetime/to_char.rs

@@ -135,10 +135,9 @@ impl ScalarUDFImpl for ToCharFunc {
         Ok(Utf8)
     }
 
-    fn invoke_batch(
+     fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         let [date_time, format] = take_function_args(self.name(), args)?;
 

datafusion/functions/src/datetime/to_date.rs

@@ -130,10 +130,9 @@ impl ScalarUDFImpl for ToDateFunc {
         Ok(Date32)
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.is_empty() {
             return exec_err!("to_date function requires 1 or more arguments, got 0");

datafusion/functions/src/datetime/to_local_time.rs

@@ -366,10 +366,9 @@ impl ScalarUDFImpl for ToLocalTimeFunc {
         }
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         let [time_value] = take_function_args(self.name(), args)?;
 

datafusion/functions/src/datetime/to_timestamp.rs

@@ -299,10 +299,9 @@ impl ScalarUDFImpl for ToTimestampFunc {
         Ok(return_type_for(&arg_types[0], Nanosecond))
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.is_empty() {
             return exec_err!(
@@ -359,10 +358,9 @@ impl ScalarUDFImpl for ToTimestampSecondsFunc {
         Ok(return_type_for(&arg_types[0], Second))
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.is_empty() {
             return exec_err!(
@@ -414,10 +412,9 @@ impl ScalarUDFImpl for ToTimestampMillisFunc {
         Ok(return_type_for(&arg_types[0], Millisecond))
     }
 
-    fn invoke_batch(
+   fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.is_empty() {
             return exec_err!(
@@ -471,10 +468,9 @@ impl ScalarUDFImpl for ToTimestampMicrosFunc {
         Ok(return_type_for(&arg_types[0], Microsecond))
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.is_empty() {
             return exec_err!(
@@ -528,10 +524,9 @@ impl ScalarUDFImpl for ToTimestampNanosFunc {
         Ok(return_type_for(&arg_types[0], Nanosecond))
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        _number_rows: usize,
+       args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.is_empty() {
             return exec_err!(

datafusion/functions/src/datetime/to_unixtime.rs

@@ -90,10 +90,9 @@ impl ScalarUDFImpl for ToUnixtimeFunc {
         Ok(DataType::Int64)
     }
 
-    fn invoke_batch(
+    fn invoke_with_args(
         &self,
-        args: &[ColumnarValue],
-        batch_size: usize,
+        args: datafusion_expr::ScalarFunctionArgs,
     ) -> Result<ColumnarValue> {
         if args.is_empty() {
             return exec_err!("to_unixtime function requires 1 or more arguments, got 0");