[SPARK-31573][R] Apply fixed=TRUE as appropriate to regex usage in R #28367
Conversation
This file contains 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
|
ok to test |
HyukjinKwon
reviewed
Apr 27, 2020
| @@ -606,7 +606,7 @@ getClientModeSparkSubmitOpts <- function(submitOps, sparkEnvirMap) { | |||
| # process only if --option is not already specified | |||
| if (!is.null(opsValue) && | |||
| nchar(opsValue) > 1 && | |||
| !grepl(sparkConfToSubmitOps[[conf]], submitOps)) { | |||
| !grepl(sparkConfToSubmitOps[[conf]], submitOps, fixed = TRUE)) { | |||
There was a problem hiding this comment.
This could actually be a bug fix too for very, very unlikely corner cases such as spark.driver.memory <> sparkAdriverXmemory
There was a problem hiding this comment.
yes exactly. there were a few other like this in utils.R e.g.
grep("org.apache.spark.sql.streaming.StreamingQueryException: "
HyukjinKwon
changed the title
|
Test build #121894 has finished for PR 28367 at commit
|
srowen
approved these changes
Apr 27, 2020
MichaelChirico
commented
Apr 27, 2020
|
Test build #121912 has finished for PR 28367 at commit
|
|
Let me rerun the AppVeyor build to make sure. |
|
same transient failure for linter here... |
|
Let's see if AppVeyor tests pass. |
|
Test build #121955 has finished for PR 28367 at commit
|
HyukjinKwon
pushed a commit
that referenced
this pull request
Apr 28, 2020
### What changes were proposed in this pull request? For regex functions in base R (`gsub`, `grep`, `grepl`, `strsplit`, `gregexpr`), supplying the `fixed=TRUE` option will be more performant. ### Why are the changes needed? This is a minor fix for performance ### Does this PR introduce any user-facing change? No (although some internal code was applying fixed-as-regex in some cases that could technically have been over-broad and caught unintended patterns) ### How was this patch tested? Not Closes #28367 from MichaelChirico/r-regex-fixed. Authored-by: Michael Chirico <michael.chirico@grabtaxi.com> Signed-off-by: HyukjinKwon <gurwls223@apache.org> (cherry picked from commit c011502) Signed-off-by: HyukjinKwon <gurwls223@apache.org>
|
Merged to master and branch-3.0. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What changes were proposed in this pull request?
For regex functions in base R (
gsub,grep,grepl,strsplit,gregexpr), supplying thefixed=TRUEoption will be more performant.Why are the changes needed?
This is a minor fix for performance
Does this PR introduce any user-facing change?
No (although some internal code was applying fixed-as-regex in some cases that could technically have been over-broad and caught unintended patterns)
How was this patch tested?
Not