Skip to content

Commit b93996f

Browse files
jimczijimczi
committed
Fix synonym phrase query expansion for cross_fields parsing (#28045)
* Fix synonym phrase query expansion for cross_fields parsing The `cross_fields` mode for query parser ignores phrase query generated by multi-word synonyms. In such case only the first field of each analyzer group is kept. This change fixes this issue by expanding the phrase query for each analyzer group to **all** fields using a disjunction max query.
1 parent 9334fa0 commit b93996f

File tree

3 files changed

+110
-3
lines changed

3 files changed

+110
-3
lines changed

‎server/src/main/java/org/elasticsearch/index/search/MatchQuery.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.lucene.search.BooleanClause.Occur;
3030
import org.apache.lucene.search.BooleanQuery;
3131
import org.apache.lucene.search.BoostQuery;
32+
import org.apache.lucene.search.DisjunctionMaxQuery;
3233
import org.apache.lucene.search.FuzzyQuery;
3334
import org.apache.lucene.search.MultiPhraseQuery;
3435
import org.apache.lucene.search.MultiTermQuery;
@@ -351,7 +352,12 @@ protected Query analyzePhrase(String field, TokenStream stream, int slop) throws
351352
throw exc;
352353
}
353354
}
354-
return super.analyzePhrase(field, stream, slop);
355+
Query query = super.analyzePhrase(field, stream, slop);
356+
if (query instanceof PhraseQuery) {
357+
// synonyms that expand to multiple terms can return a phrase query.
358+
return blendPhraseQuery((PhraseQuery) query, mapper);
359+
}
360+
return query;
355361
}
356362

357363
/**
@@ -476,6 +482,14 @@ private Query boolToExtendedCommonTermsQuery(BooleanQuery bq, Occur highFreqOccu
476482
}
477483
}
478484

485+
/**
486+
* Called when a phrase query is built with {@link QueryBuilder#analyzePhrase(String, TokenStream, int)}.
487+
* Subclass can override this function to blend this query to multiple fields.
488+
*/
489+
protected Query blendPhraseQuery(PhraseQuery query, MappedFieldType fieldType) {
490+
return query;
491+
}
492+
479493
protected Query blendTermsQuery(Term[] terms, MappedFieldType fieldType) {
480494
return new SynonymQuery(terms);
481495
}
@@ -498,5 +512,4 @@ protected Query blendTermQuery(Term term, MappedFieldType fieldType) {
498512
}
499513
return termQuery(fieldType, term.bytes(), lenient);
500514
}
501-
502515
}

‎server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import org.apache.lucene.search.BoostQuery;
2626
import org.apache.lucene.search.DisjunctionMaxQuery;
2727
import org.apache.lucene.search.MatchNoDocsQuery;
28+
import org.apache.lucene.search.PhraseQuery;
2829
import org.apache.lucene.search.Query;
2930
import org.apache.lucene.search.TermQuery;
3031
import org.apache.lucene.util.BytesRef;
31-
import org.elasticsearch.ElasticsearchParseException;
3232
import org.elasticsearch.common.lucene.search.Queries;
3333
import org.elasticsearch.index.mapper.MappedFieldType;
3434
import org.elasticsearch.index.query.AbstractQueryBuilder;
@@ -141,6 +141,10 @@ public Query blendTerms(Term[] terms, MappedFieldType fieldType) {
141141
public Query termQuery(MappedFieldType fieldType, BytesRef value) {
142142
return MultiMatchQuery.this.termQuery(fieldType, value, lenient);
143143
}
144+
145+
public Query blendPhrase(PhraseQuery query, MappedFieldType type) {
146+
return MultiMatchQuery.super.blendPhraseQuery(query, type);
147+
}
144148
}
145149

146150
final class CrossFieldsQueryBuilder extends QueryBuilder {
@@ -224,6 +228,17 @@ public Query termQuery(MappedFieldType fieldType, BytesRef value) {
224228
*/
225229
return blendTerm(new Term(fieldType.name(), value.utf8ToString()), fieldType);
226230
}
231+
232+
@Override
233+
public Query blendPhrase(PhraseQuery query, MappedFieldType type) {
234+
if (blendedFields == null) {
235+
return super.blendPhrase(query, type);
236+
}
237+
/**
238+
* We build phrase queries for multi-word synonyms when {@link QueryBuilder#autoGenerateSynonymsPhraseQuery} is true.
239+
*/
240+
return MultiMatchQuery.blendPhrase(query, blendedFields);
241+
}
227242
}
228243

229244
static Query blendTerm(QueryShardContext context, BytesRef value, Float commonTermsCutoff, float tieBreaker,
@@ -293,6 +308,28 @@ static Query blendTerms(QueryShardContext context, BytesRef[] values, Float comm
293308
}
294309
}
295310

311+
/**
312+
* Expand a {@link PhraseQuery} to multiple fields that share the same analyzer.
313+
* Returns a {@link DisjunctionMaxQuery} with a disjunction for each expanded field.
314+
*/
315+
static Query blendPhrase(PhraseQuery query, FieldAndFieldType... fields) {
316+
List<Query> disjunctions = new ArrayList<>();
317+
for (FieldAndFieldType field : fields) {
318+
int[] positions = query.getPositions();
319+
Term[] terms = query.getTerms();
320+
PhraseQuery.Builder builder = new PhraseQuery.Builder();
321+
for (int i = 0; i < terms.length; i++) {
322+
builder.add(new Term(field.fieldType.name(), terms[i].bytes()), positions[i]);
323+
}
324+
Query q = builder.build();
325+
if (field.boost != AbstractQueryBuilder.DEFAULT_BOOST) {
326+
q = new BoostQuery(q, field.boost);
327+
}
328+
disjunctions.add(q);
329+
}
330+
return new DisjunctionMaxQuery(disjunctions, 0.0f);
331+
}
332+
296333
@Override
297334
protected Query blendTermQuery(Term term, MappedFieldType fieldType) {
298335
if (queryBuilder == null) {
@@ -309,6 +346,14 @@ protected Query blendTermsQuery(Term[] terms, MappedFieldType fieldType) {
309346
return queryBuilder.blendTerms(terms, fieldType);
310347
}
311348

349+
@Override
350+
protected Query blendPhraseQuery(PhraseQuery query, MappedFieldType fieldType) {
351+
if (queryBuilder == null) {
352+
return super.blendPhraseQuery(query, fieldType);
353+
}
354+
return queryBuilder.blendPhrase(query, fieldType);
355+
}
356+
312357
static final class FieldAndFieldType {
313358
final MappedFieldType fieldType;
314359
final float boost;

‎server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@
1919

2020
package org.elasticsearch.index.search;
2121

22+
import org.apache.lucene.analysis.MockSynonymAnalyzer;
2223
import org.apache.lucene.index.Term;
2324
import org.apache.lucene.queries.BlendedTermQuery;
25+
import org.apache.lucene.search.BooleanClause;
26+
import org.apache.lucene.search.BooleanQuery;
2427
import org.apache.lucene.search.BoostQuery;
2528
import org.apache.lucene.search.DisjunctionMaxQuery;
2629
import org.apache.lucene.search.MatchAllDocsQuery;
2730
import org.apache.lucene.search.MatchNoDocsQuery;
31+
import org.apache.lucene.search.PhraseQuery;
2832
import org.apache.lucene.search.Query;
2933
import org.apache.lucene.search.SynonymQuery;
3034
import org.apache.lucene.search.TermQuery;
@@ -43,7 +47,11 @@
4347
import org.junit.Before;
4448

4549
import java.io.IOException;
50+
import java.util.ArrayList;
4651
import java.util.Arrays;
52+
import java.util.HashMap;
53+
import java.util.List;
54+
import java.util.Map;
4755

4856
import static org.elasticsearch.index.query.QueryBuilders.multiMatchQuery;
4957
import static org.hamcrest.Matchers.equalTo;
@@ -215,4 +223,45 @@ public void testMultiMatchCrossFieldsWithSynonyms() throws IOException {
215223
assertThat(parsedQuery, equalTo(expectedQuery));
216224

217225
}
226+
227+
public void testMultiMatchCrossFieldsWithSynonymsPhrase() throws IOException {
228+
QueryShardContext queryShardContext = indexService.newQueryShardContext(
229+
randomInt(20), null, () -> { throw new UnsupportedOperationException(); }, null);
230+
MultiMatchQuery parser = new MultiMatchQuery(queryShardContext);
231+
parser.setAnalyzer(new MockSynonymAnalyzer());
232+
Map<String, Float> fieldNames = new HashMap<>();
233+
fieldNames.put("name.first", 1.0f);
234+
fieldNames.put("name.last", 1.0f);
235+
Query query = parser.parse(MultiMatchQueryBuilder.Type.CROSS_FIELDS, fieldNames, "guinea pig", null);
236+
237+
Term[] terms = new Term[2];
238+
terms[0] = new Term("name.first", "cavy");
239+
terms[1] = new Term("name.last", "cavy");
240+
float[] boosts = new float[2];
241+
Arrays.fill(boosts, 1.0f);
242+
243+
List<Query> phraseDisjuncts = new ArrayList<>();
244+
phraseDisjuncts.add(
245+
new PhraseQuery.Builder()
246+
.add(new Term("name.first", "guinea"))
247+
.add(new Term("name.first", "pig"))
248+
.build()
249+
);
250+
phraseDisjuncts.add(
251+
new PhraseQuery.Builder()
252+
.add(new Term("name.last", "guinea"))
253+
.add(new Term("name.last", "pig"))
254+
.build()
255+
);
256+
BooleanQuery expected = new BooleanQuery.Builder()
257+
.add(
258+
new BooleanQuery.Builder()
259+
.add(new DisjunctionMaxQuery(phraseDisjuncts, 0.0f), BooleanClause.Occur.SHOULD)
260+
.add(BlendedTermQuery.dismaxBlendedQuery(terms, boosts, 1.0f), BooleanClause.Occur.SHOULD)
261+
.build(),
262+
BooleanClause.Occur.SHOULD
263+
)
264+
.build();
265+
assertEquals(expected, query);
266+
}
218267
}

0 commit comments

Comments
 (0)