honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use default forceAnalyzeQueryString if no query builder is present

Browse Source 
In the single field case no query builder is selected which causes NPE
when the query has only a numeric field.

Closes #6215
This commit is contained in:
Simon Willnauer 2014-05-18 08:34:19 +02:00
parent 1e5138889e
commit dab4596b13
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
View File

@ -263,6 +263,6 @@ public class MultiMatchQuery extends MatchQuery {
}
protected boolean forceAnalyzeQueryString() {
return this.queryBuilder.forceAnalyzeQueryString();
return this.queryBuilder == null ? super.forceAnalyzeQueryString() : this.queryBuilder.forceAnalyzeQueryString();
}
}

9
src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java
View File

@ -210,6 +210,15 @@ public class MultiMatchQueryTests extends ElasticsearchIntegrationTest {
assertHitCount(searchResponse, 2l);
}
@Test
public void testSingleField() {
SearchResponse searchResponse = client().prepareSearch("test")
.setQuery(randomizeType(multiMatchQuery("15", "skill"))).get();
assertNoFailures(searchResponse);
assertFirstHit(searchResponse, hasId("theone"));
// TODO we need equivalence tests with match query here
}
@Test
public void testCutoffFreq() throws ExecutionException, InterruptedException {
final long numDocs = client().prepareCount("test")