honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that a non static top docs is created during the search phase 

This change fixes an unreleased bug that trips an assertion because a static instance
shared among threads is modified during the search. This commit copies the static
instance in order to ensure that each thread can modify the value without modifying
the other instances.

Closes #37179
Closes #37266
This commit is contained in:
Jim Ferenczi 2019-01-09 22:57:34 +01:00
parent 195873002b
commit 95479f1766
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/parent-join/src/test/java/org/elasticsearch/join/query/ChildQuerySearchIT.java
View File

@ -59,7 +59,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import static org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.common.xcontent.support.XContentMapValues.extractValue;
import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
@ -86,7 +85,6 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/37266")
public class ChildQuerySearchIT extends ParentChildTestCase {
public void testMultiLevelChild() throws Exception {

8
server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java
View File

@ -760,13 +760,7 @@ public final class SearchPhaseController {
if (trackTotalHitsUpTo == SearchContext.TRACK_TOTAL_HITS_DISABLED) {
return null;
} else if (trackTotalHitsUpTo == SearchContext.TRACK_TOTAL_HITS_ACCURATE) {
// NORELEASE The assertion below has been replaced by a runtime exception in order to debug
// https://github.com/elastic/elasticsearch/issues/37179.
// The assertion should be restored and the exception removed when this issue is solved.
// assert totalHitsRelation == Relation.EQUAL_TO;
if (totalHitsRelation != Relation.EQUAL_TO) {
throw new IllegalStateException("Expected accurate total hits but got " + new TotalHits(totalHits, totalHitsRelation));
}
assert totalHitsRelation == Relation.EQUAL_TO;
return new TotalHits(totalHits, totalHitsRelation);
} else {
if (totalHits < trackTotalHitsUpTo) {

7
server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java
View File

@ -264,8 +264,7 @@ abstract class TopDocsCollectorContext extends QueryCollectorContext {
@Override
void postProcess(QuerySearchResult result) throws IOException {
final TopDocs topDocs = topDocsSupplier.get();
topDocs.totalHits = totalHitsSupplier.get();
final TopDocs topDocs = new TopDocs(totalHitsSupplier.get(), topDocsSupplier.get().scoreDocs);
result.topDocs(new TopDocsAndMaxScore(topDocs, maxScoreSupplier.get()),
sortAndFormats == null ? null : sortAndFormats.formats);
}
@ -292,11 +291,11 @@ abstract class TopDocsCollectorContext extends QueryCollectorContext {
@Override
void postProcess(QuerySearchResult result) throws IOException {
final TopDocs topDocs = topDocsSupplier.get();
final TopDocs topDocs = new TopDocs(totalHitsSupplier.get(), topDocsSupplier.get().scoreDocs);
final float maxScore;
if (scrollContext.totalHits == null) {
// first round
topDocs.totalHits = scrollContext.totalHits = totalHitsSupplier.get();
scrollContext.totalHits = topDocs.totalHits;
maxScore = scrollContext.maxScore = maxScoreSupplier.get();
} else {
// subsequent round: the total number of hits and