EntityLockProviderCache

Author: SergeiPavlov

Orm/Xtensive.Orm/Orm/Domain.cs

@@ -150,6 +150,11 @@ public static Domain Demand()
     /// </summary>
     internal ConcurrentDictionary<AssociationInfo, (CompilableProvider, Parameter<Xtensive.Tuples.Tuple>)> RefsToEntityQueryCache { get; } = new();
 
+    /// <summary>
+    /// Caches providers that lock certain type of entity with certain <see cref="LockMode"/> and <see cref="LockBehavior"/>.
+    /// </summary>
+    internal ConcurrentDictionary<(TypeInfo, LockMode, LockBehavior), ExecutableProvider> EntityLockProviderCache { get; } = new();
+
     internal object UpgradeContextCookie { get; private set; }
 
     internal SqlConnection SingleConnection { get; private set; }

Orm/Xtensive.Orm/Orm/DomainBound.cs

@@ -4,37 +4,24 @@
 // Created by: Dmitri Maximov
 // Created:    2007.08.10
 
-using System;
 using Xtensive.Core;
 
-using Xtensive.IoC;
-using Xtensive.Orm;
-
 namespace Xtensive.Orm
 {
   /// <summary>
   /// Base class for all objects that are bound to the <see cref="Domain"/> instance.
   /// </summary>
   public abstract class DomainBound: IContextBound<Domain>
   {
-    private Domain domain;
-
     /// <summary>
     /// Gets <see cref="Domain"/> to which current instance is bound.
     /// </summary>
-    public Domain Domain
-    {
-      get { return domain; }
-      internal set { domain = value; }
-    }
+    public Domain Domain { get; internal set; }
 
     #region IContextBound<Domain> Members
 
     /// <inheritdoc/>
-    Domain IContextBound<Domain>.Context
-    {
-      get { return domain; }
-    }
+    Domain IContextBound<Domain>.Context => Domain;
 
     #endregion
 
@@ -57,7 +44,7 @@ protected DomainBound()
     protected DomainBound(Domain domain)
     {
       ArgumentNullException.ThrowIfNull(domain);
-      this.domain = domain;
+      Domain = domain;
     }
   }
-}
+}

Orm/Xtensive.Orm/Orm/Entity.cs

@@ -270,7 +270,7 @@ public void Lock(LockMode lockMode, LockBehavior lockBehavior)
     {
       var parameterContext = new ParameterContext();
       parameterContext.SetValue(keyParameter, Key.Value);
-      var source = Session.StorageNode.EntityLockProviderCache.GetOrAdd((TypeInfo, lockMode, lockBehavior), ExecutableProviderGenerator, Session);
+      var source = Session.Domain.EntityLockProviderCache.GetOrAdd((TypeInfo, lockMode, lockBehavior), ExecutableProviderGenerator, Session);
       using var recordSetReader = source.GetRecordSetReader(Session, parameterContext);
       recordSetReader.MoveNext();
     }

Orm/Xtensive.Orm/Orm/Providers/SessionHandler.cs

@@ -22,12 +22,12 @@ public abstract partial class SessionHandler : IDisposable, IAsyncDisposable
     /// <summary>
     /// Gets <see cref="HandlerAccessor"/>.
     /// </summary>
-    protected HandlerAccessor Handlers { get; private set; }
+    protected HandlerAccessor Handlers => Session.Handlers;
 
     /// <summary>
     /// Gets the current <see cref="Session"/>.
     /// </summary>
-    public Session Session { get; private set; }
+    public Session Session { get; }
 
     /// <summary>
     /// Gets the real session handler (the final handler in chain of all <see cref="ChainingSessionHandler"/>s).
@@ -117,7 +117,6 @@ public virtual void Dispose()
     protected SessionHandler(Session session)
     {
       Session = session;
-      Handlers = session.Handlers;
     }
   }
-}
+}

Orm/Xtensive.Orm/Orm/Session.cs

@@ -235,7 +235,7 @@ public static Func<Session> Resolver
 
     internal SessionHandler Handler { get; set; }
 
-    internal HandlerAccessor Handlers { get; private set; }
+    internal HandlerAccessor Handlers => Domain.Handlers;
 
     internal SyncManager PairSyncManager { get; }
 
@@ -546,7 +546,6 @@ internal Session(Domain domain, StorageNode selectedStorageNode, SessionConfigur
       storageNode = selectedStorageNode;
 
       // Handlers
-      Handlers = domain.Handlers;
       Handler = CreateSessionHandler();
 
       // Caches, registry

Orm/Xtensive.Orm/Orm/StorageNode.cs

@@ -44,12 +44,6 @@ public sealed class StorageNode : ISessionSource
     /// </summary>
     public TypeIdRegistry TypeIdRegistry { get; private set; }
 
-    /// <summary>
-    /// Caches providers that lock certain type of entity with certain <see cref="LockMode"/> and <see cref="LockBehavior"/>.
-    /// </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>