Add a FeaturesCollection constructor that supports initial capacity (#…

…31381)

* Add a FeaturesCollection constructor that supports initial capacity

src/Http/Http.Features/src/FeatureCollection.cs

@@ -15,6 +15,7 @@ public class FeatureCollection : IFeatureCollection
     {
         private static readonly KeyComparer FeatureKeyComparer = new KeyComparer();
         private readonly IFeatureCollection? _defaults;
+        private readonly int _initialCapacity;
         private IDictionary<Type, object>? _features;
         private volatile int _containerRevision;
 
@@ -25,6 +26,21 @@ public FeatureCollection()
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of <see cref="FeatureCollection"/> with the specified initial capacity.
+        /// </summary>
+        /// <param name="initialCapacity">The initial number of elements that the collection can contain.</param>
+        /// <exception cref="System.ArgumentOutOfRangeException"><paramref name="initialCapacity"/> is less than 0</exception>
+        public FeatureCollection(int initialCapacity)
+        {
+            if (initialCapacity < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(initialCapacity));
+            }
+
+            _initialCapacity = initialCapacity;
+        }
+
         /// <summary>
         /// Initializes a new instance of <see cref="FeatureCollection"/> with the specified defaults.
         /// </summary>
@@ -73,7 +89,7 @@ public object? this[Type key]
 
                 if (_features == null)
                 {
-                    _features = new Dictionary<Type, object>();
+                    _features = new Dictionary<Type, object>(_initialCapacity);
                 }
                 _features[key] = value;
                 _containerRevision++;

src/Http/Http.Features/src/PublicAPI.Unshipped.txt

@@ -13,4 +13,5 @@ Microsoft.AspNetCore.Http.Features.FeatureCollection.Set<TFeature>(TFeature? ins
 Microsoft.AspNetCore.Http.Features.IFeatureCollection.Get<TFeature>() -> TFeature?
 Microsoft.AspNetCore.Http.Features.IFeatureCollection.Set<TFeature>(TFeature? instance) -> void
 Microsoft.AspNetCore.Http.Features.IServerVariablesFeature.this[string! variableName].get -> string?
-Microsoft.AspNetCore.Http.ISession.TryGetValue(string! key, out byte[]? value) -> bool
+Microsoft.AspNetCore.Http.ISession.TryGetValue(string! key, out byte[]? value) -> bool
+Microsoft.AspNetCore.Http.Features.FeatureCollection.FeatureCollection(int initialCapacity) -> void

src/Http/Http/src/DefaultHttpContext.cs

@@ -19,6 +19,10 @@ namespace Microsoft.AspNetCore.Http
     /// </summary>
     public sealed class DefaultHttpContext : HttpContext
     {
+        // The initial size of the feature collection when using the default constructor; based on number of common features
+        // https://github.com/dotnet/aspnetcore/issues/31249
+        private const int DefaultFeatureCollectionSize = 10;
+
         // Lambdas hoisted to static readonly fields to improve inlining https://github.com/dotnet/roslyn/issues/13624
         private readonly static Func<IFeatureCollection, IItemsFeature> _newItemsFeature = f => new ItemsFeature();
         private readonly static Func<DefaultHttpContext, IServiceProvidersFeature> _newServiceProvidersFeature = context => new RequestServicesFeature(context, context.ServiceScopeFactory);
@@ -44,7 +48,7 @@ public sealed class DefaultHttpContext : HttpContext
         /// Initializes a new instance of the <see cref="DefaultHttpContext"/> class.
         /// </summary>
         public DefaultHttpContext()
-            : this(new FeatureCollection())
+            : this(new FeatureCollection(DefaultFeatureCollectionSize))
         {
             Features.Set<IHttpRequestFeature>(new HttpRequestFeature());
             Features.Set<IHttpResponseFeature>(new HttpResponseFeature());