Skip to content

Commit 182cf11

Browse files
committed
Fixed bug when non percolator docs end up in the search hits.
In the case that a document with a percolator field is matched when using the `percolate` query then the fetch phase can fail due to the fact that the percolator can't resolve any query from that document. Closes #29429
1 parent 9f0c5cc commit 182cf11

File tree

2 files changed

+77
-2
lines changed

2 files changed

+77
-2
lines changed

modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorMatchedSlotSubFetchPhase.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ final class PercolatorMatchedSlotSubFetchPhase implements FetchSubPhase {
5757

5858
@Override
5959
public void hitsExecute(SearchContext context, SearchHit[] hits) throws IOException {
60-
List<PercolateQuery> percolateQueries = locatePercolatorQuery(context.query());
60+
innerHitsExecute(context.query(), context.searcher(), hits);
61+
}
62+
63+
static void innerHitsExecute(Query mainQuery, IndexSearcher indexSearcher, SearchHit[] hits) throws IOException {
64+
List<PercolateQuery> percolateQueries = locatePercolatorQuery(mainQuery);
6165
if (percolateQueries.isEmpty()) {
6266
return;
6367
}
@@ -81,11 +85,15 @@ public void hitsExecute(SearchContext context, SearchHit[] hits) throws IOExcept
8185
}
8286

8387
PercolateQuery.QueryStore queryStore = percolateQuery.getQueryStore();
84-
List<LeafReaderContext> ctxs = context.searcher().getIndexReader().leaves();
88+
List<LeafReaderContext> ctxs = indexSearcher.getIndexReader().leaves();
8589
for (SearchHit hit : hits) {
8690
LeafReaderContext ctx = ctxs.get(ReaderUtil.subIndex(hit.docId(), ctxs));
8791
int segmentDocId = hit.docId() - ctx.docBase;
8892
Query query = queryStore.getQueries(ctx).apply(segmentDocId);
93+
if (query == null) {
94+
// This is not a document with a percolator field.
95+
continue;
96+
}
8997

9098
TopDocs topDocs = percolatorIndexSearcher.search(query, memoryIndexMaxDoc, new Sort(SortField.FIELD_DOC));
9199
if (topDocs.totalHits == 0) {

modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,82 @@
1818
*/
1919
package org.elasticsearch.percolator;
2020

21+
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
22+
import org.apache.lucene.document.Document;
23+
import org.apache.lucene.index.DirectoryReader;
24+
import org.apache.lucene.index.RandomIndexWriter;
25+
import org.apache.lucene.index.Term;
26+
import org.apache.lucene.index.memory.MemoryIndex;
27+
import org.apache.lucene.search.IndexSearcher;
28+
import org.apache.lucene.search.MatchAllDocsQuery;
29+
import org.apache.lucene.search.MatchNoDocsQuery;
2130
import org.apache.lucene.search.ScoreDoc;
31+
import org.apache.lucene.search.TermQuery;
2232
import org.apache.lucene.search.TopDocs;
33+
import org.apache.lucene.store.Directory;
2334
import org.apache.lucene.util.FixedBitSet;
35+
import org.elasticsearch.search.SearchHit;
2436
import org.elasticsearch.test.ESTestCase;
2537

38+
import java.util.Collections;
2639
import java.util.stream.IntStream;
2740

2841
public class PercolatorMatchedSlotSubFetchPhaseTests extends ESTestCase {
2942

43+
public void testHitsExecute() throws Exception {
44+
try (Directory directory = newDirectory()) {
45+
// Need a one doc index:
46+
try (RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory)) {
47+
Document document = new Document();
48+
indexWriter.addDocument(document);
49+
}
50+
51+
try (DirectoryReader reader = DirectoryReader.open(directory)) {
52+
IndexSearcher indexSearcher = new IndexSearcher(reader);
53+
54+
// A match:
55+
{
56+
SearchHit[] hits = new SearchHit[]{new SearchHit(0)};
57+
PercolateQuery.QueryStore queryStore = ctx -> docId -> new TermQuery(new Term("field", "value"));
58+
MemoryIndex memoryIndex = new MemoryIndex();
59+
memoryIndex.addField("field", "value", new WhitespaceAnalyzer());
60+
PercolateQuery percolateQuery = new PercolateQuery("_name", queryStore, Collections.emptyList(),
61+
new MatchAllDocsQuery(), memoryIndex.createSearcher(), new MatchNoDocsQuery());
62+
63+
PercolatorMatchedSlotSubFetchPhase.innerHitsExecute(percolateQuery, indexSearcher, hits);
64+
assertNotNull(hits[0].field(PercolatorMatchedSlotSubFetchPhase.FIELD_NAME_PREFIX));
65+
assertEquals(0, (int) hits[0].field(PercolatorMatchedSlotSubFetchPhase.FIELD_NAME_PREFIX).getValue());
66+
}
67+
68+
// No match:
69+
{
70+
SearchHit[] hits = new SearchHit[]{new SearchHit(0)};
71+
PercolateQuery.QueryStore queryStore = ctx -> docId -> new TermQuery(new Term("field", "value"));
72+
MemoryIndex memoryIndex = new MemoryIndex();
73+
memoryIndex.addField("field", "value1", new WhitespaceAnalyzer());
74+
PercolateQuery percolateQuery = new PercolateQuery("_name", queryStore, Collections.emptyList(),
75+
new MatchAllDocsQuery(), memoryIndex.createSearcher(), new MatchNoDocsQuery());
76+
77+
PercolatorMatchedSlotSubFetchPhase.innerHitsExecute(percolateQuery, indexSearcher, hits);
78+
assertNull(hits[0].field(PercolatorMatchedSlotSubFetchPhase.FIELD_NAME_PREFIX));
79+
}
80+
81+
// No query:
82+
{
83+
SearchHit[] hits = new SearchHit[]{new SearchHit(0)};
84+
PercolateQuery.QueryStore queryStore = ctx -> docId -> null;
85+
MemoryIndex memoryIndex = new MemoryIndex();
86+
memoryIndex.addField("field", "value", new WhitespaceAnalyzer());
87+
PercolateQuery percolateQuery = new PercolateQuery("_name", queryStore, Collections.emptyList(),
88+
new MatchAllDocsQuery(), memoryIndex.createSearcher(), new MatchNoDocsQuery());
89+
90+
PercolatorMatchedSlotSubFetchPhase.innerHitsExecute(percolateQuery, indexSearcher, hits);
91+
assertNull(hits[0].field(PercolatorMatchedSlotSubFetchPhase.FIELD_NAME_PREFIX));
92+
}
93+
}
94+
}
95+
}
96+
3097
public void testConvertTopDocsToSlots() {
3198
ScoreDoc[] scoreDocs = new ScoreDoc[randomInt(128)];
3299
for (int i = 0; i < scoreDocs.length; i++) {

0 commit comments

Comments
 (0)