A bunch of small improvements related to query translation

ChangeLog/7.0.5_dev.txt

@@ -1 +1,5 @@
-[main] Updated BitFaster.Caching package
+[main] Some constructors of SqlPersistTask marked Obsolete, new constructors provided
+[main] Some constructors of CalculateProvider marked Obsolete, new constructors provided
+[main] Some constructors of AggregateProvider marked Obsolete, new constructors provided
+[main] Updated BitFaster.Caching package
+[main] Certain optimizations connected to query translation made

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v8_0/Extractor.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2003-2023 Xtensive LLC.
+// Copyright (C) 2003-2024 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
@@ -718,14 +718,14 @@ protected virtual void ReadColumnData(DbDataReader dataReader, ExtractionContext
       var columnOwnerId = Convert.ToInt64(dataReader["attrelid"]);
       var columnId = Convert.ToInt64(dataReader["attnum"]);
       var columnName = dataReader["attname"].ToString();
-      if (tableMap.ContainsKey(columnOwnerId)) {
-        var table = tableMap[columnOwnerId];
+      if (tableMap.TryGetValue(columnOwnerId, out var table)) {
         var col = table.CreateColumn(columnName);
-        if (!tableColumns.ContainsKey(columnOwnerId)) {
-          tableColumns.Add(columnOwnerId, new Dictionary<long, TableColumn>());
+        if (tableColumns.TryGetValue(columnOwnerId, out var columns)) {
+          columns.Add(columnId, col);
+        }
+        else {
+          tableColumns.Add(columnOwnerId, new Dictionary<long, TableColumn>() { { columnId, col } });
         }
-
-        tableColumns[columnOwnerId].Add(columnId, col);
 
         var columnTypeName = dataReader["typname"].ToString();
         var columnTypeSpecificData = Convert.ToInt32(dataReader["atttypmod"]);

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/ErrorMessageParser.cs

@@ -23,12 +23,12 @@ public sealed class ErrorMessageParser
     private sealed class PreparedTemplate
     {
       public readonly Regex ParserExpression;
-      public readonly ReadOnlyCollection<int> Indexes;
+      public readonly IReadOnlyList<int> Indexes;
 
-      public PreparedTemplate(string regex, IEnumerable<int> indexes)
+      public PreparedTemplate(string regex, IReadOnlyList<int> indexes)
       {
         ParserExpression = new Regex(regex, RegexOptions.Compiled | RegexOptions.CultureInvariant);
-        Indexes = indexes.ToList().AsReadOnly();
+        Indexes = indexes;
       }
     }
 
@@ -190,7 +190,7 @@ private static PreparedTemplate PrepareEnglishTemplate(string template)
       }
 
       CollectLastChunk(regexBuilder, template, offset);
-      return new PreparedTemplate(regexBuilder.ToString(), Enumerable.Range(1, count));
+      return new PreparedTemplate(regexBuilder.ToString(), Enumerable.Range(1, count).ToArray(count));
     }
 
     private static PreparedTemplate PrepareNonEnglishTemplate(string template)

Orm/Xtensive.Orm/Core/Extensions/EnumerableExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2021 Xtensive LLC.
+// Copyright (C) 2008-2024 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
@@ -601,7 +601,7 @@ public static List<TValue> SortTopologically<TValue>(this IEnumerable<TValue> va
           if (edgeTester.Invoke(left.Value, right.Value))
             new Edge(left, right);
       var result = TopologicalSorter.Sort(graph);
-      return result.HasLoops ? null : result.SortedNodes.Select(node => node.Value).ToList();
+      return result.HasLoops ? null : result.SortedNodes.SelectToList(node => node.Value);
     }
 
     /// <summary>

Orm/Xtensive.Orm/Linq/Internals/ExpressionComparer.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2020 Xtensive LLC.
+// Copyright (C) 2009-2024 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
@@ -111,7 +111,7 @@ private bool VisitListInit(ListInitExpression x, ListInitExpression y)
       return VisitNew(x.NewExpression, y.NewExpression)
         && x.Initializers.Count==y.Initializers.Count
         && x.Initializers
-          .Zip(y.Initializers, (first, second) => new Pair<ElementInit>(first, second))
+          .Zip(y.Initializers)
           .All(p => VisitElementInit(p.First, p.Second));
     }
 
@@ -126,7 +126,7 @@ private bool VisitMemberInit(MemberInitExpression x, MemberInitExpression y)
       return VisitNew(x.NewExpression, y.NewExpression)
         && x.Bindings.Count==y.Bindings.Count
         && x.Bindings
-          .Zip(y.Bindings, (first, second) => new Pair<MemberBinding>(first, second))
+          .Zip(y.Bindings)
           .All(p => VisitMemberBinding(p.First, p.Second));
     }
 
@@ -145,14 +145,14 @@ private bool VisitMemberBinding(MemberBinding x, MemberBinding y)
           var mby = (MemberMemberBinding)y;
           return mbx.Bindings.Count==mby.Bindings.Count
                  && mbx.Bindings
-                    .Zip(mby.Bindings, (first, second) => new Pair<MemberBinding>(first, second))
+                    .Zip(mby.Bindings)
                     .All(p => VisitMemberBinding(p.First, p.Second));
         case MemberBindingType.ListBinding:
           var mlx = (MemberListBinding)x;
           var mly = (MemberListBinding)y;
           return mlx.Initializers.Count==mly.Initializers.Count
                  && mlx.Initializers
-                    .Zip(mly.Initializers, (first, second) => new Pair<ElementInit>(first, second))
+                    .Zip(mly.Initializers)
                     .All(p => VisitElementInit(p.First, p.Second));
         default:
           throw new ArgumentOutOfRangeException();
@@ -189,7 +189,7 @@ private bool VisitNew(NewExpression x, NewExpression y)
         return false;
       if (x.Members.Count != y.Members.Count)
         return false;
-      for (int i = 0; i < x.Members.Count; i++)
+      for (int i = 0, count = x.Members.Count; i < count; i++)
         if (x.Members[i] != y.Members[i])
           return false;
       return true;
@@ -253,7 +253,7 @@ private bool CompareExpressionSequences<T>(
     {
       if (x.Count != y.Count)
         return false;
-      for (int i = 0; i < x.Count; i++)
+      for (int i = 0, count = x.Count; i < count; i++)
         if (!Visit(x[i], y[i]))
           return false;
       return true;

Orm/Xtensive.Orm/Modelling/Actions/ActionSequence.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2024 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
 // Created:    2009.03.23
 
@@ -51,8 +51,7 @@ public void Add(NodeAction action)
         var last = actions[lastIndex] as PropertyChangeAction;
         if (last!=null && ca.Path==last.Path) {
           foreach (var pair in last.Properties) {
-            if (!ca.Properties.ContainsKey(pair.Key))
-              ca.Properties.Add(pair.Key, pair.Value);
+            _ = ca.Properties.TryAdd(pair.Key, pair.Value);
           }
           actions.RemoveAt(lastIndex);
         }

Orm/Xtensive.Orm/Modelling/Actions/CreateNodeAction.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2024 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
 // Created:    2009.03.23
 
@@ -102,8 +102,8 @@ protected override void PerformExecute(IModel model, IPathNode item)
     protected Node TryConstructor(IModel model, params object[] arguments)
     {
       if (parameters!=null)
-        arguments = arguments.Concat(parameters.Select(p => PathNodeReference.Resolve(model, p))).ToArray();
-      var argTypes = arguments.Select(a => a.GetType()).ToArray();
+        arguments = arguments.Concat(parameters.Select(p => PathNodeReference.Resolve(model, p))).ToArray(arguments.Length + parameters.Length);
+      var argTypes = arguments.SelectToArray(a => a.GetType());
       var ci = type.GetConstructor(argTypes);
       if (ci==null)
         return null;

Orm/Xtensive.Orm/Modelling/Actions/GroupingNodeAction.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2024 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
 // Created:    2009.04.22
 
@@ -56,8 +56,7 @@ public void Add(NodeAction action)
         var last = actions[lastIndex] as PropertyChangeAction;
         if (last!=null && ca.Path==last.Path) {
           foreach (var pair in last.Properties) {
-            if (!ca.Properties.ContainsKey(pair.Key))
-              ca.Properties.Add(pair.Key, pair.Value);
+            _ = ca.Properties.TryAdd(pair.Key, pair.Value);
           }
           actions.RemoveAt(lastIndex);
         }

Orm/Xtensive.Orm/Modelling/Comparison/Hints/HintSet.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2009-2021 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2024 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
 // Created:    2009.03.26
 
@@ -77,31 +77,25 @@ public void Add(Hint hint)
         var nodes = new List<Node>();
         foreach (var target in targets) {
           Node node;
-          if (target.Model==ModelType.Source)
+          if (target.Model == ModelType.Source)
             node = (Node) SourceModel.Resolve(target.Path, true);
           else
             node = (Node) TargetModel.Resolve(target.Path, true);
           nodes.Add(node);
-
-          if (!hintMap.ContainsKey(node))
-            hintMap.Add(node, new Dictionary<Type, object>());
-          var nodeHintMap = hintMap[node];
+
+          var nodeHintMap = GetNodeHints(node);
           var hintType = hint.GetType();
-
-          if (!nodeHintMap.ContainsKey(hintType))
-            nodeHintMap.Add(hintType, null);
-
-          var hintOrList = nodeHintMap[hintType];
-          if (hintOrList==null)
-            nodeHintMap[hintType] = hint;
-          else {
-            var list = hintOrList as List<Hint>;
-            if (list==null) {
-              var oldHint = (Hint) hintOrList;
-              nodeHintMap[hintType] = new List<Hint>(new[] {oldHint, hint});
-            }
-            else
+
+          if (nodeHintMap.TryGetValue(hintType, out var hintOrList)) {
+            if (hintOrList is List<Hint> list) {
               list.Add(hint);
+            }
+            else {
+              nodeHintMap[hintType] = new List<Hint>(new[] { (Hint) hintOrList, hint });
+            }
+          }
+          else {
+            nodeHintMap.Add(hintType, hint);
           }
         }
       }
@@ -126,46 +120,20 @@ public void Clear()
 
     /// <inheritdoc/>
     /// <exception cref="InvalidOperationException">Multiple hints found.</exception>
-    public THint GetHint<THint>(Node node)
-      where THint : Hint
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
-
-      if (!hintMap.ContainsKey(node))
-        hintMap.Add(node, new Dictionary<Type, object>());
-      var nodeHintMap = hintMap.GetValueOrDefault(node);
-      if (nodeHintMap==null)
-        return null;
-      var hintType = typeof(THint);
-      var hintOrList = nodeHintMap.GetValueOrDefault(hintType);
-      if (hintOrList==null)
-        return null;
-      var hint = hintOrList as THint;
-      if (hint!=null)
-        return hint;
-      throw new InvalidOperationException(Strings.ExMultipleHintsFound);
-    }
+    public THint GetHint<THint>(Node node) where THint : Hint =>
+      GetNodeHints(node).GetValueOrDefault(typeof(THint)) switch {
+        null => null,
+        THint hint => hint,
+        _ => throw new InvalidOperationException(Strings.ExMultipleHintsFound)
+      };
 
     /// <inheritdoc/>
-    public THint[] GetHints<THint>(Node node)
-      where THint : Hint
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
-
-      if (!hintMap.ContainsKey(node))
-        hintMap.Add(node, new Dictionary<Type, object>());
-      var nodeHintMap = hintMap.GetValueOrDefault(node);
-      if (nodeHintMap==null)
-        return ArrayUtils<THint>.EmptyArray;
-      var hintType = typeof (THint);
-      var hintOrList = nodeHintMap.GetValueOrDefault(hintType);
-      if (hintOrList==null)
-        return ArrayUtils<THint>.EmptyArray;
-      var hint = hintOrList as THint;
-      if (hint!=null)
-        return new[] {hint};
-      return ((List<Hint>) hintOrList).Cast<THint>().ToArray();
-    }
+    public THint[] GetHints<THint>(Node node) where THint : Hint =>
+      GetNodeHints(node).GetValueOrDefault(typeof(THint)) switch {
+        null => Array.Empty<THint>(),
+        THint hint => new[] { hint },
+        var list => ((List<Hint>) list).Cast<THint>().ToArray()
+      };
 
     /// <summary>
     /// Determines whether there are any hints associated with the specified.
@@ -175,29 +143,10 @@ public THint[] GetHints<THint>(Node node)
     /// <see langword="true"/> if the specified node has associated hints; 
     /// otherwise, <see langword="false"/>.
     /// </returns>
-    public bool HasHints(Node node)
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
+    public bool HasHints(Node node) => GetNodeHints(node).Count > 0;
 
-      if (!hintMap.ContainsKey(node))
-        hintMap.Add(node, new Dictionary<Type, object>());
-      var nodeHintMap = hintMap.GetValueOrDefault(node);
-      if (nodeHintMap==null)
-        return false;
-
-      return nodeHintMap.Values.Count > 0;
-    }
-
-    public bool HasHints<THint>(Node node)
-      where THint : Hint
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
-
-      if (!hintMap.TryGetValue(node, out var nodeHintMap)) {
-        hintMap.Add(node, nodeHintMap = new Dictionary<Type, object>());
-      }
-      return nodeHintMap.ContainsKey(typeof(THint));
-    }
+    public bool HasHints<THint>(Node node) where THint : Hint =>
+      GetNodeHints(node).ContainsKey(typeof(THint));
 
     #region IEnumerable<...> methods
 
@@ -215,6 +164,16 @@ IEnumerator IEnumerable.GetEnumerator()
 
     #endregion
 
+    private Dictionary<Type, object> GetNodeHints(Node node)
+    {
+      ArgumentValidator.EnsureArgumentNotNull(node, "node");
+
+      if (!hintMap.TryGetValue(node, out var nodeHintMap)) {
+        hintMap.Add(node, nodeHintMap = new Dictionary<Type, object>());
+      }
+      return nodeHintMap;
+    }
+
     #region ILockable methods
 
     /// <inheritdoc/>