Cache property and field infos

Memoize DisplayName() for Type
Call Attribute.IsDefined before GetCustomAttributes()
Use in parameters for TypeMappingInfo and RelationalTypeMappingInfo
Implement IEquatable<T> on TypeMappingInfo and RelationalTypeMappingInfo

Fixes #9347

samples/OracleProvider/src/OracleProvider/Storage/Internal/OracleTypeMappingSource.cs

@@ -164,7 +164,7 @@ public OracleTypeMappingSource(
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        protected override RelationalTypeMapping FindMapping(RelationalTypeMappingInfo mappingInfo)
+        protected override RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo)
         {
             var mapping = FindRawMapping(mappingInfo)?.Clone(mappingInfo);
 

src/EFCore.Relational/Storage/Internal/FallbackRelationalTypeMappingSource.cs

@@ -41,7 +41,7 @@ public FallbackRelationalTypeMappingSource(
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         protected override RelationalTypeMapping FindMappingWithConversion(
-            RelationalTypeMappingInfo mappingInfo,
+            in RelationalTypeMappingInfo mappingInfo,
             IProperty property)
         {
             _property = property;
@@ -53,7 +53,7 @@ protected override RelationalTypeMapping FindMappingWithConversion(
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        protected override RelationalTypeMapping FindMapping(RelationalTypeMappingInfo mappingInfo)
+        protected override RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo)
         {
             Check.NotNull(mappingInfo, nameof(mappingInfo));
 
@@ -83,12 +83,12 @@ protected override RelationalTypeMapping FindMapping(RelationalTypeMappingInfo m
             return mapping;
         }
 
-        private RelationalTypeMapping FindMappingForProperty(RelationalTypeMappingInfo mappingInfo)
+        private RelationalTypeMapping FindMappingForProperty(in RelationalTypeMappingInfo mappingInfo)
             => _property != null
                 ? _relationalTypeMapper.FindMapping(_property)
                 : null;
 
-        private RelationalTypeMapping FindMappingForClrType(RelationalTypeMappingInfo mappingInfo)
+        private RelationalTypeMapping FindMappingForClrType(in RelationalTypeMappingInfo mappingInfo)
         {
             if (mappingInfo.ClrType == null
                 || (mappingInfo.StoreTypeName != null
@@ -118,7 +118,7 @@ private RelationalTypeMapping FindMappingForClrType(RelationalTypeMappingInfo ma
             return _relationalTypeMapper.FindMapping(mappingInfo.ClrType);
         }
 
-        private RelationalTypeMapping FindMappingForStoreTypeName(RelationalTypeMappingInfo mappingInfo)
+        private RelationalTypeMapping FindMappingForStoreTypeName(in RelationalTypeMappingInfo mappingInfo)
         {
             if (mappingInfo.StoreTypeName != null)
             {
@@ -130,7 +130,7 @@ private RelationalTypeMapping FindMappingForStoreTypeName(RelationalTypeMappingI
             return null;
         }
 
-        private static RelationalTypeMapping FilterByClrType(RelationalTypeMapping mapping, RelationalTypeMappingInfo mappingInfo)
+        private static RelationalTypeMapping FilterByClrType(RelationalTypeMapping mapping, in RelationalTypeMappingInfo mappingInfo)
             => mapping != null
                && (mappingInfo.ClrType == null
                    || mappingInfo.ClrType == mapping.ClrType)

src/EFCore.Relational/Storage/RelationalTypeMapping.cs

@@ -295,7 +295,7 @@ public override CoreTypeMapping Clone(ValueConverter converter)
         /// </summary>
         /// <param name="mappingInfo"> The mapping info containing the facets to use. </param>
         /// <returns> The cloned mapping, or the original mapping if no clone was needed. </returns>
-        public virtual RelationalTypeMapping Clone(RelationalTypeMappingInfo mappingInfo)
+        public virtual RelationalTypeMapping Clone(in RelationalTypeMappingInfo mappingInfo)
         {
             Check.NotNull(mappingInfo, nameof(mappingInfo));
 

src/EFCore.Relational/Storage/RelationalTypeMappingInfo.cs

@@ -17,7 +17,7 @@ namespace Microsoft.EntityFrameworkCore.Storage
     ///     Describes metadata needed to decide on a relational type mapping for
     ///     a property, type, or provider-specific relational type name.
     /// </summary>
-    public readonly struct RelationalTypeMappingInfo
+    public readonly struct RelationalTypeMappingInfo : IEquatable<RelationalTypeMappingInfo>
     {
         private readonly TypeMappingInfo _coreTypeMappingInfo;
         private readonly int? _parsedSize;
@@ -88,11 +88,12 @@ public RelationalTypeMappingInfo([NotNull] MemberInfo member)
 
             _coreTypeMappingInfo = new TypeMappingInfo(member);
 
-            var attribute = member.GetCustomAttributes<ColumnAttribute>(true)?.FirstOrDefault();
-            if (attribute != null)
+            if (Attribute.IsDefined(member, typeof(ColumnAttribute), inherit: true))
             {
+                var attribute = member.GetCustomAttributes<ColumnAttribute>(inherit: true).First();
                 StoreTypeName = attribute.TypeName;
-                StoreTypeNameBase = ParseStoreTypeName(attribute.TypeName, out _parsedSize, out _parsedPrecision, out _parsedScale, out _isMax);
+                StoreTypeNameBase = ParseStoreTypeName(
+                    attribute.TypeName, out _parsedSize, out _parsedPrecision, out _parsedScale, out _isMax);
             }
             else
             {
@@ -113,8 +114,8 @@ public RelationalTypeMappingInfo([NotNull] MemberInfo member)
         /// <param name="source"> The source info. </param>
         /// <param name="converter"> The converter to apply. </param>
         public RelationalTypeMappingInfo(
-            RelationalTypeMappingInfo source,
-            ValueConverterInfo converter)
+            in RelationalTypeMappingInfo source,
+            in ValueConverterInfo converter)
         {
             _coreTypeMappingInfo = new TypeMappingInfo(
                 source._coreTypeMappingInfo,
@@ -277,7 +278,7 @@ private static string ParseStoreTypeName(
         /// </summary>
         /// <param name="converterInfo"> The converter to apply. </param>
         /// <returns> The new mapping info. </returns>
-        public RelationalTypeMappingInfo WithConverter(ValueConverterInfo converterInfo)
+        public RelationalTypeMappingInfo WithConverter(in ValueConverterInfo converterInfo)
             => new RelationalTypeMappingInfo(this, converterInfo);
 
         /// <summary>

src/EFCore.Relational/Storage/RelationalTypeMappingSource.cs

@@ -9,15 +9,16 @@
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.EntityFrameworkCore.Utilities;
 
+#pragma warning disable 1574
+#pragma warning disable CS0419 // Ambiguous reference in cref attribute
 namespace Microsoft.EntityFrameworkCore.Storage
 {
     /// <summary>
     ///     <para>
-    ///         The base class for non-relational type mapping starting with version 2.1. Non-relational providers
-    ///         should derive from this class and override <see cref="FindMapping(RelationalTypeMappingInfo)" />
+    ///         The base class for relational type mapping starting with version 2.1. Relational providers
+    ///         should derive from this class and override <see cref="RelationalTypeMappingSource.FindMapping" />
     ///     </para>
     ///     <para>
     ///         This type is typically used by database providers (and other extensions). It is generally
@@ -26,8 +27,8 @@ namespace Microsoft.EntityFrameworkCore.Storage
     /// </summary>
     public abstract class RelationalTypeMappingSource : TypeMappingSourceBase, IRelationalTypeMappingSource
     {
-        private readonly ConcurrentDictionary<RelationalTypeMappingInfo, RelationalTypeMapping> _explicitMappings
-            = new ConcurrentDictionary<RelationalTypeMappingInfo, RelationalTypeMapping>();
+        private readonly ConcurrentDictionary<(RelationalTypeMappingInfo, Type), RelationalTypeMapping> _explicitMappings
+            = new ConcurrentDictionary<(RelationalTypeMappingInfo, Type), RelationalTypeMapping>();
 
         /// <summary>
         ///     Initializes a new instance of the this class.
@@ -56,27 +57,27 @@ protected RelationalTypeMappingSource(
         /// </summary>
         /// <param name="mappingInfo"> The mapping info to use to create the mapping. </param>
         /// <returns> The type mapping, or <c>null</c> if none could be found. </returns>
-        protected abstract RelationalTypeMapping FindMapping(RelationalTypeMappingInfo mappingInfo);
+        protected abstract RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo);
 
         /// <summary>
         ///     Dependencies used to create this <see cref="RelationalTypeMappingSource" />
         /// </summary>
         protected virtual RelationalTypeMappingSourceDependencies RelationalDependencies { get; }
 
         /// <summary>
-        ///     Overridden to call <see cref="FindMapping(RelationalTypeMappingInfo)" />
+        ///    Call <see cref="RelationalTypeMappingSource.FindMapping" /> instead
         /// </summary>
         /// <param name="mappingInfo"> The mapping info to use to create the mapping. </param>
         /// <returns> The type mapping, or <c>null</c> if none could be found. </returns>
-        protected override CoreTypeMapping FindMapping(TypeMappingInfo mappingInfo)
+        protected override CoreTypeMapping FindMapping(in TypeMappingInfo mappingInfo)
             => throw new InvalidOperationException("FindMapping on a 'RelationalTypeMappingSource' with a non-relational 'TypeMappingInfo'.");
 
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
         protected virtual RelationalTypeMapping FindMappingWithConversion(
-            RelationalTypeMappingInfo mappingInfo,
+            in RelationalTypeMappingInfo mappingInfo,
             [CanBeNull] IProperty property)
         {
             Check.NotNull(mappingInfo, nameof(mappingInfo));
@@ -93,33 +94,34 @@ protected virtual RelationalTypeMapping FindMappingWithConversion(
                 ?.UnwrapNullableType();
 
             var resolvedMapping = _explicitMappings.GetOrAdd(
-                mappingInfo,
+                (mappingInfo, providerClrType),
                 k =>
                 {
-                    var mapping = providerClrType == null
-                                  || providerClrType == mappingInfo.ClrType
-                        ? FindMapping(mappingInfo)
+                    var (info, providerType) = k;
+                    var mapping = providerType == null
+                                  || providerType == info.ClrType
+                        ? FindMapping(info)
                         : null;
 
                     if (mapping == null)
                     {
-                        var sourceType = mappingInfo.ClrType;
+                        var sourceType = info.ClrType;
 
                         if (sourceType != null)
                         {
                             foreach (var converterInfo in Dependencies
                                 .ValueConverterSelector
-                                .Select(sourceType, providerClrType))
+                                .Select(sourceType, providerType))
                             {
-                                var mappingInfoUsed = mappingInfo.WithConverter(converterInfo);
+                                var mappingInfoUsed = info.WithConverter(converterInfo);
                                 mapping = FindMapping(mappingInfoUsed);
 
                                 if (mapping == null
-                                    && providerClrType != null)
+                                    && providerType != null)
                                 {
                                     foreach (var secondConverterInfo in Dependencies
                                         .ValueConverterSelector
-                                        .Select(providerClrType))
+                                        .Select(providerType))
                                     {
                                         mapping = FindMapping(mappingInfoUsed.WithConverter(secondConverterInfo));
 
@@ -140,15 +142,15 @@ protected virtual RelationalTypeMapping FindMappingWithConversion(
                         }
                     }
 
-                    if (mapping != null
-                        && customConverter != null)
-                    {
-                        mapping = (RelationalTypeMapping)mapping.Clone(customConverter);
-                    }
-
                     return mapping;
                 });
 
+            if (resolvedMapping != null
+                && customConverter != null)
+            {
+                resolvedMapping = (RelationalTypeMapping)resolvedMapping.Clone(customConverter);
+            }
+
             ValidateMapping(resolvedMapping, property);
 
             return resolvedMapping;

src/EFCore.SqlServer/Metadata/SqlServerPropertyAnnotations.cs

@@ -7,7 +7,6 @@
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.SqlServer.Internal;
 using Microsoft.EntityFrameworkCore.SqlServer.Metadata.Internal;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.EntityFrameworkCore.Utilities;
 
 namespace Microsoft.EntityFrameworkCore.Metadata

src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs

@@ -224,7 +224,7 @@ protected override void ValidateMapping(CoreTypeMapping mapping, IProperty prope
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        protected override RelationalTypeMapping FindMapping(RelationalTypeMappingInfo mappingInfo)
+        protected override RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo)
             => FindRawMapping(mappingInfo)?.Clone(mappingInfo);
 
         private RelationalTypeMapping FindRawMapping(RelationalTypeMappingInfo mappingInfo)

src/EFCore.Sqlite.Core/Storage/Internal/SqliteTypeMappingSource.cs

@@ -64,7 +64,7 @@ public SqliteTypeMappingSource(
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        protected override RelationalTypeMapping FindMapping(RelationalTypeMappingInfo mappingInfo)
+        protected override RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo)
         {
             var clrType = mappingInfo.ClrType;
             if (clrType != null

src/EFCore/Extensions/MutableModelExtensions.cs

@@ -70,7 +70,7 @@ public static IMutableEntityType RemoveEntityType([NotNull] this IMutableModel m
             Check.NotNull(model, nameof(model));
             Check.NotNull(type, nameof(type));
 
-            return model.RemoveEntityType(type.DisplayName());
+            return model.AsModel().RemoveEntityType(type);
         }
 
         /// <summary>

src/EFCore/Infrastructure/ModelValidator.cs

@@ -511,12 +511,7 @@ protected virtual void ValidateData([NotNull] IModel model)
             foreach (var entityType in model.GetEntityTypes().Where(et => !et.IsQueryType))
             {
                 var key = entityType.FindPrimaryKey();
-                if (!identityMaps.TryGetValue(key, out var identityMap))
-                {
-                    identityMap = key.GetIdentityMapFactory()(sensitiveDataLogged);
-                    identityMaps[key] = identityMap;
-                }
-
+                IIdentityMap identityMap = null;
                 foreach (var seedDatum in entityType.GetData())
                 {
                     foreach (var property in entityType.GetProperties())
@@ -578,6 +573,15 @@ protected virtual void ValidateData([NotNull] IModel model)
                         }
                     }
 
+                    if (identityMap == null)
+                    {
+                        if (!identityMaps.TryGetValue(key, out identityMap))
+                        {
+                            identityMap = key.GetIdentityMapFactory()(sensitiveDataLogged);
+                            identityMaps[key] = identityMap;
+                        }
+                    }
+
                     var entry = identityMap.TryGetEntry(keyValues);
                     if (entry != null)
                     {

src/EFCore/Metadata/Builders/EntityTypeBuilder.cs

@@ -226,7 +226,7 @@ public virtual ReferenceOwnershipBuilder OwnsOne(
             [NotNull] Type ownedType,
             [NotNull] string navigationName)
             => OwnsOneBuilder(
-                new TypeIdentity(Check.NotNull(ownedType, nameof(ownedType))),
+                new TypeIdentity(Check.NotNull(ownedType, nameof(ownedType)), (Model)Metadata.Model),
                 Check.NotEmpty(navigationName, nameof(navigationName)));
 
         /// <summary>
@@ -278,7 +278,7 @@ public virtual EntityTypeBuilder OwnsOne(
 
             using (Builder.Metadata.Model.ConventionDispatcher.StartBatch())
             {
-                buildAction.Invoke(OwnsOneBuilder(new TypeIdentity(ownedType), navigationName));
+                buildAction.Invoke(OwnsOneBuilder(new TypeIdentity(ownedType, (Model)Metadata.Model), navigationName));
                 return this;
             }
         }
@@ -311,7 +311,7 @@ public virtual EntityTypeBuilder OwnsOne(
             }
         }
 
-        private ReferenceOwnershipBuilder OwnsOneBuilder(TypeIdentity ownedType, string navigationName)
+        private ReferenceOwnershipBuilder OwnsOneBuilder(in TypeIdentity ownedType, string navigationName)
         {
             InternalRelationshipBuilder relationship;
             using (Builder.Metadata.Model.ConventionDispatcher.StartBatch())

src/EFCore/Metadata/Builders/ReferenceOwnershipBuilder.cs

@@ -279,7 +279,7 @@ public virtual ReferenceOwnershipBuilder OwnsOne(
             [NotNull] Type ownedType,
             [NotNull] string navigationName)
             => OwnsOneBuilder(
-                new TypeIdentity(Check.NotNull(ownedType, nameof(ownedType))),
+                new TypeIdentity(Check.NotNull(ownedType, nameof(ownedType)), (Model)OwnedEntityType.Model),
                 Check.NotEmpty(navigationName, nameof(navigationName)));
 
         /// <summary>
@@ -339,7 +339,7 @@ public virtual ReferenceOwnershipBuilder OwnsOne(
 
             using (DeclaringEntityType.Model.ConventionDispatcher.StartBatch())
             {
-                buildAction.Invoke(OwnsOneBuilder(new TypeIdentity(ownedType), navigationName));
+                buildAction.Invoke(OwnsOneBuilder(new TypeIdentity(ownedType, (Model)OwnedEntityType.Model), navigationName));
                 return this;
             }
         }
@@ -380,7 +380,7 @@ public virtual ReferenceOwnershipBuilder OwnsOne(
             }
         }
 
-        private ReferenceOwnershipBuilder OwnsOneBuilder(TypeIdentity ownedType, string navigationName)
+        private ReferenceOwnershipBuilder OwnsOneBuilder(in TypeIdentity ownedType, string navigationName)
         {
             InternalRelationshipBuilder relationship;
             using (RelatedEntityType.Model.ConventionDispatcher.StartBatch())