[MM-25538] Adds the termOperator and takes it into account for terms and hashtag queries #14664
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
…and hashtag queries
mgdelacroix
added
2: Dev Review
amyblais
added
the
CherryPick/Approved
ethervoid
reviewed
May 28, 2020
| @@ -43,6 +43,11 @@ func (b *BleveEngine) SearchPosts(channels *model.ChannelList, searchParams []*m | |||
| filters = append(filters, typeQ) | |||
|
|
|||
| for i, params := range searchParams { | |||
| var termOperator query.MatchQueryOperator = query.MatchQueryOperatorAnd | |||
There was a problem hiding this comment.
Question. Why don't do termOperator := query.MatchQueryOperatorAnd?
There was a problem hiding this comment.
I'm not really sure why, but the type inference system doesn't play well with that assignment particularly:
# github.com/mattermost/mattermost-server/v5/services/searchengine/bleveengine
services/searchengine/bleveengine/search.go:149:25: cannot use termOperator (type int) as type query.MatchQueryOperator in argument to hashtagQ.SetOperator
services/searchengine/bleveengine/search.go:154:25: cannot use termOperator (type int) as type query.MatchQueryOperator in argument to hashtagQ.SetOperator
services/searchengine/bleveengine/search.go:161:25: cannot use termOperator (type int) as type query.MatchQueryOperator in argument to messageQ.SetOperator
services/searchengine/bleveengine/search.go:168:25: cannot use termOperator (type int) as type query.MatchQueryOperator in argument to messageQ.SetOperator
There was a problem hiding this comment.
Awesome! Thanks for taking the time to send the PR!! ❤️
ogi-m
removed
the
3: QA Review
|
/update-branch |
mgdelacroix
added
4: Reviews Complete
|
Will try to auto merge this PR once all tests and checks are passing. This might take up to an hour. |
1 similar comment
|
Will try to auto merge this PR once all tests and checks are passing. This might take up to an hour. |
|
Test server destroyed |
|
Will try to auto merge this PR once all tests and checks are passing. This might take up to an hour. |
|
Trying to auto merge this PR. |
|
Pull Request successfully merged |
mattermod
added
CherryPick/Done
amyblais
added
Changelog/Not Needed
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.
Summary
Adds the term operator for both term and hashtag queries and for normal and excluded terms
Ticket Link
https://mattermost.atlassian.net/browse/MM-25538