Perf: Cache candidate properties for propagation and generation

src/EFCore/ChangeTracking/Internal/EntityReferenceMap.cs

@@ -50,7 +50,6 @@ public virtual void Update(
             EntityState state,
             EntityState? oldState)
         {
-            var mapKey = entry.Entity ?? entry;
             var entityType = entry.EntityType;
             if (_hasSubMap
                 && entityType.HasDefiningNavigation())
@@ -70,6 +69,8 @@ public virtual void Update(
             }
             else
             {
+                var mapKey = entry.Entity ?? entry;
+
                 if (oldState.HasValue)
                 {
                     Remove(mapKey, entityType, oldState.Value);

src/EFCore/ChangeTracking/Internal/IValueGenerationManager.cs

@@ -31,7 +31,7 @@ public interface IValueGenerationManager
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        void Generate([NotNull] InternalEntityEntry entry, bool includePKs = true);
+        void Generate([NotNull] InternalEntityEntry entry, bool includePrimaryKey = true);
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -49,7 +49,7 @@ public interface IValueGenerationManager
         /// </summary>
         Task GenerateAsync(
             [NotNull] InternalEntityEntry entry,
-            bool includePKs = true,
+            bool includePrimaryKey = true,
             CancellationToken cancellationToken = default);
 
         /// <summary>

src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs

@@ -133,7 +133,7 @@ public virtual void SetEntityState(
 
             if (adding || oldState is EntityState.Detached)
             {
-                StateManager.ValueGenerationManager.Generate(this, includePKs: adding);
+                StateManager.ValueGenerationManager.Generate(this, includePrimaryKey: adding);
             }
 
             SetEntityState(oldState, entityState, acceptChanges, modifyProperties);
@@ -159,7 +159,7 @@ public virtual async Task SetEntityStateAsync(
 
             if (adding || oldState is EntityState.Detached)
             {
-                await StateManager.ValueGenerationManager.GenerateAsync(this, includePKs: adding, cancellationToken)
+                await StateManager.ValueGenerationManager.GenerateAsync(this, includePrimaryKey: adding, cancellationToken)
                     .ConfigureAwait(false);
             }
 

src/EFCore/ChangeTracking/Internal/StateManager.cs

@@ -324,9 +324,9 @@ private void UpdateReferenceMaps(
             EntityState? oldState)
         {
             var entityType = entry.EntityType;
-            var mapKey = entry.Entity ?? entry;
             if (entityType.HasDefiningNavigation())
             {
+                var mapKey = entry.Entity ?? entry;
                 foreach (var otherType in _model.GetEntityTypes(entityType.Name)
                     .Where(et => et != entityType && TryGetEntry(mapKey, et) != null))
                 {

src/EFCore/ChangeTracking/Internal/ValueGenerationManager.cs

@@ -33,6 +33,10 @@ public class ValueGenerationManager : IValueGenerationManager
         private readonly IKeyPropagator _keyPropagator;
         private readonly IDiagnosticsLogger<DbLoggerCategory.ChangeTracking> _logger;
         private readonly ILoggingOptions _loggingOptions;
+        private readonly Dictionary<IEntityType, List<IProperty>> _entityTypePropagatingPropertiesMap
+            = new Dictionary<IEntityType, List<IProperty>>();
+        private readonly Dictionary<IEntityType, List<IProperty>> _entityTypeGeneratingPropertiesMap
+            = new Dictionary<IEntityType, List<IProperty>>();
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -61,8 +65,13 @@ public ValueGenerationManager(
         public virtual InternalEntityEntry Propagate(InternalEntityEntry entry)
         {
             InternalEntityEntry chosenPrincipal = null;
-            foreach (var property in FindPropagatingProperties(entry))
+            foreach (var property in FindCandidatePropagatingProperties(entry))
             {
+                if (!entry.HasDefaultValue(property))
+                {
+                    continue;
+                }
+
                 var principalEntry = _keyPropagator.PropagateValue(entry, property);
                 if (chosenPrincipal == null)
                 {
@@ -79,12 +88,19 @@ public virtual InternalEntityEntry Propagate(InternalEntityEntry entry)
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public virtual void Generate(InternalEntityEntry entry, bool includePKs = true)
+        public virtual void Generate(InternalEntityEntry entry, bool includePrimaryKey = true)
         {
             var entityEntry = new EntityEntry(entry);
 
-            foreach (var property in FindGeneratingProperties(entry, includePKs))
+            foreach (var property in FindCandidateGeneratingProperties(entry))
             {
+                if (!entry.HasDefaultValue(property)
+                    || (!includePrimaryKey
+                        && property.IsPrimaryKey()))
+                {
+                    continue;
+                }
+
                 var valueGenerator = GetValueGenerator(entry, property);
 
                 var generatedValue = valueGenerator.Next(entityEntry);
@@ -120,13 +136,20 @@ private void Log(InternalEntityEntry entry, IProperty property, object generated
         /// </summary>
         public virtual async Task GenerateAsync(
             InternalEntityEntry entry,
-            bool includePKs = true,
+            bool includePrimaryKey = true,
             CancellationToken cancellationToken = default)
         {
             var entityEntry = new EntityEntry(entry);
 
-            foreach (var property in FindGeneratingProperties(entry, includePKs))
+            foreach (var property in FindCandidateGeneratingProperties(entry))
             {
+                if (!entry.HasDefaultValue(property)
+                    || (!includePrimaryKey
+                        && property.IsPrimaryKey()))
+                {
+                    continue;
+                }
+
                 var valueGenerator = GetValueGenerator(entry, property);
                 var generatedValue = await valueGenerator.NextAsync(entityEntry, cancellationToken)
                     .ConfigureAwait(false);
@@ -142,30 +165,42 @@ public virtual async Task GenerateAsync(
             }
         }
 
-        private static IEnumerable<IProperty> FindPropagatingProperties(InternalEntityEntry entry)
+        private List<IProperty> FindCandidatePropagatingProperties(InternalEntityEntry entry)
         {
-            foreach (var property in ((EntityType)entry.EntityType).GetProperties())
+            if (!_entityTypePropagatingPropertiesMap.TryGetValue(entry.EntityType, out var candidateProperties))
             {
-                if (property.IsForeignKey()
-                    && entry.HasDefaultValue(property))
+                candidateProperties = new List<IProperty>();
+                foreach (var property in entry.EntityType.GetProperties())
                 {
-                    yield return property;
+                    if (property.IsForeignKey())
+                    {
+                        candidateProperties.Add(property);
+                    }
                 }
+
+                _entityTypePropagatingPropertiesMap[entry.EntityType] = candidateProperties;
             }
+
+            return candidateProperties;
         }
 
-        private static IEnumerable<IProperty> FindGeneratingProperties(InternalEntityEntry entry, bool includePKs = true)
+        private List<IProperty> FindCandidateGeneratingProperties(InternalEntityEntry entry)
         {
-            foreach (var property in ((EntityType)entry.EntityType).GetProperties())
+            if (!_entityTypeGeneratingPropertiesMap.TryGetValue(entry.EntityType, out var candidateProperties))
             {
-                if (property.RequiresValueGenerator()
-                    && entry.HasDefaultValue(property)
-                    && (includePKs
-                        || !property.IsPrimaryKey()))
+                candidateProperties = new List<IProperty>();
+                foreach (var property in entry.EntityType.GetProperties())
                 {
-                    yield return property;
+                    if (property.RequiresValueGenerator())
+                    {
+                        candidateProperties.Add(property);
+                    }
                 }
+
+                _entityTypeGeneratingPropertiesMap[entry.EntityType] = candidateProperties;
             }
+
+            return candidateProperties;
         }
 
         private ValueGenerator GetValueGenerator(InternalEntityEntry entry, IProperty property)