Skip to content

Avoid double Dictionary lookups (incl. hashkey generation) by using new Dictionary methods #120456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2025
Merged

Avoid double Dictionary lookups (incl. hashkey generation) by using new Dictionary methods #120456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c845c7
Avoid double Dictionary lookups (incl. hashkey generation) by using n…
Henr1k80 Oct 6, 2025
65703b4
Remove long outdated comment
Henr1k80 Oct 7, 2025
76ae22e
Revert changes in DbConnectionOptions.Common.cs
Henr1k80 Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,10 +1177,8 @@ private void PopulateEvents(
{
string name = eventInfo.Name;

if (csEventInfos.ContainsKey(name))
if (!csEventInfos.TryAdd(name, eventInfo))
continue;

csEventInfos[name] = eventInfo;
}
else
{
Expand Down
8 changes: 4 additions & 4 deletions src/libraries/Common/src/System/Data/Common/DbConnectionOptions.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,9 @@ private static Dictionary<string, string> SplitConnectionString(string connectio
{
throw ADP.KeywordNotSupported(keyname);
}
if (!firstKey || !parsetable.ContainsKey(realkeyname))
if (!firstKey)
{
parsetable[realkeyname] = keyvalue!; // last key-value pair wins (or first)
parsetable.TryAdd(realkeyname, keyvalue!); // last key-value pair wins (or first)
}
}
}
Expand Down Expand Up @@ -578,9 +578,9 @@ private static void ParseComparison(Dictionary<string, string?> parsetable, stri
{
throw ADP.KeywordNotSupported(keyname);
}
if (!firstKey || !parsetable.ContainsKey(realkeyname))
if (!firstKey)
{
parsetable[realkeyname] = keyvalue; // last key-value pair wins (or first)
parsetable.TryAdd(realkeyname, keyvalue); // last key-value pair wins (or first)
}

if (null != localKeychain)
Expand Down
5 changes: 1 addition & 4 deletions src/libraries/System.Private.Xml/src/System/Xml/Xsl/Xslt/Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,7 @@ public Stylesheet CreateStylesheet()

public void AddModule(string baseUri)
{
if (!_moduleOrder.ContainsKey(baseUri))
{
_moduleOrder[baseUri] = _moduleOrder.Count;
}
_moduleOrder.TryAdd(baseUri, _moduleOrder.Count);
}

public void ApplyNsAliases(ref string? prefix, ref string nsUri)
Expand Down
Loading