Fix for #6976 -replace operator slowed down after adding scriptblock support#7135
Merged
daxian-dbw merged 1 commit intoPowerShell:masterfrom Jun 26, 2018
Merged
Conversation
…riptblock support
iSazonov
reviewed
Jun 22, 2018
| if (rList.Count > 1) | ||
| { | ||
| substitute = rList[1]; | ||
| substitute = PSObject.Base(rList[1]); |
Collaborator
There was a problem hiding this comment.
Could you please add a comment why it is needed? what we break without this?
Collaborator
Author
There was a problem hiding this comment.
Sure, This is actually a pretty fundamental operation in PowerShell. Anywhere you receive something of type object, you have to deal with the case where it might be wrapped in a PSObject. So before you can use it as string or ScriptBlock, you have to get the base object. The PSObject.Base() method encapsulates this operation. If it's passed a PSObject, it returns the core object otherwise it just returns the object.
Collaborator
|
LGTM. |
lzybkr
approved these changes
Jun 26, 2018
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 #6976.
The performance of
-replacewas greatly reduced when scriptblock support was added. This is because of the way the code selected what type of replacement to do. In the old code, the first choice was string. In the modified code, the last choice was string and an earlier clause usedTryConvertTo()to see if the substitution object was (or could be transformed into) aMatchEvaluatorobject. It was this (very expensive) call toTryConvertTo()that was slowing everything down. I added a clause for strings (the most common case) to the beginning of the switch statement so it's fast again. I also added a call toPSObject.Base()to make sure the test for strings is correct.PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:to the beginning of the title and remove the prefix when the PR is ready.[feature]if the change is significant or affects feature tests