honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix random failures in SearchResponseMerger#testMergeSearchHits (#40223)

Browse Source 
This commit fixes the expectation in the test when the search hits are empty.

Closes #40214
This commit is contained in:
Jim Ferenczi 2019-03-27 11:15:25 +01:00 committed by jimczi
parent f4e56118c2
commit fe05a4d511
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/test/java/org/elasticsearch/action/search/SearchResponseMergerTests.java
View File

@ -396,7 +396,6 @@ public class SearchResponseMergerTests extends ESTestCase {
assertEquals(totalCount, bucket.getDocCount()); assertEquals(totalCount, bucket.getDocCount());
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/40214")
public void testMergeSearchHits() throws InterruptedException { public void testMergeSearchHits() throws InterruptedException {
final long currentRelativeTime = randomLong(); final long currentRelativeTime = randomLong();
final SearchTimeProvider timeProvider = new SearchTimeProvider(randomLong(), 0, () -> currentRelativeTime); final SearchTimeProvider timeProvider = new SearchTimeProvider(randomLong(), 0, () -> currentRelativeTime);
@ -513,8 +512,14 @@ public class SearchResponseMergerTests extends ESTestCase {
assertNull(searchResponse.getScrollId()); assertNull(searchResponse.getScrollId());
SearchHits searchHits = searchResponse.getHits(); SearchHits searchHits = searchResponse.getHits();
assertArrayEquals(sortFields, searchHits.getSortFields()); // the sort fields and the collapse field are not returned when hits are empty
assertEquals(collapseField, searchHits.getCollapseField()); if (searchHits.getHits().length > 0) {
assertArrayEquals(sortFields, searchHits.getSortFields());
assertEquals(collapseField, searchHits.getCollapseField());
} else {
assertNull(searchHits.getSortFields());
assertNull(searchHits.getCollapseField());
}
if (expectedTotalHits == null) { if (expectedTotalHits == null) {
assertNull(searchHits.getTotalHits()); assertNull(searchHits.getTotalHits());
} else { } else {
@ -532,7 +537,9 @@ public class SearchResponseMergerTests extends ESTestCase {
priorityQueue.poll(); priorityQueue.poll();
} }
SearchHit[] hits = searchHits.getHits(); SearchHit[] hits = searchHits.getHits();
if (collapseField != null) { if (collapseField != null
// the collapse field is not returned when hits are empty
&& hits.length > 0) {
assertEquals(hits.length, searchHits.getCollapseValues().length); assertEquals(hits.length, searchHits.getCollapseValues().length);
} else { } else {
assertNull(searchHits.getCollapseValues()); assertNull(searchHits.getCollapseValues());