EntitySetTypeStateCache

Author: SergeiPavlov

Orm/Xtensive.Orm/Orm/Domain.cs

@@ -155,6 +155,11 @@ public static Domain Demand()
     /// </summary>
     internal ConcurrentDictionary<(TypeInfo, LockMode, LockBehavior), ExecutableProvider> EntityLockProviderCache { get; } = new();
 
+    /// <summary>
+    /// Caches certain info about EntitySet fields, e.g. queries to fetch current count or items.
+    /// </summary>
+    internal ConcurrentDictionary<Xtensive.Orm.Model.FieldInfo, EntitySetTypeState> EntitySetTypeStateCache { get; } = new();
+
     internal object UpgradeContextCookie { get; private set; }
 
     internal SqlConnection SingleConnection { get; private set; }

Orm/Xtensive.Orm/Orm/EntitySetBase.cs

@@ -923,7 +923,7 @@ private static Key GetOwnerKey(Persistent owner)
     private EntitySetTypeState GetEntitySetTypeState()
     {
       EnsureOwnerIsNotRemoved();
-      return Session.StorageNode.EntitySetTypeStateCache.GetOrAdd(Field, EntitySetTypeStateFactory, this);
+      return Session.Domain.EntitySetTypeStateCache.GetOrAdd(Field, EntitySetTypeStateFactory, this);
     }
 
     private static EntitySetTypeState BuildEntitySetTypeState(FieldInfo field, EntitySetBase entitySet)

Orm/Xtensive.Orm/Orm/StorageNode.cs

@@ -44,11 +44,6 @@ public sealed class StorageNode : ISessionSource
     /// </summary>
     public TypeIdRegistry TypeIdRegistry { get; private set; }
 
-    /// <summary>
-    /// Caches certain info about EntitySet fields, e.g. queries to fetch current count or items.
-    /// </summary>
-    internal ConcurrentDictionary<Xtensive.Orm.Model.FieldInfo, EntitySetTypeState> EntitySetTypeStateCache { get; } = new();
-
     internal ConcurrentDictionary<SequenceInfo, CachingSequence> KeySequencesCache { get; } = new();
     internal ConcurrentDictionary<PersistRequestBuilderTask, IReadOnlyList<PreparedPersistRequest>> PersistRequestCache { get; } = new();