Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed the caching of FieldDataSource in aggs to be based on field n…
…ame + required Value Source type as a combi key (used to be only field name). This fixes a problem where multiple aggregations where defined on the same field, yet require different types of value sources. Closes #5190
- Loading branch information
Showing
4 changed files
with
164 additions
and
14 deletions.
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
113 changes: 113 additions & 0 deletions
113
src/test/java/org/elasticsearch/search/aggregations/CombiTests.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,113 @@ | ||
/* | ||
* 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.search.aggregations; | ||
|
||
import com.carrotsearch.hppc.IntIntMap; | ||
import com.carrotsearch.hppc.IntIntOpenHashMap; | ||
import org.elasticsearch.action.index.IndexRequestBuilder; | ||
import org.elasticsearch.action.search.SearchResponse; | ||
import org.elasticsearch.common.settings.ImmutableSettings; | ||
import org.elasticsearch.common.settings.Settings; | ||
import org.elasticsearch.search.aggregations.bucket.missing.Missing; | ||
import org.elasticsearch.search.aggregations.bucket.terms.Terms; | ||
import org.elasticsearch.test.ElasticsearchIntegrationTest; | ||
import org.junit.Test; | ||
|
||
import java.util.Collection; | ||
|
||
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; | ||
import static org.elasticsearch.search.aggregations.AggregationBuilders.missing; | ||
import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; | ||
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; | ||
import static org.hamcrest.CoreMatchers.equalTo; | ||
|
||
/** | ||
* | ||
*/ | ||
public class CombiTests extends ElasticsearchIntegrationTest { | ||
|
||
|
||
@Override | ||
public Settings indexSettings() { | ||
return ImmutableSettings.builder() | ||
.put("index.number_of_shards", between(1, 5)) | ||
.put("index.number_of_replicas", between(0, 1)) | ||
.build(); | ||
} | ||
|
||
/** | ||
* Making sure that if there are multiple aggregations, working on the same field, yet require different | ||
* value source type, they can all still work. It used to fail as we used to cache the ValueSource by the | ||
* field name. If the cached value source was of type "bytes" and another aggregation on the field required to see | ||
* it as "numeric", it didn't work. Now we cache the Value Sources by a custom key (field name + ValueSource type) | ||
* so there's no conflict there. | ||
*/ | ||
@Test | ||
public void multipleAggs_OnSameField_WithDifferentRequiredValueSourceType() throws Exception { | ||
|
||
createIndex("idx"); | ||
IndexRequestBuilder[] builders = new IndexRequestBuilder[randomInt(30)]; | ||
IntIntMap values = new IntIntOpenHashMap(); | ||
long missingValues = 0; | ||
for (int i = 0; i < builders.length; i++) { | ||
String name = "name_" + randomIntBetween(1, 10); | ||
if (rarely()) { | ||
missingValues++; | ||
builders[i] = client().prepareIndex("idx", "type").setSource(jsonBuilder() | ||
.startObject() | ||
.field("name", name) | ||
.endObject()); | ||
} else { | ||
int value = randomIntBetween(1, 10); | ||
values.put(value, values.getOrDefault(value, 0) + 1); | ||
builders[i] = client().prepareIndex("idx", "type").setSource(jsonBuilder() | ||
.startObject() | ||
.field("name", name) | ||
.field("value", value) | ||
.endObject()); | ||
} | ||
} | ||
indexRandom(true, builders); | ||
ensureSearchable(); | ||
|
||
|
||
SearchResponse response = client().prepareSearch("idx") | ||
.addAggregation(missing("missing_values").field("value")) | ||
.addAggregation(terms("values").field("value")) | ||
.execute().actionGet(); | ||
|
||
assertSearchResponse(response); | ||
|
||
Aggregations aggs = response.getAggregations(); | ||
|
||
Missing missing = aggs.get("missing_values"); | ||
assertNotNull(missing); | ||
assertThat(missing.getDocCount(), equalTo(missingValues)); | ||
|
||
Terms terms = aggs.get("values"); | ||
assertNotNull(terms); | ||
Collection<Terms.Bucket> buckets = terms.getBuckets(); | ||
assertThat(buckets.size(), equalTo(values.size())); | ||
for (Terms.Bucket bucket : buckets) { | ||
values.remove(bucket.getKeyAsNumber().intValue()); | ||
} | ||
assertTrue(values.isEmpty()); | ||
} | ||
} |
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