Merge branch 'master' into upstream/buildDomains

Author: SergeiPavlov

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -7,11 +7,22 @@
 [main] Obsolete Query's members have been removed
 [main] Obsolete members of DelayedScalarQuery<T> have been removed
 [main] Obsolete FieldInfo.IsDynalicallyDefined property's been removed (FieldInfo.IsDynamicallyDefined is still there)
+[main] Changed translation of queries when DomainConfiguration.ShareStorageSchemaOverNodes set to true
+[main] StorageDriver.Compile(ISqlCompileUnit, NodeConfiguration) became obsolete
+[main] SqlNodeActualizer became obsolete
+[main] SqlCompilerConfiguration's DatabaseMapping and SchemaMapping moved to SqlPostCompilerConfiguration
 [main] Some EventArgs inheritors that were sealed classes transformed to read-only structures
 [main] DbCommandEventArgs became read-only structure
 [main] SqlCustomFunctionCall and SqlFunctionCall share one base type
 [main] SqlFunctionCall.Arguments property is IReadOnlyList now and parameters can't be changed after instance creation
 [main] Xtensive.Sql.Dml.Extensions.IsNullReference() extension method is marked obsolete, use 'is null' operator instead
+[main] DirectSessionAccessor.GetChangedEntities() result type changed to improve enumeration
+[main] EntityChangeRegistry.GetItems(PersistenceState) changed result type to improve enumeration
+[main] EntitySetChangeRegistry.GetItems() changed result type to improve enumeration
+[main] IgnoreRule now has only one public constructor - parameterless
+[main] IgnoreRule supports indexes
+[main] Queries use parameters instead of constant values for type indentifiers within columns list
+[main] Added DomainConfiguration.PreferTypeIdsAsQueryParameters to choose between contants and parameters for TypeIds
 [main] BitFaster.Caching package reference is updated to 1.0.7
 [main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
 [reprocessing] DomainBuildErrorEventArgs (not sealed) became read-only structure

Directory.Build.props

@@ -63,6 +63,8 @@
 
   <PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
    <DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
+   <DebugSymbols>true</DebugSymbols>
+   <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition = "$(Configuration.Contains('Release')) == 'true'">

Extensions/TestCommon/TestCommon.csproj

@@ -8,11 +8,16 @@
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj

@@ -12,9 +12,12 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="Readme.txt" />
   </ItemGroup>

Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj

@@ -13,9 +13,12 @@
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
   </ItemGroup>

Extensions/Xtensive.Orm.Tracking.Tests/TrackingStackFrameTests.cs

@@ -11,7 +11,7 @@ public class TrackingStackFrameTests : TrackingTestBase
     [Test]
     public void SafelyInsertTheSameItemTwiceTest()
     {
-      var frame = new TrackingStackFrame();
+      var frame = new TrackingStackFrame(false);
       var key = Key.Create(Domain, typeof(MyEntity), 1);
       var item = CreateTrackingItem(key, TrackingItemState.Created);
       frame.Register(item);
@@ -21,8 +21,8 @@ public void SafelyInsertTheSameItemTwiceTest()
     [Test]
     public void MergeTwoEmptyFramesTest()
     {
-      var target = new TrackingStackFrame();
-      var source = new TrackingStackFrame();
+      var target = new TrackingStackFrame(false);
+      var source = new TrackingStackFrame(false);
       target.MergeWith(source);
 
       Assert.AreEqual(0, target.Count);
@@ -32,9 +32,9 @@ public void MergeTwoEmptyFramesTest()
     public void MergeEmptyFrameWithNonEmptyFrameTest()
     {
       var key = Key.Create(Domain, typeof(MyEntity), 1);
-      var target = new TrackingStackFrame();
+      var target = new TrackingStackFrame(false);
 
-      var source = new TrackingStackFrame();
+      var source = new TrackingStackFrame(false);
       source.Register(CreateTrackingItem(key, TrackingItemState.Created));
 
       target.MergeWith(source);
@@ -46,11 +46,11 @@ public void MergeEmptyFrameWithNonEmptyFrameTest()
     public void MergeNonEmptyFrameWithEmptyFrameTest()
     {
       var key = Key.Create(Domain, typeof(MyEntity), 1);
-      var target = new TrackingStackFrame();
+      var target = new TrackingStackFrame(false);
       target.Register(CreateTrackingItem(key, TrackingItemState.Created));
       var count = target.Count;
 
-      var source = new TrackingStackFrame();
+      var source = new TrackingStackFrame(false);
 
       target.MergeWith(source);
 
@@ -61,11 +61,11 @@ public void MergeNonEmptyFrameWithEmptyFrameTest()
     public void MergeFramesWithTheSameItemsTest()
     {
       var key = Key.Create(Domain, typeof(MyEntity), 1);
-      var target = new TrackingStackFrame();
+      var target = new TrackingStackFrame(false);
       target.Register(CreateTrackingItem(key, TrackingItemState.Created));
       var count = target.Count;
 
-      var source = new TrackingStackFrame();
+      var source = new TrackingStackFrame(false);
       source.Register(CreateTrackingItem(key, TrackingItemState.Changed));
 
       target.MergeWith(source);
@@ -79,10 +79,10 @@ public void MergeFramesWithDifferentItemsTest()
     {
       var key1 = Key.Create(Domain, typeof(MyEntity), 1);
       var key2 = Key.Create(Domain, typeof(MyEntity), 2);
-      var target = new TrackingStackFrame();
+      var target = new TrackingStackFrame(false);
       target.Register(CreateTrackingItem(key1, TrackingItemState.Created));
 
-      var source = new TrackingStackFrame();
+      var source = new TrackingStackFrame(false);
       source.Register(CreateTrackingItem(key2, TrackingItemState.Changed));
       var count = target.Count + source.Count;
 

Extensions/Xtensive.Orm.Tracking/ChangedValue.cs

@@ -1,26 +1,30 @@
-using Xtensive.Orm.Model;
+// Copyright (C) 2012-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+
+using Xtensive.Orm.Model;
 
 namespace Xtensive.Orm.Tracking
 {
   /// <summary>
   /// Represents a pair of original and changed values for a persistent field
   /// </summary>
-  public sealed class ChangedValue
+  public readonly struct ChangedValue
   {
     /// <summary>
     /// Gets the field.
     /// </summary>
-    public FieldInfo Field { get; private set; }
+    public FieldInfo Field { get; }
 
     /// <summary>
     /// Gets the original value.
     /// </summary>
-    public object OriginalValue { get; private set; }
+    public object OriginalValue { get; }
 
     /// <summary>
     /// Gets the new value.
     /// </summary>
-    public object NewValue { get; private set; }
+    public object NewValue { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ChangedValue"/> class.

Extensions/Xtensive.Orm.Tracking/Interfaces/ITrackingItem.cs

@@ -32,6 +32,6 @@ public interface ITrackingItem
     /// <summary>
     /// Gets list of detected changes of field values.
     /// </summary>
-    IList<ChangedValue> ChangedValues { get; }
+    IReadOnlyList<ChangedValue> ChangedValues { get; }
   }
 }

Extensions/Xtensive.Orm.Tracking/Internals/SessionTrackingMonitor.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2020 Xtensive LLC.
+// Copyright (C) 2019-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
@@ -15,19 +15,20 @@ internal sealed class SessionTrackingMonitor : TrackingMonitor, ISessionTracking
   {
     private readonly Session session;
     private readonly DirectSessionAccessor accessor;
-    private readonly Stack<TrackingStackFrame> stack;
+    private readonly Stack<TrackingStackFrame> stack = new(2);
 
     private void Subscribe()
     {
-      session.Events.Persisting += OnPersisting;
-      session.Events.TransactionOpened += OnOpenTransaction;
-      session.Events.TransactionCommitted += OnCommitTransaction;
-      session.Events.TransactionRollbacked += OnRollbackTransaction;
+      var events = session.Events;
+      events.Persisting += OnPersisting;
+      events.TransactionOpened += OnOpenTransaction;
+      events.TransactionCommitted += OnCommitTransaction;
+      events.TransactionRollbacked += OnRollbackTransaction;
     }
 
     private void OnOpenTransaction(object sender, TransactionEventArgs e)
     {
-      stack.Push(new TrackingStackFrame());
+      stack.Push(new TrackingStackFrame(false));
     }
 
     private void OnCommitTransaction(object sender, TransactionEventArgs e)
@@ -76,16 +77,10 @@ private void OnPersisting(object sender, EventArgs e)
     [ServiceConstructor]
     public SessionTrackingMonitor(Session session, DirectSessionAccessor accessor)
     {
-      if (session==null)
-        throw new ArgumentNullException("session");
-      if (accessor==null)
-        throw new ArgumentNullException("accessor");
+      this.session = session ?? throw new ArgumentNullException(nameof(session));
+      this.accessor = accessor ?? throw new ArgumentNullException(nameof(accessor));
 
-      this.session = session;
-      this.accessor = accessor;
-
-      stack = new Stack<TrackingStackFrame>();
-      stack.Push(new TrackingStackFrame());
+      stack.Push(new TrackingStackFrame(false));
 
       Subscribe();
     }

Extensions/Xtensive.Orm.Tracking/Internals/TrackingItem.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2012 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2012-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov
 // Created:    2012.05.16
 
@@ -16,23 +16,15 @@ namespace Xtensive.Orm.Tracking
   [DebuggerDisplay("{Key}")]
   internal sealed class TrackingItem : ITrackingItem
   {
-    private IList<ChangedValue> cachedChangedValues;
+    private IReadOnlyList<ChangedValue> cachedChangedValues;
 
-    public Key Key { get; private set; }
+    public Key Key { get; }
 
     public DifferentialTuple RawData { get; private set; }
 
     public TrackingItemState State { get; private set; }
 
-    public IList<ChangedValue> ChangedValues
-    {
-      get
-      {
-        if (cachedChangedValues==null)
-          cachedChangedValues = CalculateChangedValues().ToList().AsReadOnly();
-        return cachedChangedValues;
-      }
-    }
+    public IReadOnlyList<ChangedValue> ChangedValues => cachedChangedValues ??= CalculateChangedValues();
 
     public void MergeWith(TrackingItem source)
     {
@@ -55,29 +47,33 @@ public void MergeWith(TrackingItem source)
       State = source.State;
     }
 
-    private IEnumerable<ChangedValue> CalculateChangedValues()
+    private IReadOnlyList<ChangedValue> CalculateChangedValues()
     {
       var originalValues = RawData.Origin;
       var changedValues = RawData.Difference;
 
-      if (State==TrackingItemState.Created) {
+      if (State == TrackingItemState.Created) {
         originalValues = null;
         changedValues = RawData.Origin;
       }
 
-      foreach (var field in Key.TypeInfo.Fields.Where(f => f.Column!=null)) {
+      var changedValuesList = new List<ChangedValue>(Key.TypeInfo.Fields.Count);
+
+      foreach (var field in Key.TypeInfo.Fields.Where(f => f.Column != null)) {
         object origValue = null, changedValue = null;
         int fieldIndex = field.MappingInfo.Offset;
         TupleFieldState fieldState;
-        if (originalValues!=null)
+        if (originalValues != null)
           origValue = originalValues.GetValue(fieldIndex, out fieldState);
-        if (changedValues!=null) {
+        if (changedValues != null) {
           changedValue = changedValues.GetValue(fieldIndex, out fieldState);
           if (!fieldState.IsAvailable())
             continue;
         }
-        yield return new ChangedValue(field, origValue, changedValue);
+        changedValuesList.Add(new ChangedValue(field, origValue, changedValue));
       }
+
+      return changedValuesList.AsReadOnly();
     }
 
     private void MergeWith(Tuple difference)