Skip to content

Allow composite to be a sub-aggregation of filter #71639

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 10 commits into from
Apr 19, 2021
Merged

Allow composite to be a sub-aggregation of filter #71639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
325b56d
Allow composite to be a sub-aggregation of filters
not-napoleon Apr 13, 2021
7d705e5
ouch, my line count!
not-napoleon Apr 13, 2021
9d9c15b
Remove nested field from most composite tests
not-napoleon Apr 14, 2021
4e0e7b8
WIP - I don't understand why this passes.
not-napoleon Apr 14, 2021
51bc02c
actually test composite, not terms
not-napoleon Apr 15, 2021
c30b8e2
use the slow path when we have parent aggs
not-napoleon Apr 15, 2021
be9d9ea
Merge branch 'master' into composite-nested-filter-2
elasticmachine Apr 15, 2021
d96d47b
BWC skip dance
not-napoleon Apr 19, 2021
544e4f3
Merge branch 'composite-nested-filter-2' of github.com:not-napoleon/e…
not-napoleon Apr 19, 2021
c2faceb
Merge branch 'master' into composite-nested-filter-2
elasticmachine Apr 19, 2021
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
255 changes: 177 additions & 78 deletions ...i-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/230_composite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ setup:
type: long
geo_point:
type: geo_point
nested:
type: nested
properties:
nested_long:
type: long

- do:
indices.create:
Expand All @@ -32,11 +27,6 @@ setup:
type: date
long:
type: long
nested:
type: nested
properties:
nested_long:
type: long

- do:
indices.create:
Expand All @@ -61,23 +51,118 @@ setup:
semester:
type: keyword

- do:
indices.create:
index: nonesting
body:
mappings:
properties:
kw:
type: keyword
num:
type: integer

- do:
index:
index: nonesting
id: 1
body: { "kw": "one", "num": 1 }

- do:
index:
index: nonesting
id: 2
body: { "kw": "two", "num": 2 }

- do:
index:
index: nonesting
id: 3
body: { "kw": "three", "num": 3 }

- do:
index:
index: verynested
id: 1
body: { "department": "compsci", "staff": 12, "courses": [ { "name": "Object Oriented Programming", "credits": 3, "sessions": [ { "semester": "spr2021", "students": 37 }, { "semester": "fall2020", "students": 45} ] }, { "name": "Theory of Computation", "credits": 4, "sessions": [ { "semester": "spr2021", "students": 19 }, { "semester": "fall2020", "students": 14 } ] } ] }
body: {
"department": "compsci",
"staff": 12,
"courses": [
{
"name": "Object Oriented Programming",
"credits": 3,
"sessions": [
{
"semester": "spr2021",
"students": 37
},
{
"semester": "fall2020",
"students": 45
}
]
},
{
"name": "Theory of Computation",
"credits": 4,
"sessions": [
{
"semester": "spr2021",
"students": 19
},
{
"semester": "fall2020",
"students": 14
}
]
}
]
}

- do:
index:
index: verynested
id: 2
body: { "department": "math", "staff": 20, "courses": [ { "name": "Precalculus", "credits": 1, "sessions": [ { "semester": "spr2021", "students": 100 }, { "semester": "fall2020", "students": 134 } ] }, { "name": "Linear Algebra", "credits": 3, "sessions": [ { "semester": "spr2021", "students": 29 }, { "semester": "fall2020", "students": 23 } ] } ] }
body: {
"department": "math",
"staff": 20,
"courses": [
{
"name": "Precalculus",
"credits": 1,
"sessions": [
{
"semester": "spr2021",
"students": 100
},
{
"semester": "fall2020",
"students": 134
}
]
},
{
"name": "Linear Algebra",
"credits": 3,
"sessions": [
{
"semester": "spr2021",
"students": 29
},
{
"semester": "fall2020",
"students": 23
}
]
}
]
}

- do:
index:
index: test
id: 1
body: { "keyword": "foo", "long": [10, 20], "geo_point": "37.2343,-115.8067", "nested": [{"nested_long": 10}, {"nested_long": 20}] }
body: { "keyword": "foo", "long": [10, 20], "geo_point": "37.2343,-115.8067"}

- do:
index:
Expand All @@ -89,13 +174,13 @@ setup:
index:
index: test
id: 3
body: { "keyword": "bar", "long": [100, 0], "geo_point": "90.0,0.0", "nested": [{"nested_long": 10}, {"nested_long": 0}] }
body: { "keyword": "bar", "long": [100, 0], "geo_point": "90.0,0.0"}

- do:
index:
index: test
id: 4
body: { "keyword": "bar", "long": [1000, 0], "geo_point": "41.12,-71.34", "nested": [{"nested_long": 1000}, {"nested_long": 20}] }
body: { "keyword": "bar", "long": [1000, 0], "geo_point": "41.12,-71.34"}

- do:
index:
Expand All @@ -117,7 +202,7 @@ setup:

- do:
indices.refresh:
index: [test, other, verynested]
index: [test, other, verynested, nonesting]

---
"Simple Composite aggregation":
Expand Down Expand Up @@ -265,7 +350,7 @@ setup:
terms:
field: long
aggs:
nested:
invalid_child:
composite:
sources: [
{
Expand Down Expand Up @@ -485,67 +570,6 @@ setup:
}
]

---
"Composite aggregation with nested parent":
- do:
search:
rest_total_hits_as_int: true
index: test
body:
aggregations:
1:
nested:
path: nested
aggs:
2:
composite:
sources: [
"nested": {
"terms": {
"field": "nested.nested_long"
}
}
]

- match: {hits.total: 6}
- length: { aggregations.1.2.buckets: 4 }
- match: { aggregations.1.2.buckets.0.key.nested: 0 }
- match: { aggregations.1.2.buckets.0.doc_count: 1 }
- match: { aggregations.1.2.buckets.1.key.nested: 10 }
- match: { aggregations.1.2.buckets.1.doc_count: 2 }
- match: { aggregations.1.2.buckets.2.key.nested: 20 }
- match: { aggregations.1.2.buckets.2.doc_count: 2 }
- match: { aggregations.1.2.buckets.3.key.nested: 1000 }
- match: { aggregations.1.2.buckets.3.doc_count: 1 }

- do:
search:
rest_total_hits_as_int: true
index: test
body:
aggregations:
1:
nested:
path: nested
aggs:
2:
composite:
after: { "nested": 10 }
sources: [
"nested": {
"terms": {
"field": "nested.nested_long"
}
}
]

- match: {hits.total: 6}
- length: { aggregations.1.2.buckets: 2 }
- match: { aggregations.1.2.buckets.0.key.nested: 20 }
- match: { aggregations.1.2.buckets.0.doc_count: 2 }
- match: { aggregations.1.2.buckets.1.key.nested: 1000 }
- match: { aggregations.1.2.buckets.1.doc_count: 1 }

---
"Composite aggregation with unmapped field":
- skip:
Expand Down Expand Up @@ -1120,3 +1144,78 @@ setup:
- match: { aggregations.courses.sessions.names.buckets.0.doc_count: 4}
- match: { aggregations.courses.sessions.names.buckets.1.key.kw: "spr2021" }
- match: { aggregations.courses.sessions.names.buckets.1.doc_count: 4}

---
"Nested then filter then nested then terms":
- skip:
version: " - 7.99.99"
reason: Filter support not backported yet
- do:
search:
rest_total_hits_as_int: true
index: verynested
body:
"aggregations": {
"courses": {
"nested": { "path": "courses" },
"aggregations": {
"highpass_filter": {
"filter": { "range": {"courses.credits": { "gt": 1 }}},
"aggregations": {
"sessions": {
"nested": { "path": "courses.sessions" },
"aggregations": {
"names": {
"composite": {
"sources": [
"kw": {"terms": { "field": "courses.sessions.semester" }}
]
}
}
}
}
}
}
}
}
}
- match: {hits.total: 2}
- match: {aggregations.courses.doc_count: 4}
- match: {aggregations.courses.highpass_filter.doc_count: 3}
- match: {aggregations.courses.highpass_filter.sessions.doc_count: 6}
- length: { aggregations.courses.highpass_filter.sessions.names.buckets: 2 }
- match: { aggregations.courses.highpass_filter.sessions.names.buckets.0.key.kw: "fall2020" }
- match: { aggregations.courses.highpass_filter.sessions.names.buckets.0.doc_count: 3}
- match: { aggregations.courses.highpass_filter.sessions.names.buckets.1.key.kw: "spr2021" }
- match: { aggregations.courses.highpass_filter.sessions.names.buckets.1.doc_count: 3}

---
"Filter without nesting":
- skip:
version: " - 7.99.99"
reason: Filter support not backported yet
- do:
search:
rest_total_hits_as_int: true
index: nonesting
body: {
"aggs": {
"not_one": {
"filter": { "range": {"num": {"gt": 1}} },
"aggs": {
"keez": {
"composite": {
"sources": [
"key": {"terms": {"field": "kw"}}
]
}
}
}
}
}
}
- match: {hits.total: 3}
- match: {aggregations.not_one.doc_count: 2}
- length: {aggregations.not_one.keez.buckets: 2}
- match: {aggregations.not_one.keez.buckets.0.key.key: "three"}
- match: {aggregations.not_one.keez.buckets.1.key.key: "two"}
9 changes: 5 additions & 4 deletions ...a/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.AggregatorFactories;
import org.elasticsearch.search.aggregations.AggregatorFactory;
import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregatorFactory;
import org.elasticsearch.search.aggregations.bucket.nested.NestedAggregatorFactory;
import org.elasticsearch.search.aggregations.support.AggregationContext;
import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
Expand Down Expand Up @@ -160,11 +161,11 @@ public BucketCardinality bucketCardinality() {
* this aggregator or the instance of the parent's factory that is incompatible with
* the composite aggregation.
*/
private AggregatorFactory checkParentIsNullOrNested(AggregatorFactory factory) {
private AggregatorFactory validateParentAggregations(AggregatorFactory factory) {
if (factory == null) {
return null;
} else if (factory instanceof NestedAggregatorFactory) {
return checkParentIsNullOrNested(factory.getParent());
} else if (factory instanceof NestedAggregatorFactory || factory instanceof FilterAggregatorFactory) {
return validateParentAggregations(factory.getParent());
} else {
return factory;
}
Expand Down Expand Up @@ -195,7 +196,7 @@ private static void validateSources(List<CompositeValuesSourceBuilder<?>> source
@Override
protected AggregatorFactory doBuild(AggregationContext context, AggregatorFactory parent,
AggregatorFactories.Builder subfactoriesBuilder) throws IOException {
AggregatorFactory invalid = checkParentIsNullOrNested(parent);
AggregatorFactory invalid = validateParentAggregations(parent);
if (invalid != null) {
throw new IllegalArgumentException("[composite] aggregation cannot be used with a parent aggregation of" +
" type: [" + invalid.getClass().getSimpleName() + "]");
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ protected LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucket
Sort indexSortPrefix = buildIndexSortPrefix(ctx);
int sortPrefixLen = computeSortPrefixLen(indexSortPrefix);

SortedDocsProducer sortedDocsProducer = sortPrefixLen == 0 ?
SortedDocsProducer sortedDocsProducer = (sortPrefixLen == 0 && parent == null) ?
sources[0].createSortedDocsProducerOrNull(ctx.reader(), topLevelQuery()) : null;
if (sortedDocsProducer != null) {
// Visit documents sorted by the leading source of the composite definition and terminates
Expand Down