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

Fix CI failure for recent commit in SimpleQueryStringBuilder

This commit is contained in:
Christoph Büscher 2015-10-28 13:58:36 +01:00
parent 1672bcc21c
commit fdcfc7e817
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
View File

@ -287,17 +287,20 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
sqp.setDefaultOperator(defaultOperator.toBooleanClauseOccur()); sqp.setDefaultOperator(defaultOperator.toBooleanClauseOccur());
Query query = sqp.parse(queryText); Query query = sqp.parse(queryText);
if (minimumShouldMatch != null && query instanceof BooleanQuery) { if (query instanceof BooleanQuery) {
BooleanQuery booleanQuery = (BooleanQuery) query; BooleanQuery booleanQuery = (BooleanQuery) query;
// treat special case for one term query and more than one field
// we need to wrap this in additional BooleanQuery so minimum_should_match is applied correctly
if (booleanQuery.clauses().size() > 1 if (booleanQuery.clauses().size() > 1
&& ((booleanQuery.clauses().iterator().next().getQuery() instanceof BooleanQuery) == false)) { && ((booleanQuery.clauses().iterator().next().getQuery() instanceof BooleanQuery) == false)) {
// special case for one term query and more than one field: (f1:t1 f2:t1 f3:t1)
// we need to wrap this in additional BooleanQuery so minimum_should_match is applied correctly
BooleanQuery.Builder builder = new BooleanQuery.Builder(); BooleanQuery.Builder builder = new BooleanQuery.Builder();
builder.add(new BooleanClause(booleanQuery, Occur.SHOULD)); builder.add(new BooleanClause(booleanQuery, Occur.SHOULD));
booleanQuery = builder.build(); booleanQuery = builder.build();
} }
query = Queries.applyMinimumShouldMatch(booleanQuery, minimumShouldMatch); if (minimumShouldMatch != null) {
booleanQuery = Queries.applyMinimumShouldMatch(booleanQuery, minimumShouldMatch);
}
query = booleanQuery;
} }
return query; return query;
} }