continue

apache · Nov 10, 2024 · aa18c1d · aa18c1d
1 parent 17909a8
commit aa18c1d
Show file tree

Hide file tree

Showing 11 changed files with 178 additions and 572 deletions.
diff --git a/datafusion/core/src/dataframe/mod.rs b/datafusion/core/src/dataframe/mod.rs
@@ -1946,12 +1946,12 @@ mod tests {
     use datafusion_common_runtime::SpawnedTask;
     use datafusion_expr::expr::WindowFunction;
     use datafusion_expr::{
-        cast, create_udf, lit, BuiltInWindowFunction, ExprFunctionExt,
-        ScalarFunctionImplementation, Volatility, WindowFrame, WindowFrameBound,
-        WindowFrameUnits, WindowFunctionDefinition,
+        cast, create_udf, lit, ExprFunctionExt, ScalarFunctionImplementation, Volatility,
+        WindowFrame, WindowFrameBound, WindowFrameUnits, WindowFunctionDefinition,
     };
     use datafusion_functions_aggregate::expr_fn::{array_agg, count_distinct};
     use datafusion_functions_window::expr_fn::row_number;
+    use datafusion_functions_window::nth_value::first_value_udwf;
     use datafusion_physical_expr::expressions::Column;
     use datafusion_physical_plan::{get_plan_string, ExecutionPlanProperties};
     use sqlparser::ast::NullTreatment;
@@ -2177,9 +2177,7 @@ mod tests {
         // build plan using Table API
         let t = test_table().await?;
         let first_row = Expr::WindowFunction(WindowFunction::new(
-            WindowFunctionDefinition::BuiltInWindowFunction(
-                BuiltInWindowFunction::FirstValue,
-            ),
+            WindowFunctionDefinition::WindowUDF(first_value_udwf()),
             vec![col("aggregate_test_100.c1")],
         ))
         .partition_by(vec![col("aggregate_test_100.c2")])

diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs
@@ -65,7 +65,6 @@ pub mod type_coercion;
 pub mod utils;
 pub mod var_provider;
 pub mod window_frame;
-pub mod window_function;
 pub mod window_state;
 
 pub use built_in_window_function::BuiltInWindowFunction;

diff --git a/datafusion/expr/src/window_function.rs b/datafusion/expr/src/window_function.rs
diff --git a/datafusion/functions-window/src/lib.rs b/datafusion/functions-window/src/lib.rs
@@ -23,8 +23,6 @@
 //! [DataFusion]: https://crates.io/crates/datafusion
 //!
 
-extern crate core;
-
 use std::sync::Arc;
 
 use log::debug;

diff --git a/datafusion/functions-window/src/nth_value.rs b/datafusion/functions-window/src/nth_value.rs
@@ -27,7 +27,7 @@ use std::sync::OnceLock;
 
 use datafusion_common::arrow::array::ArrayRef;
 use datafusion_common::arrow::datatypes::{DataType, Field};
-use datafusion_common::{exec_err, Result, ScalarValue};
+use datafusion_common::{exec_datafusion_err, exec_err, Result, ScalarValue};
 use datafusion_expr::window_doc_sections::DOC_SECTION_ANALYTICAL;
 use datafusion_expr::window_state::WindowAggState;
 use datafusion_expr::{
@@ -215,7 +215,11 @@ impl WindowUDFImpl for NthValue {
         }
 
         let n =
-            match get_scalar_value_from_args(partition_evaluator_args.input_exprs(), 1)?
+            match get_scalar_value_from_args(partition_evaluator_args.input_exprs(), 1)
+                .map_err(|_e| {
+                    exec_datafusion_err!(
+                "Expected a signed integer literal for the second argument of nth_value")
+                })?
                 .map(get_signed_integer)
             {
                 Some(Ok(n)) => {