Refactor Indexable\Term::parse_orderby() and remove refs to non-existent .long fields #2421
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
Rahmon
reviewed
Oct 21, 2021
Comment on lines
978
to
981
| $es_field_name = 'name.sortable'; | ||
|
|
||
| if ( version_compare( $es_version, '7.0', '>=' ) ) { | ||
| $sort[] = array( | ||
| 'name.sortable' => array( | ||
| 'order' => $order, | ||
| ), | ||
| ); | ||
| $es_field_name = 'name.sortable'; |
There was a problem hiding this comment.
Could we check only if $es_version is less than 7.0? And if true, change it to name.raw.
| 'order' => $order, | ||
| ), | ||
| ); | ||
| $es_field_name = 'meta.' . $args['meta_key'] . '.value'; |
There was a problem hiding this comment.
If we enter in this case and the if condition fails, we would never set the $es_field_name variable, wouldn't we? In this case, wouldn't be an issue in line 1027?
| 'order' => $order, | ||
| ), | ||
| ); | ||
| $es_field_name = 'meta.' . $args['meta_key'] . '.long'; |
There was a problem hiding this comment.
Maybe the same behavior as the previous comment.
Rahmon
approved these changes
Oct 21, 2021
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.
Description of the Change
This PR fixes a bug in terms' sort, where non-existent fields
term_group.longandcount.longwere used causing ES to fail. It also refactor the method a bit, making it smaller and, hopefully, easier to understand.Although this PR updates some tests, we should implement a new test really triggering those queries, in addition to check if the code parsed them correctly.
Changelog Entry
Fixed: Sort by count and tem_group on Terms