From 5f67cd77da5b2961217e5ff9284d39855d844a33 Mon Sep 17 00:00:00 2001 From: Andy Bristol Date: Thu, 12 Mar 2020 12:22:26 -0700 Subject: [PATCH] register missing agg in ValuesSourceRegistry Part of refactoring ValuesSource in #42949 --- .../elasticsearch/search/SearchModule.java | 4 +- .../missing/MissingAggregationBuilder.java | 5 +++ .../missing/MissingAggregatorFactory.java | 34 +++++++++++++- .../missing/MissingAggregatorSupplier.java | 44 +++++++++++++++++++ 4 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorSupplier.java diff --git a/server/src/main/java/org/elasticsearch/search/SearchModule.java b/server/src/main/java/org/elasticsearch/search/SearchModule.java index 270732ffa76d4..e579861dcfc68 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchModule.java +++ b/server/src/main/java/org/elasticsearch/search/SearchModule.java @@ -381,7 +381,9 @@ private void registerAggregations(List plugins) { registerAggregation(new AggregationSpec(GlobalAggregationBuilder.NAME, GlobalAggregationBuilder::new, GlobalAggregationBuilder::parse).addResultReader(InternalGlobal::new)); registerAggregation(new AggregationSpec(MissingAggregationBuilder.NAME, MissingAggregationBuilder::new, - MissingAggregationBuilder.PARSER).addResultReader(InternalMissing::new)); + MissingAggregationBuilder.PARSER) + .addResultReader(InternalMissing::new) + .setAggregatorRegistrar(MissingAggregationBuilder::registerAggregators)); registerAggregation(new AggregationSpec(FilterAggregationBuilder.NAME, FilterAggregationBuilder::new, FilterAggregationBuilder::parse).addResultReader(InternalFilter::new)); registerAggregation(new AggregationSpec(FiltersAggregationBuilder.NAME, FiltersAggregationBuilder::new, diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java index 059acb6a7a49f..4894112ea3dbf 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java @@ -33,6 +33,7 @@ import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.aggregations.support.ValuesSourceParserHelper; +import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.search.aggregations.support.ValuesSourceType; import java.io.IOException; @@ -47,6 +48,10 @@ public class MissingAggregationBuilder extends ValuesSourceAggregationBuilder metaData) throws IOException { @@ -50,13 +71,22 @@ protected MissingAggregator createUnmapped(SearchContext searchContext, } @Override - protected MissingAggregator doCreateInternal(ValuesSource valuesSource, + protected Aggregator doCreateInternal(ValuesSource valuesSource, SearchContext searchContext, Aggregator parent, boolean collectsFromSingleBucket, List pipelineAggregators, Map metaData) throws IOException { - return new MissingAggregator(name, factories, valuesSource, searchContext, parent, pipelineAggregators, metaData); + + final AggregatorSupplier aggregatorSupplier = queryShardContext.getValuesSourceRegistry() + .getAggregator(config.valueSourceType(), MissingAggregationBuilder.NAME); + if (aggregatorSupplier instanceof MissingAggregatorSupplier == false) { + throw new AggregationExecutionException("Registry miss-match - expected MissingAggregatorSupplier, found [" + + aggregatorSupplier.getClass().toString() + "]"); + } + + return ((MissingAggregatorSupplier) aggregatorSupplier) + .build(name, factories, valuesSource, searchContext, parent, pipelineAggregators, metaData); } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorSupplier.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorSupplier.java new file mode 100644 index 0000000000000..2aca451accb08 --- /dev/null +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorSupplier.java @@ -0,0 +1,44 @@ +/* + * 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.bucket.missing; + +import org.elasticsearch.common.Nullable; +import org.elasticsearch.search.aggregations.Aggregator; +import org.elasticsearch.search.aggregations.AggregatorFactories; +import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; +import org.elasticsearch.search.aggregations.support.AggregatorSupplier; +import org.elasticsearch.search.aggregations.support.ValuesSource; +import org.elasticsearch.search.internal.SearchContext; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +@FunctionalInterface +public interface MissingAggregatorSupplier extends AggregatorSupplier { + + Aggregator build(String name, + AggregatorFactories factories, + @Nullable ValuesSource valuesSource, + SearchContext aggregationContext, + Aggregator parent, + List pipelineAggregators, + Map metaData) throws IOException; +}