cleanup of the percentiles aggregation

Author: uboness

pom.xml

@@ -990,7 +990,7 @@
                                 <exclude>org/elasticsearch/plugins/PluginManager.class</exclude>
                                 <exclude>org/elasticsearch/bootstrap/Bootstrap.class</exclude>
                                 <exclude>org/elasticsearch/Version.class</exclude>
-                                <exclude>org/elasticsearch/search/aggregations/metrics/percentile/providers/tdigest/GroupTree.class</exclude>
+                                <exclude>org/elasticsearch/search/aggregations/metrics/percentile/tdigest/GroupTree.class</exclude>
                                 <!-- end excludes for valid system-out -->
                                 <!-- start excludes for Unsafe -->
                                 <exclude>org/elasticsearch/common/util/UnsafeUtils.class</exclude>

src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java

@@ -123,7 +123,7 @@ public static TermsBuilder terms(String name) {
         return new TermsBuilder(name);
     }
 
-    public static PercentileBuilder percentile(String name) {
+    public static PercentileBuilder percentiles(String name) {
         return new PercentileBuilder(name);
     }
 }

src/main/java/org/elasticsearch/search/aggregations/TransportAggregationModule.java

@@ -38,7 +38,7 @@
 import org.elasticsearch.search.aggregations.metrics.avg.InternalAvg;
 import org.elasticsearch.search.aggregations.metrics.max.InternalMax;
 import org.elasticsearch.search.aggregations.metrics.min.InternalMin;
-import org.elasticsearch.search.aggregations.metrics.percentile.InternalPercentile;
+import org.elasticsearch.search.aggregations.metrics.percentile.InternalPercentiles;
 import org.elasticsearch.search.aggregations.metrics.stats.InternalStats;
 import org.elasticsearch.search.aggregations.metrics.stats.extended.InternalExtendedStats;
 import org.elasticsearch.search.aggregations.metrics.sum.InternalSum;
@@ -60,7 +60,7 @@ protected void configure() {
         InternalStats.registerStreams();
         InternalExtendedStats.registerStreams();
         InternalValueCount.registerStreams();
-        InternalPercentile.registerStreams();
+        InternalPercentiles.registerStreams();
 
         // buckets
         InternalGlobal.registerStreams();

src/main/java/org/elasticsearch/search/aggregations/metrics/percentile/InternalExecutionHint.java

@@ -0,0 +1,69 @@
+/*
+ * 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.metrics.percentile;
+
+import org.elasticsearch.search.aggregations.metrics.percentile.frugal.Frugal;
+import org.elasticsearch.search.aggregations.metrics.percentile.qdigest.QDigest;
+import org.elasticsearch.search.aggregations.metrics.percentile.tdigest.TDigest;
+
+import java.util.Map;
+
+/**
+ *
+ */
+public enum InternalExecutionHint {
+
+    FRUGAL() {
+        @Override
+        public InternalPercentiles.Estimator.Factory estimatorFactory(Map <String, Object> settings) {
+            return new Frugal.Factory();
+        }
+    },
+
+    TDIGEST() {
+        @Override
+        public InternalPercentiles.Estimator.Factory estimatorFactory(Map <String, Object> settings) {
+            return new TDigest.Factory(settings);
+        }
+    },
+
+    QDIGEST() {
+        @Override
+        public InternalPercentiles.Estimator.Factory estimatorFactory(Map <String, Object> settings) {
+            return new QDigest.Factory(settings);
+        }
+    };
+
+    public abstract InternalPercentiles.Estimator.Factory estimatorFactory(Map <String, Object> settings);
+
+    public static InternalExecutionHint resolve(String name) {
+        if (name.equals("frugal")) {
+            return FRUGAL;
+        }
+        if (name.equals("qdigest")) {
+            return QDIGEST;
+        }
+        if (name.equals("tdigest")) {
+            return TDIGEST;
+        }
+        return null;
+    }
+
+}