Aggregations: Fixes resize bug in Geo bounds Aggregator

Closes #7556
elastic · Sep 3, 2014 · 6245552 · 6245552
1 parent bd42911
commit 6245552
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/...ain/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java b/...ain/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java
@@ -108,7 +108,7 @@ public void collect(int docId, long owningBucketOrdinal) throws IOException {
             bottoms.fill(from, bottoms.size(), Double.NEGATIVE_INFINITY);
             posLefts = bigArrays.resize(posLefts, tops.size());
             posLefts.fill(from, posLefts.size(), Double.NEGATIVE_INFINITY);
-            posLefts = bigArrays.resize(posLefts, tops.size());
+            posRights = bigArrays.resize(posRights, tops.size());
             posRights.fill(from, posRights.size(), Double.NEGATIVE_INFINITY);
             negLefts = bigArrays.resize(negLefts, tops.size());
             negLefts.fill(from, negLefts.size(), Double.NEGATIVE_INFINITY);

diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java
@@ -22,7 +22,12 @@
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.geo.GeoPoint;
+import org.elasticsearch.common.settings.ImmutableSettings;
+import org.elasticsearch.common.util.BigArray;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
 import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBounds;
+import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBoundsAggregator;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
@@ -32,6 +37,7 @@
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.geoBounds;
+import static org.elasticsearch.search.aggregations.AggregationBuilders.terms;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
 import static org.hamcrest.Matchers.equalTo;
@@ -120,6 +126,22 @@ public void setupSuiteScopeCluster() throws Exception {
                     .field("tag", "tag" + i)
                     .endObject()));
         }
+        assertAcked(prepareCreate("high_card_idx").setSettings(ImmutableSettings.builder().put("number_of_shards", 2))
+                .addMapping("type", SINGLE_VALUED_FIELD_NAME, "type=geo_point", MULTI_VALUED_FIELD_NAME, "type=geo_point", NUMBER_FIELD_NAME, "type=long", "tag", "type=string,index=not_analyzed"));
+
+
+        for (int i = 0; i < 2000; i++) {
+            builders.add(client().prepareIndex("high_card_idx", "type").setSource(jsonBuilder()
+                    .startObject()
+                    .array(SINGLE_VALUED_FIELD_NAME, singleValues[i % numUniqueGeoPoints].lon(), singleValues[i % numUniqueGeoPoints].lat())
+                    .startArray(MULTI_VALUED_FIELD_NAME)
+                        .startArray().value(multiValues[i % numUniqueGeoPoints].lon()).value(multiValues[i % numUniqueGeoPoints].lat()).endArray()   
+                        .startArray().value(multiValues[(i+1) % numUniqueGeoPoints].lon()).value(multiValues[(i+1) % numUniqueGeoPoints].lat()).endArray()
+                     .endArray()
+                    .field(NUMBER_FIELD_NAME, i)
+                    .field("tag", "tag" + i)
+                    .endObject()));
+        }
 
         indexRandom(true, builders);
         ensureSearchable();
@@ -293,4 +315,31 @@ public void singleValuedFieldNearDateLineWrapLongitude() throws Exception {
         assertThat(bottomRight.lon(), equalTo(geoValuesBottomRight.lon()));
     }
 
+    /**
+     * This test forces the {@link GeoBoundsAggregator} to resize the {@link BigArray}s it uses to ensure they are resized correctly
+     */
+    @Test
+    public void singleValuedFieldAsSubAggToHighCardTermsAgg() {
+        SearchResponse response = client().prepareSearch("high_card_idx")
+                .addAggregation(terms("terms").field(NUMBER_FIELD_NAME).subAggregation(geoBounds("geoBounds").field(SINGLE_VALUED_FIELD_NAME)
+                        .wrapLongitude(false)))
+                .execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        List<Bucket> buckets = terms.getBuckets();
+        assertThat(buckets.size(), equalTo(10));
+        for (int i = 0; i < 10; i++) {
+            Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat(bucket.getDocCount(), equalTo(1l));
+            GeoBounds geoBounds = bucket.getAggregations().get("geoBounds");
+            assertThat(geoBounds, notNullValue());
+            assertThat(geoBounds.getName(), equalTo("geoBounds"));
+        }
+    }
+
 }