Skip to content

Fix minimum_should_match for combined_fields query #72152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2021
Merged

Fix minimum_should_match for combined_fields query #72152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.MappedFieldType;
Expand Down Expand Up @@ -75,7 +76,13 @@ public class CombinedFieldsQueryBuilder extends AbstractQueryBuilder<CombinedFie
}, FIELDS_FIELD);

PARSER.declareString(CombinedFieldsQueryBuilder::operator, Operator::fromString, OPERATOR_FIELD);
PARSER.declareString(CombinedFieldsQueryBuilder::minimumShouldMatch, MINIMUM_SHOULD_MATCH_FIELD);
PARSER.declareField(
CombinedFieldsQueryBuilder::minimumShouldMatch,
XContentParser::textOrNull,
MINIMUM_SHOULD_MATCH_FIELD,
// using INT_OR_NULL (which includes VALUE_NUMBER, VALUE_STRING, VALUE_NULL) to also allow for numeric values and null
ValueType.INT_OR_NULL
);
PARSER.declareBoolean(CombinedFieldsQueryBuilder::autoGenerateSynonymsPhraseQuery, GENERATE_SYNONYMS_PHRASE_QUERY);
PARSER.declareString(CombinedFieldsQueryBuilder::zeroTermsQuery, value -> {
if ("none".equalsIgnoreCase(value)) {
Expand Down
23 changes: 23 additions & 0 deletions server/src/test/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,27 @@ public void testValuesFromXContent() throws IOException {
assertEquals(json, Operator.OR, parsed.operator());
assertEquals(json, 2.0, parsed.boost, 1e-6);
}

/**
* We parse `minimum_should_match` to a String but other queries supporting this parameter also accept integer values and null
*/
public void testMinumumShouldMatchFromXContent() throws IOException {
Object[] testValues = new Object[] { 2, "\"2\"", "\"2%\"", null };
Object[] expectedValues = new Object[] { "2", "2", "2%", null };
int i = 0;
for (Object value : testValues) {
String json = "{\n"
+ " \"combined_fields\" : {\n"
+ " \"query\" : \"quick brown fox\",\n"
+ " \"minimum_should_match\" : " + value + "\n"
+ " }\n"
+ "}";

CombinedFieldsQueryBuilder parsed = (CombinedFieldsQueryBuilder) parseQuery(json);

assertEquals(json, "quick brown fox", parsed.value());
assertEquals(json, expectedValues[i], parsed.minimumShouldMatch());
i++;
}
}
}