SCRIPTING: Terms set query expression#33856
Merged
original-brownbear merged 8 commits intoelastic:masterfrom Oct 4, 2018
original-brownbear:terms-set-query-expression
Merged
SCRIPTING: Terms set query expression#33856original-brownbear merged 8 commits intoelastic:masterfrom original-brownbear:terms-set-query-expression
original-brownbear merged 8 commits intoelastic:masterfrom
original-brownbear:terms-set-query-expression
Conversation
* Follow up to #33602 adding the ability to compile TermsSetQuery scripts with the expressions engine in the same way we support SearchScript in Expressions * Duplicated the code here for now to make the change less complex, the only difference to SearchScript is that `_score` and `_value` are not handled for TermsSetQuery
Collaborator
|
Pinging @elastic/es-core-infra |
Contributor
Author
rjernst
reviewed
Sep 28, 2018
| MapperService mapper = lookup.doc().mapperService(); | ||
| // NOTE: if we need to do anything complicated with bindings in the future, we can just extend Bindings, | ||
| // instead of complicating SimpleBindings (which should stay simple) | ||
| SimpleBindings bindings = new SimpleBindings(); |
Member
There was a problem hiding this comment.
I'm worried about a copy/paste of the bindings creation here, as we do change this from time to time. Can you move it out so it is shared with SearchScript creation?
Contributor
Author
There was a problem hiding this comment.
Sounds good, happy to dry this up :)
Contributor
Author
|
@rjernst dried up the solution, should be good for another review :) |
rjernst
approved these changes
Oct 2, 2018
Member
rjernst
left a comment
There was a problem hiding this comment.
LGTM, a few minor naming suggestions
| throw new ScriptException(message, cause, stack, source, NAME); | ||
| } | ||
|
|
||
| private static ValueSource getValueSource(String variable, SearchLookup lookup) throws ParseException { |
Member
There was a problem hiding this comment.
I would name this related to "doc" since it is always the doc variable?
| // TODO: document and/or error if vars contains _score? | ||
| // NOTE: by checking for the variable in vars first, it allows masking document fields with a global constant, | ||
| // but if we were to reverse it, we could provide a way to supply dynamic defaults for documents missing the field? | ||
| private static void bindFromVars(@Nullable final Map<String, Object> vars, final SimpleBindings bindings, final String variable) throws ParseException { |
Member
There was a problem hiding this comment.
I know "vars" is the terminology used in the code originally, but irrc this is actually params? I think that naming would be better.
Contributor
Author
|
@rjernst thanks, renamings applied -> will merge once green :) |
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Oct 4, 2018
* master: (25 commits) HLRC: ML Adding get datafeed stats API (elastic#34271) Small fixes to the HLRC watcher documentation. (elastic#34306) Tasks: Document that status is not semvered (elastic#34270) HLRC: ML Add preview datafeed api (elastic#34284) [CI] Fix bogus ScheduleWithFixedDelayTests.testRunnableRunsAtMostOnceAfterCancellation Fix error in documentation for activete watch SCRIPTING: Terms set query expression (elastic#33856) Logging: Drop remaining Settings log ctor (elastic#34149) [ML] Remove unused last_data_time member from Job (elastic#34262) Docs: Allow skipping response assertions (elastic#34240) HLRC: Add activate watch action (elastic#33988) [Security] Multi Index Expression alias wildcard exclusion (elastic#34144) [ML] Label anomalies with multi_bucket_impact (elastic#34233) Document smtp.ssl.trust configuration option (elastic#34275) Support PKCS#11 tokens as keystores and truststores (elastic#34063) Fix sporadic failure in NestedObjectMapperTests [Authz] Allow update settings action for system user (elastic#34030) Replace version with reader cache key in IndicesRequestCache (elastic#34189) [TESTS] Set SO_LINGER and SO_REUSEADDR on the mock socket (elastic#34211) Security: upgrade unboundid ldapsdk to 4.0.8 (elastic#34247) ...
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Oct 4, 2018
* rename-ccr-stats: (25 commits) HLRC: ML Adding get datafeed stats API (elastic#34271) Small fixes to the HLRC watcher documentation. (elastic#34306) Tasks: Document that status is not semvered (elastic#34270) HLRC: ML Add preview datafeed api (elastic#34284) [CI] Fix bogus ScheduleWithFixedDelayTests.testRunnableRunsAtMostOnceAfterCancellation Fix error in documentation for activete watch SCRIPTING: Terms set query expression (elastic#33856) Logging: Drop remaining Settings log ctor (elastic#34149) [ML] Remove unused last_data_time member from Job (elastic#34262) Docs: Allow skipping response assertions (elastic#34240) HLRC: Add activate watch action (elastic#33988) [Security] Multi Index Expression alias wildcard exclusion (elastic#34144) [ML] Label anomalies with multi_bucket_impact (elastic#34233) Document smtp.ssl.trust configuration option (elastic#34275) Support PKCS#11 tokens as keystores and truststores (elastic#34063) Fix sporadic failure in NestedObjectMapperTests [Authz] Allow update settings action for system user (elastic#34030) Replace version with reader cache key in IndicesRequestCache (elastic#34189) [TESTS] Set SO_LINGER and SO_REUSEADDR on the mock socket (elastic#34211) Security: upgrade unboundid ldapsdk to 4.0.8 (elastic#34247) ...
kcm
pushed a commit
that referenced
this pull request
Oct 30, 2018
* SCRIPTING: Add Expr. Compile for TermSetQuery Ctx. * Follow up to #33602 adding the ability to compile TermsSetQuery scripts with the expressions engine in the same way we support SearchScript in Expressions * Duplicated the code here for now to make the change less complex, the only difference to SearchScript is that `_score` and `_value` are not handled for TermsSetQuery * remove redundant check
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.
scripts with the expressions engine in the same way we support
SearchScript in Expressions
the only difference to SearchScript is that
_scoreand_valueare not handled for TermsSetQuery