honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fail queries that have two aggregations with the same name. 

Close #6255
This commit is contained in:
Adrien Grand 2014-05-21 15:08:34 +02:00
parent f29744cc2f
commit 34f7bd1ca4
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.search.aggregations;
import org.apache.lucene.index.AtomicReaderContext;
import org.elasticsearch.ElasticsearchIllegalArgumentException;
import org.elasticsearch.common.lease.Releasables;
import org.elasticsearch.common.util.ObjectArray;
import org.elasticsearch.search.aggregations.Aggregator.BucketAggregationMode;
@ -26,7 +27,9 @@ import org.elasticsearch.search.aggregations.support.AggregationContext;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
*
@ -183,9 +186,13 @@ public class AggregatorFactories {
public static class Builder {
private List<AggregatorFactory> factories = new ArrayList<>();
private final Set<String> names = new HashSet<>();
private final List<AggregatorFactory> factories = new ArrayList<>();
public Builder add(AggregatorFactory factory) {
if (!names.add(factory.name)) {
throw new ElasticsearchIllegalArgumentException("Two sibling aggregations cannot have the same name: [" + factory.name + "]");
}
factories.add(factory);
return this;
}

21
src/test/java/org/elasticsearch/search/aggregations/ParsingTests.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.search.aggregations;
import com.carrotsearch.randomizedtesting.generators.RandomStrings;
import org.elasticsearch.action.search.SearchPhaseExecutionException;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
@ -112,6 +113,26 @@ public class ParsingTests extends ElasticsearchIntegrationTest {
.endObject()).execute().actionGet();
}
@Test(expected=SearchPhaseExecutionException.class)
public void testSameAggregationName() throws Exception {
createIndex("idx");
ensureGreen();
final String name = RandomStrings.randomAsciiOfLength(getRandom(), 10);
client().prepareSearch("idx").setAggregations(JsonXContent.contentBuilder()
.startObject()
.startObject(name)
.startObject("terms")
.field("field", "a")
.endObject()
.endObject()
.startObject(name)
.startObject("terms")
.field("field", "b")
.endObject()
.endObject()
.endObject()).execute().actionGet();
}
@Test(expected=SearchPhaseExecutionException.class)
public void testMissingName() throws Exception {
createIndex("idx");