Switch to using the BCL HashCode type

Also remove allocations from GetHashCode() methods by refraining from using LINQ.
dotnet · Jun 13, 2019 · 507ef21 · 507ef21
1 parent 4aba171
commit 507ef21
Show file tree

Hide file tree

Showing 57 changed files with 275 additions and 478 deletions.
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/CaseExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/CaseExpression.cs
@@ -122,16 +122,14 @@ private bool Equals(CaseExpression caseExpression)
 
         public override int GetHashCode()
         {
-            unchecked
+            var hash = new HashCode();
+            hash.Add(Operand);
+            for (var i = 0; i < WhenClauses.Count; i++)
             {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ (Operand?.GetHashCode() ?? 0);
-                hashCode = (hashCode * 397) ^ WhenClauses.Aggregate(
-                    0, (current, value) => current + ((current * 397) ^ value.GetHashCode()));
-                hashCode = (hashCode * 397) ^ (ElseResult?.GetHashCode() ?? 0);
-
-                return hashCode;
+                hash.Add(WhenClauses[i]);
             }
+            hash.Add(ElseResult);
+            return hash.ToHashCode();
         }
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/CaseWhenClause.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/CaseWhenClause.cs
@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+
 namespace Microsoft.EntityFrameworkCore.Relational.Query.Pipeline.SqlExpressions
 {
     public class CaseWhenClause
@@ -24,15 +26,6 @@ private bool Equals(CaseWhenClause caseWhenClause)
             => Test.Equals(caseWhenClause.Test)
             && Result.Equals(caseWhenClause.Result);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = Test.GetHashCode();
-                hashCode = (hashCode * 397) ^ Result.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(Test, Result);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/ColumnExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/ColumnExpression.cs
@@ -64,18 +64,7 @@ private bool Equals(ColumnExpression columnExpression)
             && Table.Equals(columnExpression.Table)
             && Nullable == columnExpression.Nullable;
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Name.GetHashCode();
-                hashCode = (hashCode * 397) ^ Table.GetHashCode();
-                hashCode = (hashCode * 397) ^ Nullable.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Name, Table, Nullable);
 
         private string DebuggerDisplay() => $"{Table.Alias}.{Name}";
     }

diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/ExistsExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/ExistsExpression.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -55,16 +56,6 @@ private bool Equals(ExistsExpression existsExpression)
             && Subquery.Equals(existsExpression.Subquery)
             && Negated == existsExpression.Negated;
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Subquery.GetHashCode();
-                hashCode = (hashCode * 397) ^ Negated.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Subquery, Negated);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/FromSqlExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/FromSqlExpression.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Query.Internal;
@@ -34,15 +35,6 @@ private bool Equals(FromSqlExpression fromSqlExpression)
             => base.Equals(fromSqlExpression)
                && string.Equals(Sql, fromSqlExpression.Sql);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Sql.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Sql);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/InExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/InExpression.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -72,18 +73,6 @@ private bool Equals(InExpression inExpression)
             && (Values == null ? inExpression.Values == null : Values.Equals(inExpression.Values))
             && (Subquery == null ? inExpression.Subquery == null : Subquery.Equals(inExpression.Subquery));
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Item.GetHashCode();
-                hashCode = (hashCode * 397) ^ Negated.GetHashCode();
-                hashCode = (hashCode * 397) ^ (Values?.GetHashCode() ?? 0);
-                hashCode = (hashCode * 397) ^ (Subquery?.GetHashCode() ?? 0);
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Item, Negated, Values, Subquery);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/JoinExpressionBase.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/JoinExpressionBase.cs
@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+
 namespace Microsoft.EntityFrameworkCore.Relational.Query.Pipeline.SqlExpressions
 {
     public abstract class JoinExpressionBase : TableExpressionBase
@@ -23,15 +25,6 @@ private bool Equals(JoinExpressionBase joinExpressionBase)
             => base.Equals(joinExpressionBase)
             && Table.Equals(joinExpressionBase.Table);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Table.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Table);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/LikeExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/LikeExpression.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -60,17 +61,6 @@ private bool Equals(LikeExpression likeExpression)
             && Pattern.Equals(likeExpression.Pattern)
             && EscapeChar.Equals(likeExpression.EscapeChar);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Match.GetHashCode();
-                hashCode = (hashCode * 397) ^ Pattern.GetHashCode();
-                hashCode = (hashCode * 397) ^ (EscapeChar?.GetHashCode() ?? 0);
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Match, Pattern, EscapeChar);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/OrderingExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/OrderingExpression.cs
@@ -46,15 +46,6 @@ private bool Equals(OrderingExpression orderingExpression)
             => Expression.Equals(orderingExpression.Expression)
             && Ascending == orderingExpression.Ascending;
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = Expression.GetHashCode();
-                hashCode = (hashCode * 397) ^ Ascending.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(Expression, Ascending);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/PredicateJoinExpressionBase.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/PredicateJoinExpressionBase.cs
@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+
 namespace Microsoft.EntityFrameworkCore.Relational.Query.Pipeline.SqlExpressions
 {
     public abstract class PredicateJoinExpressionBase : JoinExpressionBase
@@ -23,15 +25,6 @@ private bool Equals(PredicateJoinExpressionBase predicateJoinExpressionBase)
             => base.Equals(predicateJoinExpressionBase)
             && JoinPredicate.Equals(predicateJoinExpressionBase.JoinPredicate);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ JoinPredicate.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), JoinPredicate);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/ProjectionExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/ProjectionExpression.cs
@@ -51,16 +51,6 @@ private bool Equals(ProjectionExpression projectionExpression)
             => string.Equals(Alias, projectionExpression.Alias)
             && Expression.Equals(projectionExpression.Expression);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Alias.GetHashCode();
-                hashCode = (hashCode * 397) ^ Expression.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Alias, Expression);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SelectExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SelectExpression.cs
@@ -948,30 +948,33 @@ public SelectExpression Update(
 
         public override int GetHashCode()
         {
-            unchecked
+            var hash = new HashCode();
+            hash.Add(base.GetHashCode());
+            foreach (var projectionMapping in _projectionMapping)
             {
-                var hashCode = base.GetHashCode();
-                foreach (var projectionMapping in _projectionMapping)
-                {
-                    hashCode = (hashCode * 397) ^ projectionMapping.Key.GetHashCode();
-                    hashCode = (hashCode * 397) ^ projectionMapping.Value.GetHashCode();
-                }
+                hash.Add(projectionMapping.Key);
+                hash.Add(projectionMapping.Value);
+            }
 
-                hashCode = (hashCode * 397) ^ _tables.Aggregate(
-                    0, (current, value) => current + ((current * 397) ^ value.GetHashCode()));
+            foreach (var table in _tables)
+            {
+                hash.Add(table);
+            }
 
-                hashCode = (hashCode * 397) ^ (Predicate?.GetHashCode() ?? 0);
+            hash.Add(Predicate);
 
-                hashCode = (hashCode * 397) ^ _orderings.Aggregate(
-                    0, (current, value) => current + ((current * 397) ^ value.GetHashCode()));
+            foreach (var ordering in _orderings)
+            {
+                hash.Add(ordering);
+            }
 
-                hashCode = (hashCode * 397) ^ (Offset?.GetHashCode() ?? 0);
-                hashCode = (hashCode * 397) ^ (Limit?.GetHashCode() ?? 0);
-                hashCode = (hashCode * 397) ^ IsDistinct.GetHashCode();
+            hash.Add(Offset);
+            hash.Add(Limit);
+            hash.Add(IsDistinct);
 
-                return hashCode;
-            }
+            return hash.ToHashCode();
         }
+
         public override void Print(ExpressionPrinter expressionPrinter)
         {
             expressionPrinter.StringBuilder.AppendLine("Projection Mapping:");

diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlBinaryExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlBinaryExpression.cs
@@ -128,17 +128,6 @@ private bool Equals(SqlBinaryExpression sqlBinaryExpression)
             && Left.Equals(sqlBinaryExpression.Left)
             && Right.Equals(sqlBinaryExpression.Right);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ OperatorType.GetHashCode();
-                hashCode = (hashCode * 397) ^ Left.GetHashCode();
-                hashCode = (hashCode * 397) ^ Right.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), OperatorType, Left, Right);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlConstantExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlConstantExpression.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query.Internal;
@@ -62,15 +63,6 @@ private bool Equals(SqlConstantExpression sqlConstantExpression)
                 ? sqlConstantExpression.Value == null
                 : Value.Equals(sqlConstantExpression.Value));
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ (Value?.GetHashCode() ?? 0);
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Value);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlExpression.cs
@@ -36,15 +36,6 @@ private bool Equals(SqlExpression sqlExpression)
             => Type == sqlExpression.Type
             && TypeMapping?.Equals(sqlExpression.TypeMapping) == true;
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = Type.GetHashCode();
-                hashCode = (hashCode * 397) ^ (TypeMapping?.GetHashCode() ?? 0);
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(Type, TypeMapping);
     }
 }
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlFragmentExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlFragmentExpression.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 
@@ -29,15 +30,6 @@ private bool Equals(SqlFragmentExpression sqlFragmentExpression)
             => base.Equals(sqlFragmentExpression)
             && string.Equals(Sql, sqlFragmentExpression.Sql);
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ Sql.GetHashCode();
-
-                return hashCode;
-            }
-        }
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Sql);
     }
 }