Skip to content

[7.x] Allow composite to be a sub-aggregation of filter (#71639) #71867

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 19, 2021
Merged

[7.x] Allow composite to be a sub-aggregation of filter (#71639) #71867

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
270 changes: 187 additions & 83 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 @@ -14,11 +14,6 @@ setup:
type: long
geo_point:
type: geo_point
nested:
type: nested
properties:
nested_long:
type: long

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

- do:
indices.create:
Expand All @@ -59,23 +49,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 @@ -87,13 +172,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 @@ -115,7 +200,7 @@ setup:

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

---
"Simple Composite aggregation":
Expand Down Expand Up @@ -286,7 +371,7 @@ setup:
terms:
field: long
aggs:
nested:
invalid_child:
composite:
sources: [
{
Expand Down Expand Up @@ -514,71 +599,6 @@ setup:
}
]

---
"Composite aggregation with nested parent":
- skip:
version: " - 6.99.99"
reason: the ability to set a nested parent aggregation was added in 7.0.

- 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 @@ -1068,6 +1088,9 @@ setup:

---
"Nested as parent":
- skip:
version: " - 6.99.99"
reason: Nested supporte added in 7.0
- do:
search:
rest_total_hits_as_int: true
Expand All @@ -1078,7 +1101,7 @@ setup:
"nested": { "path": "courses" },
"aggregations": {
"names": {
"composite": {
"composite": {
"sources": [
"kw": {"terms": {"field": "courses.name"}}
]
Expand All @@ -1102,6 +1125,9 @@ setup:

---
"Nested parent with compound key":
- skip:
version: " - 6.99.99"
reason: Nested supporte added in 7.0
- do:
search:
rest_total_hits_as_int: true
Expand Down Expand Up @@ -1131,6 +1157,9 @@ setup:

---
"Nested with a nested sub aggregation":
- skip:
version: " - 6.99.99"
reason: Nested supporte added in 7.0
- do:
search:
rest_total_hits_as_int: true
Expand Down Expand Up @@ -1163,3 +1192,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.12.99"
reason: Filter support added in 7.13
- 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.12.99"
reason: Filter support added in 7.13
- 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"}
Loading