Allow fields to be set to *
#42301
Merged
Allow fields to be set to *
#42301
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allow for SimpleQueryString, QueryString and MultiMatchQuery to set the `fields` parameter to the wildcard `*`. If so, set the leniency to `true`, to achieve the same behaviour as from the `"default_field" : "*" setting. Closes: elastic#39577
matriv
added
>enhancement
:Search/Search
|
Pinging @elastic/es-search |
matriv
commented
May 21, 2019
| if (isAllField) { | ||
| newSettings.lenient(lenientSet ? settings.lenient() : true); | ||
| } | ||
| isAllField = defaultFields.size() == 1 && Regex.isMatchAllPattern(defaultFields.get(0)); |
There was a problem hiding this comment.
@jimczi Why do we check only the first element here, shouldn't we check all the defaultFields?
(same applies to all 3 types of queries)
There was a problem hiding this comment.
I agree we should check all elements. However I don't think it's useful to set fields or the default fields to something like ["*", "field1", "field2"] but for consistency we should always set the leniency to true if * is part of the list of fields to query.
jimczi
requested changes
May 21, 2019
| if (isAllField) { | ||
| newSettings.lenient(lenientSet ? settings.lenient() : true); | ||
| } | ||
| isAllField = defaultFields.size() == 1 && Regex.isMatchAllPattern(defaultFields.get(0)); |
There was a problem hiding this comment.
I agree we should check all elements. However I don't think it's useful to set fields or the default fields to something like ["*", "field1", "field2"] but for consistency we should always set the leniency to true if * is part of the list of fields to query.
| } | ||
| assertEquals(11, noMatchNoDocsQueries); | ||
| assertThat(disjunctionMaxQuery.getDisjuncts(), hasItems(new TermQuery(new Term(STRING_FIELD_NAME, "hello")), | ||
| new TermQuery(new Term(STRING_FIELD_NAME_2, "hello")))); |
There was a problem hiding this comment.
Can you also add a test with a single field set on * ?
| } | ||
| assertEquals(11, noMatchNoDocsQueries); | ||
| assertThat(disjunctionMaxQuery.getDisjuncts(), hasItems(new TermQuery(new Term(STRING_FIELD_NAME, "hello")), | ||
| new TermQuery(new Term(STRING_FIELD_NAME_2, "hello")))); |
Also check if `*` is in the list of the default_field but not necessarily as the 1st element.
cbuescher
requested changes
May 22, 2019
server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java
Show resolved
Hide resolved
matriv
added a commit
that referenced
this pull request
May 23, 2019
Allow for SimpleQueryString, QueryString and MultiMatchQuery to set the `fields` parameter to the wildcard `*`. If so, set the leniency to `true`, to achieve the same behaviour as from the `"default_field" : "*" setting. Furthermore, check if `*` is in the list of the `default_field` but not necessarily as the 1st element. Closes: #39577 (cherry picked from commit e75ff0c)
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
Allow for SimpleQueryString, QueryString and MultiMatchQuery to set the `fields` parameter to the wildcard `*`. If so, set the leniency to `true`, to achieve the same behaviour as from the `"default_field" : "*" setting. Furthermore, check if `*` is in the list of the `default_field` but not necessarily as the 1st element. Closes: elastic#39577
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow for SimpleQueryString, QueryString and MultiMatchQuery
to set the
fieldsparameter to the wildcard*. If so, setthe leniency to
true, to achieve the same behaviour as from the"default_field" : "*"setting.Closes: #39577