Skip to content

Apache DataFusion SQL Query Engine

fix: Avoid assertion failure on divide-by-zero (#20216)

Neil Conwaybadaa8400d3a
diff --git a/datafusion/physical-expr/src/analysis.rs b/datafusion/physical-expr/src/analysis.rs
index d734c86726..11a60afc90 100644
--- a/datafusion/physical-expr/src/analysis.rs
+++ b/datafusion/physical-expr/src/analysis.rs
@@ -178,7 +178,7 @@ pub fn analyze(
"ExprBoundaries has a non-zero distinct count although it represents an empty table"
);
assert_or_internal_err!(
- context.selectivity == Some(0.0),
+ context.selectivity.unwrap_or(0.0) == 0.0,
"AnalysisContext has a non-zero selectivity although it represents an empty table"
);
Ok(context)
diff --git a/datafusion/sqllogictest/test_files/select.slt b/datafusion/sqllogictest/test_files/select.slt
index 490df4b72d..d49ccb9fe9 100644
--- a/datafusion/sqllogictest/test_files/select.slt
+++ b/datafusion/sqllogictest/test_files/select.slt
@@ -1926,3 +1926,12 @@ select "current_time" is not null from t_with_current_time;
true
false
true
+
+# https://github.com/apache/datafusion/issues/20215
+statement count 0
+CREATE TABLE t0;
+
+query I
+SELECT COUNT(*) FROM t0 AS tt0 WHERE (4==(3/0));
+----
+0