Skip to content

[7.x] Tests for running composite under nested aggregation (#68243) #71572

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 2 commits into from
Apr 12, 2021
Merged

[7.x] Tests for running composite under nested aggregation (#68243) #71572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b759389
Tests for running composite under nested aggregation (#68243)
not-napoleon Apr 12, 2021
b81e3ef
NestedPathFieldMapper isn't in 7.x
not-napoleon Apr 12, 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
135 changes: 134 additions & 1 deletion ...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 @@ -36,6 +36,41 @@ setup:
nested_long:
type: long

- do:
indices.create:
index: verynested
body:
mappings:
properties:
department:
type: keyword
staff:
type: integer
courses:
type: nested
properties:
name:
type: keyword
credits:
type: integer
sessions:
type: nested
properties:
semester:
type: keyword

- 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 } ] } ] }

- 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 } ] } ] }

- do:
index:
index: test
Expand Down Expand Up @@ -80,7 +115,7 @@ setup:

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

---
"Simple Composite aggregation":
Expand Down Expand Up @@ -1030,3 +1065,101 @@ setup:
- length: { aggregations.test.buckets: 1 }
- match: { aggregations.test.buckets.0.key.keyword: "foo" }
- match: { aggregations.test.buckets.0.doc_count: 1 }

---
"Nested as parent":
- do:
search:
rest_total_hits_as_int: true
index: verynested
body:
"aggregations": {
"courses": {
"nested": { "path": "courses" },
"aggregations": {
"names": {
"composite": {
"sources": [
"kw": {"terms": {"field": "courses.name"}}
]
}
}
}
}
}

- match: {hits.total: 2}
- match: {aggregations.courses.doc_count: 4}
- length: { aggregations.courses.names.buckets: 4 }
- match: { aggregations.courses.names.buckets.0.key.kw: "Linear Algebra" }
- match: { aggregations.courses.names.buckets.0.doc_count: 1}
- match: { aggregations.courses.names.buckets.1.key.kw: "Object Oriented Programming" }
- match: { aggregations.courses.names.buckets.1.doc_count: 1}
- match: { aggregations.courses.names.buckets.2.key.kw: "Precalculus" }
- match: { aggregations.courses.names.buckets.2.doc_count: 1}
- match: { aggregations.courses.names.buckets.3.key.kw: "Theory of Computation" }
- match: { aggregations.courses.names.buckets.3.doc_count: 1}

---
"Nested parent with compound key":
- do:
search:
rest_total_hits_as_int: true
index: verynested
body:
"aggregations": {
"sessions": {
"nested": { "path": "courses.sessions" },
"aggregations": {
"names": {
"composite": {
"sources": [
"kw": { "terms": { "field": "courses.sessions.semester" } }
]
}
}
}
}
}
- match: {hits.total: 2}
- match: {aggregations.sessions.doc_count: 8}
- length: { aggregations.sessions.names.buckets: 2 }
- match: { aggregations.sessions.names.buckets.0.key.kw: "fall2020" }
- match: { aggregations.sessions.names.buckets.0.doc_count: 4}
- match: { aggregations.sessions.names.buckets.1.key.kw: "spr2021" }
- match: { aggregations.sessions.names.buckets.1.doc_count: 4}

---
"Nested with a nested sub aggregation":
- do:
search:
rest_total_hits_as_int: true
index: verynested
body:
"aggregations": {
"courses": {
"nested": { "path": "courses" },
"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.sessions.doc_count: 8}
- length: { aggregations.courses.sessions.names.buckets: 2 }
- match: { aggregations.courses.sessions.names.buckets.0.key.kw: "fall2020" }
- 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}
162 changes: 162 additions & 0 deletions ...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/380_nested.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
---
setup:
- do:
indices.create:
index: test
body:
mappings:
properties:
department:
type: keyword
staff:
type: integer
courses:
type: nested
properties:
name:
type: keyword
credits:
type: integer
sessions:
type: nested
properties:
semester:
type: keyword

- do:
index:
index: test
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 } ] } ] }

- do:
index:
index: test
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 } ] } ] }

- do:
indices.refresh:
index: [test]

---
"Single Level Nested with Terms":
- do:
search:
rest_total_hits_as_int: true
index: test
body:
"aggregations": {
"courses": {
"nested": { "path": "courses" },
"aggregations": {
"names": {
"terms": { "field": "courses.name" }
}
}
}
}

- match: {hits.total: 2}
- match: {aggregations.courses.doc_count: 4}
- length: { aggregations.courses.names.buckets: 4 }
- match: { aggregations.courses.names.buckets.0.key: "Linear Algebra" }
- match: { aggregations.courses.names.buckets.0.doc_count: 1}
- match: { aggregations.courses.names.buckets.1.key: "Object Oriented Programming" }
- match: { aggregations.courses.names.buckets.1.doc_count: 1}
- match: { aggregations.courses.names.buckets.2.key: "Precalculus" }
- match: { aggregations.courses.names.buckets.2.doc_count: 1}
- match: { aggregations.courses.names.buckets.3.key: "Theory of Computation" }
- match: { aggregations.courses.names.buckets.3.doc_count: 1}

---
"Compound nested key":
- do:
search:
rest_total_hits_as_int: true
index: test
body:
"aggregations": {
"sessions": {
"nested": { "path": "courses.sessions" },
"aggregations": {
"names": {
"terms": { "field": "courses.sessions.semester" }
}
}
}
}
- match: {hits.total: 2}
- match: {aggregations.sessions.doc_count: 8}
- length: { aggregations.sessions.names.buckets: 2 }
- match: { aggregations.sessions.names.buckets.0.key: "fall2020" }
- match: { aggregations.sessions.names.buckets.0.doc_count: 4}
- match: { aggregations.sessions.names.buckets.1.key: "spr2021" }
- match: { aggregations.sessions.names.buckets.1.doc_count: 4}

---
"Nested with a nested sub aggregation":
- do:
search:
rest_total_hits_as_int: true
index: test
body:
"aggregations": {
"courses": {
"nested": { "path": "courses" },
"aggregations": {
"sessions": {
"nested": { "path": "courses.sessions" },
"aggregations": {
"names": {
"terms": { "field": "courses.sessions.semester" }
}
}
}
}
}
}
- match: {hits.total: 2}
- match: {aggregations.courses.doc_count: 4}
- match: {aggregations.courses.sessions.doc_count: 8}
- length: { aggregations.courses.sessions.names.buckets: 2 }
- match: { aggregations.courses.sessions.names.buckets.0.key: "fall2020" }
- match: { aggregations.courses.sessions.names.buckets.0.doc_count: 4}
- match: { aggregations.courses.sessions.names.buckets.1.key: "spr2021" }
- match: { aggregations.courses.sessions.names.buckets.1.doc_count: 4}
---
"Nested then filter then nested then terms":
- do:
search:
rest_total_hits_as_int: true
index: test
body:
"aggregations": {
"courses": {
"nested": { "path": "courses" },
"aggregations": {
"highpass_filter": {
"filter": { "range": {"courses.credits": { "gt": 1 }}},
"aggregations": {
"sessions": {
"nested": { "path": "courses.sessions" },
"aggregations": {
"names": {
"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: "fall2020" }
- match: { aggregations.courses.highpass_filter.sessions.names.buckets.0.doc_count: 3}
- match: { aggregations.courses.highpass_filter.sessions.names.buckets.1.key: "spr2021" }
- match: { aggregations.courses.highpass_filter.sessions.names.buckets.1.doc_count: 3}
4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ private BitSet getAndLoadIfNotPresent(final Query query, final LeafReaderContext
}
final IndexReader.CacheKey coreCacheReader = cacheHelper.getKey();
final ShardId shardId = ShardUtils.extractShardId(context.reader());
if (shardId == null) {
throw new IllegalStateException("Null shardId. If you got here from a test, you need to wrap the directory reader. " +
"see for example AggregatorTestCase#wrapInMockESDirectoryReader. If you got here in production, please file a bug.");
}
if (indexSettings.getIndex().equals(shardId.getIndex()) == false) {
// insanity
throw new IllegalStateException("Trying to load bit set for index " + shardId.getIndex()
Expand Down
Loading