Perform structural equality in ExpressionEqualityComparer (#28720)

Fixes #28581
dotnet · Sep 7, 2022 · 3255316 · 3255316
1 parent 6d4881a
commit 3255316
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/src/EFCore/Query/ExpressionEqualityComparer.cs b/src/EFCore/Query/ExpressionEqualityComparer.cs
@@ -5,6 +5,8 @@
 // ReSharper disable ForCanBeConvertedToForeach
 // ReSharper disable LoopCanBeConvertedToQuery
 
+using System.Collections;
+
 namespace Microsoft.EntityFrameworkCore.Query;
 
 /// <summary>
@@ -64,10 +66,19 @@ public int GetHashCode(Expression obj)
                     break;
 
                 case ConstantExpression constantExpression:
-                    if (constantExpression.Value != null
-                        && !(constantExpression.Value is IQueryable))
+                    switch (constantExpression.Value)
                     {
-                        hash.Add(constantExpression.Value);
+                        case IQueryable:
+                        case null:
+                            break;
+
+                        case IStructuralEquatable structuralEquatable:
+                            hash.Add(structuralEquatable.GetHashCode(StructuralComparisons.StructuralEqualityComparer));
+                            break;
+
+                        default:
+                            hash.Add(constantExpression.Value);
+                            break;
                     }
 
                     break;
@@ -354,7 +365,12 @@ private bool CompareConditional(ConditionalExpression a, ConditionalExpression b
                 && Compare(a.IfFalse, b.IfFalse);
 
         private static bool CompareConstant(ConstantExpression a, ConstantExpression b)
-            => Equals(a.Value, b.Value);
+        {
+            var (v1, v2) = (a.Value, b.Value);
+
+            return Equals(v1, v2)
+                || (v1 is IStructuralEquatable array1 && array1.Equals(v2, StructuralComparisons.StructuralEqualityComparer));
+        }
 
         private bool CompareGoto(GotoExpression a, GotoExpression b)
             => a.Kind == b.Kind

diff --git a/test/EFCore.Tests/Query/ExpressionEqualityComparerTest.cs b/test/EFCore.Tests/Query/ExpressionEqualityComparerTest.cs
@@ -94,6 +94,22 @@ public void Index_expressions_are_compared_correctly()
         Assert.True(expressionComparer.Equals(e2, e3));
     }
 
+    [ConditionalFact]
+    public void Array_constant_expressions_are_compared_correctly()
+    {
+        var expressionComparer = ExpressionEqualityComparer.Instance;
+
+        var e1 = Expression.Constant(new[] { 1, 2, 3 });
+        var e2 = Expression.Constant(new[] { 1, 2, 3 });
+        var e3 = Expression.Constant(new[] { 1, 2, 4 });
+
+        Assert.True(expressionComparer.Equals(e1, e2));
+        Assert.False(expressionComparer.Equals(e1, e3));
+
+        Assert.Equal(expressionComparer.GetHashCode(e1), expressionComparer.GetHashCode(e2));
+        Assert.NotEqual(expressionComparer.GetHashCode(e1), expressionComparer.GetHashCode(e3));
+    }
+
     private class Node
     {
         [UsedImplicitly]