This is an automated email from the ASF dual-hosted git repository.
comphead pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new f54712d8c2 handle 0 and NULL value of NTH_VALUE function (#12676)
f54712d8c2 is described below
commit f54712d8c2545fc0dd60cdc693704992e9d82eef
Author: iamthinh <[email protected]>
AuthorDate: Tue Oct 1 09:58:25 2024 -0700
handle 0 and NULL value of NTH_VALUE function (#12676)
* handle 0 and NULL value of NTH_VALUE function
* use exec_err
* cargo fmt
---
datafusion/physical-expr/src/window/nth_value.rs | 29 ++++++------------
datafusion/physical-plan/src/windows/mod.rs | 18 +++++++----
datafusion/sqllogictest/test_files/window.slt | 39 ++++++++++++++++++++++++
3 files changed, 61 insertions(+), 25 deletions(-)
diff --git a/datafusion/physical-expr/src/window/nth_value.rs
b/datafusion/physical-expr/src/window/nth_value.rs
index 87c74579c6..d94983c5ad 100644
--- a/datafusion/physical-expr/src/window/nth_value.rs
+++ b/datafusion/physical-expr/src/window/nth_value.rs
@@ -30,7 +30,7 @@ use crate::PhysicalExpr;
use arrow::array::{Array, ArrayRef};
use arrow::datatypes::{DataType, Field};
use datafusion_common::Result;
-use datafusion_common::{exec_err, ScalarValue};
+use datafusion_common::ScalarValue;
use datafusion_expr::window_state::WindowAggState;
use datafusion_expr::PartitionEvaluator;
@@ -86,16 +86,13 @@ impl NthValue {
n: i64,
ignore_nulls: bool,
) -> Result<Self> {
- match n {
- 0 => exec_err!("NTH_VALUE expects n to be non-zero"),
- _ => Ok(Self {
- name: name.into(),
- expr,
- data_type,
- kind: NthValueKind::Nth(n),
- ignore_nulls,
- }),
- }
+ Ok(Self {
+ name: name.into(),
+ expr,
+ data_type,
+ kind: NthValueKind::Nth(n),
+ ignore_nulls,
+ })
}
/// Get the NTH_VALUE kind
@@ -188,10 +185,7 @@ impl PartitionEvaluator for NthValueEvaluator {
// Negative index represents reverse direction.
(n_range >= reverse_index, true)
}
- Ordering::Equal => {
- // The case n = 0 is not valid for the NTH_VALUE
function.
- unreachable!();
- }
+ Ordering::Equal => (true, false),
}
}
};
@@ -298,10 +292,7 @@ impl PartitionEvaluator for NthValueEvaluator {
)
}
}
- Ordering::Equal => {
- // The case n = 0 is not valid for the NTH_VALUE
function.
- unreachable!();
- }
+ Ordering::Equal =>
ScalarValue::try_from(arr.data_type()),
}
}
}
diff --git a/datafusion/physical-plan/src/windows/mod.rs
b/datafusion/physical-plan/src/windows/mod.rs
index b6f34ec69f..6aafaad0ad 100644
--- a/datafusion/physical-plan/src/windows/mod.rs
+++ b/datafusion/physical-plan/src/windows/mod.rs
@@ -185,20 +185,26 @@ fn get_scalar_value_from_args(
}
fn get_signed_integer(value: ScalarValue) -> Result<i64> {
+ if value.is_null() {
+ return Ok(0);
+ }
+
if !value.data_type().is_integer() {
- return Err(DataFusionError::Execution(
- "Expected an integer value".to_string(),
- ));
+ return exec_err!("Expected an integer value");
}
+
value.cast_to(&DataType::Int64)?.try_into()
}
fn get_unsigned_integer(value: ScalarValue) -> Result<u64> {
+ if value.is_null() {
+ return Ok(0);
+ }
+
if !value.data_type().is_integer() {
- return Err(DataFusionError::Execution(
- "Expected an integer value".to_string(),
- ));
+ return exec_err!("Expected an integer value");
}
+
value.cast_to(&DataType::UInt64)?.try_into()
}
diff --git a/datafusion/sqllogictest/test_files/window.slt
b/datafusion/sqllogictest/test_files/window.slt
index 7fee84f9bc..cb6c6a5ace 100644
--- a/datafusion/sqllogictest/test_files/window.slt
+++ b/datafusion/sqllogictest/test_files/window.slt
@@ -4894,3 +4894,42 @@ NULL a4 5
statement ok
drop table t
+
+## test handle NULL and 0 value of nth_value
+statement ok
+CREATE TABLE t(v1 int, v2 int);
+
+statement ok
+INSERT INTO t VALUES (1,1), (1,2),(1,3),(2,1),(2,2);
+
+query II
+SELECT v1, NTH_VALUE(v2, null) OVER (PARTITION BY v1 ORDER BY v2) FROM t;
+----
+1 NULL
+1 NULL
+1 NULL
+2 NULL
+2 NULL
+
+query II
+SELECT v1, NTH_VALUE(v2, v2*null) OVER (PARTITION BY v1 ORDER BY v2) FROM t;
+----
+1 NULL
+1 NULL
+1 NULL
+2 NULL
+2 NULL
+
+query II
+SELECT v1, NTH_VALUE(v2, 0) OVER (PARTITION BY v1 ORDER BY v2) FROM t;
+----
+1 NULL
+1 NULL
+1 NULL
+2 NULL
+2 NULL
+
+statement ok
+DROP TABLE t;
+
+## end test handle NULL and 0 of NTH_VALUE
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
