From e113ec13bcaa3084763307c37509df62733b923c Mon Sep 17 00:00:00 2001
From: cht42 <42912042+cht42@users.noreply.github.com>
Date: Fri, 10 Jan 2025 01:49:58 +0400
Subject: [PATCH] fix (#14042)

Co-authored-by: Cyprien Huet <chuet@palantir.com>
---
 datafusion/functions-window/src/nth_value.rs  |  5 ++-
 datafusion/sqllogictest/test_files/window.slt | 38 +++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/datafusion/functions-window/src/nth_value.rs b/datafusion/functions-window/src/nth_value.rs
index d15e76718b02..e5d866940c05 100644
--- a/datafusion/functions-window/src/nth_value.rs
+++ b/datafusion/functions-window/src/nth_value.rs
@@ -360,9 +360,10 @@ impl PartitionEvaluator for NthValueEvaluator {
                     })
                     .unwrap_or_default();
                 if valid_indices.is_empty() {
-                    return ScalarValue::try_from(arr.data_type());
+                    None
+                } else {
+                    Some(valid_indices)
                 }
-                Some(valid_indices)
             } else {
                 None
             };
diff --git a/datafusion/sqllogictest/test_files/window.slt b/datafusion/sqllogictest/test_files/window.slt
index 3c6f0f6deba1..2c82df969f1f 100644
--- a/datafusion/sqllogictest/test_files/window.slt
+++ b/datafusion/sqllogictest/test_files/window.slt
@@ -1767,7 +1767,7 @@ logical_plan
 01)Projection: count(*) AS global_count
 02)--Aggregate: groupBy=[[]], aggr=[[count(Int64(1)) AS count(*)]]
 03)----SubqueryAlias: a
-04)------Projection: 
+04)------Projection:
 05)--------Aggregate: groupBy=[[aggregate_test_100.c1]], aggr=[[]]
 06)----------Projection: aggregate_test_100.c1
 07)------------Filter: aggregate_test_100.c13 != Utf8("C2GT5KVyOPZpgKVl110TyZO0NcJ434")
@@ -4625,6 +4625,38 @@ NULL 1
 statement ok
 DROP TABLE t;
 
+
+# Test for ignore nulls in nth_VALUE without null values
+statement ok
+CREATE TABLE t AS VALUES  (3, 3), (4, 4), (5, 5), (6, 6);
+
+query I
+SELECT column1 FROM t ORDER BY column2;
+----
+3
+4
+5
+6
+
+query I
+SELECT nth_VALUE(column1, 1) OVER(ORDER BY column2) FROM t;
+----
+3
+3
+3
+3
+
+query I
+SELECT nth_VALUE(column1, 1) IGNORE NULLS OVER(ORDER BY column2) FROM t;
+----
+3
+3
+3
+3
+
+statement ok
+DROP TABLE t;
+
 # Test for ignore nulls with ORDER BY in nth_VALUE
 statement ok
 CREATE TABLE t AS VALUES  (3, 3), (4, 4), (null::bigint, 1), (null::bigint, 2), (5, 5), (6, 6);
@@ -5055,7 +5087,7 @@ select b, row_number() over (order by a) from (select TRUE as a, 1 as b);
 
 # test window functions on boolean columns
 statement count 0
-create table t1 (id int, bool_col boolean) as values 
+create table t1 (id int, bool_col boolean) as values
     (1, true),
     (2, false),
     (3, true),
@@ -5110,7 +5142,7 @@ select ntile(2) over (order by bool_col) from t1;
 2
 
 query IIIRRI
-select 
+select
     row_number() over (order by bool_col) as row_num,
     rank() over (order by bool_col) as rank,
     dense_rank() over (order by bool_col) as dense_rank,