russell@unturf.com
d4ed2dff91
Hibernate (5 HIGH): addColumn/addReferencedColumn/addIndex ArrayList→LinkedHashSet (19x) FK second-pass LinkedHashSet, orderHierarchy LinkedHashSet MyBatis (1 MEDIUM): sortConstructorMappings indexOf→HashMap (12x) EF Core (2 HIGH + 1 MEDIUM): FindGenerationProperty HashSet (250x), AddPrincipals HashSet (250x), FK discovery HashSet (6x) Diesel (3 MEDIUM): SQLite/MySQL row position()→BTreeMap (51x) SQLAlchemy (2 HIGH): _values_bindparam Set (500x), evaluated_keys Set (500x) Peewee (1 MEDIUM): _SortedFieldList.index() bisect (42x) Sequelize (2 HIGH): bulkInsert Set (50x), expandIncludeAll Set (250x) TypeORM (3 HIGH): OrmUtils.uniq Map (500x), diffColumns Set (125x), updatedColumns Set (100x) Doctrine ORM (1 HIGH + 2 MEDIUM): hydrator discriminator (26x), addSubClass (250x), SqlWalker partial (130x) GORM (1 MEDIUM): sortCallbacks getRIndex→map (194x) SQLite: SqliteTest unit proof 4/4 PASS (101x) Unit tests: all PASS — Hibernate/MyBatis/EfCore/Diesel/SQLAlchemy/Peewee/ Sequelize/TypeORM/Doctrine/GORM Whitepaper: 157 sites, 62 ecosystems; PDF 752K
43 lines
2.6 KiB
Diff
43 lines
2.6 KiB
Diff
diff --git a/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs b/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs
|
||
index xxxxxxx..xxxxxxx 100644
|
||
--- a/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs
|
||
+++ b/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs
|
||
@@ -496,14 +496,17 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions;
|
||
foreach (var key in dependentEntityType.GetKeys())
|
||
{
|
||
var isKeyContainedInForeignKey = true;
|
||
+ // efcore-0003 fix: build a HashSet once from foreignKeyProperties so that
|
||
+ // key.Properties[i] lookup is O(1) instead of O(FK_props) per iteration.
|
||
+ // Without fix: O(keys × key_props × fk_props) model-build cost.
|
||
+ var foreignKeyPropertySet = foreignKeyProperties != null
|
||
+ ? new HashSet<IConventionProperty>(foreignKeyProperties, ReferenceEqualityComparer.Instance)
|
||
+ : null;
|
||
// ReSharper disable once LoopCanBeConvertedToQuery
|
||
// ReSharper disable once ForCanBeConvertedToForeach
|
||
for (var i = 0; i < key.Properties.Count; i++)
|
||
{
|
||
- if (!foreignKeyProperties.Contains(key.Properties[i]))
|
||
+ if (foreignKeyPropertySet == null || !foreignKeyPropertySet.Contains(key.Properties[i]))
|
||
{
|
||
isKeyContainedInForeignKey = false;
|
||
break;
|
||
}
|
||
}
|
||
@@ -742,10 +742,13 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions;
|
||
public virtual void ProcessKeyAdded(IConventionKeyBuilder keyBuilder, IConventionContext<IConventionKeyBuilder> context)
|
||
{
|
||
var key = keyBuilder.Metadata;
|
||
foreach (var foreignKey in key.DeclaringEntityType.GetDerivedTypesInclusive()
|
||
.SelectMany(t => t.GetDeclaredForeignKeys()).ToList())
|
||
{
|
||
- if (key.Properties.All(p => foreignKey.Properties.Contains(p))
|
||
+ // efcore-0003 fix: build HashSet once per foreignKey so key.Properties.All()
|
||
+ // is O(key_props) not O(key_props × fk_props).
|
||
+ var fkPropsSet = new HashSet<IConventionProperty>(foreignKey.Properties, ReferenceEqualityComparer.Instance);
|
||
+ if (key.Properties.All(p => fkPropsSet.Contains(p))
|
||
&& (!foreignKey.IsUnique || foreignKey.DeclaringEntityType.BaseType != null))
|
||
{
|
||
foreignKey.Builder.HasForeignKey((IReadOnlyList<IConventionProperty>?)null);
|
||
}
|
||
}
|
||
}
|