Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SCRIPTING: Terms set query expression #33856

Merged
merged 8 commits into from
Oct 4, 2018
Merged

SCRIPTING: Terms set query expression #33856

merged 8 commits into from
Oct 4, 2018

Conversation

original-brownbear
Copy link
Member

  • Follow up to SCRIPTING: Move terms_set Context to its Own Class #33602 adding the ability to compile TermsSetQueryScript
    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

@original-brownbear
SCRIPTING: Add Expr. Compile for TermSetQuery Ctx.
20a66f9 
* Follow up to elastic#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
@original-brownbear
remove redundant check
6bf5af9
@original-brownbear
cleanup constructor
7ce1ebd
@original-brownbear original-brownbear added >non-issue :Core/Infra/Scripting Scripting abstractions, Painless, and Mustache v7.0.0 v6.5.0 labels Sep 19, 2018
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@original-brownbear
Copy link
Member Author

original-brownbear commented Sep 19, 2018 •
edited
Loading

@rjernst can you take a look here and let me know if this approach towards handling the expressions is ok please? I need some clarity there before continuing on the other two contexts :) (#33717 #33820 )

rjernst
rjernst reviewed Sep 28, 2018
View reviewed changes
...ang-expression/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngine.java
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();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, happy to dry this up :)

@rjernst rjernst mentioned this pull request Sep 29, 2018
Merged
@original-brownbear
Copy link
Member Author

@rjernst dried up the solution, should be good for another review :)

rjernst
rjernst approved these changes Oct 2, 2018
View reviewed changes
Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, a few minor naming suggestions

...ang-expression/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngine.java Outdated
@@ -362,4 +299,106 @@ private ScriptException convertToScriptException(String message, String source,
stack.add(pointer.toString());
throw new ScriptException(message, cause, stack, source, NAME);
}

private static ValueSource getValueSource(String variable, SearchLookup lookup) throws ParseException {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would name this related to "doc" since it is always the doc variable?

...ang-expression/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngine.java Outdated
// 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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know "vars" is the terminology used in the code originally, but irrc this is actually params? I think that naming would be better.

@original-brownbear
Copy link
Member Author

@rjernst thanks, renamings applied -> will merge once green :)

@original-brownbear original-brownbear merged commit 3ccfc3d into elastic:master Oct 4, 2018
@original-brownbear original-brownbear deleted the terms-set-query-expression branch October 4, 2018 14:04
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Oct 4, 2018
@jasontedor
Merge branch 'master' into rename-ccr-stats
6833ad7 
* 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
@jasontedor
Merge branch 'rename-ccr-stats' into follow-stats-structure
11f4565 
* 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
@original-brownbear @kcm
SCRIPTING: Terms set query expression (#33856)
2df110b 
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rjernst rjernst rjernst approved these changes

Assignees
No one assigned
Labels
:Core/Infra/Scripting Scripting abstractions, Painless, and Mustache >non-issue v6.5.0 v7.0.0-beta1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@original-brownbear @elasticmachine @rjernst @colings86