Skip to content

Commit 7cf665a

Browse files
jordan-powersjordan-powers
committed
Merge remote-tracking branch 'upstream/main' into move-text-class-2
2 parents 71c466e + 13bce60 commit 7cf665a

File tree

12 files changed

+239
-12
lines changed

12 files changed

+239
-12
lines changed

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@
2020

2121
import static org.elasticsearch.gradle.internal.release.GenerateReleaseNotesTask.getSortedBundlesWithUniqueChangelogs;
2222
import static org.hamcrest.Matchers.equalTo;
23+
import static org.junit.Assert.assertFalse;
2324
import static org.junit.Assert.assertThat;
2425

2526
public class ReleaseNotesGeneratorTest {
2627

28+
// Temporarily set this to `true` to regenerate test output files when they need to be updated
29+
private final boolean UPDATE_EXPECTED_OUTPUT = false;
30+
2731
private static final List<String> CHANGE_TYPES = List.of(
2832
"breaking",
2933
"breaking-java",
@@ -78,8 +82,9 @@ public void testTemplate(String templateFilename, String outputFilename) throws
7882

7983
public void testTemplate(String templateFilename, String outputFilename, List<ChangelogBundle> bundles) throws Exception {
8084
// given:
85+
final String outputFile = "/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest." + outputFilename;
8186
final String template = getResource("/templates/" + templateFilename);
82-
final String expectedOutput = getResource("/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest." + outputFilename);
87+
final String expectedOutput = getResource(outputFile);
8388

8489
if (bundles == null) {
8590
bundles = getBundles();
@@ -91,7 +96,12 @@ public void testTemplate(String templateFilename, String outputFilename, List<Ch
9196
final String actualOutput = ReleaseNotesGenerator.generateFile(template, bundles);
9297

9398
// then:
94-
assertThat(actualOutput, equalTo(expectedOutput));
99+
if (UPDATE_EXPECTED_OUTPUT) {
100+
writeResource(outputFile, actualOutput);
101+
assertFalse("UPDATE_EXPECTED_OUTPUT should be set back to false after updating output", UPDATE_EXPECTED_OUTPUT);
102+
} else {
103+
assertThat(actualOutput, equalTo(expectedOutput));
104+
}
95105
}
96106

97107
private List<ChangelogBundle> getBundles() {
@@ -176,4 +186,9 @@ private ChangelogEntry makeHighlightsEntry(int pr, boolean notable) {
176186
private String getResource(String name) throws Exception {
177187
return Files.readString(Paths.get(Objects.requireNonNull(this.getClass().getResource(name)).toURI()), StandardCharsets.UTF_8);
178188
}
189+
190+
private void writeResource(String name, String contents) throws Exception {
191+
String path = "src/test/resources" + name;
192+
Files.writeString(Paths.get(path), contents);
193+
}
179194
}

‎build-tools-internal/src/test/resources/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ To check for security updates, go to [Security announcements for the Elastic sta
2020
% ### Fixes [elasticsearch-next-fixes]
2121
% *
2222

23+
## 9.1.0 [elasticsearch-9.1.0-release-notes]
2324
```{applies_to}
2425
stack: coming 9.1.0
2526
```
26-
## 9.1.0 [elasticsearch-9.1.0-release-notes]
2727

2828
### Highlights [elasticsearch-9.1.0-highlights]
2929

@@ -47,10 +47,10 @@ Search:
4747
* [#52](https://github.com/elastic/elasticsearch/pull/52)
4848

4949

50+
## 9.0.10 [elasticsearch-9.0.10-release-notes]
5051
```{applies_to}
5152
stack: coming 9.0.10
5253
```
53-
## 9.0.10 [elasticsearch-9.0.10-release-notes]
5454

5555
### Features and enhancements [elasticsearch-9.0.10-features-enhancements]
5656

‎build-tools-internal/src/test/resources/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.index.no-highlights.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ To check for security updates, go to [Security announcements for the Elastic sta
2020
% ### Fixes [elasticsearch-next-fixes]
2121
% *
2222

23+
## 9.0.10 [elasticsearch-9.0.10-release-notes]
2324
```{applies_to}
2425
stack: coming 9.0.10
2526
```
26-
## 9.0.10 [elasticsearch-9.0.10-release-notes]
2727

2828
### Features and enhancements [elasticsearch-9.0.10-features-enhancements]
2929

‎docs/changelog/128036.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 128036
2+
summary: Fix inner hits + aggregations concurrency bug
3+
area: Search
4+
type: bug
5+
issues:
6+
- 122419

‎modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/InnerHitsIT.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import org.elasticsearch.script.ScriptType;
2727
import org.elasticsearch.search.SearchHit;
2828
import org.elasticsearch.search.SearchHits;
29+
import org.elasticsearch.search.aggregations.AggregationBuilder;
30+
import org.elasticsearch.search.aggregations.metrics.TopHits;
2931
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
3032
import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
3133
import org.elasticsearch.search.sort.FieldSortBuilder;
@@ -51,6 +53,7 @@
5153
import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
5254
import static org.elasticsearch.join.query.JoinQueryBuilders.hasChildQuery;
5355
import static org.elasticsearch.join.query.JoinQueryBuilders.hasParentQuery;
56+
import static org.elasticsearch.search.aggregations.AggregationBuilders.topHits;
5457
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
5558
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
5659
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCountAndNoFailures;
@@ -64,6 +67,7 @@
6467
import static org.hamcrest.Matchers.containsString;
6568
import static org.hamcrest.Matchers.equalTo;
6669
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
70+
import static org.hamcrest.Matchers.lessThanOrEqualTo;
6771
import static org.hamcrest.Matchers.notNullValue;
6872
import static org.hamcrest.Matchers.nullValue;
6973

@@ -698,4 +702,68 @@ public void testTooHighResultWindow() {
698702
)
699703
);
700704
}
705+
706+
public void testTopHitsOnParentChild() throws Exception {
707+
assertAcked(
708+
prepareCreate("idx").setMapping(
709+
jsonBuilder().startObject()
710+
.startObject("_doc")
711+
.startObject("properties")
712+
.startObject("id")
713+
.field("type", "keyword")
714+
.endObject()
715+
.startObject("join_field")
716+
.field("type", "join")
717+
.startObject("relations")
718+
.field("parent", new String[] { "child1", "child2" })
719+
.endObject()
720+
.endObject()
721+
.endObject()
722+
.endObject()
723+
.endObject()
724+
)
725+
);
726+
ensureGreen("idx");
727+
728+
List<IndexRequestBuilder> requestBuilders = new ArrayList<>();
729+
int numDocs = scaledRandomIntBetween(10, 100);
730+
int child1 = 0;
731+
int child2 = 0;
732+
int[] child1InnerObjects = new int[numDocs];
733+
int[] child2InnerObjects = new int[numDocs];
734+
for (int parent = 0; parent < numDocs; parent++) {
735+
String parentId = String.format(Locale.ENGLISH, "p_%03d", parent);
736+
requestBuilders.add(createIndexRequest("idx", "parent", parentId, null));
737+
738+
int numChildDocs = child1InnerObjects[parent] = scaledRandomIntBetween(1, numDocs);
739+
int limit = child1 + numChildDocs;
740+
for (; child1 < limit; child1++) {
741+
requestBuilders.add(createIndexRequest("idx", "child1", String.format(Locale.ENGLISH, "c1_%04d", child1), parentId));
742+
}
743+
numChildDocs = child2InnerObjects[parent] = scaledRandomIntBetween(1, numDocs);
744+
limit = child2 + numChildDocs;
745+
for (; child2 < limit; child2++) {
746+
requestBuilders.add(createIndexRequest("idx", "child2", String.format(Locale.ENGLISH, "c2_%04d", child2), parentId));
747+
}
748+
}
749+
750+
indexRandom(true, requestBuilders);
751+
ensureSearchable();
752+
753+
QueryBuilder hasChildQuery = hasChildQuery("child2", matchAllQuery(), ScoreMode.None).innerHit(new InnerHitBuilder().setSize(2));
754+
AggregationBuilder topHitsAgg = topHits("top-children").size(3);
755+
756+
assertNoFailuresAndResponse(prepareSearch("idx").setQuery(hasChildQuery).addAggregation(topHitsAgg), response -> {
757+
assertHitCount(response, numDocs);
758+
759+
TopHits topHits = response.getAggregations().get("top-children");
760+
SearchHits hits = topHits.getHits();
761+
assertThat(hits.getHits().length, equalTo(3));
762+
763+
for (SearchHit hit : hits) {
764+
SearchHits innerHits = hit.getInnerHits().get("child2");
765+
assertThat(innerHits.getHits().length, lessThanOrEqualTo(2));
766+
}
767+
});
768+
}
701769
}

‎modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,35 @@ static final class JoinFieldInnerHitSubContext extends InnerHitsContext.InnerHit
8888
private final String typeName;
8989
private final boolean fetchChildInnerHits;
9090
private final Joiner joiner;
91+
private final SearchExecutionContext searchExecutionContext;
9192

9293
JoinFieldInnerHitSubContext(String name, SearchContext context, String typeName, boolean fetchChildInnerHits, Joiner joiner) {
9394
super(name, context);
9495
this.typeName = typeName;
9596
this.fetchChildInnerHits = fetchChildInnerHits;
9697
this.joiner = joiner;
98+
this.searchExecutionContext = null;
99+
}
100+
101+
JoinFieldInnerHitSubContext(
102+
JoinFieldInnerHitSubContext joinFieldInnerHitSubContext,
103+
SearchExecutionContext searchExecutionContext
104+
) {
105+
super(joinFieldInnerHitSubContext);
106+
this.typeName = joinFieldInnerHitSubContext.typeName;
107+
this.fetchChildInnerHits = joinFieldInnerHitSubContext.fetchChildInnerHits;
108+
this.joiner = joinFieldInnerHitSubContext.joiner;
109+
this.searchExecutionContext = searchExecutionContext;
110+
}
111+
112+
@Override
113+
public JoinFieldInnerHitSubContext copyWithSearchExecutionContext(SearchExecutionContext searchExecutionContext) {
114+
return new JoinFieldInnerHitSubContext(this, searchExecutionContext);
115+
}
116+
117+
@Override
118+
public SearchExecutionContext getSearchExecutionContext() {
119+
return searchExecutionContext != null ? searchExecutionContext : super.getSearchExecutionContext();
97120
}
98121

99122
@Override

‎muted-tests.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,12 +534,6 @@ tests:
534534
- class: org.elasticsearch.packaging.test.DockerTests
535535
method: test040JavaUsesTheOsProvidedKeystore
536536
issue: https://github.com/elastic/elasticsearch/issues/128230
537-
- class: org.elasticsearch.gradle.internal.release.ReleaseNotesGeneratorTest
538-
method: generateFile_index_rendersCorrectMarkup
539-
issue: https://github.com/elastic/elasticsearch/issues/128772
540-
- class: org.elasticsearch.gradle.internal.release.ReleaseNotesGeneratorTest
541-
method: generateFile_index_noHighlights_rendersCorrectMarkup
542-
issue: https://github.com/elastic/elasticsearch/issues/128773
543537
- class: org.elasticsearch.xpack.rank.rrf.LinearRankClientYamlTestSuiteIT
544538
method: test {yaml=linear/10_linear_retriever/should normalize initial scores with l2_norm}
545539
issue: https://github.com/elastic/elasticsearch/issues/128774

‎server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
import org.elasticsearch.common.settings.Settings;
2020
import org.elasticsearch.index.IndexSettings;
2121
import org.elasticsearch.index.fielddata.ScriptDocValues;
22+
import org.elasticsearch.index.query.InnerHitBuilder;
2223
import org.elasticsearch.index.query.MatchAllQueryBuilder;
24+
import org.elasticsearch.index.query.QueryBuilder;
2325
import org.elasticsearch.index.query.QueryBuilders;
2426
import org.elasticsearch.index.seqno.SequenceNumbers;
2527
import org.elasticsearch.plugins.Plugin;
@@ -30,6 +32,7 @@
3032
import org.elasticsearch.script.ScriptType;
3133
import org.elasticsearch.search.SearchHit;
3234
import org.elasticsearch.search.SearchHits;
35+
import org.elasticsearch.search.aggregations.AggregationBuilder;
3336
import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
3437
import org.elasticsearch.search.aggregations.BucketOrder;
3538
import org.elasticsearch.search.aggregations.InternalAggregation;
@@ -45,6 +48,7 @@
4548
import org.elasticsearch.search.lookup.FieldLookup;
4649
import org.elasticsearch.search.lookup.LeafSearchLookup;
4750
import org.elasticsearch.search.rescore.QueryRescorerBuilder;
51+
import org.elasticsearch.search.sort.NestedSortBuilder;
4852
import org.elasticsearch.search.sort.ScriptSortBuilder.ScriptSortType;
4953
import org.elasticsearch.search.sort.SortBuilders;
5054
import org.elasticsearch.search.sort.SortOrder;
@@ -983,6 +987,67 @@ public void testTopHitsInNested() throws Exception {
983987
);
984988
}
985989

990+
public void testTopHitsOnInnerHits() {
991+
QueryBuilder nestedQuery = nestedQuery("comments", matchQuery("comments.message", "text"), ScoreMode.Avg).innerHit(
992+
new InnerHitBuilder().setSize(2)
993+
);
994+
AggregationBuilder topHitsAgg = topHits("top-comments").size(3)
995+
.sort(SortBuilders.fieldSort("comments.date").order(SortOrder.ASC).setNestedSort(new NestedSortBuilder("comments")));
996+
997+
assertNoFailuresAndResponse(prepareSearch("articles").setQuery(nestedQuery).addAggregation(topHitsAgg), response -> {
998+
TopHits topHits = response.getAggregations().get("top-comments");
999+
SearchHits hits = topHits.getHits();
1000+
assertThat(hits.getHits().length, equalTo(3));
1001+
1002+
for (SearchHit hit : hits) {
1003+
SearchHits innerHits = hit.getInnerHits().get("comments");
1004+
assertThat(innerHits.getHits().length, lessThanOrEqualTo(2));
1005+
for (SearchHit innerHit : innerHits) {
1006+
assertThat(innerHit.getNestedIdentity().getField().string(), equalTo("comments"));
1007+
Map<String, Object> source = innerHit.getSourceAsMap();
1008+
assertTrue(source.containsKey("message"));
1009+
assertFalse(source.containsKey("reviewers"));
1010+
}
1011+
}
1012+
});
1013+
}
1014+
1015+
public void testTopHitsOnMultipleNestedInnerHits() {
1016+
QueryBuilder doubleNestedQuery = nestedQuery(
1017+
"comments",
1018+
nestedQuery("comments.reviewers", matchQuery("comments.reviewers.name", "user c"), ScoreMode.Avg).innerHit(
1019+
new InnerHitBuilder()
1020+
),
1021+
ScoreMode.Avg
1022+
).innerHit(new InnerHitBuilder("review"));
1023+
AggregationBuilder topHitsAgg = topHits("top-reviewers").size(2)
1024+
.sort(SortBuilders.fieldSort("comments.date").order(SortOrder.ASC).setNestedSort(new NestedSortBuilder("comments")));
1025+
1026+
assertNoFailuresAndResponse(prepareSearch("articles").setQuery(doubleNestedQuery).addAggregation(topHitsAgg), response -> {
1027+
TopHits topHits = response.getAggregations().get("top-reviewers");
1028+
SearchHits hits = topHits.getHits();
1029+
assertThat(hits.getHits().length, equalTo(1));
1030+
1031+
SearchHit hit = hits.getAt(0);
1032+
SearchHits innerHits = hit.getInnerHits().get("review");
1033+
assertThat(innerHits.getHits().length, equalTo(2));
1034+
1035+
assertThat(innerHits.getAt(0).getId(), equalTo("1"));
1036+
assertThat(innerHits.getAt(0).getNestedIdentity().getField().string(), equalTo("comments"));
1037+
assertThat(innerHits.getAt(0).getNestedIdentity().getOffset(), equalTo(0));
1038+
Map<String, Object> source0 = innerHits.getAt(0).getSourceAsMap();
1039+
assertTrue(source0.containsKey("message"));
1040+
assertTrue(source0.containsKey("reviewers"));
1041+
1042+
assertThat(innerHits.getAt(1).getId(), equalTo("1"));
1043+
assertThat(innerHits.getAt(1).getNestedIdentity().getField().string(), equalTo("comments"));
1044+
assertThat(innerHits.getAt(1).getNestedIdentity().getOffset(), equalTo(1));
1045+
Map<String, Object> source1 = innerHits.getAt(1).getSourceAsMap();
1046+
assertTrue(source1.containsKey("message"));
1047+
assertTrue(source1.containsKey("reviewers"));
1048+
});
1049+
}
1050+
9861051
public void testUseMaxDocInsteadOfSize() throws Exception {
9871052
updateIndexSettings(
9881053
Settings.builder().put(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING.getKey(), ArrayUtil.MAX_ARRAY_LENGTH),

‎server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ static final class NestedInnerHitSubContext extends InnerHitsContext.InnerHitSub
396396

397397
private final NestedObjectMapper parentObjectMapper;
398398
private final NestedObjectMapper childObjectMapper;
399+
private final SearchExecutionContext searchExecutionContext;
399400

400401
NestedInnerHitSubContext(
401402
String name,
@@ -406,6 +407,24 @@ static final class NestedInnerHitSubContext extends InnerHitsContext.InnerHitSub
406407
super(name, context);
407408
this.parentObjectMapper = parentObjectMapper;
408409
this.childObjectMapper = childObjectMapper;
410+
this.searchExecutionContext = null;
411+
}
412+
413+
NestedInnerHitSubContext(NestedInnerHitSubContext nestedInnerHitSubContext, SearchExecutionContext searchExecutionContext) {
414+
super(nestedInnerHitSubContext);
415+
this.parentObjectMapper = nestedInnerHitSubContext.parentObjectMapper;
416+
this.childObjectMapper = nestedInnerHitSubContext.childObjectMapper;
417+
this.searchExecutionContext = searchExecutionContext;
418+
}
419+
420+
@Override
421+
public NestedInnerHitSubContext copyWithSearchExecutionContext(SearchExecutionContext searchExecutionContext) {
422+
return new NestedInnerHitSubContext(this, searchExecutionContext);
423+
}
424+
425+
@Override
426+
public SearchExecutionContext getSearchExecutionContext() {
427+
return searchExecutionContext != null ? searchExecutionContext : super.getSearchExecutionContext();
409428
}
410429

411430
@Override

0 commit comments

Comments
 (0)