Store cache entry on the ControllerActionDescriptor (#27763)

- Remove dictionary lookup and version check per request

Author: davidfowl

src/Mvc/Mvc.Core/src/Controllers/ControllerActionDescriptor.cs

@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Mvc.Controllers
@@ -36,6 +37,9 @@ public class ControllerActionDescriptor : ActionDescriptor
         /// </summary>
         public TypeInfo ControllerTypeInfo { get; set; }
 
+        // Cache entry so we can avoid an external cache
+        internal ControllerActionInvokerCacheEntry CacheEntry { get; set; }
+
         /// <inheritdoc />
         public override string DisplayName
         {

src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerCache.cs

@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Options;
@@ -16,25 +13,21 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
 {
     internal class ControllerActionInvokerCache
     {
-        private readonly IActionDescriptorCollectionProvider _collectionProvider;
         private readonly ParameterBinder _parameterBinder;
         private readonly IModelBinderFactory _modelBinderFactory;
         private readonly IModelMetadataProvider _modelMetadataProvider;
         private readonly IFilterProvider[] _filterProviders;
         private readonly IControllerFactoryProvider _controllerFactoryProvider;
         private readonly MvcOptions _mvcOptions;
-        private volatile InnerCache _currentCache;
 
         public ControllerActionInvokerCache(
-            IActionDescriptorCollectionProvider collectionProvider,
             ParameterBinder parameterBinder,
             IModelBinderFactory modelBinderFactory,
             IModelMetadataProvider modelMetadataProvider,
             IEnumerable<IFilterProvider> filterProviders,
             IControllerFactoryProvider factoryProvider,
             IOptions<MvcOptions> mvcOptions)
         {
-            _collectionProvider = collectionProvider;
             _parameterBinder = parameterBinder;
             _modelBinderFactory = modelBinderFactory;
             _modelMetadataProvider = modelMetadataProvider;
@@ -43,30 +36,16 @@ public ControllerActionInvokerCache(
             _mvcOptions = mvcOptions.Value;
         }
 
-        private InnerCache CurrentCache
-        {
-            get
-            {
-                var current = _currentCache;
-                var actionDescriptors = _collectionProvider.ActionDescriptors;
-
-                if (current == null || current.Version != actionDescriptors.Version)
-                {
-                    current = new InnerCache(actionDescriptors.Version);
-                    _currentCache = current;
-                }
-
-                return current;
-            }
-        }
-
         public (ControllerActionInvokerCacheEntry cacheEntry, IFilterMetadata[] filters) GetCachedResult(ControllerContext controllerContext)
         {
-            var cache = CurrentCache;
             var actionDescriptor = controllerContext.ActionDescriptor;
 
             IFilterMetadata[] filters;
-            if (!cache.Entries.TryGetValue(actionDescriptor, out var cacheEntry))
+
+            var cacheEntry = actionDescriptor.CacheEntry;
+
+            // We don't care about thread safety here
+            if (cacheEntry is null)
             {
                 var filterFactoryResult = FilterFactory.GetAllFilters(_filterProviders, controllerContext);
                 filters = filterFactoryResult.Filters;
@@ -97,7 +76,8 @@ private InnerCache CurrentCache
                     propertyBinderFactory,
                     objectMethodExecutor,
                     actionMethodExecutor);
-                cacheEntry = cache.Entries.GetOrAdd(actionDescriptor, cacheEntry);
+
+                actionDescriptor.CacheEntry = cacheEntry;
             }
             else
             {
@@ -107,18 +87,5 @@ private InnerCache CurrentCache
 
             return (cacheEntry, filters);
         }
-
-        private class InnerCache
-        {
-            public InnerCache(int version)
-            {
-                Version = version;
-            }
-
-            public ConcurrentDictionary<ActionDescriptor, ControllerActionInvokerCacheEntry> Entries { get; } =
-                new ConcurrentDictionary<ActionDescriptor, ControllerActionInvokerCacheEntry>();
-
-            public int Version { get; }
-        }
     }
 }

src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerCacheTest.cs

@@ -29,7 +29,6 @@ public void GetControllerActionMethodExecutor_CachesFilters()
                     new FilterDescriptor(filter, FilterScope.Action)
                 });
             var controllerActionInvokerCache = CreateControllerActionInvokerCache(
-                controllerContext,
                 new[] { new DefaultFilterProvider() });
 
             // Act
@@ -50,7 +49,6 @@ public void GetControllerActionMethodExecutor_CachesEntry()
                     new FilterDescriptor(filter, FilterScope.Action)
                 });
             var controllerActionInvokerCache = CreateControllerActionInvokerCache(
-                controllerContext,
                 new[] { new DefaultFilterProvider() });
 
             // Act
@@ -93,17 +91,13 @@ public CustomActionDescriptorCollectionProvider(ControllerActionDescriptor[] act
         }
 
         private static ControllerActionInvokerCache CreateControllerActionInvokerCache(
-            ControllerContext controllerContext,
             IFilterProvider[] filterProviders)
         {
-            var descriptorProvider = new CustomActionDescriptorCollectionProvider(
-                new[] { controllerContext.ActionDescriptor });
             var modelMetadataProvider = new EmptyModelMetadataProvider();
             var modelBinderFactory = TestModelBinderFactory.CreateDefault();
             var mvcOptions = Options.Create(new MvcOptions());
 
             return new ControllerActionInvokerCache(
-                descriptorProvider,
                 new ParameterBinder(
                     modelMetadataProvider,
                     modelBinderFactory,