Skip to content

Simplify comparators in InternalOrder #122330

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 1 commit into from
Feb 12, 2025
Merged

Simplify comparators in InternalOrder #122330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 20 additions & 35 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 @@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -188,52 +189,35 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws

@Override
public <T extends Bucket> Comparator<BucketAndOrd<T>> partiallyBuiltBucketComparator(Aggregator aggregator) {
List<Comparator<BucketAndOrd<T>>> comparators = new ArrayList<>(orderElements.size());
for (BucketOrder order : orderElements) {
comparators.add(order.partiallyBuiltBucketComparator(aggregator));
Iterator<BucketOrder> iterator = orderElements.iterator();
Comparator<BucketAndOrd<T>> comparator = iterator.next().partiallyBuiltBucketComparator(aggregator);
while (iterator.hasNext()) {
comparator = comparator.thenComparing(iterator.next().partiallyBuiltBucketComparator(aggregator));
}
return (lhs, rhs) -> {
for (Comparator<BucketAndOrd<T>> c : comparators) {
int result = c.compare(lhs, rhs);
if (result != 0) {
return result;
}
}
return 0;
};
return comparator;
}

@Override
public Comparator<Bucket> comparator() {
List<Comparator<Bucket>> comparators = orderElements.stream().map(BucketOrder::comparator).toList();
return (lhs, rhs) -> {
for (Comparator<Bucket> c : comparators) {
int result = c.compare(lhs, rhs);
if (result != 0) {
return result;
}
}
return 0;
};
Iterator<BucketOrder> iterator = orderElements.iterator();
Comparator<Bucket> comparator = iterator.next().comparator();
while (iterator.hasNext()) {
comparator = comparator.thenComparing(iterator.next().comparator());
}
return comparator;
}

@Override
<B extends InternalMultiBucketAggregation.InternalBucket> Comparator<DelayedBucket<B>> delayedBucketComparator(
BiFunction<List<B>, AggregationReduceContext, B> reduce,
AggregationReduceContext reduceContext
) {
List<Comparator<DelayedBucket<B>>> comparators = orderElements.stream()
.map(b -> b.delayedBucketComparator(reduce, reduceContext))
.toList();
return (lhs, rhs) -> {
for (Comparator<DelayedBucket<B>> c : comparators) {
int result = c.compare(lhs, rhs);
if (result != 0) {
return result;
}
}
return 0;
};
Iterator<BucketOrder> iterator = orderElements.iterator();
Comparator<DelayedBucket<B>> comparator = iterator.next().delayedBucketComparator(reduce, reduceContext);
while (iterator.hasNext()) {
comparator = comparator.thenComparing(iterator.next().delayedBucketComparator(reduce, reduceContext));
}
return comparator;
}

@Override
Expand Down Expand Up @@ -285,12 +269,13 @@ public Comparator<Bucket> comparator() {
return comparator;
}

@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
<B extends InternalMultiBucketAggregation.InternalBucket> Comparator<DelayedBucket<B>> delayedBucketComparator(
BiFunction<List<B>, AggregationReduceContext, B> reduce,
AggregationReduceContext reduceContext
) {
return delayedBucketCompator::compare;
return (Comparator) delayedBucketCompator;
}

@Override
Expand Down