Improve cache for match, split, replace operators and WildcardPattern#10657
Merged
daxian-dbw merged 7 commits intoPowerShell:masterfrom Nov 1, 2019
Merged
Improve cache for match, split, replace operators and WildcardPattern#10657daxian-dbw merged 7 commits intoPowerShell:masterfrom
daxian-dbw merged 7 commits intoPowerShell:masterfrom
Conversation
PoshChan
reviewed
Oct 1, 2019
PoshChan
reviewed
Oct 1, 2019
PoshChan
reviewed
Oct 1, 2019
Collaborator
Author
|
/cc @mklement0 if you are interested to see and measure results. |
SteveL-MSFT
requested changes
Oct 1, 2019
Add new cache for ignore case Regex-s Use StringComparer.Ordinal in the cache Use the cache in regex.cs
Co-Authored-By: Steve Lee <[email protected]>
8799f38 to
c3fee9c
Compare
PoshChan
reviewed
Oct 21, 2019
SteveL-MSFT
approved these changes
Oct 21, 2019
daxian-dbw
requested changes
Oct 31, 2019
| } | ||
| else | ||
| { | ||
| return subordinateRegexCache.GetOrAdd(patternString, key => |
Member
There was a problem hiding this comment.
Having this lambda expression in this method will result in an instance of the helper class to be created every time NewRegex gets called, even if the query can be served by the cache.
This should be changed to the following:
else
{
if (subordinateRegexCache.Count > MaxRegexCache)
{
subordinateRegexCache.Clear();
}
var regex = new Regex(patternString, options);
return subordinateRegexCache.GetOrAdd(patternString, regex);
}Note that, the ValueFactory delegate is called outside the locks and thus it's not atomic, meaning there is no difference clearing the dictionary this way from doing it in the ValueFactory delegate.
Collaborator
Author
There was a problem hiding this comment.
Thanks for great comment!
Done.
|
🎉 Handy links: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
Fix #8941
PR Context
Before the change we cached only case-insensitive Regex-s (with RegexOptions.IgnoreCase).
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:or[ WIP ]to the beginning of the title (theWIPbot will keep its status check atPendingwhile the prefix is present) and remove the prefix when the PR is ready.