Organizational changes of building provider headers being in region, not in constructor section

alex-kulakov · alex-kulakov · commit 18a8a601169f · 2026-03-26T13:14:36.000+05:00
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/AggregateProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/AggregateProvider.cs
@@ -157,6 +157,7 @@ private static NotSupportedException AggregateNotSupported(Type sourceColumnType
 
     #endregion
 
+    #region Header build
     private static RecordSetHeader BuildHeaderAndColumns(
       CompilableProvider source,
       IReadOnlyList<AggregateColumnDescriptor> columnDescriptors,
@@ -196,6 +197,7 @@ private static RecordSetHeader BuildHeaderAndColumns(
 
       return sourceHeader.Select(groupIndexes).Add(aggregateColumns);
     }
+    #endregion
 
     // Constructors
 
@@ -207,7 +209,7 @@ private static RecordSetHeader BuildHeaderAndColumns(
     /// <param name="columnDescriptors">The descriptors of <see cref="AggregateColumns"/>.</param>
     [Obsolete]
     public AggregateProvider(CompilableProvider source, int[] groupIndexes, params AggregateColumnDescriptor[] columnDescriptors)
-      : base(ProviderType.Aggregate, BuildHeaderAndColumns(source, columnDescriptors, ref groupIndexes, out var columns), source)
+      : this(source,groupIndexes, (IReadOnlyList<AggregateColumnDescriptor>)columnDescriptors)
     {
     }
 
@@ -220,7 +222,6 @@ public AggregateProvider(CompilableProvider source, int[] groupIndexes, params A
     public AggregateProvider(CompilableProvider source, int[] groupIndexes, IReadOnlyList<AggregateColumnDescriptor> columnDescriptors)
       : base(ProviderType.Aggregate, BuildHeaderAndColumns(source, columnDescriptors, ref groupIndexes, out var columns), source)
     {
-      ArgumentValidator.EnsureArgumentNotNull(columnDescriptors, nameof(columnDescriptors));
       AggregateColumns = columns;
       GroupColumnIndexes = groupIndexes;
     }
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/CalculateProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/CalculateProvider.cs
@@ -33,9 +33,7 @@ protected override string ParametersToString()
       return CalculatedColumns.ToCommaDelimitedString();
     }
 
-
-    // Constructors
-
+    #region Header build
     private static RecordSetHeader BuildHeaderAndColumns(
       CompilableProvider source,
       IReadOnlyList<CalculatedColumnDescriptor> columnDescriptors,
@@ -51,6 +49,9 @@ private static RecordSetHeader BuildHeaderAndColumns(
 
       return sourceHeader.Add(calculatedColumns);
     }
+    #endregion
+
+    // Constructors
 
     /// <summary>
     /// Initializes a new instance of this class.
@@ -59,7 +60,7 @@ private static RecordSetHeader BuildHeaderAndColumns(
     /// <param name="columnDescriptors">The descriptors of <see cref="CalculatedColumns"/>.</param>
     [Obsolete]
     public CalculateProvider(CompilableProvider source, params CalculatedColumnDescriptor[] columnDescriptors)
-      : this(source, false, columnDescriptors)
+      : this(source, columnDescriptors, false)
     {
     }
 
@@ -71,10 +72,8 @@ public CalculateProvider(CompilableProvider source, params CalculatedColumnDescr
     /// <param name="columnDescriptors">The descriptors of <see cref="CalculatedColumns"/>.</param>
     [Obsolete]
     public CalculateProvider(CompilableProvider source, bool isInlined, params CalculatedColumnDescriptor[] columnDescriptors)
-      : base(ProviderType.Calculate, BuildHeaderAndColumns(source, columnDescriptors, out var calculatedColumns), source)
+      : this(source, columnDescriptors, isInlined)
     {
-      IsInlined = isInlined;
-      CalculatedColumns = calculatedColumns;
     }
 
     /// <summary>
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ConcatProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ConcatProvider.cs
@@ -17,7 +17,7 @@ namespace Xtensive.Orm.Rse.Providers
   [Serializable]
   public sealed class ConcatProvider : BinaryProvider
   {
-
+    #region Header build
     private static RecordSetHeader BuildHeader(CompilableProvider left, CompilableProvider right)
     {
       var leftHeader = left.Header;
@@ -59,6 +59,7 @@ private static void EnsureConcatIsPossible(RecordSetHeader leftHeader, RecordSet
         throw new InvalidOperationException(string.Format(Strings.ExXCantBeExecuted, "Concatenation"));
       }
     }
+    #endregion
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ContainsTableProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ContainsTableProvider.cs
@@ -26,11 +26,10 @@ public sealed class ContainsTableProvider : CompilableProvider
 
     public Func<ParameterContext, int> TopN { get; }
 
-    public IReadOnlyList<FullTextColumnInfo> TargetColumns { get; } 
-
-
-    // Constructors
+    public IReadOnlyList<FullTextColumnInfo> TargetColumns { get; }
+    
 
+    #region Header build
     private static RecordSetHeader BuildHeader(FullTextIndexInfo index, string rankColumnName, bool fullFeatured)
     {
       if (fullFeatured) {
@@ -55,6 +54,9 @@ private static RecordSetHeader BuildHeader(FullTextIndexInfo index, string rankC
         return new RecordSetHeader(tupleDescriptor, columns);
       }
     }
+    #endregion
+
+    // Constructors
 
     public ContainsTableProvider(FullTextIndexInfo index, Func<ParameterContext, string> searchCriteria, string rankColumnName, IList<ColumnInfo> targetColumns, bool fullFeatured)
       : this(index, searchCriteria, rankColumnName, targetColumns, null, fullFeatured)
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ExceptProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ExceptProvider.cs
@@ -16,6 +16,7 @@ namespace Xtensive.Orm.Rse.Providers
   [Serializable]
   public sealed class ExceptProvider : BinaryProvider
   {
+    #region Header build
     private static RecordSetHeader BuildHeader(CompilableProvider left, CompilableProvider right)
     {
       var leftHeader = left.Header;
@@ -26,6 +27,7 @@ private static RecordSetHeader BuildHeader(CompilableProvider left, CompilablePr
       }
       return leftHeader;
     }
+    #endregion
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ExistenceProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/ExistenceProvider.cs
@@ -24,12 +24,13 @@ public sealed class ExistenceProvider : UnaryProvider
     /// </summary>
     public string ExistenceColumnName { get; }
 
-
+    #region Header build
     private static RecordSetHeader BuildHeader(string existenceColumnName)
     {
       return new RecordSetHeader(
         BoolTupleDescriptor, new[] { new SystemColumn(existenceColumnName, 0, WellKnownTypes.Bool) });
     }
+    #endregion
 
 
     // Constructors
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/FreeTextProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/FreeTextProvider.cs
@@ -28,6 +28,7 @@ public sealed class FreeTextProvider : CompilableProvider
 
     public bool FullFeatured { get; }
 
+    #region Header build
     private static RecordSetHeader BuildHeader(FullTextIndexInfo index, string rankColumnName, bool fullFeatured)
     {
       if (fullFeatured) {
@@ -51,6 +52,7 @@ private static RecordSetHeader BuildHeader(FullTextIndexInfo index, string rankC
         return new RecordSetHeader(tupleDescriptor, columns);
       }
     }
+    #endregion
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs
@@ -52,7 +52,7 @@ public sealed class IncludeProvider: UnaryProvider,
 
     public TupleDescriptor FilteredTupleDescriptor { get; }
 
-
+    #region Header build
     private static RecordSetHeader BuildHeaderAndFilteredTupleDescriptor(
       CompilableProvider source, IReadOnlyList<int> filteredColumns, string resultColumnName, out TupleDescriptor filteredTupleDescriptor)
     {
@@ -65,6 +65,7 @@ private static RecordSetHeader BuildHeaderAndFilteredTupleDescriptor(
       filteredTupleDescriptor = TupleDescriptor.Create(fieldTypes);
       return header;
     }
+    #endregion
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IntersectProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IntersectProvider.cs
@@ -16,6 +16,7 @@ namespace Xtensive.Orm.Rse.Providers
   [Serializable]
   public sealed class IntersectProvider : BinaryProvider
   {
+    #region Header build
     private static RecordSetHeader BuildHeader(CompilableProvider left, CompilableProvider right)
     {
       var leftHeader = left.Header;
@@ -26,6 +27,7 @@ private static RecordSetHeader BuildHeader(CompilableProvider left, CompilablePr
       }
       return leftHeader;
     }
+    #endregion
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/RowNumberProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/RowNumberProvider.cs
@@ -20,12 +20,14 @@ public sealed class RowNumberProvider : UnaryProvider
     /// </summary>
     public SystemColumn SystemColumn { get; }
 
+    #region Header build
     private static RecordSetHeader CreateHeaderAndColumn(CompilableProvider source, string columnName, out SystemColumn systemColumn)
     {
       var sourceHeader = source.Header;
       systemColumn = new SystemColumn(columnName, sourceHeader.Length, WellKnownTypes.Int64);
       return sourceHeader.Add(systemColumn);
     }
+    #endregion
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/UnionProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/UnionProvider.cs
@@ -18,7 +18,7 @@ namespace Xtensive.Orm.Rse.Providers
   [Serializable]
   public sealed class UnionProvider : BinaryProvider
   {
-
+    #region Header build
     private static RecordSetHeader BuildHeader(CompilableProvider left, CompilableProvider right)
     {
       var leftHeader = left.Header;
@@ -60,6 +60,7 @@ private static void EnsureUnionIsPossible(RecordSetHeader leftHeader, RecordSetH
         throw new InvalidOperationException(string.Format(Strings.ExXCantBeExecuted, "Union operation"));
       }
     }
+    #endregion
 
     // Constructors
 

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ private static NotSupportedException AggregateNotSupported(Type sourceColumnType`
`157`	`157`
`158`	`158`	`#endregion`
`159`	`159`
	`160`	`+ #region Header build`
`160`	`161`	`private static RecordSetHeader BuildHeaderAndColumns(`
`161`	`162`	`CompilableProvider source,`
`162`	`163`	`IReadOnlyList<AggregateColumnDescriptor> columnDescriptors,`
`@@ -196,6 +197,7 @@ private static RecordSetHeader BuildHeaderAndColumns(`
`196`	`197`
`197`	`198`	`return sourceHeader.Select(groupIndexes).Add(aggregateColumns);`
`198`	`199`	`}`
	`200`	`+ #endregion`
`199`	`201`
`200`	`202`	`// Constructors`
`201`	`203`
`@@ -207,7 +209,7 @@ private static RecordSetHeader BuildHeaderAndColumns(`
`207`	`209`	`/// <param name="columnDescriptors">The descriptors of <see cref="AggregateColumns"/>.</param>`
`208`	`210`	`[Obsolete]`
`209`	`211`	`public AggregateProvider(CompilableProvider source, int[] groupIndexes, params AggregateColumnDescriptor[] columnDescriptors)`
`210`		`- : base(ProviderType.Aggregate, BuildHeaderAndColumns(source, columnDescriptors, ref groupIndexes, out var columns), source)`
	`212`	`+ : this(source,groupIndexes, (IReadOnlyList<AggregateColumnDescriptor>)columnDescriptors)`
`211`	`213`	`{`
`212`	`214`	`}`
`213`	`215`
`@@ -220,7 +222,6 @@ public AggregateProvider(CompilableProvider source, int[] groupIndexes, params A`
`220`	`222`	`public AggregateProvider(CompilableProvider source, int[] groupIndexes, IReadOnlyList<AggregateColumnDescriptor> columnDescriptors)`
`221`	`223`	`: base(ProviderType.Aggregate, BuildHeaderAndColumns(source, columnDescriptors, ref groupIndexes, out var columns), source)`
`222`	`224`	`{`
`223`		`- ArgumentValidator.EnsureArgumentNotNull(columnDescriptors, nameof(columnDescriptors));`
`224`	`225`	`AggregateColumns = columns;`
`225`	`226`	`GroupColumnIndexes = groupIndexes;`
`226`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,7 @@ protected override string ParametersToString()`
`33`	`33`	`return CalculatedColumns.ToCommaDelimitedString();`
`34`	`34`	`}`
`35`	`35`
`36`		`-`
`37`		`- // Constructors`
`38`		`-`
	`36`	`+ #region Header build`
`39`	`37`	`private static RecordSetHeader BuildHeaderAndColumns(`
`40`	`38`	`CompilableProvider source,`
`41`	`39`	`IReadOnlyList<CalculatedColumnDescriptor> columnDescriptors,`
`@@ -51,6 +49,9 @@ private static RecordSetHeader BuildHeaderAndColumns(`
`51`	`49`
`52`	`50`	`return sourceHeader.Add(calculatedColumns);`
`53`	`51`	`}`
	`52`	`+ #endregion`
	`53`	`+`
	`54`	`+ // Constructors`
`54`	`55`
`55`	`56`	`/// <summary>`
`56`	`57`	`/// Initializes a new instance of this class.`
`@@ -59,7 +60,7 @@ private static RecordSetHeader BuildHeaderAndColumns(`
`59`	`60`	`/// <param name="columnDescriptors">The descriptors of <see cref="CalculatedColumns"/>.</param>`
`60`	`61`	`[Obsolete]`
`61`	`62`	`public CalculateProvider(CompilableProvider source, params CalculatedColumnDescriptor[] columnDescriptors)`
`62`		`- : this(source, false, columnDescriptors)`
	`63`	`+ : this(source, columnDescriptors, false)`
`63`	`64`	`{`
`64`	`65`	`}`
`65`	`66`
`@@ -71,10 +72,8 @@ public CalculateProvider(CompilableProvider source, params CalculatedColumnDescr`
`71`	`72`	`/// <param name="columnDescriptors">The descriptors of <see cref="CalculatedColumns"/>.</param>`
`72`	`73`	`[Obsolete]`
`73`	`74`	`public CalculateProvider(CompilableProvider source, bool isInlined, params CalculatedColumnDescriptor[] columnDescriptors)`
`74`		`- : base(ProviderType.Calculate, BuildHeaderAndColumns(source, columnDescriptors, out var calculatedColumns), source)`
	`75`	`+ : this(source, columnDescriptors, isInlined)`
`75`	`76`	`{`
`76`		`- IsInlined = isInlined;`
`77`		`- CalculatedColumns = calculatedColumns;`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace Xtensive.Orm.Rse.Providers`
`17`	`17`	`[Serializable]`
`18`	`18`	`public sealed class ConcatProvider : BinaryProvider`
`19`	`19`	`{`
`20`		`-`
	`20`	`+ #region Header build`
`21`	`21`	`private static RecordSetHeader BuildHeader(CompilableProvider left, CompilableProvider right)`
`22`	`22`	`{`
`23`	`23`	`var leftHeader = left.Header;`
`@@ -59,6 +59,7 @@ private static void EnsureConcatIsPossible(RecordSetHeader leftHeader, RecordSet`
`59`	`59`	`throw new InvalidOperationException(string.Format(Strings.ExXCantBeExecuted, "Concatenation"));`
`60`	`60`	`}`
`61`	`61`	`}`
	`62`	`+ #endregion`
`62`	`63`
`63`	`64`	`// Constructors`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ namespace Xtensive.Orm.Rse.Providers`
`16`	`16`	`[Serializable]`
`17`	`17`	`public sealed class ExceptProvider : BinaryProvider`
`18`	`18`	`{`
	`19`	`+ #region Header build`
`19`	`20`	`private static RecordSetHeader BuildHeader(CompilableProvider left, CompilableProvider right)`
`20`	`21`	`{`
`21`	`22`	`var leftHeader = left.Header;`
`@@ -26,6 +27,7 @@ private static RecordSetHeader BuildHeader(CompilableProvider left, CompilablePr`
`26`	`27`	`}`
`27`	`28`	`return leftHeader;`
`28`	`29`	`}`
	`30`	`+ #endregion`
`29`	`31`
`30`	`32`	`// Constructors`
`31`	`33`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,13 @@ public sealed class ExistenceProvider : UnaryProvider`
`24`	`24`	`/// </summary>`
`25`	`25`	`public string ExistenceColumnName { get; }`
`26`	`26`
`27`		`-`
	`27`	`+ #region Header build`
`28`	`28`	`private static RecordSetHeader BuildHeader(string existenceColumnName)`
`29`	`29`	`{`
`30`	`30`	`return new RecordSetHeader(`
`31`	`31`	`BoolTupleDescriptor, new[] { new SystemColumn(existenceColumnName, 0, WellKnownTypes.Bool) });`
`32`	`32`	`}`
	`33`	`+ #endregion`
`33`	`34`
`34`	`35`
`35`	`36`	`// Constructors`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public sealed class FreeTextProvider : CompilableProvider`
`28`	`28`
`29`	`29`	`public bool FullFeatured { get; }`
`30`	`30`
	`31`	`+ #region Header build`
`31`	`32`	`private static RecordSetHeader BuildHeader(FullTextIndexInfo index, string rankColumnName, bool fullFeatured)`
`32`	`33`	`{`
`33`	`34`	`if (fullFeatured) {`
`@@ -51,6 +52,7 @@ private static RecordSetHeader BuildHeader(FullTextIndexInfo index, string rankC`
`51`	`52`	`return new RecordSetHeader(tupleDescriptor, columns);`
`52`	`53`	`}`
`53`	`54`	`}`
	`55`	`+ #endregion`
`54`	`56`
`55`	`57`	`// Constructors`
`56`	`58`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public sealed class IncludeProvider: UnaryProvider,`
`52`	`52`
`53`	`53`	`public TupleDescriptor FilteredTupleDescriptor { get; }`
`54`	`54`
`55`		`-`
	`55`	`+ #region Header build`
`56`	`56`	`private static RecordSetHeader BuildHeaderAndFilteredTupleDescriptor(`
`57`	`57`	`CompilableProvider source, IReadOnlyList<int> filteredColumns, string resultColumnName, out TupleDescriptor filteredTupleDescriptor)`
`58`	`58`	`{`
`@@ -65,6 +65,7 @@ private static RecordSetHeader BuildHeaderAndFilteredTupleDescriptor(`
`65`	`65`	`filteredTupleDescriptor = TupleDescriptor.Create(fieldTypes);`
`66`	`66`	`return header;`
`67`	`67`	`}`
	`68`	`+ #endregion`
`68`	`69`
`69`	`70`	`// Constructors`
`70`	`71`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,14 @@ public sealed class RowNumberProvider : UnaryProvider`
`20`	`20`	`/// </summary>`
`21`	`21`	`public SystemColumn SystemColumn { get; }`
`22`	`22`
	`23`	`+ #region Header build`
`23`	`24`	`private static RecordSetHeader CreateHeaderAndColumn(CompilableProvider source, string columnName, out SystemColumn systemColumn)`
`24`	`25`	`{`
`25`	`26`	`var sourceHeader = source.Header;`
`26`	`27`	`systemColumn = new SystemColumn(columnName, sourceHeader.Length, WellKnownTypes.Int64);`
`27`	`28`	`return sourceHeader.Add(systemColumn);`
`28`	`29`	`}`
	`30`	`+ #endregion`
`29`	`31`
`30`	`32`	`// Constructors`
`31`	`33`