Skip to content

Apache DataFusion SQL Query Engine

fix: SortPreservingMerge sanity check rejects valid ORDER BY with CASE expression (#18342)

Christopher Watfordd2b93f5303f5
diff --git a/datafusion/expr-common/src/interval_arithmetic.rs b/datafusion/expr-common/src/interval_arithmetic.rs
index 40c44cfb3c..7515b59b92 100644
--- a/datafusion/expr-common/src/interval_arithmetic.rs
+++ b/datafusion/expr-common/src/interval_arithmetic.rs
@@ -583,7 +583,9 @@ impl Interval {
upper: ScalarValue::Boolean(Some(upper)),
})
}
- _ => internal_err!("Incompatible data types for logical conjunction"),
+
+ // Return UNCERTAIN when intervals don't have concrete boolean bounds
+ _ => Ok(Self::UNCERTAIN),
}
}
@@ -606,7 +608,9 @@ impl Interval {
upper: ScalarValue::Boolean(Some(upper)),
})
}
- _ => internal_err!("Incompatible data types for logical disjunction"),
+
+ // Return UNCERTAIN when intervals don't have concrete boolean bounds
+ _ => Ok(Self::UNCERTAIN),
}
}
@@ -2517,6 +2521,64 @@ mod tests {
Ok(())
}
+ #[test]
+ fn test_and_or_with_normalized_boolean_intervals() -> Result<()> {
+ // Verify that NULL boolean bounds are normalized and don't cause errors
+ let from_nulls =
+ Interval::try_new(ScalarValue::Boolean(None), ScalarValue::Boolean(None))?;
+
+ assert!(from_nulls.or(&Interval::CERTAINLY_TRUE).is_ok());
+ assert!(from_nulls.and(&Interval::CERTAINLY_FALSE).is_ok());
+
+ Ok(())
+ }
+
+ #[test]
+ fn test_and_null_boolean_intervals() -> Result<()> {
+ let null_interval =
+ Interval::try_new(ScalarValue::Boolean(None), ScalarValue::Boolean(None))?;
+
+ let and_result = null_interval.and(&Interval::CERTAINLY_FALSE)?;
+ assert_eq!(and_result, Interval::CERTAINLY_FALSE);
+
+ let and_result = Interval::CERTAINLY_FALSE.and(&null_interval)?;
+ assert_eq!(and_result, Interval::CERTAINLY_FALSE);
+
+ let and_result = null_interval.and(&Interval::CERTAINLY_TRUE)?;
+ assert_eq!(and_result, Interval::UNCERTAIN);
+
+ let and_result = Interval::CERTAINLY_TRUE.and(&null_interval)?;
+ assert_eq!(and_result, Interval::UNCERTAIN);
+
+ let and_result = null_interval.and(&null_interval)?;
+ assert_eq!(and_result, Interval::UNCERTAIN);
+
+ Ok(())
+ }
+
+ #[test]
+ fn test_or_null_boolean_intervals() -> Result<()> {
+ let null_interval =
+ Interval::try_new(ScalarValue::Boolean(None), ScalarValue::Boolean(None))?;
+
+ let or_result = null_interval.or(&Interval::CERTAINLY_FALSE)?;
+ assert_eq!(or_result, Interval::UNCERTAIN);
+
+ let or_result = Interval::CERTAINLY_FALSE.or(&null_interval)?;
+ assert_eq!(or_result, Interval::UNCERTAIN);
+
+ let or_result = null_interval.or(&Interval::CERTAINLY_TRUE)?;
+ assert_eq!(or_result, Interval::CERTAINLY_TRUE);
+
+ let or_result = Interval::CERTAINLY_TRUE.or(&null_interval)?;
+ assert_eq!(or_result, Interval::CERTAINLY_TRUE);
+
+ let or_result = null_interval.or(&null_interval)?;
+ assert_eq!(or_result, Interval::UNCERTAIN);
+
+ Ok(())
+ }
+
#[test]
fn intersect_test() -> Result<()> {
let possible_cases = vec![
diff --git a/datafusion/sqllogictest/test_files/union.slt b/datafusion/sqllogictest/test_files/union.slt
index 75db459b18..0c8b8c6edb 100644
--- a/datafusion/sqllogictest/test_files/union.slt
+++ b/datafusion/sqllogictest/test_files/union.slt
@@ -953,3 +953,40 @@ drop table u1;
statement count 0
drop table u2;
+
+# repro for https://github.com/apache/datafusion/issues/18327
+# should not error
+query TITT
+ WITH typ(oid, typnamespace, typname, typtype) AS (
+ SELECT * FROM (VALUES (1, 10, 't1', 'b'))
+ UNION ALL SELECT * FROM (VALUES (2, NULL, 't2', 'b'))
+ UNION ALL SELECT * FROM (VALUES (3, 12, 't3', NULL))
+ )
+ , ns(oid, nspname) AS (VALUES (1, 'ns1'), (2, 'ns2'))
+ SELECT ns.nspname, typ.oid, typ.typname, typ.typtype
+ FROM typ JOIN ns ON (ns.oid = typ.typnamespace)
+ WHERE typ.typtype IN ('b','r','m','e','d')
+ ORDER BY CASE WHEN typ.typtype IN ('b','e','p') THEN 0
+ WHEN typ.typtype = 'r' THEN 1
+ END
+----
+
+# Add another row with a non-NULL value `m` which is retained by the
+# filter but not matching any WHEN branch m?
+query TITT
+ WITH typ(oid, typnamespace, typname, typtype) AS (
+ SELECT * FROM (VALUES (1, 10, 't1', 'b'))
+ UNION ALL SELECT * FROM (VALUES (2, NULL, 't2', 'b'))
+ UNION ALL SELECT * FROM (VALUES (3, 12, 't3', NULL))
+ UNION ALL SELECT * FROM (VALUES (4, 40, 't3', 'm'))
+ ), ns(oid, nspname) AS (
+ VALUES (1, 'ns1'), (2, 'ns2'), (40, 'ns3')
+ )
+ SELECT ns.nspname, typ.oid, typ.typname, typ.typtype
+ FROM typ JOIN ns ON (ns.oid = typ.typnamespace)
+ WHERE typ.typtype IN ('b','r','m','e','d')
+ ORDER BY CASE WHEN typ.typtype IN ('b','e','p') THEN 0
+ WHEN typ.typtype = 'r' THEN 1
+ END
+----
+ns3 4 t3 m