diff options
| author | Jim Ferenczi <jim.ferenczi@elastic.co> | 2017-06-08 11:18:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 11:18:17 +0200 |
| commit | 21a57c14945fb0b82d2b78a2c89e0d92bbc086a0 (patch) | |
| tree | 566faecfed3cdcc249c8cc7d5d60d3eb054f3c8e /core/src/test/java/org/elasticsearch/search | |
| parent | d6d416cacc27bc043fc6f0958bddce78027bcfb0 (diff) | |
Always use DisjunctionMaxQuery to build cross fields disjunction (#25115)
This commit modifies query_string, simple_query_string and multi_match queries to always use a DisjunctionMaxQuery when a disjunction over multiple fields is built. The tiebreaker is set to 1 in order to behave like the boolean query in terms of scoring.
The removal of the coord factor in Lucene 7 made this change mandatory to correctly handle minimum_should_match.
Closes #23966
Diffstat (limited to 'core/src/test/java/org/elasticsearch/search')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java index 58c0bf82e9..f22ec392b9 100644 --- a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java @@ -120,7 +120,6 @@ public class SimpleQueryStringIT extends ESIntegTestCase { assertSearchHits(searchResponse, "5", "6"); } - @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/23966") public void testSimpleQueryStringMinimumShouldMatch() throws Exception { createIndex("test"); ensureGreen("test"); |