Merge branch 'master' into upstream/OptimizeTracking

Author: SergeiPavlov

ChangeLog/7.1.0-dev.txt ChangeLog/7.1.0-Beta-1.txtChangeLog/7.1.0-dev.txt renamed to ChangeLog/7.1.0-Beta-1.txt

@@ -1,50 +1,42 @@
-[main] ThreadSafeCache is removed
+[main] ThreadSafeCache, ThreadSafeDictionary, ThreadSafeList collections are removed
 [main] INamedValueCollection and its the only implementer NamedValueCollection are removed
 [main] ICollectionChangeNotifier, CollectionChangeNotifierEventArgs are removed
-[main] ArrayUtils class is removed
-[main] ISet<T> interface is removed and all usages are replaced with .Net ISet<T>
-[main] Set<T>, SetSlim<T>, ReadOnlySet<T> collections and abstract SetBase are removed
-[main] ReadOnlyList<T> is removed
-[main] ReadOnlyCollection<T>
-[main] ReadOnlyDictionary<TKey, TValue> is removed
-[main] ThreadSafeDictionary is removed
-[main] ThreadSafeList struct is removed
-[main] TypeClassifier collection is removed
-[main] LazyDictionary is removed
-[main] FlagRegistry is removed
-[main] EnumerableUtils<T> is removed
-[main] DifferentialDictionary and DifferentialDictionaryDifference are removed
+[main] ArrayUtils and EnumerableUtils<T> are removed
+[main] ISet<T> interface is removed and all usages are replaced with System.Collections.Generic.ISet<T>
+[main] Set<T>, SetSlim<T>, ReadOnlySet<T> collections and abstract SetBase class are removed
+[main] ReadOnlyList<T>, ReadOnlyCollection<T>, ReadOnlyDictionary<TKey, TValue> collections are removed
+[main] ThreadSafeCached type is removed
+[main] Triplet<T> and Triplet<TFirst,TSecond,TThird> are removed
+[main] TypeClassifier, LazyDictionary and FlagRegistry collections are removed
+[main] DifferentialDictionary and DifferentialDictionaryDifference types are removed
 [main] CollectionBase<T> is removed
 [main] StringExtensions.Join() methods are removed
 [main] CollectionExtensions.ReverseList() method is removed
-[main] ThreadSafeCached type is removed
-[main] Triplet<T> and Triplet<TFirst,TSecond,TThird> are removed
 [main] SqlTranslator/SqlCompiler APIs were significantly changed in order to improve memory usage and perfromance
 [main] Introduced IQueryable<T>.Tag() extensions allowing to add tags to result SQL statement
 [main] Introduced Session.Tag() method for being able to tag queries within returned TagScope
-[main] Domain.TagsEnabled is introduced as faster alternative to DomainConfiguration.TagLocation!=TagLocation.Nowhere check
-[main] ReadOnlyHashSet<T> now implements .Net ISet and IReadOnlySet instead of removed ISet and IReadOnly
+[main] Domain.TagsEnabled is introduced as easier alternative to DomainConfiguration.TagLocation!=TagLocation.Nowhere check
 [main] NativeTypeClassifier collection now inherits ClassifiedCollection directly
-[main] FlagCollection.Keys return type has changed from removed ReadOnlyList<T> to .Net IReadOnlyList<T>
+[main] FlagCollection.Keys no returns .Net IReadOnlyList<TKey>
 [main] CollectionBaseSlim<T> no longer implements IList<T> and ICollection but implements ICollection<T> and IReadOnlyList<T>
 [main] AggregateException.Exceptions property changed its return type to IReadOnlyList<Exception>
 [main] AggregateException constuctors get array of exceptions instead of IEnumerable<Exception>
 [main] CopyDataHint.CopiedColumns property changed its return type to IReadOnlyList<Pair<string>>
-[main] DateHint.Identitites property changed its return type to IReadOnlyList<IdentityPair>
-[main] UpdateDataHint.UpdateParameter property changed its return type to IReadOnlyList<Pair<string, object>>
+[main] DateHint.Identitites property changed return type to IReadOnlyList<IdentityPair>
+[main] UpdateDataHint.UpdateParameter property changed return type to IReadOnlyList<Pair<string, object>>
 [main] IUpgrader methods now return IReadOnlyList<NodeAction>
-[main] PropertyAccessorDictionary has changed API due to change its base type and interfaces
+[main] PropertyAccessorDictionary has changed API due to change of the base type and interfaces
 [main] FullTextIndexDefCollection changed its base type to CollectionBaseSlim<FullTextIndexDef>
-[main] HierarchyDefCollection changed its base type to CollectionBaseSlim<HierarchyDef>
+[main] HierarchyDefCollection base type changed to CollectionBaseSlim<HierarchyDef>
 [main] HierarchyDefCollection and TypeDefCollection changed events set due to change of base type
 [main] SessionConfiguration collection API changed due to changes in base type CollectionBaseSlim<T>
-[main] IGenerationTerm.Terms changed its return type to IReadOnlyList<string>
-[main] IProximityTerm.Terms changed its return type to IReadOnlyList<IProximityOperand>
+[main] IGenerationTerm.Terms property changed return type to IReadOnlyList<string>
+[main] IProximityTerm.Terms property changed its return type to IReadOnlyList<IProximityOperand>
 [main] IOperation properties (PrecedingOperations, FollowingOperations, UndoOperations, IdentifiedEntities) changed return type
-[main] HierarchyInfo.Types changed its return type to IReadOnlyList<TypeInfo>
-[main] IndexInfo.Columns changed its return type to IReadOnlyList<ColumnInfo>
+[main] HierarchyInfo.Types property changed return type to IReadOnlyList<TypeInfo>
+[main] IndexInfo.Columns property return type changed to IReadOnlyList<ColumnInfo>
 [main] KeyInfo's Fields and Columns properties changed to ReadOnlyList<FieldInfo> and IReadOnlyList<ColumnInfo> respectively
-[main] TypeIndexInfoCollection.RealPrimaryIndexes property changed its return type to IReadOnlyList<IndexInfo>
+[main] TypeIndexInfoCollection.RealPrimaryIndexes property return type changed to IReadOnlyList<IndexInfo>
 [main] TypeIndexInfoCollection.GetIndexesContainingAllData() method changed its return type to IReadOnlyList<IndexInfo>
 [main] TypeInfo members that returned IList<T> changed return type to IReadOnlyList<TypeInfo>
 [main] PersistRequestBuilderContext.AffectedIndexes changed return type to IReadOnlyList<IndexInfo>
@@ -58,24 +50,26 @@
 [main] RemoveFieldHint.AffectedColumns changed return type to IReadOnlyList<string>
 [main] RemoveTypeHint.AffectedTables changed return type to IReadOnlyList<string>
 [main] SchemaComparisonResult.UnsafeActions changed return type to IReadOnlyList<NodeAction>
-[main] UpgradeContext.Hints changed return type to ISet<UpgradeHint>
 [main] UpgradeContext.Modules changed return type to IReadOnlyList<IModule>
 [main] UpgradeContext.OrderedUpgradeHandlers changed return type to IReadOnlyList<IUpgradeHandler>
 [main] UpgradeContext.UpgradeHandlers changed return type to IReadOnlyDictionary<Assembly, IUpgradeHandler>
-[main] UpgradeHandler.AddUpgradeHints() and .AddAutoHints() now take ISet<T> from .Net instead of ORM's ISet<T>
-[main] KeyMapping.Map changed type to IReadOnlyDictionary<Key, Key>
-[main] InterfaceMapping's properties of ReadOnlyList<T> type changed the type to IReadOnlyList<T>
+[main] KeyMapping.Map property changed type to .Net IReadOnlyDictionary<Key, Key>
+[main] InterfaceMapping's properties of ReadOnlyList<T> type changed the type to .Net IReadOnlyList<T>
 [main] Node's IncomingConnections and OutgoingConnections properties changed types to IReadOnlyList<NodeConnection<TNodeItem, TConnectionItem>>
 [main] CompositePreCompiler.Items became readonly field and changed its type to IReadOnlyList<IPreCompiler>
-[main] SqlCompilerConfiguration's SchemaMapping and DatabaseMapping changed return types to IReadOnlyDictionary<string, string>
-[main] TypeMappingRegistry.Mappings and .ReverseMappings changed return types to IReadOnlyDictionary<TKey, TValue>
+[main] SqlCompilerConfiguration's SchemaMapping and DatabaseMapping properties changed return types to IReadOnlyDictionary<string, string>
+[main] TypeMappingRegistry.Mappings and ReverseMappings properties changed return types to IReadOnlyDictionary<TKey, TValue>
 [main] Xtensive.Orm.Services.QueryTranslationResult became read-only structure
 [main] Query and ParameterBindings properties of Xtensive.Orm.Services.QueryTranslationResult changed their types and became read-only
-[main] SqlTranslator.BuildBatch method changed its parameter from string[] to IReadOnlyList<string>
+[main] SqlTranslator.BuildBatch() method changed its parameter from string[] to IReadOnlyList<string>
 [main] TypeReference, QueryRequest QueryParameterBinding types became read-only structures
 [main] TypeInfoRef, ColumnInfoRef, ColumnGroup and ComparisonRule types became read-only structures
 [main] RecordSetHeader constructors changed IEnumerable<T> paremters to IReadOnlyList<T>
 [main] ColumnGroupCollection no longer takes IEnumerable<T> as parameter of constructor
 [main] ColumnCollection no longer takes IEnumerable<T> as parameter of constructor, only constructor with IReadOnlyList<T> is available now
-[firebird] Add support for Firebird 4
+[main] Overall perfromance improved
+[main] Fixed issue when Execute/CreateDelayedQuery APIs query cache caused long-living objects
+[firebird] Added support for Firebird 4
 [sqlserver] Microsoft.Data.SqlClient is updated to verson 4.0.0
+[mysql] Added support for MySQL 5.7 and 8.0
+[mysql] Updated version of Google.Protobuf package

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -0,0 +1,20 @@
+[main] Obsolete CatalogHelper class has been removed
+[main] Obsolete ReacreateTableHint has been removed
+[main] Obsolete Session.SelectStorageNode() method is removed
+[main] Obsolete methods from ArrayExtensions, EnumerableExtensions and QueryableExtensions have been removed
+[main] Obsolete DeleteDataHint.PostCopy property has been removed
+[main] Obsolete QueryEndpoint's members have been removed
+[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] 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] 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
+[reprocessing] ExecuteErrorEventArgs (not sealed) became read-only structure
+[tracking] TrackingCompletedEventArgs (sealed) became read-only structure
+[Web] Removed Obsolete SessionManager and StartupConfigurationExtension

Directory.Build.props

@@ -33,18 +33,48 @@
     <DoGeneratePackage Condition="$(MSBuildProjectName) == 'TestCommon'">false</DoGeneratePackage>
     <DoGeneratePackage Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</DoGeneratePackage>
 
+    <!-- BuildingInsideVisualStudio is also true in Rider -->
+    <DoIsIdeBuild>false</DoIsIdeBuild>
+    <DoIsIdeBuild Condition="$(BuildingInsideVisualStudio) == 'true'">true</DoIsIdeBuild>
+
     <!-- Disable "BinaryFormatter is obsolete" warnings for test projects -->
     <NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
   </PropertyGroup>
 
+  <!-- Debug-NET6, Release-NET6 are mostly for development convenience -->
+  <PropertyGroup Condition = "$(Configuration.Contains('NET6')) == 'true'">
+    <!-- hard binding to net6, no property and env variable allowed -->
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Debug-NET5, Release-NET5 are mostly for development convenience -->
+  <PropertyGroup Condition = "$(Configuration.Contains('NET5')) == 'true'">
+    <!-- hard binding to net5, no property and env variable allowed-->
+    <TargetFrameworks>net5.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <!--Release and Debug are for final builds, builds on build server, etc. Target frameworks are configurable here -->
+  <PropertyGroup Label="Defaults" Condition="$(Configuration.Contains('NET5')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
+    <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
+    <TargetFrameworks>$(TargetFrameworks)</TargetFrameworks>  <!-- the property -->
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net6.0;net5.0</TargetFrameworks> <!-- fallback to default -->
+  </PropertyGroup>
+
+  <PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
+   <DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition = "$(Configuration.Contains('Release')) == 'true'">
+   <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup>
     <NoLogo>true</NoLogo>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
       $([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
-    <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
     <BaseIntermediateOutputPath>$(ArtifactsDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
@@ -54,9 +84,9 @@
       OR $(MSBuildProjectName) == 'TestCommon'
       OR $(MSBuildProjectName) == 'Xtensive.Orm.Manual'">$(ArtifactsDir)tests\$(Configuration)\</BaseOutputPath>
     <OutputPath>$(BaseOutputPath)lib\</OutputPath>
-    <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
+    <MSBuildProjectExtensionsPath>$(IntermediateOutputPath)</MSBuildProjectExtensionsPath>
     <ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
-    <ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
+    <ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(TargetFramework)\$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
     <OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
   </PropertyGroup>
 

Directory.Build.targets

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+    Restores packages if needed. This helps VS to not go crazy on build configuration change
+  -->
+  <Target Name="DORestorePackages" BeforeTargets="PrepareForBuild"
+    Condition="!Exists($(ProjectAssetsFile)) AND $(DoIsIdeBuild)=='true'">
+      <CallTarget Targets="Restore" />
+  </Target>
+</Project>

Extensions/TestCommon/TestCommon.csproj

@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DocumentationFile />
+    <Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>

Extensions/Xtensive.Orm.BulkOperations.Tests/Xtensive.Orm.BulkOperations.Tests.csproj

@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DocumentationFile />
+    <Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
   <ItemGroup>

Extensions/Xtensive.Orm.BulkOperations/BulkExtensions.cs

@@ -78,8 +78,14 @@ public static IUpdatable<T> Set<T, TResult>(this IUpdatable<T> query, Expression
     /// <returns>Instance of <see cref=" IUpdatable&lt;T&gt;"/>.</returns>
     [Pure]
     public static IUpdatable<T> Set<T, TResult>(this IQueryable<T> query, Expression<Func<T, TResult>> field,
-      TResult value) where T: IEntity =>
-      Set(query, field, a => value);
+      TResult value) where T: IEntity
+    {
+      // Manually constructed expression is simpler than `a => value`
+      var valueFunc = Expression.Lambda<Func<T, TResult>>(Expression.Constant(value, typeof(TResult)),
+        Expression.Parameter(typeof(T), "a"));
+
+      return Set(query, field, valueFunc);
+    }
 
     /// <summary>
     /// Executes bulk update of entities specified by the query.

Extensions/Xtensive.Orm.BulkOperations/Internals/AddValueContext.cs

@@ -1,4 +1,5 @@
-using System.Linq.Expressions;
+using System.Linq.Expressions;
+using Xtensive.Linq;
 using Xtensive.Orm.Model;
 using Xtensive.Sql.Dml;
 
@@ -16,5 +17,10 @@ internal class AddValueContext
     public FieldInfo Field { get; set; }
 
     public bool SubqueryExists { get; set; }
+
+    public object EvalLambdaBody() =>
+      Lambda.Body is ConstantExpression ce
+        ? ce.Value
+        : FastExpression.Lambda(Lambda.Body).Compile().DynamicInvoke();
   }
-}
+}

Extensions/Xtensive.Orm.BulkOperations/Internals/QueryOperation.cs

@@ -142,14 +142,14 @@ private void JoinViaIn(SqlStatement statement, SqlSelect select)
         var s = (SqlSelect) select.Clone();
         foreach (var column in columns) {
           var ex = SqlDml.Equals(s.From.Columns[column.Name], table.Columns[column.Name]);
-          s.Where = s.Where.IsNullReference() ? ex : SqlDml.And(s.Where, ex);
+          s.Where = s.Where is null ? ex : SqlDml.And(s.Where, ex);
         }
         var existingColumns = s.Columns.ToChainedBuffer();
         s.Columns.Clear();
         var columnToAdd = existingColumns.First(c => c.Name.Equals(columnInfo.Name, StringComparison.Ordinal));
         s.Columns.Add(columnToAdd);
         var @in = SqlDml.In(SqlDml.TableColumn(table, columnInfo.Name), s);
-        where = where.IsNullReference() ? @in : SqlDml.And(where, @in);
+        where = where is null ? @in : SqlDml.And(where, @in);
         columns.Add(columnInfo);
       }
 

Extensions/Xtensive.Orm.BulkOperations/Internals/SetOperation.cs

@@ -136,7 +136,7 @@ private void AddComputedExpression(AddValueContext addContext)
       var sqlSelect = request.Query;
       SqlExpression ex = sqlSelect.OrderBy[0].Expression;
       parent.Bindings.AddRange(request.ParameterBindings);
-      
+
       if(parent.JoinedTableRef!=null)
         ex.AcceptVisitor(new ComputedExpressionSqlVisitor(sqlSelect.From, parent.JoinedTableRef));
 
@@ -146,10 +146,11 @@ private void AddComputedExpression(AddValueContext addContext)
     private void AddConstantValue(AddValueContext addContext)
     {
       SqlTableColumn column = SqlDml.TableColumn(addContext.Statement.Table, addContext.Field.Column.Name);
+      var constant = addContext.EvalLambdaBody();
       SqlExpression value;
-      object constant = FastExpression.Lambda(addContext.Lambda.Body).Compile().DynamicInvoke();
-      if (constant==null)
+      if (constant == null) {
         value = SqlDml.Null;
+      }
       else {
         QueryParameterBinding binding = parent.QueryBuilder.CreateParameterBinding(constant.GetType(), context => constant);
         parent.Bindings.Add(binding);
@@ -223,7 +224,8 @@ private void AddEntityValue(AddValueContext addContext)
         }
       }
       i = -1;
-      var entity = (IEntity) FastExpression.Lambda(addContext.Lambda.Body).Compile().DynamicInvoke();
+      var entity = (IEntity)addContext.EvalLambdaBody();
+
       foreach (ColumnInfo column in addContext.Field.Columns) {
         i++;
         SqlExpression value;