NH-3932 - unnecessary updates on merge, follow up for replacing an O(n²) algorithm by an O(n) one.

fredericDelaporte · fredericDelaporte · commit 24717d6d48b9 · 2017-04-12T08:15:43.000+02:00
diff --git a/src/NHibernate/Type/GenericIdentifierBagType.cs b/src/NHibernate/Type/GenericIdentifierBagType.cs
@@ -137,10 +137,11 @@ public override object ReplaceElements(
 			}
 			else
 			{
+				var originalLookup = iterOriginal.ToLookup(e => e);
 				for (var i = 0; i < targetPc.Count; i++)
 				{
 					var currTarget = targetPc[i];
-					var orgToUse = iterOriginal.First(x => currTarget.Equals(x));
+					var orgToUse = originalLookup[currTarget].First();
 					targetPc[i] = (T)elemType.Replace(orgToUse, null, session, owner, copyCache);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,11 @@ public override object ReplaceElements(`
`137`	`137`	`}`
`138`	`138`	`else`
`139`	`139`	`{`
	`140`	`+ var originalLookup = iterOriginal.ToLookup(e => e);`
`140`	`141`	`for (var i = 0; i < targetPc.Count; i++)`
`141`	`142`	`{`
`142`	`143`	`var currTarget = targetPc[i];`
`143`		`- var orgToUse = iterOriginal.First(x => currTarget.Equals(x));`
	`144`	`+ var orgToUse = originalLookup[currTarget].First();`
`144`	`145`	`targetPc[i] = (T)elemType.Replace(orgToUse, null, session, owner, copyCache);`
`145`	`146`	`}`
`146`	`147`	`}`