Skip to content

Rewire terms agg to use new VS registry #51182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 29, 2020
Merged

Rewire terms agg to use new VS registry #51182

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49ada12
Rewire terms agg to use new registry
polyfractal Jan 16, 2020
6812334
Fix tests
polyfractal Jan 21, 2020
24aeb8f
Merge branch 'feature/extensible-values-source' of github.com:elastic…
polyfractal Jan 21, 2020
c515506
Merge branch 'feature/extensible-values-source' of github.com:elastic…
polyfractal Jan 28, 2020
72a8d40
Address review, fix merge conflicts
polyfractal Jan 28, 2020
4ae4905
checkstyle
polyfractal Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/search/SearchModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,8 @@ private void registerAggregations(List<SearchPlugin> plugins) {
.addResultReader(StringTerms.NAME, StringTerms::new)
.addResultReader(UnmappedTerms.NAME, UnmappedTerms::new)
.addResultReader(LongTerms.NAME, LongTerms::new)
.addResultReader(DoubleTerms.NAME, DoubleTerms::new));
.addResultReader(DoubleTerms.NAME, DoubleTerms::new)
.setAggregatorRegistrar(TermsAggregationBuilder::registerAggregators));
registerAggregation(new AggregationSpec(RareTermsAggregationBuilder.NAME, RareTermsAggregationBuilder::new,
RareTermsAggregationBuilder::parse)
.addResultReader(StringRareTerms.NAME, StringRareTerms::new)
Expand Down
9 changes: 9 additions & 0 deletions ...main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,13 @@
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 java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;

public class TermsAggregationBuilder extends ValuesSourceAggregationBuilder<TermsAggregationBuilder>
implements MultiBucketAggregationBuilder {
Expand Down Expand Up @@ -98,6 +100,13 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
return PARSER.parse(parser, new TermsAggregationBuilder(aggregationName), null);
}

private static AtomicBoolean wasRegistered = new AtomicBoolean(false);
public static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
if (wasRegistered.compareAndSet(false, true) == true) {
TermsAggregatorFactory.registerAggregators(valuesSourceRegistry);
}
}

private BucketOrder order = BucketOrder.compound(BucketOrder.count(false)); // automatically adds tie-breaker key asc order
private IncludeExclude includeExclude = null;
private String executionHint = null;
Expand Down
Loading