File scripts cache key to include language and prevent conflicts #10033
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
javanna
added
:Core/Infra/Scripting
| } | ||
| } | ||
| } | ||
| return null; |
There was a problem hiding this comment.
maybe we should just build a map for this? I don't like the linear nature
There was a problem hiding this comment.
not that we'll ever have thousands of engines registered, but we can do this yes
There was a problem hiding this comment.
that doesn't matter here really it's just so much simpler to get the stuff from it?
There was a problem hiding this comment.
done, also noticed that we were closing multiple times the same engine pontentially, fixed that too.
javanna
force-pushed
the
fix/static_script_cache_key
branch
from
af88036
to
4e3a9a1
Compare
|
Pushed a new commit, can you have a look @s1monw please? |
| @@ -194,8 +202,8 @@ public void setClient(Client client) { | |||
| } | |||
|
|
|||
| public void close() { | |||
| for (ScriptEngineService engineService : scriptEngines.values()) { | |||
| engineService.close(); | |||
| for (ScriptEngineService scriptEngine : scriptEngines) { | |||
There was a problem hiding this comment.
can you use IOUtils.close() here please it will close all even if there are exceptions
|
left one comment other than that LGTM |
|
@s1monw I made |
| for (ScriptEngineService engineService : scriptEngines.values()) { | ||
| engineService.close(); | ||
| } | ||
| IOUtils.closeWhileHandlingException(scriptEngines); |
|
left a tiny comment LGTM otherwise |
javanna
force-pushed
the
fix/static_script_cache_key
branch
from
aba38de
to
7cb709b
Compare
javanna
force-pushed
the
fix/static_script_cache_key
branch
from
7cb709b
to
2a29e2b
Compare
…licts The file scripts cache key should include the language of the script to prevent conflicts between scripts with same name but different extension (hence lang). Note that script engines can register multiple acronyms that may be used as lang at execution time (e.g. javascript and js are synonyms). We then need to make sure that the same script gets loaded no matter which of the acronyms is used at execution time. The problem didn't exist before this change ad the lang was simply ignored, while now we take it into account. This change has also some positive effect on inline scripts caching. Up until now, the same script referred to with different acronyms would be compiled and cached multiple times, once per acronym. After this change every script gets compiled and cached only once, as we chose internally the acronym used as part of the cache key, no matter which one the user provides. Closes elastic#10033
javanna
force-pushed
the
fix/static_script_cache_key
branch
from
2a29e2b
to
67a3f31
Compare
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Mar 13, 2015
…licts The file scripts cache key should include the language of the script to prevent conflicts between scripts with same name but different extension (hence lang). Note that script engines can register multiple acronyms that may be used as lang at execution time (e.g. javascript and js are synonyms). We then need to make sure that the same script gets loaded no matter which of the acronyms is used at execution time. The problem didn't exist before this change ad the lang was simply ignored, while now we take it into account. This change has also some positive effect on inline scripts caching. Up until now, the same script referred to with different acronyms would be compiled and cached multiple times, once per acronym. After this change every script gets compiled and cached only once, as we chose internally the acronym used as part of the cache key, no matter which one the user provides. Closes elastic#10033
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Mar 13, 2015
…licts The file scripts cache key should include the language of the script to prevent conflicts between scripts with same name but different extension (hence lang). Note that script engines can register multiple acronyms that may be used as lang at execution time (e.g. javascript and js are synonyms). We then need to make sure that the same script gets loaded no matter which of the acronyms is used at execution time. The problem didn't exist before this change ad the lang was simply ignored, while now we take it into account. This change has also some positive effect on inline scripts caching. Up until now, the same script referred to with different acronyms would be compiled and cached multiple times, once per acronym. After this change every script gets compiled and cached only once, as we chose internally the acronym used as part of the cache key, no matter which one the user provides. Closes elastic#10033
clintongormley
changed the title
mute
pushed a commit
to mute/elasticsearch
that referenced
this pull request
Jul 29, 2015
…licts The file scripts cache key should include the language of the script to prevent conflicts between scripts with same name but different extension (hence lang). Note that script engines can register multiple acronyms that may be used as lang at execution time (e.g. javascript and js are synonyms). We then need to make sure that the same script gets loaded no matter which of the acronyms is used at execution time. The problem didn't exist before this change ad the lang was simply ignored, while now we take it into account. This change has also some positive effect on inline scripts caching. Up until now, the same script referred to with different acronyms would be compiled and cached multiple times, once per acronym. After this change every script gets compiled and cached only once, as we chose internally the acronym used as part of the cache key, no matter which one the user provides. Closes elastic#10033
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.
The file scripts cache key should include the language of the script to prevent conflicts between scripts with same name but different extension (hence lang). Note that script engines can register multiple acronyms that may be used as lang at execution time (e.g. javascript and js are synonyms). We then need to make sure that the same script gets loaded no matter which of the acronyms is used at execution time. This problem didn't exist before this change as the lang was simply ignored, while now we take it into account.
This change has also some positive effect on inline scripts caching. Up until now, the same script referred to with different acronyms would be compiled and cached multiple times, once per acronym. After this change every script gets compiled and cached only once, as we chose internally the acronym used as part of the cache key, no matter which one the user provides.
Also made sure that the same engine is closed only once.