Modifications need to compile against latest DF

Author: timsaucer

Cargo.lock

@@ -42,6 +42,7 @@ datafusion = { git = "https://github.com/timsaucer/datafusion.git", rev = "20756
 datafusion-substrait = { git = "https://github.com/timsaucer/datafusion.git", rev = "20756df736006253f1ce9e94385b75ab44e268f8", optional = true }
 datafusion-proto = { git = "https://github.com/timsaucer/datafusion.git", rev = "20756df736006253f1ce9e94385b75ab44e268f8" }
 datafusion-ffi = { git = "https://github.com/timsaucer/datafusion.git", rev = "20756df736006253f1ce9e94385b75ab44e268f8" }
+datafusion-functions-window-common = { git = "https://github.com/timsaucer/datafusion.git", rev = "20756df736006253f1ce9e94385b75ab44e268f8" }
 prost = "0.13" # keep in line with `datafusion-substrait`
 uuid = { version = "1.9", features = ["v4"] }
 mimalloc = { version = "0.1", optional = true, default-features = false, features = ["local_dynamic_tls"] }

Cargo.toml

@@ -97,7 +97,7 @@ impl PyScalarUDF {
         let function = create_udf(
             name,
             input_types.0,
-            Arc::new(return_type.0),
+            return_type.0,
             parse_volatility(volatility)?,
             to_scalar_function_impl(func),
         );

src/udf.rs

@@ -22,6 +22,7 @@ use std::sync::Arc;
 use arrow::array::{make_array, Array, ArrayData, ArrayRef};
 use datafusion::logical_expr::window_state::WindowAggState;
 use datafusion::scalar::ScalarValue;
+use datafusion_functions_window_common::partition::PartitionEvaluatorArgs;
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
 
@@ -299,11 +300,21 @@ impl WindowUDFImpl for MultiColumnWindowUDF {
         &self.signature
     }
 
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType> {
-        Ok(self.return_type.clone())
+    fn partition_evaluator(
+        &self,
+        partition_evaluator_args: PartitionEvaluatorArgs,
+    ) -> Result<Box<dyn PartitionEvaluator>> {
+        (self.partition_evaluator_factory)()
     }
 
-    fn partition_evaluator(&self) -> Result<Box<dyn PartitionEvaluator>> {
-        (self.partition_evaluator_factory)()
+    fn field(
+        &self,
+        field_args: datafusion::logical_expr::function::WindowUDFFieldArgs,
+    ) -> Result<arrow::datatypes::Field> {
+        Ok(arrow::datatypes::Field::new(
+            field_args.name(),
+            self.return_type.clone(),
+            true,
+        ))
     }
 }