Remove deprecated sort options: nested_path and nested_filter #42809
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
This commit removes the nested_path and nested_filter options deprecated in 6x. This change also checks that the sort field has a [nested] option if it is under a nested object and throws an exception if it's not the case. Closes elastic#27098
jimczi
added
>breaking
:Search/Search
Collaborator
|
Pinging @elastic/es-search |
cbuescher
approved these changes
Jun 6, 2019
Member
cbuescher
left a comment
cbuescher
left a comment
There was a problem hiding this comment.
Left some small nits, nothing that needs another round of review I think once the tests pass.
| [float] | ||
| ===== Removal of sort parameters | ||
|
|
||
| * The `nested_filter` and `nested_path` options, deprecated in 6.x, has been removed in favor of the `nested` context. |
| // new nested sorts takes priority | ||
| nested = resolveNested(context, nestedSort); | ||
| } else { | ||
| nested = resolveNested(context, nestedPath, nestedFilter); |
Member
There was a problem hiding this comment.
Looks like SortBuilder#resolveNested(QueryShardContext context, String nestedPath, QueryBuilder nestedFilter) is unused after this now and can be removed. I quickly tried it and didn't get compile errors, I might be missign sth. though.
| /** | ||
| * Throws an exception if the provided <code>field</code> requires a nested context. | ||
| */ | ||
| static void validateMissingNestedPath(QueryShardContext context, String field) { |
Member
There was a problem hiding this comment.
Maybe worth adding a unit test for this.
Member
There was a problem hiding this comment.
Scratch that, just was that FieldSortIT#testNestedSort covers at least the exception. I'll leave it up to you to decide if there are other cases that need checking.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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 commit removes the nested_path and nested_filter options deprecated in 6x.
This change also checks that the sort field has a [nested] option if it is under a nested
object and throws an exception if it's not the case.
Closes #27098