Skip to content

fix: handle scalar predicates in CASE expressions to prevent internal errors for InfallibleExprOrNull eval method #14156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 18, 2025
Merged

fix: handle scalar predicates in CASE expressions to prevent internal errors for InfallibleExprOrNull eval method #14156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dc81b4
fix: handle scalar predicates in CASE expressions to prevent internal…
avkirilishin Jan 16, 2025
8efe171
Update to latest datafusion-testing commit
alamb Jan 18, 2025
f0c899f
Merge remote-tracking branch 'apache/main' into predicate-did-not-eva…
alamb Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datafusion-testing
Open in desktop
Submodule datafusion-testing updated 44 files
+4 −12 data/sqlite/random/expr/slt_good_102.slt
+2 −6 data/sqlite/random/expr/slt_good_104.slt
+2 −6 data/sqlite/random/expr/slt_good_105.slt
+2 −6 data/sqlite/random/expr/slt_good_108.slt
+2 −6 data/sqlite/random/expr/slt_good_111.slt
+2 −6 data/sqlite/random/expr/slt_good_113.slt
+2 −6 data/sqlite/random/expr/slt_good_114.slt
+5 −6 data/sqlite/random/expr/slt_good_118.slt
+2 −6 data/sqlite/random/expr/slt_good_12.slt
+2 −6 data/sqlite/random/expr/slt_good_14.slt
+2 −6 data/sqlite/random/expr/slt_good_15.slt
+4 −12 data/sqlite/random/expr/slt_good_21.slt
+2 −6 data/sqlite/random/expr/slt_good_22.slt
+4 −12 data/sqlite/random/expr/slt_good_24.slt
+11 −31 data/sqlite/random/expr/slt_good_28.slt
+4 −12 data/sqlite/random/expr/slt_good_30.slt
+2 −6 data/sqlite/random/expr/slt_good_36.slt
+3 −7 data/sqlite/random/expr/slt_good_38.slt
+5 −6 data/sqlite/random/expr/slt_good_39.slt
+2 −6 data/sqlite/random/expr/slt_good_4.slt
+10 −12 data/sqlite/random/expr/slt_good_41.slt
+2 −6 data/sqlite/random/expr/slt_good_42.slt
+2 −6 data/sqlite/random/expr/slt_good_45.slt
+2 −6 data/sqlite/random/expr/slt_good_46.slt
+2 −6 data/sqlite/random/expr/slt_good_48.slt
+2 −6 data/sqlite/random/expr/slt_good_50.slt
+3 −7 data/sqlite/random/expr/slt_good_52.slt
+2 −6 data/sqlite/random/expr/slt_good_53.slt
+4 −12 data/sqlite/random/expr/slt_good_64.slt
+5 −6 data/sqlite/random/expr/slt_good_66.slt
+2 −6 data/sqlite/random/expr/slt_good_68.slt
+6 −7 data/sqlite/random/expr/slt_good_7.slt
+7 −19 data/sqlite/random/expr/slt_good_72.slt
+6 −7 data/sqlite/random/expr/slt_good_73.slt
+2 −6 data/sqlite/random/expr/slt_good_78.slt
+2 −6 data/sqlite/random/expr/slt_good_80.slt
+8 −13 data/sqlite/random/expr/slt_good_81.slt
+2 −6 data/sqlite/random/expr/slt_good_82.slt
+5 −13 data/sqlite/random/expr/slt_good_85.slt
+2 −6 data/sqlite/random/expr/slt_good_88.slt
+2 −6 data/sqlite/random/expr/slt_good_94.slt
+2 −6 data/sqlite/random/expr/slt_good_95.slt
+1 −5 data/sqlite/random/groupby/slt_good_11.slt
+9 −21 data/sqlite/random/groupby/slt_good_12.slt
58 changes: 57 additions & 1 deletion datafusion/physical-expr/src/expressions/case.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,16 @@ impl CaseExpr {
fn case_column_or_null(&self, batch: &RecordBatch) -> Result<ColumnarValue> {
let when_expr = &self.when_then_expr[0].0;
let then_expr = &self.when_then_expr[0].1;
if let ColumnarValue::Array(bit_mask) = when_expr.evaluate(batch)? {

let when_expr_value = when_expr.evaluate(batch)?;
let when_expr_value = match when_expr_value {
Copy link
Contributor

@alamb alamb Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is correct, but it effectively expands out the array even when the argument is a constant. We can probably make it more efficient by handling the other case too

Copy link
Contributor

@alamb alamb Jan 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a follow up, I have added one in

ColumnarValue::Scalar(_) => {
ColumnarValue::Array(when_expr_value.into_array(batch.num_rows())?)
}
other => other,
};

if let ColumnarValue::Array(bit_mask) = when_expr_value {
let bit_mask = bit_mask
.as_any()
.downcast_ref::<BooleanArray>()
Expand Down Expand Up @@ -896,6 +905,53 @@ mod tests {
Ok(())
}

#[test]
fn case_with_scalar_predicate() -> Result<()> {
Copy link
Contributor

@alamb alamb Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally recommend adding a .slt test for this in addition (and possibly also instead):

--- a/datafusion/sqllogictest/test_files/case.slt
+++ b/datafusion/sqllogictest/test_files/case.slt
@@ -235,3 +235,10 @@ SELECT CASE WHEN a < 5 THEN a + b ELSE b - NVL(a, 0) END FROM foo
 NULL
 NULL
 7
+
+# Reproducer for
+# https://github.com/apache/datafusion/issues/14099
+query I
+SELECT - 79 * + 91 * - COUNT ( * ) * + - 2 * + - NULLIF ( - 49, - COALESCE ( - + 69, - COALESCE ( + COALESCE ( - 20, ( - 18 ) * + COUNT ( * ) + - 93, - CASE 51 WHEN + COUNT ( * ) + 28 THEN 0 ELSE + 29 * + CASE ( 50 ) WHEN - ( - ( CASE WHEN NOT + 37 IS NULL THEN + COUNT ( * ) END ) ) THEN NULL WHEN - 46 + 87 * - 28 THEN 85 WHEN - COUNT ( * ) THEN NULL END END ), COUNT ( * ) - 39 ) * + 22 ) / - COUNT ( * ) )
+----
+-704522

let batch = case_test_batch_nulls()?;
let schema = batch.schema();

// SELECT CASE WHEN TRUE THEN load4 END
let when = lit(true);
let then = col("load4", &schema)?;
let expr = generate_case_when_with_type_coercion(
None,
vec![(when, then)],
None,
schema.as_ref(),
)?;

// many rows
let result = expr
.evaluate(&batch)?
.into_array(batch.num_rows())
.expect("Failed to convert to array");
let result =
as_float64_array(&result).expect("failed to downcast to Float64Array");
let expected = &Float64Array::from(vec![
Some(1.77),
None,
None,
Some(1.78),
None,
Some(1.77),
]);
assert_eq!(expected, result);

// one row
let expected = Float64Array::from(vec![Some(1.1)]);
let batch =
RecordBatch::try_new(Arc::clone(&schema), vec![Arc::new(expected.clone())])?;
let result = expr
.evaluate(&batch)?
.into_array(batch.num_rows())
.expect("Failed to convert to array");
let result =
as_float64_array(&result).expect("failed to downcast to Float64Array");
assert_eq!(&expected, result);

Ok(())
}

#[test]
fn case_expr_matches_and_nulls() -> Result<()> {
let batch = case_test_batch_nulls()?;
Expand Down
Loading