Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2729 from jon-wei/fix_hyperunique_comparator 

Fix HyperUniquesAggregatorFactory comparator
This commit is contained in:
Fangjin Yang 2016-03-26 15:39:35 -07:00
parent a0216dcf7d 9afaa2b94a
commit 0dae28b6af
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java
View File

@ -21,6 +21,7 @@ package io.druid.query.aggregation.hyperloglog;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Ordering;
import com.metamx.common.IAE; import com.metamx.common.IAE;
import com.metamx.common.StringUtils; import com.metamx.common.StringUtils;
import io.druid.query.aggregation.Aggregator; import io.druid.query.aggregation.Aggregator;
@ -106,20 +107,7 @@ public class HyperUniquesAggregatorFactory extends AggregatorFactory
@Override @Override
public Comparator getComparator() public Comparator getComparator()
{ {
return new Comparator<HyperLogLogCollector>() return Ordering.<HyperLogLogCollector>natural().nullsFirst();
{
@Override
public int compare(HyperLogLogCollector lhs, HyperLogLogCollector rhs)
{
if(lhs == null) {
return -1;
}
if(rhs == null) {
return 1;
}
return lhs.compareTo(rhs);
}
};
} }
@Override @Override

4
processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java
View File

@ -377,11 +377,11 @@ public class TopNQueryRunnerTest
new TopNResultValue( new TopNResultValue(
Arrays.<Map<String, Object>>asList( Arrays.<Map<String, Object>>asList(
ImmutableMap.<String, Object>builder() ImmutableMap.<String, Object>builder()
.put("market", "total_market") .put("market", "spot")
.put("uniques", 0) .put("uniques", 0)
.build(), .build(),
ImmutableMap.<String, Object>builder() ImmutableMap.<String, Object>builder()
.put("market", "spot") .put("market", "total_market")
.put("uniques", 0) .put("uniques", 0)
.build(), .build(),
ImmutableMap.<String, Object>builder() ImmutableMap.<String, Object>builder()