honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-01 00:19:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aggregations: Removes isSingleUserCriteria check

Browse Source 
This change removes the backwards compatibility workaround that checks that a compoundOrder originated from a single user defined criteria for the purposes of serialising to older versioned nodes.
This commit is contained in:
Colin Goodheart-Smithe 2014-09-15 16:26:36 +01:00
parent 5e1f95ca93
commit 66417a93a0
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java
View File

@ -220,20 +220,15 @@ class InternalOrder extends Terms.Order {
static final byte ID = -1;
private final List<Terms.Order> orderElements;
private final boolean singleUserCriteria;
public CompoundOrder(List<Terms.Order> compoundOrder) {
this.singleUserCriteria = compoundOrder.size() == 1;
this.orderElements = new LinkedList<>(compoundOrder);
// add term order ascending as a tie-breaker to avoid non-deterministic ordering
// if all user provided comparators return 0.
this.orderElements.add(Order.term(true));
this(compoundOrder, true);
}
public CompoundOrder(List<Terms.Order> compoundOrder, boolean absoluteOrdering) {
this.singleUserCriteria = compoundOrder.size() == 1;
this.orderElements = new LinkedList<>(compoundOrder);
if (absoluteOrdering) {
Terms.Order lastElement = compoundOrder.get(compoundOrder.size() - 1);
if (absoluteOrdering && !(InternalOrder.TERM_ASC == lastElement || InternalOrder.TERM_DESC == lastElement)) {
// add term order ascending as a tie-breaker to avoid non-deterministic ordering
// if all user provided comparators return 0.
this.orderElements.add(Order.term(true));
@ -245,10 +240,6 @@ class InternalOrder extends Terms.Order {
return ID;
}
boolean isSingleUserCriteria() {
return singleUserCriteria;
}
List<Terms.Order> orderElements() {
return Collections.unmodifiableList(orderElements);
}
@ -310,15 +301,11 @@ class InternalOrder extends Terms.Order {
}
} else if (order instanceof CompoundOrder) {
CompoundOrder compoundOrder = (CompoundOrder) order;
if (compoundOrder.isSingleUserCriteria()) {
Streams.writeOrder(compoundOrder.orderElements.get(0), out);
} else {
out.writeByte(order.id());
out.writeVInt(compoundOrder.orderElements.size());
for (Terms.Order innerOrder : compoundOrder.orderElements) {
Streams.writeOrder(innerOrder, out);
}
}
} else {
out.writeByte(order.id());
}