honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sorting of NaN values in terms aggregations. 

Closes #5236.
This commit is contained in:
Nils Dijk 2014-02-24 14:15:43 +01:00 committed by Adrien Grand
parent 5008b04cf4
commit 0e57915536
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,8 +212,11 @@ class InternalOrder extends Terms.Order {
double v2 = ((MetricsAggregator.MultiValue) aggregator).metric(valueName, ((InternalTerms.Bucket) o2).bucketOrd); double v2 = ((MetricsAggregator.MultiValue) aggregator).metric(valueName, ((InternalTerms.Bucket) o2).bucketOrd);
// some metrics may return NaN (eg. avg, variance, etc...) in which case we'd like to push all of those to // some metrics may return NaN (eg. avg, variance, etc...) in which case we'd like to push all of those to
// the bottom // the bottom
if (v1 == Double.NaN) { if (Double.isNaN(v1)) {
return asc ? 1 : -1; return Double.isNaN(v2) ? 0 : 1;
}
if (Double.isNaN(v2)) {
return -1;
} }
return asc ? Double.compare(v1, v2) : Double.compare(v2, v1); return asc ? Double.compare(v1, v2) : Double.compare(v2, v1);
} }
@ -227,8 +230,11 @@ class InternalOrder extends Terms.Order {
double v2 = ((MetricsAggregator.SingleValue) aggregator).metric(((InternalTerms.Bucket) o2).bucketOrd); double v2 = ((MetricsAggregator.SingleValue) aggregator).metric(((InternalTerms.Bucket) o2).bucketOrd);
// some metrics may return NaN (eg. avg, variance, etc...) in which case we'd like to push all of those to // some metrics may return NaN (eg. avg, variance, etc...) in which case we'd like to push all of those to
// the bottom // the bottom
if (v1 == Double.NaN) { if (Double.isNaN(v1)) {
return asc ? 1 : -1; return Double.isNaN(v2) ? 0 : 1;
}
if (Double.isNaN(v2)) {
return -1;
} }
return asc ? Double.compare(v1, v2) : Double.compare(v2, v1); return asc ? Double.compare(v1, v2) : Double.compare(v2, v1);
} }