-
Notifications
You must be signed in to change notification settings - Fork 24.7k
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.
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
SCRIPTING: Terms set query expression #33856
Merged
original-brownbear
merged 8 commits into
elastic:master
from
original-brownbear:terms-set-query-expression
Oct 4, 2018
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
20a66f9
SCRIPTING: Add Expr. Compile for TermSetQuery Ctx.
original-brownbear 6bf5af9
remove redundant check
original-brownbear 7ce1ebd
cleanup constructor
original-brownbear f8af5d1
Merge remote-tracking branch 'elastic/master' into terms-set-query-ex…
original-brownbear a5eff0a
CR: Dry up binding
original-brownbear 2a60a9c
cleanup unnecessary hack
original-brownbear 04faadf
Merge remote-tracking branch 'elastic/master' into terms-set-query-ex…
original-brownbear eb3bef5
CR: Renaming
original-brownbear File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
76 changes: 76 additions & 0 deletions
76
...ssion/src/main/java/org/elasticsearch/script/expression/ExpressionTermSetQueryScript.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.script.expression; | ||
|
||
import java.io.IOException; | ||
import org.apache.lucene.expressions.Bindings; | ||
import org.apache.lucene.expressions.Expression; | ||
import org.apache.lucene.expressions.SimpleBindings; | ||
import org.apache.lucene.index.LeafReaderContext; | ||
import org.apache.lucene.search.DoubleValues; | ||
import org.apache.lucene.search.DoubleValuesSource; | ||
import org.elasticsearch.script.GeneralScriptException; | ||
import org.elasticsearch.script.TermsSetQueryScript; | ||
|
||
/** | ||
* A bridge to evaluate an {@link Expression} against {@link Bindings} in the context | ||
* of a {@link TermsSetQueryScript}. | ||
*/ | ||
class ExpressionTermSetQueryScript implements TermsSetQueryScript.LeafFactory { | ||
|
||
final Expression exprScript; | ||
final SimpleBindings bindings; | ||
final DoubleValuesSource source; | ||
final ReplaceableConstDoubleValueSource specialValue; // _value | ||
|
||
ExpressionTermSetQueryScript(Expression e, SimpleBindings b, ReplaceableConstDoubleValueSource v) { | ||
exprScript = e; | ||
bindings = b; | ||
source = exprScript.getDoubleValuesSource(bindings); | ||
specialValue = v; | ||
} | ||
|
||
@Override | ||
public TermsSetQueryScript newInstance(final LeafReaderContext leaf) throws IOException { | ||
return new TermsSetQueryScript() { | ||
// Fake the scorer until setScorer is called. | ||
DoubleValues values = source.getValues(leaf, null); | ||
|
||
@Override | ||
public Number execute() { | ||
try { | ||
return values.doubleValue(); | ||
} catch (Exception exception) { | ||
throw new GeneralScriptException("Error evaluating " + exprScript, exception); | ||
} | ||
} | ||
|
||
@Override | ||
public void setDocument(int d) { | ||
try { | ||
values.advanceExact(d); | ||
} catch (IOException e) { | ||
throw new IllegalStateException("Can't advance to doc using " + exprScript, e); | ||
} | ||
} | ||
}; | ||
} | ||
|
||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 :)