remove inconsistent null equality optimization

pola-rs · ritchie46 · Nov 30, 2023 · Oct 16, 2023 · Oct 16, 2023 · Oct 17, 2023
commit 01fb1bb5c5c9ff07115ea5ead69c2e797221dcc5
@@ -530,7 +530,7 @@ impl TotalEq for f16 {
 }
 
 impl TotalOrd for f16 {
-    fn tot_cmp(&self, other: &Self) -> std::cmp::Ordering {
+    fn tot_cmp(&self, _other: &Self) -> std::cmp::Ordering {
         unimplemented!()
     }
 }

@@ -1032,7 +1032,7 @@ where
         debug_assert!(self.dtype() == other.dtype());
         let ca_other = &*(ca_other as *const ChunkedArray<T>);
         // Should be get and not get_unchecked, because there could be nulls
-        self.get(idx_self) == ca_other.get(idx_other)
+        self.get(idx_self).tot_eq(&ca_other.get(idx_other))
     }
 }
 

@@ -434,6 +434,7 @@ impl OptimizationRule for SimplifyExprRule {
                 let right_aexpr = expr_arena.get(*right);
 
                 // lit(left) + lit(right) => lit(left + right)
+                use Operator::*;
                 #[allow(clippy::manual_map)]
                 let out = match op {
                     Plus => {
@@ -524,51 +525,7 @@ impl OptimizationRule for SimplifyExprRule {
                     return Ok(out);
                 }
 
-                // Null propagation.
-                let left_is_null = matches!(left_aexpr, AExpr::Literal(LiteralValue::Null));
-                let right_is_null = matches!(right_aexpr, AExpr::Literal(LiteralValue::Null));
-                use Operator::*;
-                match (left_is_null, op, right_is_null) {
-                    // all null operation null -> null
-                    (true, _, true) => Some(AExpr::Literal(LiteralValue::Null)),
-                    // null == column -> column.is_null()
-                    (true, Eq, false) => Some(AExpr::Function {
-                        input: vec![*right],
-                        function: BooleanFunction::IsNull.into(),
-                        options: FunctionOptions {
-                            collect_groups: ApplyOptions::GroupWise,
-                            ..Default::default()
-                        },
-                    }),
-                    // column == null -> column.is_null()
-                    (false, Eq, true) => Some(AExpr::Function {
-                        input: vec![*left],
-                        function: BooleanFunction::IsNull.into(),
-                        options: FunctionOptions {
-                            collect_groups: ApplyOptions::GroupWise,
-                            ..Default::default()
-                        },
-                    }),
-                    // null != column -> column.is_not_null()
-                    (true, NotEq, false) => Some(AExpr::Function {
-                        input: vec![*right],
-                        function: BooleanFunction::IsNotNull.into(),
-                        options: FunctionOptions {
-                            collect_groups: ApplyOptions::GroupWise,
-                            ..Default::default()
-                        },
-                    }),
-                    // column != null -> column.is_not_null()
-                    (false, NotEq, true) => Some(AExpr::Function {
-                        input: vec![*left],
-                        function: BooleanFunction::IsNotNull.into(),
-                        options: FunctionOptions {
-                            collect_groups: ApplyOptions::GroupWise,
-                            ..Default::default()
-                        },
-                    }),
-                    _ => None,
-                }
+                None
             },
             // sort().reverse() -> sort(reverse)
             // sort_by().reverse() -> sort_by(reverse)