Skip to content

Allow terms agg to default to depth first #54845

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 1 commit into from
Apr 7, 2020
Merged

Allow terms agg to default to depth first #54845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .../main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ public Aggregator build(String name,
if (valuesSource instanceof ValuesSource.Bytes.WithOrdinals == false) {
execution = ExecutionMode.MAP;
}
final long maxOrd = execution == ExecutionMode.GLOBAL_ORDINALS ? getMaxOrd(valuesSource, context.searcher()) : -1;
if (execution == null) {
execution = ExecutionMode.GLOBAL_ORDINALS;
}
final long maxOrd = execution == ExecutionMode.GLOBAL_ORDINALS ? getMaxOrd(valuesSource, context.searcher()) : -1;
if (subAggCollectMode == null) {
subAggCollectMode = SubAggCollectionMode.DEPTH_FIRST;
// TODO can we remove concept of AggregatorFactories.EMPTY?
Expand Down
23 changes: 20 additions & 3 deletions ...rc/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
CoreValuesSourceType.BOOLEAN);
}

public void testGlobalOrdinalsExecutionHint() throws Exception {
public void testUsesGlobalOrdinalsByDefault() throws Exception {
randomizeAggregatorImpl = false;

Directory directory = newDirectory();
Expand All @@ -150,8 +150,7 @@ public void testGlobalOrdinalsExecutionHint() throws Exception {
IndexSearcher indexSearcher = new IndexSearcher(indexReader);

TermsAggregationBuilder aggregationBuilder = new TermsAggregationBuilder("_name").userValueTypeHint(ValueType.STRING)
.field("string")
.collectMode(Aggregator.SubAggCollectionMode.BREADTH_FIRST);
.field("string");
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType();
fieldType.setName("string");
fieldType.setHasDocValues(true);
Expand All @@ -161,11 +160,29 @@ public void testGlobalOrdinalsExecutionHint() throws Exception {
GlobalOrdinalsStringTermsAggregator globalAgg = (GlobalOrdinalsStringTermsAggregator) aggregator;
assertFalse(globalAgg.remapGlobalOrds());

// Infers depth_first because the maxOrd is 0 which is less than the size
aggregationBuilder
.subAggregation(AggregationBuilders.cardinality("card").field("string"));
aggregator = createAggregator(aggregationBuilder, indexSearcher, fieldType);
assertThat(aggregator, instanceOf(GlobalOrdinalsStringTermsAggregator.class));
globalAgg = (GlobalOrdinalsStringTermsAggregator) aggregator;
assertThat(globalAgg.collectMode, equalTo(Aggregator.SubAggCollectionMode.DEPTH_FIRST));
assertTrue(globalAgg.remapGlobalOrds());

aggregationBuilder
.collectMode(Aggregator.SubAggCollectionMode.DEPTH_FIRST);
aggregator = createAggregator(aggregationBuilder, indexSearcher, fieldType);
assertThat(aggregator, instanceOf(GlobalOrdinalsStringTermsAggregator.class));
globalAgg = (GlobalOrdinalsStringTermsAggregator) aggregator;
assertThat(globalAgg.collectMode, equalTo(Aggregator.SubAggCollectionMode.DEPTH_FIRST));
assertTrue(globalAgg.remapGlobalOrds());

aggregationBuilder
.collectMode(Aggregator.SubAggCollectionMode.BREADTH_FIRST);
aggregator = createAggregator(aggregationBuilder, indexSearcher, fieldType);
assertThat(aggregator, instanceOf(GlobalOrdinalsStringTermsAggregator.class));
globalAgg = (GlobalOrdinalsStringTermsAggregator) aggregator;
assertThat(globalAgg.collectMode, equalTo(Aggregator.SubAggCollectionMode.BREADTH_FIRST));
assertFalse(globalAgg.remapGlobalOrds());

aggregationBuilder
Expand Down