Updates type of order_by parameter

apache · Sep 2, 2024 · 19bf666 · 19bf666
1 parent 88390a0
commit 19bf666
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/datafusion/functions-aggregate/src/nth_value.rs b/datafusion/functions-aggregate/src/nth_value.rs
@@ -44,10 +44,10 @@ create_func!(NthValueAgg, nth_value_udaf);
 pub fn nth_value(
     expr: datafusion_expr::Expr,
     n: i64,
-    order_by: Option<Vec<SortExpr>>,
+    order_by: Vec<SortExpr>,
 ) -> datafusion_expr::Expr {
     let args = vec![expr, lit(n)];
-    if let Some(order_by) = order_by {
+    if !order_by.is_empty() {
         nth_value_udaf()
             .call(args)
             .order_by(order_by)

diff --git a/datafusion/proto/tests/cases/roundtrip_logical_plan.rs b/datafusion/proto/tests/cases/roundtrip_logical_plan.rs
@@ -904,23 +904,17 @@ async fn roundtrip_expr_api() -> Result<()> {
             vec![lit(10), lit(20), lit(30)],
         ),
         row_number(),
-        nth_value(col("b"), 1, None),
+        nth_value(col("b"), 1, vec![]),
         nth_value(
             col("b"),
             1,
-            Some(vec![
-                col("a").sort(false, false),
-                col("b").sort(true, false),
-            ]),
+            vec![col("a").sort(false, false), col("b").sort(true, false)],
         ),
-        nth_value(col("b"), -1, None),
+        nth_value(col("b"), -1, vec![]),
         nth_value(
             col("b"),
             -1,
-            Some(vec![
-                col("a").sort(false, false),
-                col("b").sort(true, false),
-            ]),
+            vec![col("a").sort(false, false), col("b").sort(true, false)],
         ),
     ];