Skip to content

Add count to rest output of geo_centroid #24387

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 1 commit into from
Apr 28, 2017
Merged

Add count to rest output of geo_centroid #24387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions ...n/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.elasticsearch.search.aggregations.metrics.geocentroid;

import org.apache.lucene.geo.GeoEncodingUtils;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.geo.GeoPoint;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand All @@ -36,8 +37,8 @@
* Serialization and merge logic for {@link GeoCentroidAggregator}.
*/
public class InternalGeoCentroid extends InternalAggregation implements GeoCentroid {
protected final GeoPoint centroid;
protected final long count;
private final GeoPoint centroid;
private final long count;

public static long encodeLatLon(double lat, double lon) {
return (Integer.toUnsignedLong(GeoEncodingUtils.encodeLatitude(lat)) << 32) | Integer.toUnsignedLong(GeoEncodingUtils.encodeLongitude(lon));
Expand Down Expand Up @@ -136,6 +137,8 @@ public Object getProperty(List<String> path) {
return centroid.lat();
case "lon":
return centroid.lon();
case "count":
return count;
default:
throw new IllegalArgumentException("Found unknown path element [" + coordinate + "] in [" + getName() + "]");
}
Expand All @@ -145,14 +148,27 @@ public Object getProperty(List<String> path) {
}

static class Fields {
static final String CENTROID = "location";
static final ParseField CENTROID = new ParseField("location");
static final ParseField CENTROID_LAT = new ParseField("lat");
static final ParseField CENTROID_LON = new ParseField("lon");
static final ParseField COUNT = new ParseField("count");
}

@Override
public XContentBuilder doXContentBody(XContentBuilder builder, Params params) throws IOException {
return renderXContent(builder, params, centroid, count);
}

static XContentBuilder renderXContent(XContentBuilder builder, Params params, GeoPoint centroid, long count) throws IOException {
if (centroid != null) {
builder.startObject(Fields.CENTROID).field("lat", centroid.lat()).field("lon", centroid.lon()).endObject();
builder.startObject(Fields.CENTROID.getPreferredName());
{
builder.field(Fields.CENTROID_LAT.getPreferredName(), centroid.lat());
builder.field(Fields.CENTROID_LON.getPreferredName(), centroid.lon());
}
builder.endObject();
}
builder.field(Fields.COUNT.getPreferredName(), count);
return builder;
}

Expand Down
6 changes: 6 additions & 0 deletions core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public void testEmptyAggregation() throws Exception {
assertThat(geoCentroid.getName(), equalTo(aggName));
GeoPoint centroid = geoCentroid.centroid();
assertThat(centroid, equalTo(null));
assertEquals(0, geoCentroid.count());
}

public void testUnmapped() throws Exception {
Expand All @@ -72,6 +73,7 @@ public void testUnmapped() throws Exception {
assertThat(geoCentroid.getName(), equalTo(aggName));
GeoPoint centroid = geoCentroid.centroid();
assertThat(centroid, equalTo(null));
assertEquals(0, geoCentroid.count());
}

public void testPartiallyUnmapped() throws Exception {
Expand All @@ -86,6 +88,7 @@ public void testPartiallyUnmapped() throws Exception {
GeoPoint centroid = geoCentroid.centroid();
assertThat(centroid.lat(), closeTo(singleCentroid.lat(), GEOHASH_TOLERANCE));
assertThat(centroid.lon(), closeTo(singleCentroid.lon(), GEOHASH_TOLERANCE));
assertEquals(numDocs, geoCentroid.count());
}

public void testSingleValuedField() throws Exception {
Expand All @@ -101,6 +104,7 @@ public void testSingleValuedField() throws Exception {
GeoPoint centroid = geoCentroid.centroid();
assertThat(centroid.lat(), closeTo(singleCentroid.lat(), GEOHASH_TOLERANCE));
assertThat(centroid.lon(), closeTo(singleCentroid.lon(), GEOHASH_TOLERANCE));
assertEquals(numDocs, geoCentroid.count());
}

public void testSingleValueFieldGetProperty() throws Exception {
Expand Down Expand Up @@ -130,6 +134,7 @@ public void testSingleValueFieldGetProperty() throws Exception {
closeTo(singleCentroid.lon(), GEOHASH_TOLERANCE));
assertThat((double) ((InternalAggregation)global).getProperty(aggName + ".lat"), closeTo(singleCentroid.lat(), GEOHASH_TOLERANCE));
assertThat((double) ((InternalAggregation)global).getProperty(aggName + ".lon"), closeTo(singleCentroid.lon(), GEOHASH_TOLERANCE));
assertEquals(numDocs, (long) ((InternalAggregation) global).getProperty(aggName + ".count"));
}

public void testMultiValuedField() throws Exception {
Expand All @@ -145,6 +150,7 @@ public void testMultiValuedField() throws Exception {
GeoPoint centroid = geoCentroid.centroid();
assertThat(centroid.lat(), closeTo(multiCentroid.lat(), GEOHASH_TOLERANCE));
assertThat(centroid.lon(), closeTo(multiCentroid.lon(), GEOHASH_TOLERANCE));
assertEquals(2 * numDocs, geoCentroid.count());
}

public void testSingleValueFieldAsSubAggToGeohashGrid() throws Exception {
Expand Down
25 changes: 16 additions & 9 deletions ...a/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ protected InternalGeoCentroid createTestInstance(String name, List<PipelineAggre
centroid.resetLon(GeoEncodingUtils.decodeLongitude(encodedLon));
int encodedLat = GeoEncodingUtils.encodeLatitude(centroid.lat());
centroid.resetLat(GeoEncodingUtils.decodeLatitude(encodedLat));

return new InternalGeoCentroid("_name", centroid, 1, Collections.emptyList(), Collections.emptyMap());
long count = randomIntBetween(0, 1000);
if (count == 0) {
centroid = null;
}
return new InternalGeoCentroid("_name", centroid, count, Collections.emptyList(), Collections.emptyMap());
}

@Override
Expand All @@ -53,14 +56,18 @@ protected Writeable.Reader<InternalGeoCentroid> instanceReader() {

@Override
protected void assertReduced(InternalGeoCentroid reduced, List<InternalGeoCentroid> inputs) {
GeoPoint expected = new GeoPoint(0, 0);
int i = 0;
double lonSum = 0;
double latSum = 0;
int totalCount = 0;
for (InternalGeoCentroid input : inputs) {
expected.reset(expected.lat() + (input.centroid().lat() - expected.lat()) / (i+1),
expected.lon() + (input.centroid().lon() - expected.lon()) / (i+1));
i++;
if (input.count() > 0) {
lonSum += (input.count() * input.centroid().getLon());
latSum += (input.count() * input.centroid().getLat());
}
totalCount += input.count();
}
assertEquals(expected.getLat(), reduced.centroid().getLat(), 1E-5D);
assertEquals(expected.getLon(), reduced.centroid().getLon(), 1E-5D);
assertEquals(latSum/totalCount, reduced.centroid().getLat(), 1E-5D);
assertEquals(lonSum/totalCount, reduced.centroid().getLon(), 1E-5D);
assertEquals(totalCount, reduced.count());
}
}
12 changes: 8 additions & 4 deletions docs/reference/aggregations/metrics/geocentroid-aggregation.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ The response for the above aggregation:
"location": {
"lat": 51.00982963107526,
"lon": 3.9662130922079086
}
},
"count": 6
}
}
}
Expand Down Expand Up @@ -114,7 +115,8 @@ The response for the above aggregation:
"location": {
"lat": 52.371655656024814,
"lon": 4.909563297405839
}
},
"count": 3
}
},
{
Expand All @@ -124,7 +126,8 @@ The response for the above aggregation:
"location": {
"lat": 48.86055548675358,
"lon": 2.3316944623366
}
},
"count": 2
}
},
{
Expand All @@ -134,7 +137,8 @@ The response for the above aggregation:
"location": {
"lat": 51.22289997059852,
"lon": 4.40519998781383
}
},
"count": 1
}
}
]
Expand Down