Skip to content

Commit 665ca39

Browse files
committed
feat: remove nulls from in list
apacheGH-8688
1 parent 7fcfb91 commit 665ca39

1 file changed

Lines changed: 34 additions & 0 deletions

File tree

‎datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,19 @@ impl<'a, S: SimplifyInfo> TreeNodeRewriter for Simplifier<'a, S> {
555555
)
556556
}
557557
}
558+
559+
// expr in (null, x, y, z) --> expr in (x, y, z)
560+
// expr not in (null, x, y, z) --> expr not in (x, y, z)
561+
Expr::InList(InList {
562+
expr,
563+
list,
564+
negated,
565+
}) if !is_null(&expr) => Expr::InList(InList {
566+
expr,
567+
list: list.into_iter().filter(|expr| !is_null(expr)).collect(),
568+
negated,
569+
}),
570+
558571
//
559572
// Rules for NotEq
560573
//
@@ -3116,6 +3129,27 @@ mod tests {
31163129
lit(true)
31173130
);
31183131

3132+
// c1 in (null, ...) -> c1 in (...)
3133+
assert_eq!(
3134+
simplify(in_list(
3135+
col("c1"),
3136+
vec![lit_bool_null(), lit(1), lit(2), lit(3), lit(4)],
3137+
true
3138+
)),
3139+
in_list(col("c1"), vec![lit(1), lit(2), lit(3), lit(4)], true)
3140+
);
3141+
3142+
3143+
// c1 not in (null, ...) -> c1 not in (...)
3144+
assert_eq!(
3145+
simplify(in_list(
3146+
col("c1"),
3147+
vec![lit_bool_null(), lit(1), lit(2), lit(3), lit(4)],
3148+
false
3149+
)),
3150+
in_list(col("c1"), vec![lit(1), lit(2), lit(3), lit(4)], false)
3151+
);
3152+
31193153
assert_eq!(
31203154
simplify(in_list(col("c1"), vec![lit(1)], false)),
31213155
col("c1").eq(lit(1))

0 commit comments

Comments
 (0)