Merge pull request #207 from servicetitan/upstream/minorOptimizations

Minor optimizations

Author: alex-kulakov

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

@@ -51,10 +51,10 @@ protected async override Task<int> ExecuteInternalAsync(CancellationToken token
       }
     }
 
-    private QueryCommand CreateCommand(QueryTranslationResult request)
+    private QueryCommand CreateCommand(in QueryTranslationResult request)
     {
       var delete = SqlDml.Delete(SqlDml.TableRef(PrimaryIndexes[0].Table));
-      Join(delete, (SqlSelect) request.Query);
+      Join(delete, request.Query);
       return ToCommand(delete);
     }
 

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

@@ -54,11 +54,11 @@ protected async override Task<int> ExecuteInternalAsync(CancellationToken token
       }
     }
 
-    private QueryCommand CreateCommand(QueryTranslationResult request)
+    private QueryCommand CreateCommand(in QueryTranslationResult request)
     {
       var update = SqlDml.Update(SqlDml.TableRef(PrimaryIndexes[0].Table));
       setOperation.Statement = SetStatement.Create(update);
-      Join(update, (SqlSelect) request.Query);
+      Join(update, request.Query);
       setOperation.AddValues();
       return ToCommand(update);
     }

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

@@ -103,7 +103,7 @@ private void AddComputedStaticExpression(AddValueContext addContext)
         all,
         addContext.Lambda);
       QueryTranslationResult request = parent.GetRequest(parent.QueryProvider.CreateQuery<T>(selectExpression));
-      var sqlSelect = ((SqlSelect)request.Query);
+      var sqlSelect = request.Query;
       SqlExpression ex = sqlSelect.OrderBy[0].Expression;
       var placeholder = ex as SqlPlaceholder;
       if (placeholder == null)
@@ -133,7 +133,7 @@ private void AddComputedExpression(AddValueContext addContext)
         all,
         addContext.Lambda);
       QueryTranslationResult request = parent.GetRequest(parent.QueryProvider.CreateQuery<T>(selectExpression));
-      var sqlSelect = ((SqlSelect) request.Query);
+      var sqlSelect = request.Query;
       SqlExpression ex = sqlSelect.OrderBy[0].Expression;
       parent.Bindings.AddRange(request.ParameterBindings);
 
@@ -217,7 +217,7 @@ private void AddEntityValue(AddValueContext addContext)
             QueryTranslationResult request = parent.GetRequest(field.ValueType, q);
             parent.Bindings.AddRange(request.ParameterBindings);
             SqlTableColumn c = SqlDml.TableColumn(addContext.Statement.Table, addContext.Field.Columns[i].Name);
-            addContext.Statement.AddValue(c, SqlDml.SubQuery((ISqlQueryExpression) request.Query));
+            addContext.Statement.AddValue(c, SqlDml.SubQuery(request.Query));
           }
           return;
         }

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

@@ -20,6 +20,7 @@
 using Xtensive.Orm.Providers;
 using Xtensive.Orm.Rse.Providers;
 using Xtensive.Orm.Tests.Storage.Prefetch.Model;
+using GraphContainerDictionary = System.Collections.Generic.Dictionary<(Xtensive.Orm.Key key, Xtensive.Orm.Model.TypeInfo type), Xtensive.Orm.Internals.Prefetch.GraphContainer>;
 
 namespace Xtensive.Orm.Tests.Storage.Prefetch
 {
@@ -103,9 +104,9 @@ public void ReferencedEntityHasBeenFullyLoadedBeforeTaskActivationTest()
 
         prefetchManager.InvokePrefetch(order0Key, null, new PrefetchFieldDescriptor(EmployeeField, true, true));
         prefetchManager.InvokePrefetch(order1Key, null, new PrefetchFieldDescriptor(EmployeeField, true, true));
-        var graphContainers = (HashSet<GraphContainer>) GraphContainersField.GetValue(prefetchManager);
+        var graphContainers = (GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager);
         Assert.AreEqual(2, graphContainers.Count);
-        Func<Key, ReferencedEntityContainer> taskSelector = containerKey => graphContainers
+        Func<Key, ReferencedEntityContainer> taskSelector = containerKey => graphContainers.Values
           .Where(container => container.Key==containerKey)
           .SelectMany(container => container.ReferencedEntityContainers).Single();
         var entityContainer0 = taskSelector.Invoke(order0Key);
@@ -180,7 +181,7 @@ public void PrefetchEmptyEntitySetTest()
         var prefetchManager = (PrefetchManager) PrefetchProcessorField.GetValue(session.Handler);
         session.Handler.FetchEntityState(orderKey);
         prefetchManager.InvokePrefetch(orderKey, null, new PrefetchFieldDescriptor(DetailsField, null));
-        var graphContainers = (HashSet<GraphContainer>) GraphContainersField.GetValue(prefetchManager);
+        var graphContainers = (GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager);
         Assert.AreEqual(1, graphContainers.Count);
         prefetchManager.ExecuteTasks(true);
         EntitySetState actualState;
@@ -202,8 +203,8 @@ public void PrefetchReferencedEntityWhenTypeSpecifiedForOwnerIsInvalidTest()
         prefetchManager.InvokePrefetch(keyWithoutType, Domain.Model.Types[typeof (PersonalProduct)],
           new PrefetchFieldDescriptor(Domain.Model.Types[typeof (PersonalProduct)].Fields["Employee"],
             true, true));
-        var graphContainers = (HashSet<GraphContainer>) GraphContainersField.GetValue(prefetchManager);
-        var referencedEntityContainer = graphContainers
+        var graphContainers = (GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager);
+        var referencedEntityContainer = graphContainers.Values
           .Where(container => container.ReferencedEntityContainers!=null).Single()
           .ReferencedEntityContainers.Single();
         prefetchManager.ExecuteTasks(true);
@@ -218,10 +219,10 @@ public void DeletingOfTasksAtTransactionCommitOrRollbackTest()
 
       using (var session = Domain.OpenSession()) {
         var prefetchManager = (PrefetchManager) PrefetchProcessorField.GetValue(session.Handler);
-        HashSet<GraphContainer> graphContainers;
+        GraphContainerDictionary graphContainers;
         using (var tx = session.OpenTransaction()) {
           prefetchManager.InvokePrefetch(orderKey, null, new PrefetchFieldDescriptor(CustomerField));
-          graphContainers = (HashSet<GraphContainer>) GraphContainersField.GetValue(prefetchManager);
+          graphContainers = (GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager);
           Assert.AreEqual(1, graphContainers.Count);
           tx.Complete();
         }
@@ -251,7 +252,7 @@ public void TasksAreExecutedAutomaticallyWhenCountLimitIsReachedTest()
       using (var session = Domain.OpenSession())
       using (var tx = session.OpenTransaction()) {
         var prefetchManager = (PrefetchManager) PrefetchProcessorField.GetValue(session.Handler);
-        var graphContainers = (HashSet<GraphContainer>) GraphContainersField.GetValue(prefetchManager);
+        var graphContainers = (GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager);
         var idField = BookType.Fields["Id"];
         for (var i = 1; i < keys.Count; i++) {
           prefetchManager.InvokePrefetch(keys[i - 1], null, new PrefetchFieldDescriptor(idField));

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

@@ -20,6 +20,7 @@
 using Xtensive.Orm.Rse;
 using Xtensive.Orm.Services;
 using Xtensive.Orm.Tests.Storage.Prefetch.Model;
+using GraphContainerDictionary = System.Collections.Generic.Dictionary<(Xtensive.Orm.Key key, Xtensive.Orm.Model.TypeInfo type), Xtensive.Orm.Internals.Prefetch.GraphContainer>;
 
 namespace Xtensive.Orm.Tests.Storage.Prefetch
 {
@@ -380,12 +381,12 @@ public void ReferencedEntityByKnownForeignKeyPrefetchTest()
         var prefetchManager = (PrefetchManager) PrefetchProcessorField.GetValue(session.Handler);
 
         prefetchManager.InvokePrefetch(orderKey, null, new PrefetchFieldDescriptor(EmployeeField, true, true));
-        var graphContainers = (HashSet<GraphContainer>) GraphContainersField.GetValue(prefetchManager);
+        var graphContainers = (GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager);
         Assert.AreEqual(2, graphContainers.Count);
-        foreach (var container in graphContainers)
+        foreach (var container in graphContainers.Values)
           Assert.IsNull(container.ReferencedEntityContainers);
-        var orderContainer = graphContainers.Where(container => container.Key==orderKey).SingleOrDefault();
-        var employeeContainer = graphContainers.Where(container => container.Key!=orderKey).SingleOrDefault();
+        var orderContainer = graphContainers.Values.Where(container => container.Key==orderKey).SingleOrDefault();
+        var employeeContainer = graphContainers.Values.Where(container => container.Key!=orderKey).SingleOrDefault();
         Assert.IsNotNull(orderContainer);
         Assert.IsNotNull(employeeContainer);
         prefetchManager.ExecuteTasks();
@@ -431,9 +432,9 @@ public void ReferencedEntityByNullAsForeignKeyPrefetchTest()
         var prefetchManager = (PrefetchManager) PrefetchProcessorField.GetValue(session.Handler);
         session.Handler.FetchEntityState(orderKey);
         prefetchManager.InvokePrefetch(orderKey, null, new PrefetchFieldDescriptor(EmployeeField, true, true));
-        var taskContainers = (HashSet<GraphContainer>) GraphContainersField.GetValue(prefetchManager);
+        var taskContainers = (GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager);
         Assert.AreEqual(1, taskContainers.Count);
-        Assert.AreEqual(orderKey, taskContainers.Single().Key);
+        Assert.AreEqual(orderKey, taskContainers.Values.Single().Key);
       }
     }
 

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

@@ -17,6 +17,7 @@
 using Xtensive.Orm.Tests.Storage.Prefetch.Model;
 using FieldInfo=Xtensive.Orm.Model.FieldInfo;
 using TypeInfo = Xtensive.Orm.Model.TypeInfo;
+using GraphContainerDictionary = System.Collections.Generic.Dictionary<(Xtensive.Orm.Key key, Xtensive.Orm.Model.TypeInfo type), Xtensive.Orm.Internals.Prefetch.GraphContainer>;
 
 namespace Xtensive.Orm.Tests.Storage.Prefetch
 {
@@ -103,7 +104,7 @@ internal static void ValidateLoadedEntitySet(Key key, FieldInfo field, int count
 
     internal GraphContainer GetSingleGraphContainer(PrefetchManager prefetchManager)
     {
-      return ((IEnumerable<GraphContainer>) GraphContainersField.GetValue(prefetchManager)).Single();
+      return ((GraphContainerDictionary) GraphContainersField.GetValue(prefetchManager)).Values.Single();
     }
 
     internal static bool IsFieldKeyOrSystem(FieldInfo field)

Orm/Xtensive.Orm.Tests/Storage/QueryBuilderTest.cs

@@ -56,7 +56,7 @@ public void ModifyQueryTest()
         Assert.That(translated.Query, Is.Not.Null);
         Assert.That(translated.ParameterBindings, Is.Not.Null);
 
-        var select = (SqlSelect) translated.Query;
+        var select = translated.Query;
         select.Columns.Clear();
         select.Columns.Add(SqlDml.Count());
         var compiled = builder.CompileQuery(translated.Query);

Orm/Xtensive.Orm/Caching/WeakestCache.cs

@@ -236,9 +236,7 @@ public override TItem Add(TItem item, bool replaceIfExists)
     public override void RemoveKey(TKey key)
     {
       ArgumentValidator.EnsureArgumentNotNull(key, "key");
-      WeakEntry entry;
-      if (items.TryGetValue(key, out entry)) {
-        items.Remove(key);
+      if (items.Remove(key, out var entry)) {
         entry.Dispose();
       }
     }

Orm/Xtensive.Orm/Collections/ExtensionCollection.cs

@@ -153,12 +153,13 @@ public ExtensionCollection(IExtensionCollection source)
       ArgumentValidator.EnsureArgumentNotNull(source, "source");
       if (source.Count==0)
         return;
-      var sourceLikeMe = source as ExtensionCollection;
-      if (sourceLikeMe!=null)
+      if (source is ExtensionCollection sourceLikeMe) {
         extensions = new Dictionary<Type, object>(sourceLikeMe.extensions);
-      else
+      }
+      else {
         foreach (Type extensionType in source)
           Set(extensionType, source.Get(extensionType));
+      }
     }
   }
 }

Orm/Xtensive.Orm/Collections/Graphs/TopologicalSorter.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2003-2012 Xtensive LLC.
+// Copyright (C) 2003-2012 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Alex Yakunin
@@ -41,10 +41,8 @@ public T Pop()
 
       public void Remove(T item)
       {
-        LinkedListNode<T> node;
-        if (map.TryGetValue(item, out node)) {
+        if (map.Remove(item, out var node)) {
           list.Remove(node);
-          map.Remove(item);
         }
       }
 
@@ -104,8 +102,7 @@ public static TopologicalSortResult<TNode, TEdge> Sort<TNode, TEdge>(Graph<TNode
 
     restart:
       // Sorting
-      while (nodesWithoutIncomingEdges.Count!=0) {
-        var node = nodesWithoutIncomingEdges.Dequeue();
+      while (nodesWithoutIncomingEdges.TryDequeue(out var node)) {
         if (unsortedNodes!=null) // Break edges
           unsortedNodes.Remove(node);
         else
@@ -126,8 +123,7 @@ public static TopologicalSortResult<TNode, TEdge> Sort<TNode, TEdge>(Graph<TNode
       if (unsortedNodes!=null) { // Break edges
         if (unsortedNodes.Count != 0) {
           // Trying to break edges (collection is always empty when breakEdges==false)
-          while (breakableEdges.Count != 0) {
-            var edge = breakableEdges.Dequeue();
+          while (breakableEdges.TryDequeue(out var edge)) {
             if (!edge.IsAttached || !edgeBreaker(edge))
               continue;
             result.BrokenEdges.Add(edge);