Optimize GetChangedEntities()

Author: SergeiPavlov

Extensions/Xtensive.Orm.Tracking/Internals/SessionTrackingMonitor.cs

@@ -55,13 +55,13 @@ private void OnPersisting(object sender, EventArgs e)
     {
       var frame = stack.Peek();
 
-      foreach (var state in accessor.GetChangedEntities(PersistenceState.Removed))
+      foreach (var state in accessor.GetChangedEntitiesInternal(PersistenceState.Removed))
         frame.Register(new TrackingItem(state.Key, TrackingItemState.Deleted, state.DifferentialTuple));
 
-      foreach (var state in accessor.GetChangedEntities(PersistenceState.New))
+      foreach (var state in accessor.GetChangedEntitiesInternal(PersistenceState.New))
         frame.Register(new TrackingItem(state.Key, TrackingItemState.Created, state.DifferentialTuple));
 
-      foreach (var state in accessor.GetChangedEntities(PersistenceState.Modified))
+      foreach (var state in accessor.GetChangedEntitiesInternal(PersistenceState.Modified))
         frame.Register(new TrackingItem(state.Key, TrackingItemState.Changed, state.DifferentialTuple));
     }
 

Orm/Xtensive.Orm/Orm/Internals/EntityChangeRegistry.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2020 Xtensive LLC.
+// Copyright (C) 2008-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov
@@ -16,15 +16,14 @@ namespace Xtensive.Orm.Internals
   /// </summary>
   public sealed class EntityChangeRegistry : SessionBound
   {
-    private readonly HashSet<EntityState> @new = new HashSet<EntityState>();
-    private readonly HashSet<EntityState> modified = new HashSet<EntityState>();
-    private readonly HashSet<EntityState> removed = new HashSet<EntityState>();
-    private int count;
+    private readonly HashSet<EntityState> @new = new();
+    private readonly HashSet<EntityState> modified = new();
+    private readonly HashSet<EntityState> removed = new();
 
     /// <summary>
     /// Gets the number of registered entities.
     /// </summary>
-    public int Count { get { return count; } }
+    public int Count { get; private set; }
 
     /// <summary>
     /// Registers the specified item.
@@ -35,7 +34,7 @@ internal void Register(EntityState item)
       // Remove-create sequences fix for Issue 690
       if (item.PersistenceState == PersistenceState.New && removed.Contains(item)) {
         removed.Remove(item);
-        count--;
+        Count--;
         if (item.DifferentialTuple.Difference == null) {
           item.SetPersistenceState(PersistenceState.Synchronized);
           return;
@@ -44,17 +43,17 @@ internal void Register(EntityState item)
       }
       else if (item.PersistenceState == PersistenceState.Removed && @new.Contains(item)) {
         @new.Remove(item);
-        count--;
+        Count--;
         return;
       }
       else if (item.PersistenceState == PersistenceState.Removed && modified.Contains(item)) {
         modified.Remove(item);
-        count--;
+        Count--;
       }
 
       var container = GetContainer(item.PersistenceState);
       if (container.Add(item))
-        count++;
+        Count++;
     }
 
     /// <summary>
@@ -73,26 +72,20 @@ public IEnumerable<EntityState> GetItems(PersistenceState state)
     /// </summary>
     public void Clear()
     {
-      count = 0;
+      Count = 0;
       @new.Clear();
       modified.Clear();
       removed.Clear();
     }
 
     /// <exception cref="ArgumentOutOfRangeException"><paramref name="state"/> is out of range.</exception>
-    private HashSet<EntityState> GetContainer(PersistenceState state)
-    {
-      switch (state) {
-      case PersistenceState.New:
-        return @new;
-      case PersistenceState.Modified:
-        return modified;
-      case PersistenceState.Removed:
-        return removed;
-      default:
-        throw new ArgumentOutOfRangeException("state");
-      }
-    }
+    internal HashSet<EntityState> GetContainer(PersistenceState state) =>
+      state switch {
+      PersistenceState.New => @new,
+      PersistenceState.Modified => modified,
+      PersistenceState.Removed => removed,
+        _ => throw new ArgumentOutOfRangeException(nameof(state))
+      };
 
 
     // Constructors

Orm/Xtensive.Orm/Orm/Services/DirectSessionAccessor.cs

@@ -76,11 +76,11 @@ public IDisposable NullifySessionTransaction()
     /// </summary>
     /// <param name="persistenceState">Type of entity change.</param>
     /// <returns><see cref="EntityState"/>s with the specified <paramref name="persistenceState"/>.</returns>
-    public IEnumerable<EntityState> GetChangedEntities(PersistenceState persistenceState)
-    {
-      return Session.EntityChangeRegistry.GetItems(persistenceState);
-    }
+    public IEnumerable<EntityState> GetChangedEntities(PersistenceState persistenceState) =>
+      Session.EntityChangeRegistry.GetItems(persistenceState);
 
+    internal IEnumerable<EntityState> GetChangedEntitiesInternal(PersistenceState persistenceState) =>
+      Session.EntityChangeRegistry.GetItems(persistenceState);
 
     // Constructors
 

Orm/Xtensive.Orm/Properties/Visibility.cs

@@ -6,19 +6,19 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Xtensive.Orm.Tests.Framework, PublicKey=" + 
+[assembly: InternalsVisibleTo("Xtensive.Orm.Tests.Framework, PublicKey=" +
 "0024000004800000940000000602000000240000525341310004000001000100fbdd689d62e9c6" +
 "7bb6356267f95e0b58d478cf56393c4f060fbaff42a9686272e37009ab71bfa2e41046e952f389" +
 "f37c6a033d1a2a5354fc97226fc469128e49e6a479ac5d1dd69d7da5607d0dc4ede0765d477745" +
 "1034dc3a15f1532d010db3e633e62fc5e67a3ed175457acb9dc6c9d39ccc8ecfdaae62df34d488" +
 "c45009b2")]
-[assembly: InternalsVisibleTo("Xtensive.Orm.Tests.Core, PublicKey=" + 
+[assembly: InternalsVisibleTo("Xtensive.Orm.Tests.Core, PublicKey=" +
 "0024000004800000940000000602000000240000525341310004000001000100fbdd689d62e9c6" +
 "7bb6356267f95e0b58d478cf56393c4f060fbaff42a9686272e37009ab71bfa2e41046e952f389" +
 "f37c6a033d1a2a5354fc97226fc469128e49e6a479ac5d1dd69d7da5607d0dc4ede0765d477745" +
 "1034dc3a15f1532d010db3e633e62fc5e67a3ed175457acb9dc6c9d39ccc8ecfdaae62df34d488" +
 "c45009b2")]
-[assembly: InternalsVisibleTo("Xtensive.Orm.Tests, PublicKey=" + 
+[assembly: InternalsVisibleTo("Xtensive.Orm.Tests, PublicKey=" +
 "0024000004800000940000000602000000240000525341310004000001000100fbdd689d62e9c6" +
 "7bb6356267f95e0b58d478cf56393c4f060fbaff42a9686272e37009ab71bfa2e41046e952f389" +
 "f37c6a033d1a2a5354fc97226fc469128e49e6a479ac5d1dd69d7da5607d0dc4ede0765d477745" +
@@ -29,4 +29,10 @@
 "7bb6356267f95e0b58d478cf56393c4f060fbaff42a9686272e37009ab71bfa2e41046e952f389" +
 "f37c6a033d1a2a5354fc97226fc469128e49e6a479ac5d1dd69d7da5607d0dc4ede0765d477745" +
 "1034dc3a15f1532d010db3e633e62fc5e67a3ed175457acb9dc6c9d39ccc8ecfdaae62df34d488" +
-"c45009b2")]
+"c45009b2")]
+[assembly: InternalsVisibleTo("Xtensive.Orm.Tracking, PublicKey=" +
+"00240000048000009400000006020000002400005253413100040000010001007f8790a0573a2a" +
+"4f7b77907240977b669d33774bcaef77ef39d5186de4d4c836623fb661be674c7db731bc376184" +
+"f6848fc6b64eeba506654c8212de624e9d1f15ad1fe765f769e9a5b59ecaab2866632a983e7828" +
+"f3bf20ff7afffa021951cf8adc9ac1e786716430b0637893fb71b7566405fe14acc5e340c4af4a" +
+"a293c994")]