Get rid of virtual method calls in the Provider descendant constructors

Author: AlexUstinov

Directory.Build.props

@@ -82,7 +82,7 @@
     <IncludeSymbols Condition="$(GeneratePackageOnBuild) == 'true'">true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild>false</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <ItemGroup>

Orm/Xtensive.Orm/Orm/Providers/SqlIncludeProvider.cs

@@ -98,7 +98,6 @@ public SqlIncludeProvider(
       : base(handlers, request, tableDescriptor, origin, new []{source})
     {
       this.filterDataSource = filterDataSource;
-      Initialize();
     }
   }
 }

Orm/Xtensive.Orm/Orm/Providers/SqlProvider.cs

@@ -92,23 +92,6 @@ public SqlProvider(HandlerAccessor handlers, QueryRequest request,
     {
       this.handlers = handlers;
       Request = request;
-      if (typeof (SqlProvider)==GetType())
-        Initialize();
-    }
-
-    /// <summary>
-    /// Initializes a new instance of this class.
-    /// </summary>
-    /// <param name="provider">The provider.</param>
-    /// <param name="permanentReference">The permanent reference.</param>
-    public SqlProvider(SqlProvider provider, SqlTable permanentReference)
-      : base(provider.Origin, provider.Sources.Cast<ExecutableProvider>().ToArray())
-    {
-      this.permanentReference = permanentReference;
-      handlers = provider.handlers;
-      Request = provider.Request;
-      if (typeof (SqlProvider)==GetType())
-        Initialize();
     }
   }
 }

Orm/Xtensive.Orm/Orm/Providers/SqlStoreProvider.cs

@@ -52,7 +52,6 @@ public SqlStoreProvider(
       StoreProvider origin, ExecutableProvider source)
       : base(handlers, request, descriptor, origin, new[] {source})
     {
-      Initialize();
     }
   }
 }

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/AggregateProvider.cs

@@ -31,14 +31,6 @@ public sealed class AggregateProvider : UnaryProvider
     /// </summary>
     public int[] GroupColumnIndexes { get; }
 
-    /// <inheritdoc/>
-    protected override RecordSetHeader BuildHeader()
-    {
-      return Source.Header
-        .Select(GroupColumnIndexes)
-        .Add(AggregateColumns);
-    }
-
     /// <inheritdoc/>
     protected override string ParametersToString()
     {
@@ -160,6 +152,22 @@ private static NotSupportedException AggregateNotSupported(Type sourceColumnType
 
     #endregion
 
+    private static RecordSetHeader BuildHeaderAndColumns(
+      CompilableProvider source, ref int[] groupIndexes, AggregateColumnDescriptor[] columnDescriptors, out AggregateColumn[] aggregateColumns)
+    {
+      groupIndexes ??= Array.Empty<int>();
+      aggregateColumns = new AggregateColumn[columnDescriptors.Length];
+      var sourceHeader = source.Header;
+      var sourceHeaderColumns = sourceHeader.Columns;
+      for (int i = 0; i < columnDescriptors.Length; i++) {
+        AggregateColumnDescriptor descriptor = columnDescriptors[i];
+        var type = GetAggregateColumnType(sourceHeaderColumns[descriptor.SourceIndex].Type, descriptor.AggregateType);
+        aggregateColumns[i] = new AggregateColumn(descriptor, groupIndexes.Length + i, type);
+      }
+
+      return sourceHeader.Select(groupIndexes).Add(aggregateColumns);
+    }
+
     // Constructors
 
     /// <summary>
@@ -169,18 +177,11 @@ private static NotSupportedException AggregateNotSupported(Type sourceColumnType
     /// <param name="columnDescriptors">The descriptors of <see cref="AggregateColumns"/>.</param>
     /// <param name="groupIndexes">The column indexes to group by.</param>
     public AggregateProvider(CompilableProvider source, int[] groupIndexes, params AggregateColumnDescriptor[] columnDescriptors)
-      : base(ProviderType.Aggregate, source)
+      : base(ProviderType.Aggregate, BuildHeaderAndColumns(source, ref groupIndexes, columnDescriptors, out var columns), source)
     {
       groupIndexes = groupIndexes ?? Array.Empty<int>();
-      var columns = new AggregateColumn[columnDescriptors.Length];
-      for (int i = 0; i < columnDescriptors.Length; i++) {
-        AggregateColumnDescriptor descriptor = columnDescriptors[i];
-        var type = GetAggregateColumnType(Source.Header.Columns[descriptor.SourceIndex].Type, descriptor.AggregateType);
-        columns[i] = new AggregateColumn(descriptor, groupIndexes.Length + i, type);
-      }
       AggregateColumns = columns;
       GroupColumnIndexes = groupIndexes;
-      Initialize();
     }
   }
 }

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/AliasProvider.cs

@@ -20,13 +20,7 @@ public sealed class AliasProvider : UnaryProvider
     /// <summary>
     /// Alias of the result.
     /// </summary>
-    public string Alias { get; private set; }
-
-    /// <inheritdoc/>
-    protected override RecordSetHeader BuildHeader()
-    {
-      return base.BuildHeader().Alias(Alias);
-    }
+    public string Alias { get; }
 
     /// <inheritdoc/>
     protected override string ParametersToString()
@@ -43,10 +37,9 @@ protected override string ParametersToString()
     /// <param name="source">The <see cref="UnaryProvider.Source"/> property value.</param>
     /// <param name="alias">The <see cref="Alias"/> property value.</param>
     public AliasProvider(CompilableProvider source, string alias)
-      : base(ProviderType.Alias, source)
+      : base(ProviderType.Alias, source.Header.Alias(alias), source)
     {
       Alias = alias;
-      Initialize();
     }
   }
 }

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ApplyProvider.cs

@@ -24,34 +24,22 @@ public sealed class ApplyProvider : BinaryProvider,
     /// <summary>
     /// Gets the apply parameter.
     /// </summary>
-    public ApplyParameter ApplyParameter { get; private set; }
+    public ApplyParameter ApplyParameter { get; }
 
     /// <summary>
     /// Gets a value indicating whether columns of this provider should be inlined.
     /// </summary>
-    public bool IsInlined { get; private set; }
+    public bool IsInlined { get; }
 
     /// <summary>
     /// Gets apply type.
     /// </summary>
-    public JoinType ApplyType { get; private set; }
+    public JoinType ApplyType { get; }
 
     /// <summary>
     /// Gets a value indicating whether applying of single or first row expected.
     /// </summary>
-    public ApplySequenceType SequenceType { get; private set;}
-
-    /// <inheritdoc/>
-    protected override RecordSetHeader BuildHeader()
-    {
-      switch (ApplyType) {
-        case JoinType.Inner:
-        case JoinType.LeftOuter:
-          return base.BuildHeader();
-        default:
-          throw new ArgumentOutOfRangeException();
-      }
-    }
+    public ApplySequenceType SequenceType { get; }
 
     /// <inheritdoc/>
     protected override string ParametersToString()
@@ -77,11 +65,13 @@ public ApplyProvider(ApplyParameter applyParameter, CompilableProvider left, Com
     public ApplyProvider(ApplyParameter applyParameter, CompilableProvider left, CompilableProvider right, bool isInlined, ApplySequenceType applySequenceType, JoinType applyType)
       : base(ProviderType.Apply, left, right)
     {
+      if (applyType is not JoinType.Inner and not JoinType.LeftOuter) {
+        throw new ArgumentOutOfRangeException(nameof(applyType));
+      }
       ApplyParameter = applyParameter;
       IsInlined = isInlined;
       SequenceType = applySequenceType;
       ApplyType = applyType;
-      Initialize();
     }
   }
 }

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/BinaryProvider.cs

@@ -20,18 +20,12 @@ public abstract class BinaryProvider : CompilableProvider
     /// <summary>
     /// Left source.
     /// </summary>
-    public CompilableProvider Left { get; private set; }
+    public CompilableProvider Left { get; }
 
     /// <summary>
     /// Right source.
     /// </summary>
-    public CompilableProvider Right { get; private set; }
-
-    /// <inheritdoc/>
-    protected override RecordSetHeader BuildHeader()
-    {
-      return Left.Header.Join(Right.Header);
-    }
+    public CompilableProvider Right { get; }
 
 
     // Constructors
@@ -41,12 +35,25 @@ protected override RecordSetHeader BuildHeader()
     /// </summary>
     /// <param name="type">The type of provider.</param>
     /// <param name="left">The <see cref="Left"/> provider.</param>
-    /// <param name="right">The <see cref="Left"/> provider.</param>
+    /// <param name="right">The <see cref="Right"/> provider.</param>
     protected BinaryProvider(ProviderType type, CompilableProvider left, CompilableProvider right)
-      : base(type, left, right)
+      : this(type, left.Header.Join(right.Header), left, right)
+    {
+    }
+
+    /// <summary>
+    ///   Initializes a new instance of this class.
+    /// </summary>
+    /// <param name="type">The type of provider.</param>
+    /// <param name="header">The header of the resulting record set.</param>
+    /// <param name="left">The <see cref="Left"/> provider.</param>
+    /// <param name="right">The <see cref="Right"/> provider.</param>
+    protected BinaryProvider(ProviderType type, RecordSetHeader header, CompilableProvider left, CompilableProvider right)
+      : base(type, header, left, right)
     {
-      ArgumentValidator.EnsureArgumentNotNull(left, "left");
-      ArgumentValidator.EnsureArgumentNotNull(right, "right");
+      ArgumentValidator.EnsureArgumentNotNull(header, nameof(header));
+      ArgumentValidator.EnsureArgumentNotNull(left, nameof(left));
+      ArgumentValidator.EnsureArgumentNotNull(right, nameof(right));
       Left = left;
       Right = right;
     }

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/CalculateProvider.cs

@@ -26,12 +26,6 @@ public class CalculateProvider : UnaryProvider,
     /// </summary>
     public CalculatedColumn[] CalculatedColumns { get; }
 
-    /// <inheritdoc/>
-    protected override RecordSetHeader BuildHeader()
-    {
-      return Source.Header.Add(CalculatedColumns);
-    }
-
     /// <inheritdoc/>
     protected override string ParametersToString()
     {
@@ -41,6 +35,19 @@ protected override string ParametersToString()
 
     // Constructors
 
+    private static RecordSetHeader BuildHeaderAndColumns(
+      CompilableProvider source, CalculatedColumnDescriptor[] columnDescriptors, out CalculatedColumn[] calculatedColumns)
+    {
+      var sourceHeader = source.Header;
+      var sourceHeaderLength = sourceHeader.Length;
+      calculatedColumns = new CalculatedColumn[columnDescriptors.Length];
+      for (int i = 0; i < columnDescriptors.Length; i++) {
+        calculatedColumns[i] = new CalculatedColumn(columnDescriptors[i], sourceHeaderLength + i);
+      }
+
+      return sourceHeader.Add(calculatedColumns);
+    }
+
     /// <summary>
     /// Initializes a new instance of this class.
     /// </summary>
@@ -58,16 +65,10 @@ public CalculateProvider(CompilableProvider source, params CalculatedColumnDescr
     /// <param name="isInlined">The <see cref="IsInlined"/> property value.</param>
     /// <param name="columnDescriptors">The descriptors of <see cref="CalculatedColumns"/>.</param>
     public CalculateProvider(CompilableProvider source, bool isInlined, params CalculatedColumnDescriptor[] columnDescriptors)
-      : base(ProviderType.Calculate, source)
+      : base(ProviderType.Calculate, BuildHeaderAndColumns(source, columnDescriptors, out var calculatedColumns), source)
     {
       IsInlined = isInlined;
-      var sourceHeaderLength = Source.Header.Length;
-      var columns = new CalculatedColumn[columnDescriptors.Length];
-      for (int i = 0; i < columnDescriptors.Length; i++) {
-        columns[i] = new CalculatedColumn(columnDescriptors[i], sourceHeaderLength + i);
-      }
-      CalculatedColumns = columns;
-      Initialize();
+      CalculatedColumns = calculatedColumns;
     }
   }
 }

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ConcatProvider.cs

@@ -6,9 +6,6 @@
 
 using System;
 using System.Collections.Generic;
-using Xtensive.Collections;
-
-
 using System.Linq;
 
 namespace Xtensive.Orm.Rse.Providers
@@ -20,58 +17,60 @@ namespace Xtensive.Orm.Rse.Providers
   [Serializable]
   public sealed class ConcatProvider : BinaryProvider
   {
-    protected override RecordSetHeader BuildHeader()
+
+
+    // Constructors
+
+    private static RecordSetHeader BuildHeader(CompilableProvider left, CompilableProvider right)
     {
-      EnsureConcatIsPossible();
+      var leftHeader = left.Header;
+      var rightHeader = right.Header;
+      EnsureConcatIsPossible(leftHeader, rightHeader);
       var mappedColumnIndexes = new List<int>();
       var columns = new List<Column>();
-      for (int i = 0; i < Left.Header.Columns.Count; i++) {
-        var leftColumn = Left.Header.Columns[i];
-        var rightColumn = Right.Header.Columns[i];
-        if (leftColumn is MappedColumn && rightColumn is MappedColumn) {
-          var leftMappedColumn = (MappedColumn) leftColumn;
-          var rightMappedColumn = (MappedColumn) rightColumn;
+      for (int i = 0; i < leftHeader.Columns.Count; i++) {
+        var leftColumn = leftHeader.Columns[i];
+        var rightColumn = rightHeader.Columns[i];
+        if (leftColumn is MappedColumn leftMappedColumn && rightColumn is MappedColumn rightMappedColumn) {
           if (leftMappedColumn.ColumnInfoRef.Equals(rightMappedColumn.ColumnInfoRef)) {
             columns.Add(leftMappedColumn);
             mappedColumnIndexes.Add(i);
-            }
-          else
+          }
+          else {
             columns.Add(new SystemColumn(leftColumn.Name, leftColumn.Index, leftColumn.Type));
+          }
         }
-        else
+        else {
           columns.Add(new SystemColumn(leftColumn.Name, leftColumn.Index, leftColumn.Type));
+        }
       }
-      var columnGroups = Left.Header.ColumnGroups.Where(cg => cg.Keys.All(mappedColumnIndexes.Contains)).ToList();
+      var columnGroups = leftHeader.ColumnGroups.Where(cg => cg.Keys.All(mappedColumnIndexes.Contains)).ToList();
 
       return new RecordSetHeader(
-        Left.Header.TupleDescriptor, 
-        columns, 
+        leftHeader.TupleDescriptor,
+        columns,
         columnGroups,
         null,
         null);
     }
 
-    /// <exception cref="InvalidOperationException">Something went wrong.</exception>
-    private void EnsureConcatIsPossible()
+    private static void EnsureConcatIsPossible(RecordSetHeader leftHeader, RecordSetHeader rightHeader)
     {
-      var left = Left.Header.TupleDescriptor;
-      var right = Right.Header.TupleDescriptor;
-      if (!left.Equals(right))
+      var left = leftHeader.TupleDescriptor;
+      var right = rightHeader.TupleDescriptor;
+      if (!left.Equals(right)) {
         throw new InvalidOperationException(String.Format(Strings.ExXCantBeExecuted, "Concatenation"));
+      }
     }
 
-
-    // Constructors
-
     /// <summary>
     ///  Initializes a new instance of this class.
     /// </summary>
     /// <param name="left">The left provider to intersect.</param>
     /// <param name="right">The right provider to intersect.</param>
     public ConcatProvider(CompilableProvider left, CompilableProvider right)
-      : base(ProviderType.Concat, left, right)
+      : base(ProviderType.Concat, BuildHeader(left, right), left, right)
     {
-      Initialize();
     }
   }
 }