-
Notifications
You must be signed in to change notification settings - Fork 24.4k
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
Add painless script support for Geoshape field #72886
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
d13edc0
Add painless script support for Geoshape field
iverase 7eb560e
Make new interface more generic
iverase 4febdc3
Make GeoBoundingBox a ToXContentFragment
iverase f488c94
Merge branch 'master' into GeoShapeScriptDocValues
iverase 8be69d0
Use geopoints for geoboundingbox
iverase 31d6b9b
Add dimensional type
iverase b019a47
Merge branch 'master' into GeoShapeScriptDocValues
iverase b994a04
handle null values properly
iverase 35154e7
geoshapevalue now implements ToXContentFragment
iverase 1de954e
Merge branch 'master' into GeoShapeScriptDocValues
iverase 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
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
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
230 changes: 230 additions & 0 deletions
230
.../src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPointScriptDocValuesIT.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,230 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.geo; | ||
|
|
||
| import org.apache.lucene.geo.GeoEncodingUtils; | ||
| import org.elasticsearch.action.search.SearchResponse; | ||
| import org.elasticsearch.common.document.DocumentField; | ||
| import org.elasticsearch.common.geo.GeoBoundingBox; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.common.xcontent.XContentFactory; | ||
| import org.elasticsearch.geo.GeometryTestUtils; | ||
| import org.elasticsearch.index.fielddata.ScriptDocValues; | ||
| import org.elasticsearch.plugins.Plugin; | ||
| import org.elasticsearch.script.MockScriptPlugin; | ||
| import org.elasticsearch.script.Script; | ||
| import org.elasticsearch.script.ScriptType; | ||
| import org.elasticsearch.test.ESSingleNodeTestCase; | ||
| import org.hamcrest.Matchers; | ||
| import org.junit.Before; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.function.Function; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; | ||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class GeoPointScriptDocValuesIT extends ESSingleNodeTestCase { | ||
|
|
||
| @Override | ||
| protected Collection<Class<? extends Plugin>> getPlugins() { | ||
| return Arrays.asList(CustomScriptPlugin.class); | ||
| } | ||
|
|
||
| public static class CustomScriptPlugin extends MockScriptPlugin { | ||
|
|
||
| @Override | ||
| protected Map<String, Function<Map<String, Object>, Object>> pluginScripts() { | ||
| Map<String, Function<Map<String, Object>, Object>> scripts = new HashMap<>(); | ||
|
|
||
| scripts.put("lat", this::scriptLat); | ||
| scripts.put("lon", this::scriptLon); | ||
| scripts.put("height", this::scriptHeight); | ||
| scripts.put("width", this::scriptWidth); | ||
| return scripts; | ||
| } | ||
|
|
||
| private double scriptHeight(Map<String, Object> vars) { | ||
| Map<?, ?> doc = (Map<?, ?>) vars.get("doc"); | ||
| ScriptDocValues.Geometry<?> geometry = assertGeometry(doc); | ||
| if (geometry.size() == 0) { | ||
| return Double.NaN; | ||
| } else { | ||
| GeoBoundingBox boundingBox = geometry.getBoundingBox(); | ||
| return boundingBox.topLeft().lat() - boundingBox.bottomRight().lat(); | ||
| } | ||
| } | ||
|
|
||
| private double scriptWidth(Map<String, Object> vars) { | ||
| Map<?, ?> doc = (Map<?, ?>) vars.get("doc"); | ||
| ScriptDocValues.Geometry<?> geometry = assertGeometry(doc); | ||
| if (geometry.size() == 0) { | ||
| return Double.NaN; | ||
| } else { | ||
| GeoBoundingBox boundingBox = geometry.getBoundingBox(); | ||
| return boundingBox.bottomRight().lon() - boundingBox.topLeft().lon(); | ||
| } | ||
| } | ||
|
|
||
| private double scriptLat(Map<String, Object> vars) { | ||
| Map<?, ?> doc = (Map<?, ?>) vars.get("doc"); | ||
| ScriptDocValues.Geometry<?> geometry = assertGeometry(doc); | ||
| return geometry.size() == 0 ? Double.NaN : geometry.getCentroid().lat(); | ||
| } | ||
|
|
||
| private double scriptLon(Map<String, Object> vars) { | ||
| Map<?, ?> doc = (Map<?, ?>) vars.get("doc"); | ||
| ScriptDocValues.Geometry<?> geometry = assertGeometry(doc); | ||
| return geometry.size() == 0 ? Double.NaN : geometry.getCentroid().lon(); | ||
| } | ||
|
|
||
| private ScriptDocValues.Geometry<?> assertGeometry(Map<?, ?> doc) { | ||
| ScriptDocValues.Geometry<?> geometry = (ScriptDocValues.Geometry<?>) doc.get("location"); | ||
| if (geometry.size() == 0) { | ||
| assertThat(geometry.getBoundingBox(), Matchers.nullValue()); | ||
| assertThat(geometry.getCentroid(), Matchers.nullValue()); | ||
| assertThat(geometry.getDimensionalType(), equalTo(-1)); | ||
| } else { | ||
| assertThat(geometry.getBoundingBox(), Matchers.notNullValue()); | ||
| assertThat(geometry.getCentroid(), Matchers.notNullValue()); | ||
| assertThat(geometry.getDimensionalType(), equalTo(0)); | ||
| } | ||
| return geometry; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean forbidPrivateIndexSettings() { | ||
| return false; | ||
| } | ||
|
|
||
| @Before | ||
| public void setupTestIndex() throws IOException { | ||
| XContentBuilder xContentBuilder = XContentFactory.jsonBuilder().startObject().startObject("_doc") | ||
| .startObject("properties").startObject("location").field("type", "geo_point"); | ||
| xContentBuilder.endObject().endObject().endObject().endObject(); | ||
| assertAcked(client().admin().indices().prepareCreate("test").setMapping(xContentBuilder)); | ||
| ensureGreen(); | ||
| } | ||
|
|
||
| public void testRandomPoint() throws Exception { | ||
| final double lat = GeometryTestUtils.randomLat(); | ||
| final double lon = GeometryTestUtils.randomLon(); | ||
| client().prepareIndex("test").setId("1") | ||
| .setSource(jsonBuilder().startObject() | ||
| .field("name", "TestPosition") | ||
| .field("location", new double[]{lon, lat}) | ||
| .endObject()) | ||
| .get(); | ||
|
|
||
| client().admin().indices().prepareRefresh("test").get(); | ||
|
|
||
| SearchResponse searchResponse = client().prepareSearch().addStoredField("_source") | ||
| .addScriptField("lat", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "lat", Collections.emptyMap())) | ||
| .addScriptField("lon", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "lon", Collections.emptyMap())) | ||
| .addScriptField("height", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "height", Collections.emptyMap())) | ||
| .addScriptField("width", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "width", Collections.emptyMap())) | ||
| .get(); | ||
| assertSearchResponse(searchResponse); | ||
|
|
||
| final double qLat = GeoEncodingUtils.decodeLatitude(GeoEncodingUtils.encodeLatitude(lat)); | ||
| final double qLon = GeoEncodingUtils.decodeLongitude(GeoEncodingUtils.encodeLongitude(lon)); | ||
|
|
||
| Map<String, DocumentField> fields = searchResponse.getHits().getHits()[0].getFields(); | ||
| assertThat(fields.get("lat").getValue(), equalTo(qLat)); | ||
| assertThat(fields.get("lon").getValue(), equalTo(qLon)); | ||
| assertThat(fields.get("height").getValue(), equalTo(0d)); | ||
| assertThat(fields.get("width").getValue(), equalTo(0d)); | ||
| } | ||
|
|
||
| public void testRandomMultiPoint() throws Exception { | ||
| final int size = randomIntBetween(2, 20); | ||
| final double[] lats = new double[size]; | ||
| final double[] lons = new double[size]; | ||
| for (int i = 0; i < size; i++) { | ||
| lats[i] = GeometryTestUtils.randomLat(); | ||
| lons[i] = GeometryTestUtils.randomLon(); | ||
| } | ||
|
|
||
| final double[][] values = new double[size][]; | ||
| for (int i = 0; i < size; i++) { | ||
| values[i] = new double[]{lons[i], lats[i]}; | ||
| } | ||
|
|
||
| XContentBuilder builder = jsonBuilder().startObject() | ||
| .field("name", "TestPosition") | ||
| .field("location", values).endObject(); | ||
| client().prepareIndex("test").setId("1").setSource(builder).get(); | ||
|
|
||
| client().admin().indices().prepareRefresh("test").get(); | ||
|
|
||
| SearchResponse searchResponse = client().prepareSearch().addStoredField("_source") | ||
| .addScriptField("lat", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "lat", Collections.emptyMap())) | ||
| .addScriptField("lon", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "lon", Collections.emptyMap())) | ||
| .addScriptField("height", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "height", Collections.emptyMap())) | ||
| .addScriptField("width", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "width", Collections.emptyMap())) | ||
| .get(); | ||
| assertSearchResponse(searchResponse); | ||
|
|
||
| for (int i = 0; i < size; i++) { | ||
| lats[i] = GeoEncodingUtils.decodeLatitude(GeoEncodingUtils.encodeLatitude(lats[i])); | ||
| lons[i] = GeoEncodingUtils.decodeLongitude(GeoEncodingUtils.encodeLongitude(lons[i])); | ||
| } | ||
|
|
||
| final double centroidLon = Arrays.stream(lons).sum() / size; | ||
| final double centroidLat = Arrays.stream(lats).sum() / size; | ||
| final double width = Arrays.stream(lons).max().getAsDouble() - Arrays.stream(lons).min().getAsDouble(); | ||
| final double height = Arrays.stream(lats).max().getAsDouble() - Arrays.stream(lats).min().getAsDouble(); | ||
|
|
||
| Map<String, DocumentField> fields = searchResponse.getHits().getHits()[0].getFields(); | ||
| assertThat(fields.get("lat").getValue(), equalTo(centroidLat)); | ||
| assertThat(fields.get("lon").getValue(), equalTo(centroidLon)); | ||
| assertThat(fields.get("height").getValue(), equalTo(height)); | ||
| assertThat(fields.get("width").getValue(), equalTo(width)); | ||
| } | ||
|
|
||
| public void testNullPoint() throws Exception { | ||
| client().prepareIndex("test").setId("1") | ||
| .setSource(jsonBuilder().startObject() | ||
| .field("name", "TestPosition") | ||
| .nullField("location") | ||
| .endObject()) | ||
| .get(); | ||
|
|
||
| client().admin().indices().prepareRefresh("test").get(); | ||
|
|
||
| SearchResponse searchResponse = client().prepareSearch().addStoredField("_source") | ||
| .addScriptField("lat", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "lat", Collections.emptyMap())) | ||
| .addScriptField("lon", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "lon", Collections.emptyMap())) | ||
| .addScriptField("height", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "height", Collections.emptyMap())) | ||
| .addScriptField("width", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "width", Collections.emptyMap())) | ||
| .get(); | ||
| assertSearchResponse(searchResponse); | ||
|
|
||
| Map<String, DocumentField> fields = searchResponse.getHits().getHits()[0].getFields(); | ||
| assertThat(fields.get("lat").getValue(), equalTo(Double.NaN)); | ||
| assertThat(fields.get("lon").getValue(), equalTo(Double.NaN)); | ||
| assertThat(fields.get("height").getValue(), equalTo(Double.NaN)); | ||
| assertThat(fields.get("width").getValue(), equalTo(Double.NaN)); | ||
| } | ||
| } |
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
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 have to make GeoBoundingBox to behave more like a GeoPoint