Skip to content

Simplify InternalOrder.isOrder a little #122372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Simplify InternalOrder.isOrder a little #122372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5bb4b5
Simplify InternalOrder.isOrder a little
original-brownbear Feb 12, 2025
0de5059
Merge branch 'main' into cleanup-order-check
original-brownbear Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,16 +438,7 @@ public static boolean isKeyDesc(BucketOrder order) {
* @return {@code true} if the order matches, {@code false} otherwise.
*/
private static boolean isOrder(BucketOrder order, BucketOrder expected) {
if (order == expected) {
return true;
} else if (order instanceof CompoundOrder) {
// check if its a compound order with the first element that matches
List<BucketOrder> orders = ((CompoundOrder) order).orderElements;
if (orders.size() >= 1) {
return isOrder(orders.get(0), expected);
}
}
return false;
return order == expected || (order instanceof CompoundOrder compoundOrder && compoundOrder.orderElements.getFirst() == expected);
}

/**
Expand Down