ValuesSourceRegistry Prototype

modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java

@@ -62,7 +62,7 @@ public class ChildrenAggregationBuilder
      */
     public ChildrenAggregationBuilder(String name, String childType) {
         super(name, ValueType.STRING);
-        f (childType == null) {
+        if (childType == null) {
             throw new IllegalArgumentException("[childType] must not be null: [" + name + "]");
         }
         this.childType = childType;

server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java

@@ -276,7 +276,7 @@ protected abstract CompositeValuesSourceConfig innerBuild(QueryShardContext quer
 
     public final CompositeValuesSourceConfig build(QueryShardContext queryShardContext) throws IOException {
         ValuesSourceConfig<?> config = ValuesSourceConfig.resolve(queryShardContext,
-            valueType, field, script, null,null, format);
+            valueType, field, script, null,null, format, name());
         return innerBuild(queryShardContext, config);
     }
 }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java

@@ -19,15 +19,23 @@
 
 package org.elasticsearch.search.aggregations.bucket.histogram;
 
+import org.elasticsearch.index.fielddata.IndexNumericFieldData;
+import org.elasticsearch.index.mapper.RangeFieldMapper;
 import org.elasticsearch.index.query.QueryShardContext;
+import org.elasticsearch.search.DocValueFormat;
+import org.elasticsearch.search.aggregations.AggregationExecutionException;
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.AggregatorFactories;
 import org.elasticsearch.search.aggregations.AggregatorFactory;
 import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
+import org.elasticsearch.search.aggregations.support.AggregatorSupplier;
+import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
+import org.elasticsearch.search.aggregations.support.HistogramAggregatorSupplier;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
+import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
 import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;
@@ -46,6 +54,45 @@ public final class HistogramAggregatorFactory extends ValuesSourceAggregatorFact
     private final long minDocCount;
     private final double minBound, maxBound;
 
+    // TODO: Registration should happen on the actual aggregator classes, but I don't want to set up the whole dynamic loading thing yet
+    static {
+        ValuesSourceRegistry.getInstance().register(HistogramAggregationBuilder.NAME, CoreValuesSourceType.RANGE,
+            new HistogramAggregatorSupplier() {
+                @Override
+                public Aggregator build(String name, AggregatorFactories factories, double interval, double offset,
+                                        BucketOrder order, boolean keyed, long minDocCount, double minBound, double maxBound,
+                                        ValuesSource valuesSource, DocValueFormat formatter, SearchContext context,
+                                        Aggregator parent, List<PipelineAggregator> pipelineAggregators,
+                                        Map<String, Object> metaData) throws IOException {
+                    ValuesSource.Range rangeValueSource = (ValuesSource.Range) valuesSource;
+                    if (rangeValueSource.rangeType().isNumeric() == false) {
+                        throw new IllegalArgumentException("Expected numeric range type but found non-numeric range ["
+                            + rangeValueSource.rangeType().name + "]");
+                    }
+                    return new RangeHistogramAggregator(name, factories, interval, offset, order, keyed, minDocCount, minBound,
+                        maxBound, rangeValueSource, formatter, context, parent, pipelineAggregators, metaData);
+                }
+            },
+            (fieldType, indexFieldData) -> fieldType instanceof RangeFieldMapper.RangeFieldType
+        );
+
+        ValuesSourceRegistry.getInstance().register(HistogramAggregationBuilder.NAME, CoreValuesSourceType.NUMERIC,
+            new HistogramAggregatorSupplier() {
+                @Override
+                public Aggregator build(String name, AggregatorFactories factories, double interval, double offset,
+                                        BucketOrder order, boolean keyed, long minDocCount, double minBound, double maxBound,
+                                        ValuesSource valuesSource, DocValueFormat formatter, SearchContext context,
+                                        Aggregator parent, List<PipelineAggregator> pipelineAggregators,
+                                        Map<String, Object> metaData) throws IOException {
+                    return new NumericHistogramAggregator(name, factories, interval, offset, order, keyed, minDocCount, minBound,
+                        maxBound, (ValuesSource.Numeric) valuesSource, formatter, context, parent, pipelineAggregators, metaData);
+                }
+            },
+            (fieldType, indexFieldData) -> indexFieldData instanceof IndexNumericFieldData
+        );
+    }
+
+
     @Override
     protected ValuesSource resolveMissingAny(Object missing) {
         if (missing instanceof Number) {
@@ -92,23 +139,16 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource,
         if (collectsFromSingleBucket == false) {
             return asMultiBucketAggregator(this, searchContext, parent);
         }
-        if (valuesSource instanceof ValuesSource.Numeric) {
-            return new NumericHistogramAggregator(name, factories, interval, offset, order, keyed, minDocCount, minBound, maxBound,
-                (ValuesSource.Numeric) valuesSource, config.format(), searchContext, parent, pipelineAggregators, metaData);
-        } else if (valuesSource instanceof ValuesSource.Range) {
-            ValuesSource.Range rangeValueSource = (ValuesSource.Range) valuesSource;
-            if (rangeValueSource.rangeType().isNumeric() == false) {
-                throw new IllegalArgumentException("Expected numeric range type but found non-numeric range ["
-                    + rangeValueSource.rangeType().name + "]");
-            }
-            return new RangeHistogramAggregator(name, factories, interval, offset, order, keyed, minDocCount, minBound, maxBound,
-                (ValuesSource.Range) valuesSource, config.format(), searchContext, parent, pipelineAggregators,
-                metaData);
-        }
-        else {
-            throw new IllegalArgumentException("Expected one of [Numeric, Range] values source, found ["
-                + valuesSource.toString() + "]");
+
+        AggregatorSupplier aggregatorSupplier = ValuesSourceRegistry.getInstance().getAggregator(config.valueSourceType(),
+            HistogramAggregationBuilder.NAME);
+        if (aggregatorSupplier instanceof HistogramAggregatorSupplier == false) {
+            throw new AggregationExecutionException("Registry miss-match - expected HistogramAggregatorSupplier, found [" +
+                aggregatorSupplier.getClass().toString() + "]");
         }
+        HistogramAggregatorSupplier histogramAggregatorSupplier = (HistogramAggregatorSupplier) aggregatorSupplier;
+        return histogramAggregatorSupplier.build(name, factories, interval, offset, order, keyed, minDocCount, minBound, maxBound,
+                valuesSource, config.format(), searchContext, parent, pipelineAggregators, metaData);
     }
 
     @Override

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregator.java

@@ -29,14 +29,14 @@
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.AggregatorFactories;
+import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.InternalAggregation;
+import org.elasticsearch.search.aggregations.InternalOrder;
 import org.elasticsearch.search.aggregations.LeafBucketCollector;
 import org.elasticsearch.search.aggregations.LeafBucketCollectorBase;
 import org.elasticsearch.search.aggregations.bucket.BucketsAggregator;
 import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram.EmptyBucketInfo;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
-import org.elasticsearch.search.aggregations.BucketOrder;
-import org.elasticsearch.search.aggregations.InternalOrder;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
 import org.elasticsearch.search.internal.SearchContext;
 
@@ -52,7 +52,7 @@
  * written as {@code interval * x + offset} and yet is less than or equal to
  * {@code value}.
  */
-class NumericHistogramAggregator extends BucketsAggregator {
+public class NumericHistogramAggregator extends BucketsAggregator {
 
     private final ValuesSource.Numeric valuesSource;
     private final DocValueFormat formatter;
@@ -64,7 +64,7 @@ class NumericHistogramAggregator extends BucketsAggregator {
 
     private final LongHash bucketOrds;
 
-    NumericHistogramAggregator(String name, AggregatorFactories factories, double interval, double offset,
+    public NumericHistogramAggregator(String name, AggregatorFactories factories, double interval, double offset,
                                BucketOrder order, boolean keyed, long minDocCount, double minBound, double maxBound,
                                @Nullable ValuesSource.Numeric valuesSource, DocValueFormat formatter,
                                SearchContext context, Aggregator parent,

server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/RangeHistogramAggregator.java

@@ -58,7 +58,7 @@ public class RangeHistogramAggregator extends BucketsAggregator {
 
     private final LongHash bucketOrds;
 
-    RangeHistogramAggregator(String name, AggregatorFactories factories, double interval, double offset,
+    public RangeHistogramAggregator(String name, AggregatorFactories factories, double interval, double offset,
                              BucketOrder order, boolean keyed, long minDocCount, double minBound, double maxBound,
                              @Nullable ValuesSource.Range valuesSource, DocValueFormat formatter,
                              SearchContext context, Aggregator parent,

server/src/main/java/org/elasticsearch/search/aggregations/support/AggregatorSupplier.java

@@ -0,0 +1,22 @@
+/*
+ * 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.support;
+
+public interface AggregatorSupplier {
+}

server/src/main/java/org/elasticsearch/search/aggregations/support/HistogramAggregatorSupplier.java

@@ -0,0 +1,39 @@
+/*
+ * 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.support;
+
+import org.elasticsearch.common.Nullable;
+import org.elasticsearch.search.DocValueFormat;
+import org.elasticsearch.search.aggregations.Aggregator;
+import org.elasticsearch.search.aggregations.AggregatorFactories;
+import org.elasticsearch.search.aggregations.BucketOrder;
+import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
+import org.elasticsearch.search.internal.SearchContext;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public interface HistogramAggregatorSupplier extends AggregatorSupplier {
+    Aggregator build(String name, AggregatorFactories factories, double interval, double offset,
+                     BucketOrder order, boolean keyed, long minDocCount, double minBound, double maxBound,
+                     @Nullable ValuesSource valuesSource, DocValueFormat formatter,
+                     SearchContext context, Aggregator parent,
+                     List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException;
+}

server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceAggregationBuilder.java

@@ -170,7 +170,7 @@ protected final MultiValuesSourceAggregatorFactory<VS> doBuild(QueryShardContext
         Map<String, ValuesSourceConfig<VS>> configs = new HashMap<>(fields.size());
         fields.forEach((key, value) -> {
             ValuesSourceConfig<VS> config = ValuesSourceConfig.resolve(queryShardContext, finalValueType,
-                value.getFieldName(), value.getScript(), value.getMissing(), value.getTimeZone(), format);
+                value.getFieldName(), value.getScript(), value.getMissing(), value.getTimeZone(), format, getType());
             configs.put(key, config);
         });
         DocValueFormat docValueFormat = resolveFormat(format, finalValueType);

server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java

@@ -330,7 +330,7 @@ protected ValueType defaultValueType(Script script) {
     protected ValuesSourceConfig<VS> resolveConfig(QueryShardContext queryShardContext) {
         ValueType valueType = this.valueType != null ? this.valueType : targetValueType;
         return ValuesSourceConfig.resolve(queryShardContext,
-                valueType, field, script, missing, timeZone, format, this::resolveScriptAny);
+                valueType, field, script, missing, timeZone, format, this::resolveScriptAny, this.getType());
     }
 
     protected abstract ValuesSourceAggregatorFactory<VS> innerBuild(QueryShardContext queryShardContext,