github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-19 04:45:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Temporarily bypass competitive iteration for filters aggregation (#126956)

Browse source
This commit is contained in:
Benjamin Trent 2025-04-16 17:08:17 -04:00 • committed by GitHub
parent 2e1101cf5e
commit b1f766258b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 126 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/changelog/126956.yaml Normal file
View file

@ -0,0 +1,5 @@
pr: 126956
summary: Temporarily bypass competitive iteration for filters aggregation
area: Aggregations
type: bug
issues: []

114
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java
View file

@ -29,8 +29,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
import static org.elasticsearch.search.aggregations.AggregationBuilders.avg;
import static org.elasticsearch.search.aggregations.AggregationBuilders.filters;
import static org.elasticsearch.search.aggregations.AggregationBuilders.histogram;
@ -95,6 +97,118 @@ public class FiltersIT extends ESIntegTestCase {
ensureSearchable();
}
// This test replicates a strange filter query & filters aggregation behavior
// we apparently utilize competitive iterators strangely.
// See: https://github.com/elastic/elasticsearch/issues/126955
public void testSimpleWithFilterQuery() throws Exception {
createIndex("filters_idx");
String groupFieldName = "group";
String subGroupFieldName = "subGroup";
int numTotalGroup0 = 500;
String group0Name = "group0";
int numTotalGroup1 = 1000;
String group1Name = "group1";
int subGroup0 = 100;
String subGroup0Name = "subGroup0";
int subGroup1 = 50;
String subGroup1Name = "subGroup1";
int subGroup2 = 25;
String subGroup2Name = "subGroup2";
int others = 10;
String otherName = "others";
List<IndexRequestBuilder> builders = new ArrayList<>();
for (int i = 0; i < numTotalGroup0; i++) {
for (int j = 0; j < subGroup0; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group0Name)
.field(subGroupFieldName, subGroup0Name)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
for (int j = 0; j < subGroup1; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group0Name)
.field(subGroupFieldName, subGroup1Name)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
for (int j = 0; j < subGroup2; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group0Name)
.field(subGroupFieldName, subGroup2Name)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
for (int j = 0; j < others; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group0Name)
.field(subGroupFieldName, otherName)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
}
for (int i = 0; i < numTotalGroup1; i++) {
for (int j = 0; j < subGroup0; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group1Name)
.field(subGroupFieldName, subGroup0Name)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
for (int j = 0; j < subGroup1; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group1Name)
.field(subGroupFieldName, subGroup1Name)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
for (int j = 0; j < subGroup2; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group1Name)
.field(subGroupFieldName, subGroup2Name)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
for (int j = 0; j < others; j++) {
XContentBuilder source = jsonBuilder().startObject()
.field(groupFieldName, group1Name)
.field(subGroupFieldName, otherName)
.endObject();
builders.add(prepareIndex("filters_idx").setSource(source));
}
}
indexRandom(true, false, true, builders);
ensureSearchable();
assertNoFailuresAndResponse(
prepareSearch("filters_idx").setSize(0)
.setRequestCache(false)
.setTrackTotalHits(true)
.setQuery(boolQuery().filter(termQuery(groupFieldName + ".keyword", group0Name)))
.addAggregation(
filters(
"results",
new KeyedFilter(subGroup0Name, termsQuery(subGroupFieldName + ".keyword", subGroup0Name)),
new KeyedFilter(subGroup1Name, termsQuery(subGroupFieldName + ".keyword", subGroup1Name)),
new KeyedFilter(subGroup2Name, termsQuery(subGroupFieldName + ".keyword", subGroup2Name))
// This is key
).otherBucket(false)
),
searchResponse -> {
Filters filters = searchResponse.getAggregations().get("results");
assertThat(filters, notNullValue());
assertThat(filters.getName(), equalTo("results"));
Filters.Bucket bucket = filters.getBucketByKey(subGroup0Name);
assertThat(bucket, Matchers.notNullValue());
assertThat(bucket.getDocCount(), equalTo((long) subGroup0 * numTotalGroup0));
}
);
}
public void testSimple() throws Exception {
assertNoFailuresAndResponse(
prepareSearch("idx").addAggregation(

12
server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java
View file

@ -328,11 +328,13 @@ public abstract class FiltersAggregator extends BucketsAggregator {
hasOtherBucket
);
}
if (usesCompetitiveIterator) {
return new MultiFilterCompetitiveLeafCollector(sub, filterWrappers, numFilters, totalNumKeys, hasOtherBucket);
} else {
return new MultiFilterLeafCollector(sub, filterWrappers, numFilters, totalNumKeys, hasOtherBucket);
}
// TODO: https://github.com/elastic/elasticsearch/issues/126955
// competitive iterator is currently broken, we would rather be slow than broken
return new MultiFilterLeafCollector(sub, filterWrappers, numFilters, totalNumKeys, hasOtherBucket);
// if (usesCompetitiveIterator) {
// return new MultiFilterCompetitiveLeafCollector(sub, filterWrappers, numFilters, totalNumKeys, hasOtherBucket);
// } else {
// }
}
}