Switch CreateNodeAsync to an iterative approach

NuGet · Feb 6, 2024 · 5d12337 · 5d12337
1 parent 879b37c
commit 5d12337
Show file tree

Hide file tree

Showing 10 changed files with 356 additions and 106 deletions.
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Diagnostics/UnexpectedDependencyMessages.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Diagnostics/UnexpectedDependencyMessages.cs
@@ -73,7 +73,6 @@ public static IEnumerable<RestoreLogMessage> GetMissingLowerBounds(IEnumerable<I
             foreach (var graph in graphs)
             {
                 messages.AddRange(graph.ResolvedDependencies
-                                            .Distinct()
                                             .Where(e => !ignoreIds.Contains(e.Child.Name, StringComparer.OrdinalIgnoreCase)
                                                         && DependencyRangeHasMissingExactMatch(e))
                                             .OrderBy(e => e.Child.Name, StringComparer.OrdinalIgnoreCase)

diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/SourceRepositoryDependencyProvider.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/SourceRepositoryDependencyProvider.cs
@@ -231,7 +231,7 @@ Task<LibraryIdentity> FindLibraryIdentityAsync(LibraryRange libraryRange, Source
                 {
                     lock (_libraryMatchCache)
                     {
-                        result = Task.Run(() => FindLibraryCoreAsync(libraryRange, cacheContext, logger, cancellationToken), cancellationToken);
+                        result = FindLibraryCoreAsync(libraryRange, cacheContext, logger, cancellationToken);
                         _libraryMatchCache[libraryRange] = result;
                     }
                 }
@@ -241,7 +241,7 @@ Task<LibraryIdentity> FindLibraryIdentityAsync(LibraryRange libraryRange, Source
                     {
                         if (!_libraryMatchCache.TryGetValue(libraryRange, out result))
                         {
-                            result = Task.Run(() => FindLibraryCoreAsync(libraryRange, cacheContext, logger, cancellationToken), cancellationToken);
+                            result = FindLibraryCoreAsync(libraryRange, cacheContext, logger, cancellationToken);
                             _libraryMatchCache[libraryRange] = result;
                         }
                     }
@@ -257,6 +257,7 @@ private async Task<LibraryIdentity> FindLibraryCoreAsync(
             ILogger logger,
             CancellationToken cancellationToken)
         {
+            await Task.Yield();
             await EnsureResource();
 
             if (libraryRange.VersionRange?.MinVersion != null && libraryRange.VersionRange.IsMinInclusive && !libraryRange.VersionRange.IsFloating)
@@ -400,6 +401,7 @@ private async Task<LibraryDependencyInfo> GetDependenciesCoreAsync(
             FindPackageByIdDependencyInfo packageInfo = null;
             try
             {
+                await Task.Yield();
                 await EnsureResource();
 
                 if (_throttle != null)

diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/BuildAssetsUtils.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/BuildAssetsUtils.cs
@@ -704,19 +704,18 @@ private static IEnumerable<string> GetLanguageConditions(string language, Sorted
 
         public static string GetLanguage(string nugetLanguage)
         {
-            var lang = nugetLanguage.ToUpperInvariant();
-
             // Translate S -> #
-            switch (lang)
+            if (StringComparer.OrdinalIgnoreCase.Equals(nugetLanguage, "CS"))
+            {
+                return "C#";
+            }
+            else if (StringComparer.OrdinalIgnoreCase.Equals(nugetLanguage, "FS"))
             {
-                case "CS":
-                    return "C#";
-                case "FS":
-                    return "F#";
+                return "F#";
             }
 
             // Return the language as it is
-            return lang;
+            return nugetLanguage.ToUpperInvariant();
         }
 
         private static IEnumerable<MSBuildRestoreItemGroup> GetLanguageGroups(

diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/GraphNode.cs b/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/GraphNode.cs
@@ -62,6 +62,11 @@ internal bool AreAllParentsRejected()
         /// <param name="additionalSpace">The count of additional items that will be added.</param>
         internal void EnsureInnerNodeCapacity(int additionalSpace)
         {
+            if (additionalSpace <= 0)
+            {
+                return;
+            }
+
             if (InnerNodes is List<GraphNode<TItem>> innerList)
             {
                 int requiredCapacity = innerList.Count + additionalSpace;
@@ -70,6 +75,10 @@ internal void EnsureInnerNodeCapacity(int additionalSpace)
                     innerList.Capacity = requiredCapacity;
                 }
             }
+            else
+            {
+                InnerNodes = new List<GraphNode<TItem>>(additionalSpace);
+            }
         }
 
         public override string ToString()

diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/Tracker.cs b/src/NuGet.Core/NuGet.DependencyResolver.Core/GraphModel/Tracker.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -44,7 +45,7 @@ public bool IsBestVersion(GraphItem<TItem> item)
             {
                 var version = item.Key.Version;
 
-                foreach (var known in entry.Items.NoAllocEnumerate())
+                foreach (var known in entry)
                 {
                     if (version < known.Key.Version)
                     {
@@ -58,7 +59,13 @@ public bool IsBestVersion(GraphItem<TItem> item)
 
         public IEnumerable<GraphItem<TItem>> GetDisputes(GraphItem<TItem> item)
         {
-            return TryGetEntry(item)?.Items ?? Enumerable.Empty<GraphItem<TItem>>();
+            var entry = TryGetEntry(item);
+            if (entry is null)
+            {
+                return Enumerable.Empty<GraphItem<TItem>>();
+            }
+
+            return entry;
         }
 
         internal void Clear()
@@ -83,7 +90,7 @@ private Entry GetOrAddEntry(GraphItem<TItem> item)
             return entry;
         }
 
-        private sealed class Entry
+        private sealed class Entry : IEnumerable<GraphItem<TItem>>
         {
             /// <summary>
             /// This field can have one of three values:
@@ -123,17 +130,105 @@ public void AddItem(GraphItem<TItem> item)
                 }
             }
 
+            public Enumerator GetEnumerator()
+            {
+                return new Enumerator(this);
+            }
+
+            IEnumerator<GraphItem<TItem>> IEnumerable<GraphItem<TItem>>.GetEnumerator()
+            {
+                return new Enumerator(this);
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return new Enumerator(this);
+            }
+
             public bool HasMultipleItems => _storage is HashSet<GraphItem<TItem>>;
 
-            public IEnumerable<GraphItem<TItem>> Items
+            public struct Enumerator : IEnumerator<GraphItem<TItem>>, IDisposable, IEnumerator
             {
-                get
+                private enum Type : byte
+                {
+                    Empty,
+                    SingleItem,
+                    MultipleItems,
+                }
+
+                private readonly Type _type;
+                private readonly Entry _entry;
+                private GraphItem<TItem> _current;
+                private bool _done;
+                private HashSet<GraphItem<TItem>>.Enumerator _setEnumerator;
+
+                public Enumerator(Entry entry)
+                {
+                    _entry = entry;
+                    _current = default!;
+                    _done = false;
+
+                    if (_entry._storage is null)
+                    {
+                        _type = Type.Empty;
+                    }
+                    else if (_entry._storage is GraphItem<TItem>)
+                    {
+                        _type = Type.SingleItem;
+                    }
+                    else
+                    {
+                        _type = Type.MultipleItems;
+                        _setEnumerator = ((HashSet<GraphItem<TItem>>)_entry._storage).GetEnumerator();
+                    }
+                }
+
+                public readonly GraphItem<TItem> Current => _current;
+
+                readonly object IEnumerator.Current => Current;
+
+                public bool MoveNext()
+                {
+                    if (_done || _type == Type.Empty)
+                    {
+                        return false;
+                    }
+                    else if (_type == Type.SingleItem)
+                    {
+                        _done = true;
+                        _current = (GraphItem<TItem>)_entry._storage!;
+
+                        return true;
+                    }
+                    else
+                    {
+                        bool result = _setEnumerator.MoveNext();
+                        _current = _setEnumerator.Current;
+
+                        return result;
+                    }
+                }
+
+                public void Dispose()
                 {
-                    if (_storage is null)
-                        return Enumerable.Empty<GraphItem<TItem>>();
-                    if (_storage is GraphItem<TItem> item)
-                        return new[] { item };
-                    return (HashSet<GraphItem<TItem>>)_storage;
+                    if (_type == Type.MultipleItems)
+                    {
+                        _setEnumerator.Dispose();
+                    }
+                }
+
+                void IEnumerator.Reset()
+                {
+                    if (_type == Type.SingleItem)
+                    {
+                        _done = false;
+                    }
+                    else
+                    {
+                        ((IEnumerator)_setEnumerator).Reset();
+                    }
+
+                    _current = default!;
                 }
             }
         }