Performance improvements (#745)

justinswork · web-flow · commit e57affaa4e69 · 2026-06-04T17:02:28.000+02:00
* Use dictionary lookups in Snapshot.Load instead of repeated linear searches
* Use dictionary lookups in UpdateResourceTableEntries instead of repeated linear searches
diff --git a/src/ResXManager.Model/ResourceEntity.cs b/src/ResXManager.Model/ResourceEntity.cs
@@ -82,22 +82,22 @@ public bool Update(ProjectFile file, [NotNullWhen(true)] out ResourceLanguage? u
 
     private void UpdateResourceTableEntries()
     {
-        var unmatchedTableEntries = _resourceTableEntries.ToList();
+        var entriesByKey = _resourceTableEntries.ToDictionary(entry => entry.Key);
 
         var keys = _languages.Values
             .SelectMany(language => language.ResourceKeys)
             .Distinct()
             .ToArray();
 
+        var matchedKeys = new HashSet<string>();
         var index = 0;
 
         foreach (var key in keys)
         {
-            var existingEntry = _resourceTableEntries.FirstOrDefault(entry => entry.Key == key);
-            if (existingEntry != null)
+            if (entriesByKey.TryGetValue(key, out var existingEntry))
             {
                 existingEntry.Update(index);
-                unmatchedTableEntries.Remove(existingEntry);
+                matchedKeys.Add(key);
             }
             else
             {
@@ -107,6 +107,9 @@ private void UpdateResourceTableEntries()
             index += 1;
         }
 
+        var unmatchedTableEntries = _resourceTableEntries
+            .Where(entry => !matchedKeys.Contains(entry.Key))
+            .ToList();
         _resourceTableEntries.RemoveRange(unmatchedTableEntries);
     }
 
diff --git a/src/ResXManager.Model/Snapshot.cs b/src/ResXManager.Model/Snapshot.cs
@@ -56,13 +56,27 @@ private static void UnloadSnapshot(IEnumerable<ResourceEntity> resourceEntities)
 
     private static void Load(this IEnumerable<ResourceEntity> resourceEntities, IEnumerable<EntitySnapshot> entitySnapshots)
     {
+        var entitySnapshotMap = entitySnapshots
+            .GroupBy(snapshot => (snapshot.ProjectName?.ToUpperInvariant(), snapshot.UniqueName?.ToUpperInvariant()))
+            .ToDictionary(g => g.Key, g => g.First());
+
         resourceEntities.ForEach(entity =>
         {
-            var entrySnapshots = entitySnapshots.Where(snapshot => Equals(entity, snapshot)).Select(s => s.Entries).FirstOrDefault() ?? Array.Empty<EntrySnapshot>();
+            var entityKey = (entity.ProjectName?.ToUpperInvariant(), entity.UniqueName?.ToUpperInvariant());
+            var entrySnapshots = entitySnapshotMap.TryGetValue(entityKey, out var entitySnapshot)
+                ? entitySnapshot.Entries ?? Array.Empty<EntrySnapshot>()
+                : Array.Empty<EntrySnapshot>();
+
+            var entrySnapshotMap = entrySnapshots
+                .Where(s => s.Key != null)
+                .GroupBy(s => s.Key ?? string.Empty, StringComparer.Ordinal)
+                .ToDictionary(g => g.Key, g => g.First().Data ?? Array.Empty<DataSnapshot>(), StringComparer.Ordinal);
 
             entity.Entries.ForEach(entry =>
             {
-                var data = entrySnapshots.Where(s => string.Equals(entry.Key, s.Key, StringComparison.Ordinal)).Select(s => s.Data).FirstOrDefault() ?? Array.Empty<DataSnapshot>();
+                var data = entrySnapshotMap.TryGetValue(entry.Key, out var snapData)
+                    ? snapData
+                    : Array.Empty<DataSnapshot>();
 
                 entry.Snapshot = data.ToDictionary(item => new CultureKey(item.Language), item => new ResourceData { Text = item.Text, Comment = item.Comment });
             });

Original file line number	Diff line number	Diff line change
`@@ -82,22 +82,22 @@ public bool Update(ProjectFile file, [NotNullWhen(true)] out ResourceLanguage? u`
`82`	`82`
`83`	`83`	`private void UpdateResourceTableEntries()`
`84`	`84`	`{`
`85`		`- var unmatchedTableEntries = _resourceTableEntries.ToList();`
	`85`	`+ var entriesByKey = _resourceTableEntries.ToDictionary(entry => entry.Key);`
`86`	`86`
`87`	`87`	`var keys = _languages.Values`
`88`	`88`	`.SelectMany(language => language.ResourceKeys)`
`89`	`89`	`.Distinct()`
`90`	`90`	`.ToArray();`
`91`	`91`
	`92`	`+ var matchedKeys = new HashSet<string>();`
`92`	`93`	`var index = 0;`
`93`	`94`
`94`	`95`	`foreach (var key in keys)`
`95`	`96`	`{`
`96`		`- var existingEntry = _resourceTableEntries.FirstOrDefault(entry => entry.Key == key);`
`97`		`- if (existingEntry != null)`
	`97`	`+ if (entriesByKey.TryGetValue(key, out var existingEntry))`
`98`	`98`	`{`
`99`	`99`	`existingEntry.Update(index);`
`100`		`- unmatchedTableEntries.Remove(existingEntry);`
	`100`	`+ matchedKeys.Add(key);`
`101`	`101`	`}`
`102`	`102`	`else`
`103`	`103`	`{`
`@@ -107,6 +107,9 @@ private void UpdateResourceTableEntries()`
`107`	`107`	`index += 1;`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ var unmatchedTableEntries = _resourceTableEntries`
	`111`	`+ .Where(entry => !matchedKeys.Contains(entry.Key))`
	`112`	`+ .ToList();`
`110`	`113`	`_resourceTableEntries.RemoveRange(unmatchedTableEntries);`
`111`	`114`	`}`
`112`	`115`