Generalize column management to use ColNum alias, which can be short or int (for backward compatibility) (#186)

* Optimize `ColumnIndexesToBeLoaded`

* Make `ColumnIndexesToBeLoaded` to be `List<short>`

* Generalize to ColNum type

* Generalize to ColNum type

* Generalize to ColNum type

* Generalize to ColNum type

* Fix Materializer

* Fix GetTupleAccessArgument()

* Fix translation

* Fix translation

* Fix translation

Author: SergeiPavlov

Directory.Build.props

@@ -51,7 +51,7 @@
     <!-- hard binding to net8, no property and env variable allowed-->
     <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
-  
+
   <!-- Debug-NET7, Release-NET7 are mostly for development convenience -->
   <PropertyGroup Condition = "$(Configuration.Contains('NET7')) == 'true'">
     <!-- hard binding to net7, no property and env variable allowed-->
@@ -86,7 +86,7 @@
   <PropertyGroup>
     <NoLogo>true</NoLogo>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
       $([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -131,6 +131,8 @@
       <PackagePath>.</PackagePath>
       <Pack>true</Pack>
     </None>
+
+    <Using Include="System.Int16" Alias="ColNum" />
   </ItemGroup>
 
   <Import Condition="Exists('User.Directory.Build.props')" Project="User.Directory.Build.props" />

Orm/Xtensive.Orm.Tests.Core/Collections/CollectionUtilsTest.cs

@@ -26,8 +26,8 @@ public void RangeToArrayTest()
     [Test]
     public void RangeToListTest()
     {
-      Assert.That(CollectionUtils.RangeToList(1, 10).SequenceEqual(Enumerable.Range(1, 10)));
-      Assert.That(CollectionUtils.RangeToList(-1, 10).SequenceEqual(Enumerable.Range(-1, 10)));
+      Assert.That(CollectionUtils.RangeToList(1, 10).SequenceEqual(Enumerable.Range(1, 10).Select(i => (ColNum)i)));
+      Assert.That(CollectionUtils.RangeToList(-1, 10).SequenceEqual(Enumerable.Range(-1, 10).Select(i => (ColNum) i)));
       _ = Assert.Throws<ArgumentOutOfRangeException>(() => CollectionUtils.RangeToList(1, -10));
     }
 

Orm/Xtensive.Orm.Tests.Core/Tuples/Transform/MapTransformTest.cs

@@ -17,7 +17,7 @@ public class MapTransformTest
     public void MainTest()
     {
       Xtensive.Tuples.Tuple source = Tuple.Create(1);
-      MapTransform transform = new MapTransform(true, TupleDescriptor.Create<byte, int, string>(), new[] {-1, 0});
+      MapTransform transform = new MapTransform(true, TupleDescriptor.Create<byte, int, string>(), new ColNum[] {-1, 0});
       Xtensive.Tuples.Tuple result = transform.Apply(TupleTransformType.TransformedTuple, source);
       Assert.AreEqual(TupleFieldState.Default, result.GetFieldState(0));
       Assert.AreEqual(TupleFieldState.Available, result.GetFieldState(1));

Orm/Xtensive.Orm.Tests.Core/Tuples/Transform/MergeTransformTest.cs

@@ -120,7 +120,7 @@ public void PerformanceTest2()
       AdvancedComparerStruct<Xtensive.Tuples.Tuple> comparer = AdvancedComparerStruct<Xtensive.Tuples.Tuple>.Default;
       Xtensive.Tuples.Tuple t   = Xtensive.Tuples.Tuple.Create(1);
       CombineTransform mt = new CombineTransform(false, t.Descriptor, t.Descriptor, t.Descriptor, t.Descriptor);
-      SegmentTransform st = new SegmentTransform(false, mt.Descriptor, new Segment<int>(1,2));
+      SegmentTransform st = new SegmentTransform(false, mt.Descriptor, new Segment<ColNum>(1,2));
       Xtensive.Tuples.Tuple wt1 = st.Apply(TupleTransformType.TransformedTuple, mt.Apply(TupleTransformType.TransformedTuple, t, t, t, t));
       Xtensive.Tuples.Tuple wt2 = st.Apply(TupleTransformType.TransformedTuple, mt.Apply(TupleTransformType.TransformedTuple, t, t, t, t));
       Xtensive.Tuples.Tuple ct1 = st.Apply(TupleTransformType.Tuple, mt.Apply(TupleTransformType.Tuple, t, t, t, t));

Orm/Xtensive.Orm.Tests.Core/Tuples/Transform/SegmentTransformTest.cs

@@ -26,8 +26,8 @@ public void BaseTest()
       Xtensive.Tuples.Tuple t  = Xtensive.Tuples.Tuple.Create(1, "2", 3, 4.0);
       TestLog.Info("Original: {0}", t);
 
-      SegmentTransform st   = new SegmentTransform(false, t.Descriptor, new Segment<int>(1,2));
-      SegmentTransform stro = new SegmentTransform(true,  t.Descriptor, new Segment<int>(1,2));
+      SegmentTransform st   = new SegmentTransform(false, t.Descriptor, new Segment<ColNum>(1,2));
+      SegmentTransform stro = new SegmentTransform(true,  t.Descriptor, new Segment<ColNum>(1,2));
 
       Xtensive.Tuples.Tuple wt1 = st.Apply(TupleTransformType.TransformedTuple, t);
       TestLog.Info("Wrapper:  {0}", wt1);
@@ -65,7 +65,7 @@ public void PerformanceTest()
     {
       AdvancedComparerStruct<Xtensive.Tuples.Tuple> comparer = AdvancedComparerStruct<Xtensive.Tuples.Tuple>.Default;
       Xtensive.Tuples.Tuple t   = Xtensive.Tuples.Tuple.Create(1, 2, 3, 4);
-      SegmentTransform st = new SegmentTransform(false, t.Descriptor, new Segment<int>(1,2));
+      SegmentTransform st = new SegmentTransform(false, t.Descriptor, new Segment<ColNum>(1,2));
       Xtensive.Tuples.Tuple wt1 = st.Apply(TupleTransformType.TransformedTuple, t);
       Xtensive.Tuples.Tuple wt2 = st.Apply(TupleTransformType.TransformedTuple, t);
       Xtensive.Tuples.Tuple ct1 = st.Apply(TupleTransformType.Tuple, t);

Orm/Xtensive.Orm.Tests/Rse/HeaderParseTest.cs

@@ -54,7 +54,7 @@ public void MainTest()
           ResetState(state);
 
           // Select Id, TypeId, Title
-          CompilableProvider rsTitle = rsMain.Select(new[] { 0, 1, 2 });
+          CompilableProvider rsTitle = rsMain.Select(new ColNum[] { 0, 1, 2 });
           UpdateCache(session, rsTitle.GetRecordSetReader(session, parameterContext));
           state = Session.Current.EntityStateCache[key, true];
           Assert.IsNotNull(state);
@@ -63,7 +63,7 @@ public void MainTest()
           ResetState(state);
 
           // Select Id, TypeId, Text
-          CompilableProvider rsText = rsMain.Select(new[] { 0, 1, 3 });
+          CompilableProvider rsText = rsMain.Select(new ColNum[] { 0, 1, 3 });
           UpdateCache(session, rsText.GetRecordSetReader(session, parameterContext));
           state = Session.Current.EntityStateCache[key, true];
           Assert.IsNotNull(state);
@@ -72,7 +72,7 @@ public void MainTest()
           ResetState(state);
 
           // Select a.Id, a.TypeId, a.Title, b.Id, b.TypeId, b.Text
-          CompilableProvider rsJoin = rsTitle.Alias("a").Join(rsText.Alias("b"), new Pair<int>(0, 0), new Pair<int>(1, 1));
+          CompilableProvider rsJoin = rsTitle.Alias("a").Join(rsText.Alias("b"), new Pair<ColNum>(0, 0), new Pair<ColNum>(1, 1));
           UpdateCache(session, rsJoin.GetRecordSetReader(session, parameterContext));
           state = Session.Current.EntityStateCache[key, true];
           Assert.IsNotNull(state);

Orm/Xtensive.Orm.Tests/Rse/IncludeProviderTest.cs

@@ -26,7 +26,7 @@ public void SimpleTest()
       var ids = tracks.Select(supplier => (Tuple)Tuple.Create(supplier.TrackId));
 
       var trackRs = Domain.Model.Types[typeof (Track)].Indexes.PrimaryIndex.GetQuery();
-      var inRs = trackRs.Include(context => ids, "columnName", new[] {0});
+      var inRs = trackRs.Include(context => ids, "columnName", new ColNum[] { 0 });
       var inIndex = inRs.Header.Columns.Count-1;
       var whereRs = inRs.Filter(tuple => tuple.GetValueOrDefault<bool>(inIndex));
       var parameterContext = new ParameterContext();

Orm/Xtensive.Orm.Tests/Storage/Prefetch/PrefetchManagerBasicTest.cs

@@ -373,7 +373,7 @@ public void ReferencedEntityByKnownForeignKeyPrefetchTest()
         var parameterContext = new ParameterContext();
         var orderPrimaryIndex = OrderType.Indexes.PrimaryIndex;
         var selectedColumns = orderPrimaryIndex.ColumnIndexMap.System
-          .Concat(EmployeeField.Columns.Select(column => orderPrimaryIndex.Columns.IndexOf(column))).ToArray();
+          .Concat(EmployeeField.Columns.Select(column => (ColNum) orderPrimaryIndex.Columns.IndexOf(column))).ToArray();
         var orderQuery = OrderType.Indexes.PrimaryIndex.GetQuery()
           .Filter(t => t.GetValue<int>(0)==orderKey.Value.GetValue<int>(0)).Select(selectedColumns);
         orderQuery.GetRecordSetReader(session, parameterContext).ToEntities(0).Single();

Orm/Xtensive.Orm.Tests/Storage/Providers/Sql/CharSupportTest.cs

@@ -66,7 +66,7 @@ public void SelectCharTest()
         var rs = GetRseQuery<MyEntity>();
         var parameterContext = new ParameterContext();
         var result = rs
-          .Select(new[] { rs.Header.IndexOf(charColumn) })
+          .Select(new ColNum[] { (ColNum) rs.Header.IndexOf(charColumn) })
           .GetRecordSetReader(Session.Current, parameterContext)
           .ToEnumerable()
           .Select(i => i.GetValueOrDefault<char>(0))
@@ -88,7 +88,7 @@ public void CharParameterTest()
         var rs = GetRseQuery<MyEntity>();
         var parameterContext = new ParameterContext();
         var result = rs
-          .Select(new[] { rs.Header.IndexOf(charColumn) })
+          .Select(new ColNum[] { (ColNum) rs.Header.IndexOf(charColumn) })
           .Filter(t => t.GetValueOrDefault<char>(0) == y)
           .GetRecordSetReader(Session.Current, parameterContext)
           .ToEnumerable()
@@ -108,7 +108,7 @@ public void CharConstantTest()
         var rs = GetRseQuery<MyEntity>();
         var parameterContext = new ParameterContext();
         var result = rs
-          .Select(new[] { rs.Header.IndexOf(charColumn) })
+          .Select(new ColNum[] { (ColNum) rs.Header.IndexOf(charColumn) })
           .Filter(t => t.GetValueOrDefault<char>(0)=='Y')
           .GetRecordSetReader(Session.Current, parameterContext)
           .ToEnumerable()

Orm/Xtensive.Orm.Tests/Storage/Providers/Sql/TotalBatchingTest.cs

@@ -93,7 +93,7 @@ private void CreateQueries(int amount)
     {
       for (int i = 0; i < amount; i++) {
         var rs = Domain.Model.Types[typeof (X)].Indexes.PrimaryIndex.GetQuery()
-          .Aggregate(System.Array.Empty<int>(),
+          .Aggregate(System.Array.Empty<ColNum>(),
             new AggregateColumnDescriptor("_count_", 0, AggregateType.Count));
         var compiledProvider = session.Compile(rs);
         var task = new QueryTask(compiledProvider, session.GetLifetimeToken(), null);