Remove extraneous Painless compiler pass #49797
Merged
Conversation
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
jdconrad
added
:Core/Infra/Scripting
|
Pinging @elastic/es-core-infra (:Core/Infra/Scripting) |
stu-elastic
reviewed
Dec 4, 2019
| @Override | ||
| void extractVariables(Set<String> variables) { | ||
| // Do nothing. | ||
| } | ||
|
|
||
| @Override | ||
| void analyze(ScriptRoot scriptRoot, Locals locals) { | ||
| if (false == settings.areRegexesEnabled()) { |
There was a problem hiding this comment.
Can you change this to scriptRoot.getCompilerSettings().areRegexesEnabled() == false
There was a problem hiding this comment.
Since this change is nearly mechanical, I would prefer to make this change in a follow up PR.
stu-elastic
reviewed
Dec 4, 2019
| @@ -128,6 +121,8 @@ void generateSignature(PainlessLookup painlessLookup) { | |||
|
|
|||
| @Override | |||
| void analyze(ScriptRoot scriptRoot, Locals locals) { | |||
| this.settings = scriptRoot.getCompilerSettings(); | |||
There was a problem hiding this comment.
This is only used for getMaxLoopCounter(), consider just saving that setting.
There was a problem hiding this comment.
Same as the comment above.
stu-elastic
approved these changes
Dec 4, 2019
|
@stu-elastic @rjernst Thanks for the reviews! I will follow up with another small PR for Stu's requested changes. |
jdconrad
added a commit
that referenced
this pull request
Dec 4, 2019
This removes the storeSettings pass where nodes in the AST could store information they needed out of CompilerSettings for use during later passes. CompilerSettings is part of ScriptRoot which is available during the analysis pass making the storeSettings pass redundant.
SivagurunathanV
pushed a commit
to SivagurunathanV/elasticsearch
that referenced
this pull request
Jan 23, 2020
This removes the storeSettings pass where nodes in the AST could store information they needed out of CompilerSettings for use during later passes. CompilerSettings is part of ScriptRoot which is available during the analysis pass making the storeSettings pass redundant.
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.
This removes the storeSettings pass where nodes in the AST could store information they needed out of CompilerSettings for use during later passes. CompilerSettings is part of ScriptRoot which is available during the analysis pass making the storeSettings pass redundant.