Fix bug with null/missing equivalence, refactor neq, refactor eq/eqg …

…logic
partiql · Aug 10, 2023 · d63cf7f · d63cf7f
1 parent 2798b63
commit d63cf7f
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixes variable resolution lookup order and excessive lookups
 - Fixes variable resolution of some ORDER BY variables
 - Fixes nested list/bag/tuple type ordering for when `ASC NULLS LAST` and `DESC NULLS FIRST` are specified
+- partiql-value fix deep equality of list, bags, and tuples
 
 ## [0.5.0] - 2023-06-06
 ### Changed

diff --git a/partiql-eval/src/eval/expr/operators.rs b/partiql-eval/src/eval/expr/operators.rs
@@ -11,7 +11,7 @@ use partiql_types::{
     ArrayType, BagType, PartiqlType, StructType, TypeKind, TYPE_ANY, TYPE_BOOL, TYPE_NUMERIC_TYPES,
 };
 use partiql_value::Value::{Boolean, Missing, Null};
-use partiql_value::{BinaryAnd, BinaryOr, NullableEq, NullableOrd, Value};
+use partiql_value::{BinaryAnd, BinaryOr, EqualityValue, NullableEq, NullableOrd, Value};
 
 use std::borrow::{Borrow, Cow};
 use std::fmt::Debug;
@@ -170,8 +170,14 @@ impl BindEvalExpr for EvalOpBinary {
         match self {
             EvalOpBinary::And => logical!(AndCheck, |lhs, rhs| lhs.and(rhs)),
             EvalOpBinary::Or => logical!(OrCheck, |lhs, rhs| lhs.or(rhs)),
-            EvalOpBinary::Eq => equality!(NullableEq::eq),
-            EvalOpBinary::Neq => equality!(NullableEq::neq),
+            EvalOpBinary::Eq => equality!(|lhs, rhs| {
+                let wrap = EqualityValue::<false, Value>;
+                NullableEq::eq(&wrap(lhs), &wrap(rhs))
+            }),
+            EvalOpBinary::Neq => equality!(|lhs, rhs| {
+                let wrap = EqualityValue::<false, Value>;
+                NullableEq::neq(&wrap(lhs), &wrap(rhs))
+            }),
             EvalOpBinary::Gt => equality!(NullableOrd::gt),
             EvalOpBinary::Gteq => equality!(NullableOrd::gteq),
             EvalOpBinary::Lt => equality!(NullableOrd::lt),

diff --git a/partiql-value/src/bag.rs b/partiql-value/src/bag.rs
@@ -8,7 +8,7 @@ use std::hash::{Hash, Hasher};
 
 use std::{slice, vec};
 
-use crate::{List, NullSortedValue, NullableEq, Value};
+use crate::{EqualityValue, List, NullSortedValue, NullableEq, Value};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
@@ -164,13 +164,9 @@ impl PartialEq for Bag {
             return false;
         }
         for (v1, v2) in self.0.iter().sorted().zip(other.0.iter().sorted()) {
-            match (v1, v2) {
-                (Value::Missing, Value::Missing) | (Value::Null, Value::Null) => continue,
-                (v1, v2) => {
-                    if NullableEq::eq(v1, v2) != Value::Boolean(true) {
-                        return false;
-                    }
-                }
+            let wrap = EqualityValue::<true, Value>;
+            if NullableEq::eq(&wrap(v1), &wrap(v2)) != Value::Boolean(true) {
+                return false;
             }
         }
         true