Bugfix for mixed version cluster queries using text expansion #105912
Conversation
This file contains hidden or 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
kderusso
added
>non-issue
:EnterpriseSearch/Application
Collaborator
|
Pinging @elastic/ent-search-eng (Team:Enterprise Search) |
kderusso
changed the title
demjened
approved these changes
Mar 4, 2024
Contributor
demjened
left a comment
demjened
left a comment
There was a problem hiding this comment.
LGTM, I'd just like to see more verbal explanation of the two use cases and when we might fall back.
...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/queries/TextExpansionQueryBuilder.java
Show resolved
Hide resolved
...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/queries/TextExpansionQueryBuilder.java
Show resolved
Hide resolved
...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/queries/TextExpansionQueryBuilder.java
Show resolved
Hide resolved
...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/queries/TextExpansionQueryBuilder.java
Outdated
Show resolved
Hide resolved
tteofili
approved these changes
Mar 4, 2024
jimczi
reviewed
Mar 4, 2024
| return weightedTokensQueryBuilder; | ||
| } | ||
| // Note: Weighted tokens queries were introduced in 8.13.0. To support cross cluster search against older versions, | ||
| // if no token pruning configuration is specified we fall back to a boolean query. |
Contributor
There was a problem hiding this comment.
Note that mixed version cluster requires this too which is why it was done this way in the first place. We expect that the weighted token config is used only when all nodes in the cluster are >= 8.13.
Member
Author
There was a problem hiding this comment.
Thanks, edited the comment
Contributor
There was a problem hiding this comment.
Thank you for adding this comment. This will help us avoid making this change in future.
saikatsarkar056
approved these changes
Mar 4, 2024
kderusso
changed the title
ioanatia
approved these changes
Mar 5, 2024
Member
Author
|
@elasticmachine merge upstream |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
This PR fixes a regression introduced in #105581 that broke cross cluster search for text expansion queries, since CCS supports versions that do not yet have the weighted tokens query.