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

clean up topnbinaryfn

This commit is contained in:
fjy 2014-04-21 20:30:18 -07:00
parent 310073685d
commit 07aab28325
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
processing/src/main/java/io/druid/query/topn/TopNBinaryFn.java
View File

@ -41,7 +41,7 @@ public class TopNBinaryFn implements BinaryFn<Result<TopNResultValue>, Result<To
private final TopNResultMerger merger; private final TopNResultMerger merger;
private final DimensionSpec dimSpec; private final DimensionSpec dimSpec;
private final QueryGranularity gran; private final QueryGranularity gran;
private final DimensionSpec dimensionSpec; private final String dimension;
private final TopNMetricSpec topNMetricSpec; private final TopNMetricSpec topNMetricSpec;
private final int threshold; private final int threshold;
private final List<AggregatorFactory> aggregations; private final List<AggregatorFactory> aggregations;
@ -64,13 +64,13 @@ public class TopNBinaryFn implements BinaryFn<Result<TopNResultValue>, Result<To
this.topNMetricSpec = topNMetricSpec; this.topNMetricSpec = topNMetricSpec;
this.threshold = threshold; this.threshold = threshold;
this.aggregations = aggregatorSpecs; this.aggregations = aggregatorSpecs;
this.dimensionSpec = dimSpec;
this.postAggregations = AggregatorUtil.pruneDependentPostAgg( this.postAggregations = AggregatorUtil.pruneDependentPostAgg(
postAggregatorSpecs, postAggregatorSpecs,
this.topNMetricSpec.getMetricName(this.dimensionSpec) topNMetricSpec.getMetricName(dimSpec)
); );
this.dimension = dimSpec.getOutputName();
this.comparator = topNMetricSpec.getComparator(aggregatorSpecs, postAggregatorSpecs); this.comparator = topNMetricSpec.getComparator(aggregatorSpecs, postAggregatorSpecs);
} }
@ -84,12 +84,11 @@ public class TopNBinaryFn implements BinaryFn<Result<TopNResultValue>, Result<To
return merger.getResult(arg1, comparator); return merger.getResult(arg1, comparator);
} }
Map<String, DimensionAndMetricValueExtractor> retVals = new LinkedHashMap<>();
TopNResultValue arg1Vals = arg1.getValue(); TopNResultValue arg1Vals = arg1.getValue();
TopNResultValue arg2Vals = arg2.getValue(); TopNResultValue arg2Vals = arg2.getValue();
Map<String, DimensionAndMetricValueExtractor> retVals = new LinkedHashMap<String, DimensionAndMetricValueExtractor>();
String dimension = dimensionSpec.getOutputName();
for (DimensionAndMetricValueExtractor arg1Val : arg1Vals) { for (DimensionAndMetricValueExtractor arg1Val : arg1Vals) {
retVals.put(arg1Val.getStringDimensionValue(dimension), arg1Val); retVals.put(arg1Val.getStringDimensionValue(dimension), arg1Val);
} }
@ -99,15 +98,16 @@ public class TopNBinaryFn implements BinaryFn<Result<TopNResultValue>, Result<To
if (arg1Val != null) { if (arg1Val != null) {
// size of map = aggregator + topNDim + postAgg (If sorting is done on post agg field) // size of map = aggregator + topNDim + postAgg (If sorting is done on post agg field)
Map<String, Object> retVal = new LinkedHashMap<String, Object>(aggregations.size() + 2); Map<String, Object> retVal = new LinkedHashMap<>(aggregations.size() + 2);
retVal.put(dimension, dimensionValue); retVal.put(dimension, dimensionValue);
for (AggregatorFactory factory : aggregations) { for (AggregatorFactory factory : aggregations) {
final String metricName = factory.getName(); final String metricName = factory.getName();
retVal.put(metricName, factory.combine(arg1Val.getMetric(metricName), arg2Val.getMetric(metricName))); retVal.put(metricName, factory.combine(arg1Val.getMetric(metricName), arg2Val.getMetric(metricName)));
} }
for (PostAggregator postAgg : postAggregations) {
retVal.put(postAgg.getName(), postAgg.compute(retVal)); for (PostAggregator pf : postAggregations) {
retVal.put(pf.getName(), pf.compute(retVal));
} }
retVals.put(dimensionValue, new DimensionAndMetricValueExtractor(retVal)); retVals.put(dimensionValue, new DimensionAndMetricValueExtractor(retVal));