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

Added support for _count and _key as bucketsPaths

This commit is contained in:
Colin Goodheart-Smithe 2015-02-17 11:14:47 +00:00
parent 19cdfe256e
commit 3375c02b42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ public class AggregatorFactories {
} }
public AggregatorFactories build() { public AggregatorFactories build() {
if (factories.isEmpty()) { if (factories.isEmpty() && reducerFactories.isEmpty()) {
return EMPTY; return EMPTY;
} }
List<ReducerFactory> orderedReducers = resolveReducerOrder(this.reducerFactories, this.factories); List<ReducerFactory> orderedReducers = resolveReducerOrder(this.reducerFactories, this.factories);
@ -212,7 +212,7 @@ public class AggregatorFactories {
String[] bucketsPaths = factory.getBucketsPaths(); String[] bucketsPaths = factory.getBucketsPaths();
for (String bucketsPath : bucketsPaths) { for (String bucketsPath : bucketsPaths) {
ReducerFactory matchingFactory = reducerFactoriesMap.get(bucketsPath); ReducerFactory matchingFactory = reducerFactoriesMap.get(bucketsPath);
if (aggFactoryNames.contains(bucketsPath)) { if (bucketsPath.equals("_count") || bucketsPath.equals("_key") || aggFactoryNames.contains(bucketsPath)) {
continue; continue;
} else if (matchingFactory != null) { } else if (matchingFactory != null) {
resolveReducerOrder(aggFactoryNames, reducerFactoriesMap, orderedReducers, unmarkedFactories, temporarilyMarked, resolveReducerOrder(aggFactoryNames, reducerFactoriesMap, orderedReducers, unmarkedFactories, temporarilyMarked,