Merge branch 'master' into upstream/optimize_ProjectionExpression

Author: SergeiPavlov

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

@@ -50,7 +50,15 @@ public async Task<int> ExecuteAsync(CancellationToken token = default)
       return value;
     }
 
-    protected void EnsureTransactionIsStarted() => Transaction.Require(QueryProvider.Session);
+    protected void EnsureTransactionIsStarted()
+    {
+      Transaction.Require(QueryProvider.Session);
+#pragma warning disable 168
+      // this prepares connection which ensures that connection is opened
+      // this is weird way but it is required for some scenarios.
+      _ = QueryProvider.Session.Services.Demand<DirectSqlAccessor>().Transaction;
+#pragma warning restore 168
+    }
 
     protected abstract int ExecuteInternal();
 

Orm/Xtensive.Orm/Linq/ConstantExtractor.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2020 Xtensive LLC.
+// Copyright (C) 2009-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -21,9 +21,10 @@ namespace Xtensive.Linq
   /// </summary>
   public sealed class ConstantExtractor : ExpressionVisitor
   {
+    private static readonly ParameterExpression ConstantParameter = Expression.Parameter(WellKnownTypes.ObjectArray, "constants");
+
     private readonly Func<ConstantExpression, bool> constantFilter;
     private readonly LambdaExpression lambda;
-    private readonly ParameterExpression constantParameter;
     private List<object> constantValues;
 
     /// <summary>
@@ -48,7 +49,7 @@ public LambdaExpression Process()
       if (constantValues != null)
         throw new InvalidOperationException();
       constantValues = new List<object>();
-      var parameters = EnumerableUtils.One(constantParameter).Concat(lambda.Parameters).ToArray();
+      var parameters = EnumerableUtils.One(ConstantParameter).Concat(lambda.Parameters).ToArray();
       var body = Visit(lambda.Body);
       // Preserve original delegate type because it may differ from types of parameters / return value
       return FastExpression.Lambda(FixDelegateType(lambda.Type), body, parameters);
@@ -60,7 +61,7 @@ protected override Expression VisitConstant(ConstantExpression c)
       if (!constantFilter.Invoke(c))
         return c;
       var result = Expression.Convert(
-        Expression.ArrayIndex(constantParameter, Expression.Constant(constantValues.Count)), c.Type);
+        Expression.ArrayIndex(ConstantParameter, Expression.Constant(constantValues.Count)), c.Type);
       constantValues.Add(c.Value);
       return result;
     }
@@ -70,7 +71,7 @@ protected override Expression VisitConstant(ConstantExpression c)
     private Type FixDelegateType(Type delegateType)
     {
       var signature = DelegateHelper.GetDelegateSignature(delegateType);
-      return DelegateHelper.MakeDelegateType(signature.First, signature.Second.Prepend(constantParameter.Type));
+      return DelegateHelper.MakeDelegateType(signature.First, signature.Second.Prepend(ConstantParameter.Type));
     }
 
     private static bool DefaultConstantFilter(ConstantExpression constant)
@@ -106,7 +107,6 @@ public ConstantExtractor(LambdaExpression lambda, Func<ConstantExpression, bool>
       ArgumentValidator.EnsureArgumentNotNull(lambda, "lambda");
       this.lambda = lambda;
       this.constantFilter = constantFilter ?? DefaultConstantFilter;
-      constantParameter = Expression.Parameter(WellKnownTypes.ObjectArray, "constants");
     }
   }
 }

Orm/Xtensive.Orm/Modelling/Comparison/Comparer.cs

@@ -14,6 +14,7 @@
 using Xtensive.Reflection;
 using Xtensive.Modelling.Attributes;
 using Xtensive.Modelling.Comparison.Hints;
+using Xtensive.Orm;
 
 
 namespace Xtensive.Modelling.Comparison
@@ -149,21 +150,27 @@ protected virtual Difference VisitNode(Node source, Node target)
     {
       using (TryActivate(source, target, (s, t) => new NodeDifference(s, t))) {
         IgnoreHint ignoreHint = null;
-        if (source!=null)
+        if (source!=null) {
           ignoreHint = Hints.GetHint<IgnoreHint>(source);
-        if (ignoreHint!=null)
+        }
+
+        if (ignoreHint!=null) {
           return null;
+        }
 
         var context = Context;
         var difference = (NodeDifference) context.Difference;
-        if (difference==null)
+        if (difference==null) {
           throw new NullReferenceException();
+        }
+
         var any = source ?? target;
-        if (any==null)
+        if (any==null) {
           throw Exceptions.InternalError(Strings.ExBothSourceAndTargetAreNull, CoreLog.Instance);
+        }
 
 
-        bool isNewDifference = TryRegisterDifference(source, target, difference);
+        var isNewDifference = TryRegisterDifference(source, target, difference);
         if (isNewDifference) {
           // Build movement info
           difference.MovementInfo = BuildMovementInfo(source, target);
@@ -353,68 +360,74 @@ protected IEnumerable<NodeDifference> GetPropertyDifferences(NodeDifference diff
     /// <exception cref="NullReferenceException">Current difference is not <see cref="NodeCollectionDifference"/>.</exception>
     protected virtual Difference VisitNodeCollection(NodeCollection source, NodeCollection target)
     {
-      using (TryActivate(source, target, (s,t) => new NodeCollectionDifference(s,t))) {
+      using (TryActivate(source, target, (s, t) => new NodeCollectionDifference(s, t))) {
         var context = Context;
         var difference = (NodeCollectionDifference) context.Difference;
-        if (difference==null)
+        if (difference == null) {
           throw new NullReferenceException();
+        }
 
-        bool isNewDifference = TryRegisterDifference(source, target, difference);
+        TryRegisterDifference(source, target, difference);
         difference.ItemChanges.Clear();
 
-        // Inlining 2 below lines leads to error in PEVerify.exe!
-        // (well-known issue with null coalescing operator + cast)
-        var sourceItems = (IEnumerable) source;
-        var targetItems = (IEnumerable) target;
+        if (source?.Count == 0 && target?.Count == 0) {
+          return null;
+        }
+
+        var sourceSize = source?.Count ?? 0;
+        var sourceKeyMap = new Dictionary<string, Node>(sourceSize, StringComparer.OrdinalIgnoreCase);
+        for (var index = sourceSize; index-- > 0;) {
+          var node = source[index];
+          sourceKeyMap.Add(GetNodeComparisonKey(node), node);
+        }
 
-        var src = sourceItems ?? new ReadOnlyList<Node>(new Node[] {});
-        var tgt = targetItems ?? new ReadOnlyList<Node>(new Node[] {});
+        var targetSize = target?.Count ?? 0;
+        var targetKeyMap = new Dictionary<string, Node>(targetSize, StringComparer.OrdinalIgnoreCase);
+        for (var index = targetSize; index-- > 0;) {
+          var node = target[index];
+          targetKeyMap.Add(GetNodeComparisonKey(node), node);
+        }
 
-        var srcCount = source!=null ? source.Count : 0;
-        var tgtCount = target!=null ? target.Count : 0;
+        foreach (var sourceItem in sourceKeyMap) {
+          if (!targetKeyMap.ContainsKey(sourceItem.Key)) {
+            var d = Visit(sourceKeyMap[sourceItem.Key], null);
+            if (d != null) {
+              difference.ItemChanges.Add((NodeDifference) d);
+            }
+          }
+        }
 
-        if (srcCount==0 && tgtCount==0)
-          return null;
-        var someItems = srcCount!=0 ? src : tgt;
-        var someItem = someItems.Cast<Node>().First();
-
-        Func<Node, Pair<Node, string>> keyExtractor =
-          n => new Pair<Node, string>(n, GetNodeComparisonKey(n));
-
-        var sourceKeyMap = src
-          .Cast<Node>()
-          .Select(keyExtractor)
-          .ToDictionary(pair => pair.Second, pair => pair.First, StringComparer.OrdinalIgnoreCase);
-        var targetKeyMap = tgt
-          .Cast<Node>()
-          .Select(keyExtractor)
-          .ToDictionary(pair => pair.Second, pair => pair.First, StringComparer.OrdinalIgnoreCase);
-
-        var sourceKeys = src.Cast<Node>().Select(n => keyExtractor(n).Second);
-        var targetKeys = tgt.Cast<Node>().Select(n => keyExtractor(n).Second);
-        var commonKeys = sourceKeys.Intersect(targetKeys, StringComparer.OrdinalIgnoreCase);
-
-        var sequence =
-          sourceKeys.Except(commonKeys, StringComparer.OrdinalIgnoreCase)
-            .Select(k => new {Index = sourceKeyMap[k].Index, Type = 0,
-              Source = sourceKeyMap[k], Target = (Node) null})
-          .Concat(commonKeys
-            .Select(k => new {Index = targetKeyMap[k].Index, Type = 1,
-              Source = sourceKeyMap[k], Target = targetKeyMap[k]}))
-          .Concat(targetKeys.Except(commonKeys, StringComparer.OrdinalIgnoreCase)
-            .Select(k => new {Index = targetKeyMap[k].Index, Type = 2,
-              Source = (Node) null, Target = targetKeyMap[k]}))
-          .OrderBy(i => i.Type!=0).ThenBy(i => i.Index).ThenBy(i => i.Type);
-
-        foreach (var i in sequence) {
-          var d = Visit(i.Source, i.Target);
-          if (d!=null)
+        foreach (var targetItem in targetKeyMap) {
+          var (s, t) = sourceKeyMap.ContainsKey(targetItem.Key)
+            ? (sourceKeyMap[targetItem.Key], targetKeyMap[targetItem.Key])
+            : (null, targetKeyMap[targetItem.Key]);
+          var d = Visit(s, t);
+          if (d != null) {
             difference.ItemChanges.Add((NodeDifference) d);
+          }
+          
         }
+        difference.ItemChanges.Sort(CompareNodeDifference);
 
-        return (difference.ItemChanges.Count!=0) ? difference : null;
+        return difference.ItemChanges.Count != 0 ? difference : null;
       }
     }
+    
+    // Sort by items only with source, then by (target ?? source).Index then with source and target and then only with target
+    private static int CompareNodeDifference(NodeDifference curr, NodeDifference other)
+    {
+      var currType = curr.Source != null && curr.Target != null ? 1 : curr.Source == null ? 3 : 0; 
+      var otherType = other.Source != null && other.Target != null ? 1 : other.Source == null ? 3 : 0; 
+      var typeIsNot0Comparison = (currType != 0).CompareTo(otherType != 0);
+      if (typeIsNot0Comparison != 0) {
+        return typeIsNot0Comparison;
+      }
+
+      var currIndex = (curr.Target ?? curr.Source)?.Index ?? 0;
+      var otherIndex = (other.Target ?? other.Source)?.Index ?? 0;
+      var indexComparison = currIndex.CompareTo(otherIndex);
+      return indexComparison != 0 ? indexComparison : currType.CompareTo(otherType);
+    }
 
     /// <summary>
     /// Visits specified objects.

Orm/Xtensive.Orm/Modelling/Comparison/Upgrader.cs

@@ -121,7 +121,7 @@ public ReadOnlyList<NodeAction> GetUpgradeSequence(Difference difference, HintSe
       ArgumentValidator.EnsureArgumentNotNull(hints, nameof(hints));
       ArgumentValidator.EnsureArgumentNotNull(comparer, nameof(comparer));
       if (difference == null) {
-        return new ReadOnlyList<NodeAction>(Enumerable.Empty<NodeAction>().ToList());
+        return ReadOnlyList<NodeAction>.Empty;
       }
 
       TemporaryRenames = new Dictionary<string, Node>(StringComparer.OrdinalIgnoreCase);

Orm/Xtensive.Orm/Modelling/Node.cs

@@ -34,6 +34,7 @@ public abstract class Node : LockableBase,
     /// Path delimiter character.
     /// </summary>
     public static readonly char PathDelimiter = '/';
+    public static readonly string PathDelimiterString = PathDelimiter.ToString();
     /// <summary>
     /// Path escape character.
     /// </summary>
@@ -185,18 +186,24 @@ public IEnumerable<Pair<string, IPathNode>> GetPathNodes(bool nestedOnly)
     public string Path {
       [DebuggerStepThrough]
       get {
-        if (cachedPath!=null)
+        if (cachedPath!=null) {
           return cachedPath;
-        if (Parent==null)
+        }
+
+        if (Parent==null) {
           return string.Empty;
-        string parentPath = Parent.Path;
-        if (parentPath.Length!=0)
-          parentPath += PathDelimiter;
+        }
+
+        var parentPath = Parent.Path;
+        if (parentPath.Length!=0) {
+          parentPath += PathDelimiterString;
+        }
+
         return string.Concat(
           parentPath,
           Nesting.EscapedPropertyName,
-          Nesting.IsNestedToCollection ? PathDelimiter.ToString() : string.Empty,
-          Nesting.IsNestedToCollection ? EscapedName : string.Empty);
+          Nesting.IsNestedToCollection ? PathDelimiterString : null,
+          Nesting.IsNestedToCollection ? EscapedName : null);
       }
     }
 
@@ -972,7 +979,7 @@ public override string ToString()
       var m = Model;
       var fullName = Path;
       if (m != null) {
-        fullName = string.Concat(m.EscapedName, PathDelimiter, fullName);
+        fullName = string.Concat(m.EscapedName, PathDelimiterString, fullName);
       }
 
       if (!Nesting.IsNestedToCollection && !(this is IModel)) {

Orm/Xtensive.Orm/Modelling/NodeCollection.cs

@@ -5,18 +5,13 @@
 // Created:    2009.03.16
 
 using System;
-using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Runtime.Serialization;
-using Xtensive.Collections;
 using Xtensive.Core;
 
-using Xtensive.Modelling;
-using Xtensive.Modelling.Comparison;
-
 
 namespace Xtensive.Modelling
 {
@@ -28,8 +23,6 @@ public abstract class NodeCollection : LockableBase,
     INodeCollection,
     IDeserializationCallback
   {
-    private static readonly ReadOnlyList<Node> emptyCountable =
-      new ReadOnlyList<Node>(new List<Node>(), false);
     [NonSerialized]
     private string escapedName;
     [NonSerialized]
@@ -90,7 +83,7 @@ public string Path {
         if (parentPath.Length==0)
           return EscapedName;
         return string.Concat(
-          parentPath, Node.PathDelimiter, 
+          parentPath, Node.PathDelimiterString,
           EscapedName);
       }
     }
@@ -355,7 +348,7 @@ public override string ToString()
       var m = Model;
       string fullName = Path;
       if (m!=null)
-        fullName = string.Concat(m.EscapedName, Node.PathDelimiter, fullName);
+        fullName = string.Concat(m.EscapedName, Node.PathDelimiterString, fullName);
       return string.Format(Strings.NodeInfoFormat, fullName, Count);
     }
 

Orm/Xtensive.Orm/Orm/Building/Builders/PartialIndexFilterBuilder.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2020 Xtensive LLC.
+// Copyright (C) 2011-2021 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -25,21 +25,21 @@ namespace Xtensive.Orm.Building.Builders
 {
   internal class PartialIndexFilterBuilder : ExpressionVisitor
   {
+    private static readonly ParameterExpression Parameter = Expression.Parameter(WellKnownOrmTypes.Tuple, "tuple");
+
     private readonly TypeInfo declaringType;
     private readonly TypeInfo reflectedType;
     private readonly IndexInfo index;
-    private readonly ParameterExpression parameter;
     private readonly List<FieldInfo> usedFields = new List<FieldInfo>();
     private readonly Dictionary<Expression, FieldInfo> entityAccessMap = new Dictionary<Expression, FieldInfo>();
 
     public static void BuildFilter(IndexInfo index)
     {
       ArgumentValidator.EnsureArgumentNotNull(index, "index");
-      var parameter = Expression.Parameter(WellKnownOrmTypes.Tuple, "tuple");
-      var builder = new PartialIndexFilterBuilder(index, parameter);
+      var builder = new PartialIndexFilterBuilder(index);
       var body = builder.Visit(index.FilterExpression.Body);
       var filter = new PartialIndexFilterInfo {
-        Expression = FastExpression.Lambda(body, parameter),
+        Expression = FastExpression.Lambda(body, Parameter),
         Fields = builder.usedFields,
       };
       index.Filter = filter;
@@ -112,7 +112,7 @@ private Expression BuildFieldAccess(FieldInfo field, bool addNullability)
       var fieldIndex = usedFields.Count;
       var valueType = addNullability ? field.ValueType.ToNullable() : field.ValueType;
       usedFields.Add(field);
-      return Expression.Call(parameter,
+      return Expression.Call(Parameter,
         WellKnownMembers.Tuple.GenericAccessor.MakeGenericMethod(valueType),
         Expression.Constant(fieldIndex));
     }
@@ -174,10 +174,9 @@ private DomainBuilderException UnableToTranslate(Expression expression)
       return UnableToTranslate(expression, string.Format(Strings.ExpressionsOfTypeXAreNotSupported, expression.NodeType));
     }
 
-    private PartialIndexFilterBuilder(IndexInfo index, ParameterExpression parameter)
+    private PartialIndexFilterBuilder(IndexInfo index)
     {
       this.index = index;
-      this.parameter = parameter;
 
       declaringType = index.DeclaringType;
       reflectedType = index.ReflectedType;