Skip to content

Add Runtime Fields Contexts to Painless Execute API #71374

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

Merged
merged 11 commits into from
Apr 14, 2021
Merged

Add Runtime Fields Contexts to Painless Execute API #71374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7fa4599
add rt fields to painless execute action
jdconrad Apr 5, 2021
df768ba
add some tests
jdconrad Apr 6, 2021
105c7cd
finish single node tests
jdconrad Apr 6, 2021
ab58a91
add yaml tests
jdconrad Apr 6, 2021
1f4e585
Merge branch 'master' into rtexec
jdconrad Apr 6, 2021
e26157b
Merge branch 'master' into rtexec
jdconrad Apr 13, 2021
9634407
update based on pr feedback
jdconrad Apr 13, 2021
20746ac
Merge branch 'master' into rtexec
jdconrad Apr 13, 2021
6b40ed1
some yaml tests updated
jdconrad Apr 13, 2021
662f78b
Merge branch 'master' into rtexec
jdconrad Apr 13, 2021
0c78bea
finish updating yaml tests
jdconrad Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 82 additions & 3 deletions .../lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexService;
import org.elasticsearch.index.mapper.DateFieldMapper;
import org.elasticsearch.index.mapper.ParsedDocument;
import org.elasticsearch.index.mapper.SourceToParse;
import org.elasticsearch.index.query.AbstractQueryBuilder;
Expand All @@ -60,12 +61,19 @@
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.script.BooleanFieldScript;
import org.elasticsearch.script.DateFieldScript;
import org.elasticsearch.script.DoubleFieldScript;
import org.elasticsearch.script.FilterScript;
import org.elasticsearch.script.GeoPointFieldScript;
import org.elasticsearch.script.IpFieldScript;
import org.elasticsearch.script.LongFieldScript;
import org.elasticsearch.script.ScoreScript;
import org.elasticsearch.script.Script;
import org.elasticsearch.script.ScriptContext;
import org.elasticsearch.script.ScriptService;
import org.elasticsearch.script.ScriptType;
import org.elasticsearch.script.StringFieldScript;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

Expand Down Expand Up @@ -105,7 +113,15 @@ public static class Request extends SingleShardRequest<Request> implements ToXCo
static final Map<String, ScriptContext<?>> SUPPORTED_CONTEXTS = Map.of(
"painless_test", PainlessTestScript.CONTEXT,
"filter", FilterScript.CONTEXT,
"score", ScoreScript.CONTEXT);
"score", ScoreScript.CONTEXT,
"boolean_field", BooleanFieldScript.CONTEXT,
"date_field", DateFieldScript.CONTEXT,
"double_field", DoubleFieldScript.CONTEXT,
"geo_point_field", GeoPointFieldScript.CONTEXT,
"ip_field", IpFieldScript.CONTEXT,
"long_field", LongFieldScript.CONTEXT,
"string_field", StringFieldScript.CONTEXT)
;

static ScriptContext<?> fromScriptContextName(String name) {
ScriptContext<?> scriptContext = SUPPORTED_CONTEXTS.get(name);
Expand Down Expand Up @@ -492,7 +508,7 @@ static Response innerShardOperation(Request request, ScriptService scriptService
return prepareRamIndex(request, (context, leafReaderContext) -> {
FilterScript.Factory factory = scriptService.compile(request.script, FilterScript.CONTEXT);
FilterScript.LeafFactory leafFactory =
factory.newFactory(request.getScript().getParams(), context.lookup());
factory.newFactory(request.getScript().getParams(), context.lookup());
FilterScript filterScript = leafFactory.newInstance(leafReaderContext);
filterScript.setDocument(0);
boolean result = filterScript.execute();
Expand All @@ -502,7 +518,7 @@ static Response innerShardOperation(Request request, ScriptService scriptService
return prepareRamIndex(request, (context, leafReaderContext) -> {
ScoreScript.Factory factory = scriptService.compile(request.script, ScoreScript.CONTEXT);
ScoreScript.LeafFactory leafFactory =
factory.newFactory(request.getScript().getParams(), context.lookup());
factory.newFactory(request.getScript().getParams(), context.lookup());
ScoreScript scoreScript = leafFactory.newInstance(leafReaderContext);
scoreScript.setDocument(0);

Expand All @@ -521,6 +537,69 @@ static Response innerShardOperation(Request request, ScriptService scriptService
double result = scoreScript.execute(null);
return new Response(result);
}, indexService);
} else if (scriptContext == BooleanFieldScript.CONTEXT) {
return prepareRamIndex(request, (context, leafReaderContext) -> {
BooleanFieldScript.Factory factory = scriptService.compile(request.script, BooleanFieldScript.CONTEXT);
BooleanFieldScript.LeafFactory leafFactory =
factory.newFactory("boolean_field", request.getScript().getParams(), context.lookup());
BooleanFieldScript booleanFieldScript = leafFactory.newInstance(leafReaderContext);
booleanFieldScript.runForDoc(0);
return new Response(booleanFieldScript.asDocValues());
}, indexService);
} else if (scriptContext == DateFieldScript.CONTEXT) {
return prepareRamIndex(request, (context, leafReaderContext) -> {
DateFieldScript.Factory factory = scriptService.compile(request.script, DateFieldScript.CONTEXT);
DateFieldScript.LeafFactory leafFactory = factory.newFactory("date_field",
request.getScript().getParams(), context.lookup(), DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER);
DateFieldScript dateFieldScript = leafFactory.newInstance(leafReaderContext);
dateFieldScript.runForDoc(0);
return new Response(dateFieldScript.asDocValues());
}, indexService);
} else if (scriptContext == DoubleFieldScript.CONTEXT) {
return prepareRamIndex(request, (context, leafReaderContext) -> {
DoubleFieldScript.Factory factory = scriptService.compile(request.script, DoubleFieldScript.CONTEXT);
DoubleFieldScript.LeafFactory leafFactory =
factory.newFactory("double_field", request.getScript().getParams(), context.lookup());
DoubleFieldScript doubleFieldScript = leafFactory.newInstance(leafReaderContext);
doubleFieldScript.runForDoc(0);
return new Response(doubleFieldScript.asDocValues());
}, indexService);
} else if (scriptContext == GeoPointFieldScript.CONTEXT) {
return prepareRamIndex(request, (context, leafReaderContext) -> {
GeoPointFieldScript.Factory factory = scriptService.compile(request.script, GeoPointFieldScript.CONTEXT);
GeoPointFieldScript.LeafFactory leafFactory =
factory.newFactory("geo_point_field", request.getScript().getParams(), context.lookup());
GeoPointFieldScript geoPointFieldScript = leafFactory.newInstance(leafReaderContext);
geoPointFieldScript.runForDoc(0);
return new Response(geoPointFieldScript.asDocValues());
}, indexService);
} else if (scriptContext == IpFieldScript.CONTEXT) {
return prepareRamIndex(request, (context, leafReaderContext) -> {
IpFieldScript.Factory factory = scriptService.compile(request.script, IpFieldScript.CONTEXT);
IpFieldScript.LeafFactory leafFactory =
factory.newFactory("ip_field", request.getScript().getParams(), context.lookup());
IpFieldScript ipFieldScript = leafFactory.newInstance(leafReaderContext);
ipFieldScript.runForDoc(0);
return new Response(ipFieldScript.asDocValues());
}, indexService);
} else if (scriptContext == LongFieldScript.CONTEXT) {
return prepareRamIndex(request, (context, leafReaderContext) -> {
LongFieldScript.Factory factory = scriptService.compile(request.script, LongFieldScript.CONTEXT);
LongFieldScript.LeafFactory leafFactory =
factory.newFactory("long_field", request.getScript().getParams(), context.lookup());
LongFieldScript longFieldScript = leafFactory.newInstance(leafReaderContext);
longFieldScript.runForDoc(0);
return new Response(longFieldScript.asDocValues());
}, indexService);
} else if (scriptContext == StringFieldScript.CONTEXT) {
return prepareRamIndex(request, (context, leafReaderContext) -> {
StringFieldScript.Factory factory = scriptService.compile(request.script, StringFieldScript.CONTEXT);
StringFieldScript.LeafFactory leafFactory =
factory.newFactory("string_field", request.getScript().getParams(), context.lookup());
StringFieldScript stringFieldScript = leafFactory.newInstance(leafReaderContext);
stringFieldScript.resultsForDoc(0);
return new Response(stringFieldScript.asDocValues());
}, indexService);
} else {
throw new UnsupportedOperationException("unsupported context [" + scriptContext.name + "]");
}
Expand Down
Loading