Optimize PersistRequest (#353)

* Optimize `PersistRequest`

* Remove using

Author: SergeiPavlov

Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/CommandFactory.cs

@@ -54,7 +54,7 @@ public virtual IEnumerable<CommandPart> CreatePersistParts(SqlPersistTask task,
       var result = new List<CommandPart>(task.RequestSequence.Count);
       int parameterIndex = 0;
       foreach (var request in task.RequestSequence) {
-        var compilationResult = request.GetCompiledStatement();
+        var compilationResult = request.CompiledStatement;
         var configuration = shareStorageNodesOverNodes
           ? new SqlPostCompilerConfiguration(nodeConfiguration.GetDatabaseMapping(), nodeConfiguration.GetSchemaMapping())
           : new SqlPostCompilerConfiguration();

Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/SqlPersistTask.cs

@@ -26,7 +26,7 @@ public sealed class SqlPersistTask : SqlTask
     /// <summary>
     /// Requests to execute.
     /// </summary>
-    public readonly IReadOnlyCollection<PersistRequest> RequestSequence;
+    public readonly IReadOnlyCollection<PreparedPersistRequest> RequestSequence;
 
     /// <summary>
     /// A tuple that stores changed column values.
@@ -57,38 +57,38 @@ public override void ProcessWith(ISqlTaskProcessor processor, CommandProcessorCo
 
     // Constructors
 
-    public SqlPersistTask(PersistRequest request, Tuple tuple = null)
+    public SqlPersistTask(PreparedPersistRequest request, Tuple tuple = null)
     {
-      RequestSequence = new PersistRequest[1] { request };
+      RequestSequence = [request];
       Tuple = tuple;
     }
 
-    public SqlPersistTask(PersistRequest request, IReadOnlyList<Tuple> tuples)
+    public SqlPersistTask(PreparedPersistRequest request, IReadOnlyList<Tuple> tuples)
     {
-      RequestSequence = new PersistRequest[1] { request };
+      RequestSequence = [request];
       Tuples = tuples;
     }
 
     [Obsolete]
-    public SqlPersistTask(Key key, IEnumerable<PersistRequest> requestSequence, Tuple tuple)
-      : this(key, (requestSequence as IReadOnlyCollection<PersistRequest>)?? requestSequence.ToList(), tuple)
+    public SqlPersistTask(Key key, IEnumerable<PreparedPersistRequest> requestSequence, Tuple tuple)
+      : this(key, (requestSequence as IReadOnlyCollection<PreparedPersistRequest>)?? requestSequence.ToList(), tuple)
     {
     }
 
     [Obsolete]
-    public SqlPersistTask(Key key, IEnumerable<PersistRequest> requestSequence, Tuple tuple, Tuple originalTuple, bool validateRowCount)
-      : this(key, (requestSequence as IReadOnlyCollection<PersistRequest>) ?? requestSequence.ToList(), tuple, originalTuple, validateRowCount)
+    public SqlPersistTask(Key key, IEnumerable<PreparedPersistRequest> requestSequence, Tuple tuple, Tuple originalTuple, bool validateRowCount)
+      : this(key, (requestSequence as IReadOnlyCollection<PreparedPersistRequest>) ?? requestSequence.ToList(), tuple, originalTuple, validateRowCount)
     {
     }
 
-    public SqlPersistTask(Key key, IReadOnlyCollection<PersistRequest> requestSequence, Tuple tuple)
+    public SqlPersistTask(Key key, IReadOnlyCollection<PreparedPersistRequest> requestSequence, Tuple tuple)
     {
       EntityKey = key;
       RequestSequence = requestSequence;
       Tuple = tuple;
     }
 
-    public SqlPersistTask(Key key, IReadOnlyCollection<PersistRequest> requestSequence, Tuple tuple, Tuple originalTuple, bool validateRowCount)
+    public SqlPersistTask(Key key, IReadOnlyCollection<PreparedPersistRequest> requestSequence, Tuple tuple, Tuple originalTuple, bool validateRowCount)
     {
       EntityKey = key;
       RequestSequence = requestSequence;

Orm/Xtensive.Orm/Orm/Providers/Interfaces/IPersistDescriptors.cs

@@ -13,12 +13,12 @@ public interface IPersistDescriptor
     /// <summary>
     /// Request to store data.
     /// </summary>
-    PersistRequest StoreRequest { get; }
+    PreparedPersistRequest StoreRequest { get; }
 
     /// <summary>
     /// Request to clear data.
     /// </summary>
-    PersistRequest ClearRequest { get; }
+    PreparedPersistRequest ClearRequest { get; }
   }
 
   public interface IMultiRecordPersistDescriptor : IPersistDescriptor
@@ -28,22 +28,22 @@ public interface IMultiRecordPersistDescriptor : IPersistDescriptor
     /// protion can't be stored by neither <see cref="StoreBigBatchRequest"/>
     /// nor <see cref="StoreSmallBatchRequest"/>.
     /// </summary>
-    Lazy<PersistRequest> StoreSingleRecordRequest { get { return new Lazy<PersistRequest>(StoreRequest); } }
+    Lazy<PreparedPersistRequest> StoreSingleRecordRequest => new(StoreRequest);
 
     /// <summary>
     /// Request that stores smaller portion of data at a time.
     /// The request is used when data can't be stored with <see cref="StoreBigBatchRequest"/>
     /// due to smaller size. When data portion size becomes smaller than the reqired by
     /// this request the <see cref="StoreSingleRecordRequest"/> will be used.
     /// </summary>
-    Lazy<PersistRequest> StoreSmallBatchRequest { get; }
+    Lazy<PreparedPersistRequest> StoreSmallBatchRequest { get; }
 
     /// <summary>
     /// Request that stores big portion of data at a time. The request is used
     /// unless data portion is smaller than the request can store, in this case 
     /// <see cref="StoreSmallBatchRequest"/> or even <see cref="StoreSingleRecordRequest" />
     /// will be used.
     /// </summary>
-    Lazy<PersistRequest> StoreBigBatchRequest { get; }
+    Lazy<PreparedPersistRequest> StoreBigBatchRequest { get; }
   }
 }

Orm/Xtensive.Orm/Orm/Providers/Persister.cs

@@ -93,14 +93,8 @@ private SqlPersistTask CreateRemoveTask(PersistAction action, bool validateVersi
       }
     }
 
-    private IReadOnlyCollection<PersistRequest> GetOrBuildRequest(StorageNode node, PersistRequestBuilderTask task)
-    {
-      var cache = node.PersistRequestCache;
-      if (cache.TryGetValue(task, out var result))
-        return result;
-      result = requestBuilder.Build(node, task);
-      return cache.TryAdd(task, result) ? result : cache[task];
-    }
+    private IReadOnlyCollection<PreparedPersistRequest> GetOrBuildRequest(StorageNode node, PersistRequestBuilderTask task) =>
+      node.PersistRequestCache.GetOrAdd(task, static (t, x) => x.requestBuilder.Build(x.node, t), (requestBuilder, node));
 
     #endregion
 

Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs

@@ -4,59 +4,49 @@
 // Created by: Dmitri Maximov
 // Created:    2008.08.22
 
-using System;
-using System.Collections.Generic;
 using Xtensive.Core;
 using Xtensive.Orm.Configuration;
 using Xtensive.Sql;
 using Xtensive.Sql.Compiler;
 
-namespace Xtensive.Orm.Providers
-{
-  /// <summary>
-  /// Modification (INSERT, UPDATE, DELETE) request.
-  /// </summary>
-  public sealed class PersistRequest
-  {
-    private static readonly IReadOnlySet<PersistParameterBinding> EmptyBindings = new HashSet<PersistParameterBinding>();
+namespace Xtensive.Orm.Providers;
 
-    private readonly StorageDriver driver;
+public record struct PreparedPersistRequest(
+  SqlCompilationResult CompiledStatement,
+  IReadOnlyCollection<PersistParameterBinding> ParameterBindings
+);
 
-    private SqlCompilationResult compiledStatement;
+/// <summary>
+/// Modification (INSERT, UPDATE, DELETE) request.
+/// </summary>
+public readonly struct PersistRequest
+{
+  private static readonly IReadOnlySet<PersistParameterBinding> EmptyBindings = new HashSet<PersistParameterBinding>();
 
-    public SqlStatement Statement { get; private set; }
+  private readonly StorageDriver driver;
 
-    public ISqlCompileUnit CompileUnit { get; private set; }
+  public SqlStatement Statement { get; }
 
-    public IReadOnlyCollection<PersistParameterBinding> ParameterBindings { get; }
+  public ISqlCompileUnit CompileUnit { get; }
 
-    public SqlCompilationResult GetCompiledStatement() =>
-      compiledStatement ?? throw new InvalidOperationException(Strings.ExRequestIsNotPrepared);
+  public IReadOnlyCollection<PersistParameterBinding> ParameterBindings { get; }
 
-    public void Prepare()
-    {
-      if (compiledStatement != null)
-        return;
-      compiledStatement = driver.Compile(CompileUnit);
-      CompileUnit = null;
-      Statement = null;
-    }
+  public PreparedPersistRequest Prepare() => new(driver.Compile(CompileUnit), ParameterBindings);
 
-    // Constructors
+  // Constructors
 
-    public PersistRequest(
-      StorageDriver driver, SqlStatement statement, IReadOnlySet<PersistParameterBinding> parameterBindings)
-    {
-      ArgumentNullException.ThrowIfNull(driver);
-      ArgumentNullException.ThrowIfNull(statement);
+  public PersistRequest(
+    StorageDriver driver, SqlStatement statement, IReadOnlySet<PersistParameterBinding> parameterBindings)
+  {
+    ArgumentNullException.ThrowIfNull(driver);
+    ArgumentNullException.ThrowIfNull(statement);
 
-      var compileUnit = statement as ISqlCompileUnit
-        ?? throw new ArgumentException("Statement is not ISqlCompileUnit");
+    var compileUnit = statement as ISqlCompileUnit
+      ?? throw new ArgumentException("Statement is not ISqlCompileUnit");
 
-      this.driver = driver;
-      Statement = statement;
-      CompileUnit = compileUnit;
-      ParameterBindings = parameterBindings ?? EmptyBindings;
-    }
+    this.driver = driver;
+    Statement = statement;
+    CompileUnit = compileUnit;
+    ParameterBindings = parameterBindings ?? EmptyBindings;
   }
 }

Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequestBuilder.cs

@@ -24,7 +24,7 @@ public class PersistRequestBuilder : DomainBoundHandler
     private ProviderInfo providerInfo;
     private StorageDriver driver;
 
-    internal IReadOnlyList<PersistRequest> Build(StorageNode node, PersistRequestBuilderTask task)
+    internal IReadOnlyList<PreparedPersistRequest> Build(StorageNode node, PersistRequestBuilderTask task)
     {
       var context = new PersistRequestBuilderContext(task, node.Mapping, node.Configuration);
       List<PersistRequest> result;
@@ -52,15 +52,10 @@ internal IReadOnlyList<PersistRequest> Build(StorageNode node, PersistRequestBui
           bindings.UnionWith(request.ParameterBindings);
         }
         var batchRequest = new PersistRequest(driver, batch, bindings);
-        batchRequest.Prepare();
-        return new List<PersistRequest> { batchRequest }.AsSafeWrapper();
+        return [batchRequest.Prepare()];
       }
 
-      foreach (var item in result) {
-        item.Prepare();
-      }
-
-      return result.AsSafeWrapper();
+      return result.Select(request => request.Prepare()).ToArray();
     }
 
     protected virtual List<PersistRequest> BuildInsertRequest(in PersistRequestBuilderContext context)

Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequestBuilderTask.cs

@@ -4,7 +4,6 @@
 // Created by: Dmitri Maximov
 // Created:    2008.08.29
 
-using System;
 using System.Collections;
 using Xtensive.Orm.Model;
 
@@ -13,52 +12,46 @@ namespace Xtensive.Orm.Providers
   /// <summary>
   /// A task for <see cref="PersistRequestBuilder"/>.
   /// </summary>
-  public sealed class PersistRequestBuilderTask
+  public sealed class PersistRequestBuilderTask : IEquatable<PersistRequestBuilderTask>
   {
     private readonly int hashCode;
 
     /// <summary>
     /// Gets the type.
     /// </summary>
-    public TypeInfo Type { get; private set; }
+    public TypeInfo Type { get; }
 
     /// <summary>
     /// Gets the field map that describes updated fields.
     /// </summary>
-    public BitArray ChangedFields { get; private set; }
+    public BitArray ChangedFields { get; }
 
     /// <summary>
     /// Gets the field map that describes available (fetched) fields.
     /// </summary>
-    public BitArray AvailableFields { get; private set; }
+    public BitArray AvailableFields { get; }
 
     /// <summary>
     /// Gets the <see cref="PersistRequestKind"/>.
     /// </summary>
-    public PersistRequestKind Kind { get; private set; }
+    public PersistRequestKind Kind { get; }
 
     /// <summary>
     /// Gets flag indicating if validation should be performed.
     /// </summary>
-    public bool ValidateVersion { get; private set; }
+    public bool ValidateVersion { get; }
+
+    public bool Equals(PersistRequestBuilderTask other) =>
+      ReferenceEquals(this, other)
+        || other is not null
+          && Type == other.Type
+          && Kind == other.Kind
+          && ValidateVersion == other.ValidateVersion
+          && CompareBits(AvailableFields, other.AvailableFields)
+          && CompareBits(ChangedFields, other.ChangedFields);
 
     /// <inheritdoc/>
-    public override bool Equals(object obj)
-    {
-      if (ReferenceEquals(this, obj))
-        return true;
-      if (obj is PersistRequestBuilderTask other) {
-        if (Type != other.Type)
-          return false;
-        if (Kind != other.Kind)
-          return false;
-        if (ValidateVersion != other.ValidateVersion)
-          return false;
-        return CompareBits(AvailableFields, other.AvailableFields)
-          && CompareBits(ChangedFields, other.ChangedFields);
-      }
-      return false;
-    }
+    public override bool Equals(object obj) => obj is PersistRequestBuilderTask other && Equals(other);
 
     /// <inheritdoc/>
     public override int GetHashCode() => hashCode;
@@ -78,11 +71,11 @@ private int HashBits(BitArray bits)
 
     private bool CompareBits(BitArray left, BitArray right)
     {
-      if (left==null && right==null)
+      if (left == null && right == null)
         return true;
-      if (left!=null && right!=null && left.Count==right.Count) {
-        for (var i = 0; i < left.Count; i++)
-          if (left[i]!=right[i])
+      if (left != null && right != null && left.Count == right.Count) {
+        for (int i = 0, n = left.Count; i < n; i++)
+          if (left[i] != right[i])
             return false;
         return true;
       }

Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequestKind.cs

@@ -9,7 +9,7 @@ namespace Xtensive.Orm.Providers
   /// <summary>
   /// Kinds of <see cref="PersistRequest"/>.
   /// </summary>
-  public enum PersistRequestKind
+  public enum PersistRequestKind : sbyte
   {
     /// <summary>
     /// Insert request.
@@ -26,4 +26,4 @@ public enum PersistRequestKind
     /// </summary>
     Update = 0,
   }
-}
+}

Orm/Xtensive.Orm/Orm/Providers/TemporaryTables/TemporaryTableDescriptor.cs

@@ -41,37 +41,37 @@ public sealed class TemporaryTableDescriptor : IMultiRecordPersistDescriptor
     /// <summary>
     /// Gets or sets the persist request used to store batched data in temporary table.
     /// </summary>
-    public Lazy<PersistRequest> LazyLevel1BatchStoreRequest { get; set; }
+    public Lazy<PreparedPersistRequest> LazyLevel1BatchStoreRequest { get; set; }
 
     /// <summary>
     /// Gets or sets the persist request used to store batched data in temporary table.
     /// </summary>
-    public Lazy<PersistRequest> LazyLevel2BatchStoreRequest { get; set; }
+    public Lazy<PreparedPersistRequest> LazyLevel2BatchStoreRequest { get; set; }
 
     /// <summary>
     /// Gets or sets the persist request used to store data in temporary table.
     /// </summary>
-    public Lazy<PersistRequest> StoreSingleRecordRequest { get; set; }
+    public Lazy<PreparedPersistRequest> StoreSingleRecordRequest { get; set; }
 
     /// <summary>
     /// Gets or sets the persist request used to store batched data in temporary table.
     /// </summary>
-    public Lazy<PersistRequest> StoreSmallBatchRequest { get; set; }
+    public Lazy<PreparedPersistRequest> StoreSmallBatchRequest { get; set; }
 
     /// <summary>
     /// Gets or sets the persist request used to store batched data in temporary table.
     /// </summary>
-    public Lazy<PersistRequest> StoreBigBatchRequest { get; set; }
+    public Lazy<PreparedPersistRequest> StoreBigBatchRequest { get; set; }
 
     /// <summary>
     /// Gets the persist request used to store data in temporary table.
     /// </summary>
-    PersistRequest IPersistDescriptor.StoreRequest => StoreSingleRecordRequest.Value;
+    PreparedPersistRequest IPersistDescriptor.StoreRequest => StoreSingleRecordRequest.Value;
 
     /// <summary>
     /// Gets or sets the clear reqest used to delete all data from temporary table.
     /// </summary>
-    public PersistRequest ClearRequest { get; set; }
+    public PreparedPersistRequest ClearRequest { get; set; }
 
     /// <summary>
     /// Gets or sets the query statement associated with this table descriptor.