Aggregations Refactor: Refactor Percentiles and Percentile Ranks Aggregation

core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java

@@ -65,7 +65,7 @@ public interface Parser {
          * @return an empty {@link AggregatorFactory} instance for this parser
          *         that can be used for deserialization
          */
-        AggregatorFactory getFactoryPrototype();
+        AggregatorFactory[] getFactoryPrototypes();
     }
 
     /**

core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java

@@ -29,6 +29,7 @@
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.common.util.ObjectArray;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.search.aggregations.InternalAggregation.Type;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.internal.SearchContext.Lifetime;
@@ -44,7 +45,7 @@
 public abstract class AggregatorFactory extends ToXContentToBytes implements NamedWriteable<AggregatorFactory> {
 
     protected String name;
-    protected String type;
+    protected Type type;
     protected AggregatorFactory parent;
     protected AggregatorFactories factories = AggregatorFactories.EMPTY;
     protected Map<String, Object> metaData;
@@ -56,7 +57,7 @@ public abstract class AggregatorFactory extends ToXContentToBytes implements Nam
      * @param name  The aggregation name
      * @param type  The aggregation type
      */
-    public AggregatorFactory(String name, String type) {
+    public AggregatorFactory(String name, Type type) {
         this.name = name;
         this.type = type;
     }
@@ -74,7 +75,7 @@ public final void init(AggregationContext context) {
     /**
      * Allows the {@link AggregatorFactory} to initialize any state prior to
      * using it to create {@link Aggregator}s.
-     * 
+     *
      * @param context
      *            the {@link AggregationContext} to use during initialization.
      */
@@ -170,7 +171,7 @@ public final XContentBuilder toXContent(XContentBuilder builder, Params params)
         if (this.metaData != null) {
             builder.field("meta", this.metaData);
         }
-        builder.field(type);
+        builder.field(type.name());
         internalXContent(builder, params);
 
         if (factories != null && factories.count() > 0) {
@@ -189,7 +190,11 @@ protected XContentBuilder internalXContent(XContentBuilder builder, Params param
 
     @Override
     public String getWriteableName() {
-        return type;
+        return type.stream().toUtf8();
+    }
+
+    public String getType() {
+        return type.name();
     }
 
     /**

core/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java

@@ -60,10 +60,12 @@ public AggregatorParsers(Set<Aggregator.Parser> aggParsers, Set<PipelineAggregat
         Map<String, Aggregator.Parser> aggParsersBuilder = new HashMap<>(aggParsers.size());
         for (Aggregator.Parser parser : aggParsers) {
             aggParsersBuilder.put(parser.type(), parser);
-            AggregatorFactory factoryPrototype = parser.getFactoryPrototype();
+            AggregatorFactory[] factoryPrototypes = parser.getFactoryPrototypes();
             // NORELEASE remove this check when agg refactoring complete
-            if (factoryPrototype != null) {
-                namedWriteableRegistry.registerPrototype(AggregatorFactory.class, factoryPrototype);
+            if (factoryPrototypes != null) {
+                for (AggregatorFactory factoryPrototype : factoryPrototypes) {
+                    namedWriteableRegistry.registerPrototype(AggregatorFactory.class, factoryPrototype);
+                }
             }
         }
         this.aggParsers = unmodifiableMap(aggParsersBuilder);

core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java

@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.search.aggregations.bucket.children;
 
-import org.apache.lucene.search.Query;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.SearchParseException;
 import org.elasticsearch.search.aggregations.Aggregator;
@@ -70,7 +69,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java

@@ -201,7 +201,7 @@ public static class Factory extends ValuesSourceAggregatorFactory<ValuesSource.B
         private Query childFilter;
 
         public Factory(String name, String childType) {
-            super(name, InternalChildren.TYPE.name(), new ValuesSourceParser.Input<ValuesSource.Bytes.WithOrdinals.ParentChild>());
+            super(name, InternalChildren.TYPE, new ValuesSourceParser.Input<ValuesSource.Bytes.WithOrdinals.ParentChild>());
             this.childType = childType;
         }
 

core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java

@@ -85,7 +85,7 @@ public static class Factory extends AggregatorFactory {
         private final Query filter;
 
         public Factory(String name, Query filter) {
-            super(name, InternalFilter.TYPE.name());
+            super(name, InternalFilter.TYPE);
             this.filter = filter;
         }
 

core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterParser.java

@@ -46,7 +46,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 

core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java

@@ -150,7 +150,7 @@ public static class Factory extends AggregatorFactory {
         private String otherBucketKey;
 
         public Factory(String name, List<KeyedFilter> filters, boolean keyed, String otherBucketKey) {
-            super(name, InternalFilters.TYPE.name());
+            super(name, InternalFilters.TYPE);
             this.filters = filters;
             this.keyed = keyed;
             this.otherBucketKey = otherBucketKey;

core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersParser.java

@@ -119,7 +119,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 

core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParser.java

@@ -72,8 +72,8 @@ public String type() {
         return InternalGeoHashGrid.TYPE.name();
     }
     @Override
-    public AggregatorFactory getFactoryPrototype() {
-        return new GeoGridFactory(null);
+    public AggregatorFactory[] getFactoryPrototypes() {
+        return new AggregatorFactory[] { new GeoGridFactory(null) };
     }
 
     @Override
@@ -121,7 +121,7 @@ public static class GeoGridFactory extends ValuesSourceAggregatorFactory<ValuesS
         private int shardSize = -1;
 
         public GeoGridFactory(String name) {
-            super(name, InternalGeoHashGrid.TYPE.name(), ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
+            super(name, InternalGeoHashGrid.TYPE, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
     }
 
         public void precision(int precision) {

core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java

@@ -74,7 +74,7 @@ public InternalAggregation buildEmptyAggregation() {
     public static class Factory extends AggregatorFactory {
 
         public Factory(String name) {
-            super(name, InternalGlobal.TYPE.name());
+            super(name, InternalGlobal.TYPE);
         }
 
         @Override

core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalParser.java

@@ -42,8 +42,8 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
     }
 
     @Override
-    public AggregatorFactory getFactoryPrototype() {
-        return new GlobalAggregator.Factory(null);
+    public AggregatorFactory[] getFactoryPrototypes() {
+        return new AggregatorFactory[] { new GlobalAggregator.Factory(null) };
     }
 
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramParser.java

@@ -106,7 +106,7 @@ protected long parseStringOffset(String offset) throws IOException {
     }
 
     @Override
-    public AggregatorFactory getFactoryPrototype() {
-        return HistogramAggregator.DateHistogramFactory.PROTOTYPE;
+    public AggregatorFactory[] getFactoryPrototypes() {
+        return new AggregatorFactory[] { HistogramAggregator.DateHistogramFactory.PROTOTYPE };
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramParser.java

@@ -165,7 +165,7 @@ static InternalOrder resolveOrder(String key, boolean asc) {
     }
 
     @Override
-    public AggregatorFactory getFactoryPrototype() {
-        return HistogramAggregator.Factory.PROTOTYPE;
+    public AggregatorFactory[] getFactoryPrototypes() {
+        return new AggregatorFactory[] { HistogramAggregator.Factory.PROTOTYPE };
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java

@@ -67,8 +67,8 @@ static class Factory extends InternalHistogram.Factory<InternalDateHistogram.Buc
         }
 
         @Override
-        public String type() {
-            return TYPE.name();
+        public Type type() {
+            return TYPE;
         }
 
         @Override

core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java

@@ -238,8 +238,8 @@ public static class Factory<B extends InternalHistogram.Bucket> {
         protected Factory() {
         }
 
-        public String type() {
-            return TYPE.name();
+        public Type type() {
+            return TYPE;
         }
 
         public ValueType valueType() {
@@ -514,7 +514,7 @@ protected static <B extends InternalHistogram.Bucket> Factory<B> resolveFactory(
 
     @Override
     protected void doWriteTo(StreamOutput out) throws IOException {
-        out.writeString(factory.type());
+        out.writeString(factory.type().name());
         InternalOrder.Streams.writeOrder(order, out);
         out.writeVLong(minDocCount);
         if (minDocCount == 0) {

core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java

@@ -84,7 +84,7 @@ public InternalAggregation buildEmptyAggregation() {
     public static class Factory extends ValuesSourceAggregatorFactory<ValuesSource>  {
 
         public Factory(String name, ValuesSourceParser.Input valueSourceInput) {
-            super(name, InternalMissing.TYPE.name(), valueSourceInput);
+            super(name, InternalMissing.TYPE, valueSourceInput);
         }
 
         @Override

core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingParser.java

@@ -62,7 +62,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java

@@ -114,7 +114,7 @@ public void collect(int parentDoc, long bucket) throws IOException {
             }
         };
     }
-        
+
     @Override
     public InternalAggregation buildAggregation(long owningBucketOrdinal) throws IOException {
         return new InternalNested(name, bucketDocCount(owningBucketOrdinal), bucketAggregations(owningBucketOrdinal), pipelineAggregators(),
@@ -142,7 +142,7 @@ public static class Factory extends AggregatorFactory {
         private final String path;
 
         public Factory(String name, String path) {
-            super(name, InternalNested.TYPE.name());
+            super(name, InternalNested.TYPE);
             this.path = path;
         }
 

core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedParser.java

@@ -69,7 +69,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java

@@ -79,8 +79,8 @@ public void collect(int childDoc, long bucket) throws IOException {
                 // fast forward to retrieve the parentDoc this childDoc belongs to
                 final int parentDoc = parentDocs.nextSetBit(childDoc);
                 assert childDoc <= parentDoc && parentDoc != DocIdSetIterator.NO_MORE_DOCS;
-                
-                int keySlot = bucketOrdToLastCollectedParentDoc.indexOf(bucket); 
+
+                int keySlot = bucketOrdToLastCollectedParentDoc.indexOf(bucket);
                 if (bucketOrdToLastCollectedParentDoc.indexExists(keySlot)) {
                     int lastCollectedParentDoc = bucketOrdToLastCollectedParentDoc.indexGet(keySlot);
                     if (parentDoc > lastCollectedParentDoc) {
@@ -124,7 +124,7 @@ public static class Factory extends AggregatorFactory {
         private final String path;
 
         public Factory(String name, String path) {
-            super(name, InternalReverseNested.TYPE.name());
+            super(name, InternalReverseNested.TYPE);
             this.path = path;
         }
 

core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedParser.java

@@ -63,7 +63,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java

@@ -221,8 +221,8 @@ public void writeTo(StreamOutput out) throws IOException {
 
     public static class Factory<B extends Bucket, R extends InternalRange<B, R>> {
 
-        public String type() {
-            return TYPE.name();
+        public Type type() {
+            return TYPE;
         }
 
         public R create(String name, List<B> ranges, ValueFormatter formatter, boolean keyed, List<PipelineAggregator> pipelineAggregators,

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java

@@ -115,7 +115,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java

@@ -120,7 +120,7 @@ public AggregatorFactory parse(String aggregationName, XContentParser parser, Se
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 }

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java

@@ -115,8 +115,8 @@ ValueFormatter formatter() {
     public static class Factory extends InternalRange.Factory<InternalDateRange.Bucket, InternalDateRange> {
 
         @Override
-        public String type() {
-            return TYPE.name();
+        public Type type() {
+            return TYPE;
         }
 
         @Override

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java

@@ -246,7 +246,7 @@ public SortedBinaryDocValues bytesValues(LeafReaderContext ctx) {
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }
 

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java

@@ -104,8 +104,8 @@ ValueFormatter formatter() {
     public static class Factory extends InternalRange.Factory<InternalGeoDistance.Bucket, InternalGeoDistance> {
 
         @Override
-        public String type() {
-            return TYPE.name();
+        public Type type() {
+            return TYPE;
         }
 
         @Override

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/InternalIPv4Range.java

@@ -112,8 +112,8 @@ boolean keyed() {
     public static class Factory extends InternalRange.Factory<InternalIPv4Range.Bucket, InternalIPv4Range> {
 
         @Override
-        public String type() {
-            return TYPE.name();
+        public Type type() {
+            return TYPE;
         }
 
         @Override

core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IpRangeParser.java

@@ -139,7 +139,7 @@ private static void parseMaskRange(String cidr, RangeAggregator.Range range, Str
 
     // NORELEASE implement this method when refactoring this aggregation
     @Override
-    public AggregatorFactory getFactoryPrototype() {
+    public AggregatorFactory[] getFactoryPrototypes() {
         return null;
     }