diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java b/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java index f48102ca1f73..54f7f5744daa 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java @@ -26,17 +26,14 @@ public class DistinctCountAggregator implements Aggregator { - private final String name; private final DimensionSelector selector; private final MutableBitmap mutableBitmap; public DistinctCountAggregator( - String name, DimensionSelector selector, MutableBitmap mutableBitmap ) { - this.name = name; this.selector = selector; this.mutableBitmap = mutableBitmap; } @@ -70,7 +67,7 @@ public float getFloat() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java b/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java index 88c393423f2f..b889e1ea2771 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java +++ b/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java @@ -69,10 +69,9 @@ public Aggregator factorize(ColumnSelectorFactory columnFactory) { DimensionSelector selector = makeDimensionSelector(columnFactory); if (selector == null) { - return new EmptyDistinctCountAggregator(name); + return new EmptyDistinctCountAggregator(); } else { return new DistinctCountAggregator( - name, selector, bitMapFactory.makeEmptyMutableBitmap() ); @@ -197,12 +196,6 @@ public int getMaxIntermediateSize() return Longs.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return 0; - } - @Override public boolean equals(Object o) { diff --git a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java b/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java index 4828446427ac..9060a60f8e4f 100644 --- a/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java @@ -24,11 +24,8 @@ public class EmptyDistinctCountAggregator implements Aggregator { - private final String name; - - public EmptyDistinctCountAggregator(String name) + public EmptyDistinctCountAggregator() { - this.name = name; } @Override @@ -56,7 +53,7 @@ public float getFloat() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/EmptySketchAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/EmptySketchAggregator.java index 02da6e064d5e..c5c70706119f 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/EmptySketchAggregator.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/EmptySketchAggregator.java @@ -23,11 +23,8 @@ public class EmptySketchAggregator implements Aggregator { - private final String name; - - public EmptySketchAggregator(String name) + public EmptySketchAggregator() { - this.name = name; } @Override @@ -61,7 +58,7 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java index b89bece6c729..d49019f34ee8 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java @@ -37,16 +37,12 @@ public class SketchAggregator implements Aggregator private static final Logger logger = new Logger(SketchAggregator.class); private final ObjectColumnSelector selector; - private final String name; - private final int size; private Union union; - public SketchAggregator(String name, ObjectColumnSelector selector, int size) + public SketchAggregator(ObjectColumnSelector selector, int size) { - this.name = name; this.selector = selector; - this.size = size; union = new SynchronizedUnion((Union) SetOperation.builder().build(size, Family.UNION)); } @@ -93,7 +89,7 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java index a825f487da38..dd288932a4d5 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java @@ -29,7 +29,6 @@ import com.yahoo.sketches.memory.Memory; import com.yahoo.sketches.theta.SetOperation; import com.yahoo.sketches.theta.Sketch; -import com.yahoo.sketches.theta.Sketches; import com.yahoo.sketches.theta.Union; import io.druid.java.util.common.IAE; import io.druid.query.aggregation.Aggregator; @@ -82,9 +81,9 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory) { ObjectColumnSelector selector = metricFactory.makeObjectColumnSelector(fieldName); if (selector == null) { - return new EmptySketchAggregator(name); + return new EmptySketchAggregator(); } else { - return new SketchAggregator(name, selector, size); + return new SketchAggregator(selector, size); } } @@ -172,12 +171,6 @@ public int getMaxIntermediateSize() return SetOperation.getMaxUnionBytes(size); } - @Override - public Object getAggregatorStartValue() - { - return Sketches.updateSketchBuilder().build(size); - } - @Override public List requiredFields() { diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java index 88be52f31eaf..b66b156a2686 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java +++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java @@ -41,7 +41,6 @@ static Object combineHistograms(Object lhs, Object rhs) return ((ApproximateHistogram) lhs).foldFast((ApproximateHistogram) rhs); } - private final String name; private final FloatColumnSelector selector; private final int resolution; private final float lowerLimit; @@ -50,14 +49,12 @@ static Object combineHistograms(Object lhs, Object rhs) private ApproximateHistogram histogram; public ApproximateHistogramAggregator( - String name, FloatColumnSelector selector, int resolution, float lowerLimit, float upperLimit ) { - this.name = name; this.selector = selector; this.resolution = resolution; this.lowerLimit = lowerLimit; @@ -98,7 +95,7 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java index 901390be2dbc..ddbf948530b5 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java +++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java @@ -81,7 +81,6 @@ public ApproximateHistogramAggregatorFactory( public Aggregator factorize(ColumnSelectorFactory metricFactory) { return new ApproximateHistogramAggregator( - name, metricFactory.makeFloatColumnSelector(fieldName), resolution, lowerLimit, @@ -254,12 +253,6 @@ public int getMaxIntermediateSize() return new ApproximateHistogram(resolution).getMaxStorageSize(); } - @Override - public Object getAggregatorStartValue() - { - return new ApproximateHistogram(resolution); - } - @Override public boolean equals(Object o) { diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java index ee04f45b8adf..1c2bed00e6c8 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java +++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java @@ -25,7 +25,6 @@ public class ApproximateHistogramFoldingAggregator implements Aggregator { - private final String name; private final ObjectColumnSelector selector; private final int resolution; private final float lowerLimit; @@ -36,14 +35,12 @@ public class ApproximateHistogramFoldingAggregator implements Aggregator private long[] tmpBufferB; public ApproximateHistogramFoldingAggregator( - String name, ObjectColumnSelector selector, int resolution, float lowerLimit, float upperLimit ) { - this.name = name; this.selector = selector; this.resolution = resolution; this.lowerLimit = lowerLimit; @@ -96,7 +93,7 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java index bec1849b29d5..e277b57a44d1 100644 --- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java +++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java @@ -80,7 +80,6 @@ public ApproximateHistogram get() final Class cls = selector.classOfObject(); if (cls.equals(Object.class) || ApproximateHistogram.class.isAssignableFrom(cls)) { return new ApproximateHistogramFoldingAggregator( - name, selector, resolution, lowerLimit, diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java b/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java index 7497862c5ec1..564ebc29d870 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java +++ b/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java @@ -45,14 +45,14 @@ public void testCompute() ApproximateHistogram ah = buildHistogram(10, VALUES); final TestFloatColumnSelector selector = new TestFloatColumnSelector(VALUES); - ApproximateHistogramAggregator agg = new ApproximateHistogramAggregator("price", selector, 10, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY); + ApproximateHistogramAggregator agg = new ApproximateHistogramAggregator(selector, 10, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY); for (int i = 0; i < VALUES.length; i++) { agg.aggregate(); selector.increment(); } Map metricValues = new HashMap(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put("price", agg.get()); ApproximateHistogramPostAggregator approximateHistogramPostAggregator = new EqualBucketsPostAggregator( "approxHist", diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java index 2553322d2fda..e335bd348bde 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java +++ b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java @@ -28,13 +28,10 @@ */ public abstract class VarianceAggregator implements Aggregator { - protected final String name; - protected final VarianceAggregatorCollector holder = new VarianceAggregatorCollector(); - public VarianceAggregator(String name) + public VarianceAggregator() { - this.name = name; } @Override @@ -52,7 +49,7 @@ public Object get() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override @@ -76,9 +73,9 @@ public static final class FloatVarianceAggregator extends VarianceAggregator { private final FloatColumnSelector selector; - public FloatVarianceAggregator(String name, FloatColumnSelector selector) + public FloatVarianceAggregator(FloatColumnSelector selector) { - super(name); + super(); this.selector = selector; } @@ -93,9 +90,9 @@ public static final class LongVarianceAggregator extends VarianceAggregator { private final LongColumnSelector selector; - public LongVarianceAggregator(String name, LongColumnSelector selector) + public LongVarianceAggregator(LongColumnSelector selector) { - super(name); + super(); this.selector = selector; } @@ -110,9 +107,9 @@ public static final class ObjectVarianceAggregator extends VarianceAggregator { private final ObjectColumnSelector selector; - public ObjectVarianceAggregator(String name, ObjectColumnSelector selector) + public ObjectVarianceAggregator(ObjectColumnSelector selector) { - super(name); + super(); this.selector = selector; } diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java index 59a3a6c655c3..37fa1f08419a 100644 --- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java +++ b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java @@ -99,17 +99,11 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory) } if ("float".equalsIgnoreCase(inputType)) { - return new VarianceAggregator.FloatVarianceAggregator( - name, - metricFactory.makeFloatColumnSelector(fieldName) - ); + return new VarianceAggregator.FloatVarianceAggregator(metricFactory.makeFloatColumnSelector(fieldName)); } else if ("long".equalsIgnoreCase(inputType)) { - return new VarianceAggregator.LongVarianceAggregator( - name, - metricFactory.makeLongColumnSelector(fieldName) - ); + return new VarianceAggregator.LongVarianceAggregator(metricFactory.makeLongColumnSelector(fieldName)); } else if ("variance".equalsIgnoreCase(inputType)) { - return new VarianceAggregator.ObjectVarianceAggregator(name, selector); + return new VarianceAggregator.ObjectVarianceAggregator(selector); } throw new IAE( "Incompatible type for metric[%s], expected a float, long or variance, got a %s", fieldName, inputType @@ -169,12 +163,6 @@ public Comparator getComparator() return VarianceAggregatorCollector.COMPARATOR; } - @Override - public Object getAggregatorStartValue() - { - return new VarianceAggregatorCollector(); - } - @Override public Object combine(Object lhs, Object rhs) { diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java index 9beb980a14a5..48e220494c76 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java +++ b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java @@ -76,8 +76,6 @@ public void testDoubleVarianceAggregator() { VarianceAggregator agg = (VarianceAggregator) aggFactory.factorize(colSelectorFactory); - Assert.assertEquals("billy", agg.getName()); - assertValues((VarianceAggregatorCollector) agg.get(), 0, 0d, 0d); aggregate(selector, agg); assertValues((VarianceAggregatorCollector) agg.get(), 1, 1.1d, 0d); diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java b/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java index aa23ed6db62e..4ef717dacd4f 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java @@ -99,9 +99,9 @@ public InputRow get() catch (ParseException e) { // "aggregate" can throw ParseExceptions if a selector expects something but gets something else. if (reportParseExceptions) { - throw new ParseException(e, "Encountered parse error for aggregator[%s]", agg.getName()); + throw new ParseException(e, "Encountered parse error for aggregator[%s]", k); } - log.debug(e, "Encountered parse error, skipping aggregator[%s].", agg.getName()); + log.debug(e, "Encountered parse error, skipping aggregator[%s].", k); } String t = aggFactory.getTypeName(); diff --git a/processing/src/main/java/io/druid/query/QueryRunnerHelper.java b/processing/src/main/java/io/druid/query/QueryRunnerHelper.java index 2383b72fd286..8df31dfe42ea 100644 --- a/processing/src/main/java/io/druid/query/QueryRunnerHelper.java +++ b/processing/src/main/java/io/druid/query/QueryRunnerHelper.java @@ -44,17 +44,6 @@ public class QueryRunnerHelper { private static final Logger log = new Logger(QueryRunnerHelper.class); - public static Aggregator[] makeAggregators(Cursor cursor, List aggregatorSpecs) - { - Aggregator[] aggregators = new Aggregator[aggregatorSpecs.size()]; - int aggregatorIndex = 0; - for (AggregatorFactory spec : aggregatorSpecs) { - aggregators[aggregatorIndex] = spec.factorize(cursor); - ++aggregatorIndex; - } - return aggregators; - } - public static Sequence> makeCursorBasedQuery( final StorageAdapter adapter, List queryIntervals, diff --git a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java b/processing/src/main/java/io/druid/query/aggregation/Aggregator.java index 0cc56b458c55..c60902bfbb82 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/Aggregator.java @@ -37,7 +37,11 @@ public interface Aggregator { void reset(); Object get(); float getFloat(); - String getName(); + + /** + * Deprecated, to be removed in 0.10.0. See https://github.com/druid-io/druid/issues/3588. + */ + @Deprecated String getName(); void close(); long getLong(); diff --git a/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java index e758f3e5c7a9..2bdc2b2298e7 100644 --- a/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java @@ -29,9 +29,9 @@ /** * Processing related interface - * + * * An AggregatorFactory is an object that knows how to generate an Aggregator using a ColumnSelectorFactory. - * + * * This is useful as an abstraction to allow Aggregator classes to be written in terms of MetricSelector objects * without making any assumptions about how they are pulling values out of the base data. That is, the data is * provided to the Aggregator through the MetricSelector object, so whatever creates that object gets to choose how @@ -78,7 +78,10 @@ public abstract class AggregatorFactory */ public AggregatorFactory getMergingFactory(AggregatorFactory other) throws AggregatorFactoryNotMergeableException { - throw new UnsupportedOperationException(String.format("[%s] does not implement getMergingFactory(..)", this.getClass().getName())); + throw new UnsupportedOperationException(String.format( + "[%s] does not implement getMergingFactory(..)", + this.getClass().getName() + )); } /** @@ -124,11 +127,13 @@ public AggregatorFactory getMergingFactory(AggregatorFactory other) throws Aggre public abstract int getMaxIntermediateSize(); /** - * Returns the starting value for a corresponding aggregator. For example, 0 for sums, - Infinity for max, an empty mogrifier - * - * @return the starting value for a corresponding aggregator. + * Deprecated, to be removed in 0.10.0. See https://github.com/druid-io/druid/issues/3588. */ - public abstract Object getAggregatorStartValue(); + @Deprecated + public Object getAggregatorStartValue() + { + throw new UnsupportedOperationException("getAggregatorStartValue is deprecated"); + } /** * Merges the list of AggregatorFactory[] (presumable from metadata of some segments being merged) and diff --git a/processing/src/main/java/io/druid/query/aggregation/Aggregators.java b/processing/src/main/java/io/druid/query/aggregation/Aggregators.java index 717e02053627..41d70fb3092b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregators.java +++ b/processing/src/main/java/io/druid/query/aggregation/Aggregators.java @@ -56,7 +56,7 @@ public float getFloat() @Override public String getName() { - return null; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java b/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java index 4c283760bb5f..8ef34690efb0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java @@ -32,12 +32,10 @@ static Object combineValues(Object lhs, Object rhs) return ((Number) lhs).longValue() + ((Number) rhs).longValue(); } - long count = 0; - private final String name; + private long count = 0; - public CountAggregator(String name) + public CountAggregator() { - this.name = name; } @Override @@ -73,13 +71,13 @@ public long getLong() @Override public String getName() { - return this.name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new CountAggregator(name); + return new CountAggregator(); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java index 1f12a5d59df6..480c57865f7c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java @@ -50,7 +50,7 @@ public CountAggregatorFactory( @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new CountAggregator(name); + return new CountAggregator(); } @Override @@ -126,12 +126,6 @@ public int getMaxIntermediateSize() return Longs.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return 0; - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java index ce1156115edd..843bcc5a987c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java @@ -35,13 +35,11 @@ static double combineValues(Object lhs, Object rhs) } private final FloatColumnSelector selector; - private final String name; private double max; - public DoubleMaxAggregator(String name, FloatColumnSelector selector) + public DoubleMaxAggregator(FloatColumnSelector selector) { - this.name = name; this.selector = selector; reset(); @@ -80,13 +78,13 @@ public long getLong() @Override public String getName() { - return this.name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new DoubleMaxAggregator(name, selector); + return new DoubleMaxAggregator(selector); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java index 1a4283b1d31d..e4cdccc4556e 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Doubles; - import io.druid.common.utils.StringUtils; import io.druid.math.expr.Parser; import io.druid.segment.ColumnSelectorFactory; @@ -71,7 +70,7 @@ public DoubleMaxAggregatorFactory(String name, String fieldName) @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new DoubleMaxAggregator(name, getFloatColumnSelector(metricFactory)); + return new DoubleMaxAggregator(getFloatColumnSelector(metricFactory)); } @Override @@ -186,12 +185,6 @@ public int getMaxIntermediateSize() return Doubles.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return Double.NEGATIVE_INFINITY; - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java index bca2b3770a79..e0f4fc519a61 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java @@ -35,13 +35,11 @@ static double combineValues(Object lhs, Object rhs) } private final FloatColumnSelector selector; - private final String name; private double min; - public DoubleMinAggregator(String name, FloatColumnSelector selector) + public DoubleMinAggregator(FloatColumnSelector selector) { - this.name = name; this.selector = selector; reset(); @@ -80,13 +78,13 @@ public long getLong() @Override public String getName() { - return this.name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new DoubleMinAggregator(name, selector); + return new DoubleMinAggregator(selector); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java index 2338e19ccebe..36c92262914c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; import com.google.common.primitives.Doubles; - import io.druid.common.utils.StringUtils; import io.druid.math.expr.Parser; import io.druid.segment.ColumnSelectorFactory; @@ -71,7 +70,7 @@ public DoubleMinAggregatorFactory(String name, String fieldName) @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new DoubleMinAggregator(name, getFloatColumnSelector(metricFactory)); + return new DoubleMinAggregator(getFloatColumnSelector(metricFactory)); } @Override @@ -186,12 +185,6 @@ public int getMaxIntermediateSize() return Doubles.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return Double.POSITIVE_INFINITY; - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java index 9a8e73745f89..93acc5642664 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java @@ -44,13 +44,11 @@ static double combineValues(Object lhs, Object rhs) } private final FloatColumnSelector selector; - private final String name; private double sum; - public DoubleSumAggregator(String name, FloatColumnSelector selector) + public DoubleSumAggregator(FloatColumnSelector selector) { - this.name = name; this.selector = selector; this.sum = 0; @@ -89,13 +87,13 @@ public long getLong() @Override public String getName() { - return this.name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new DoubleSumAggregator(name, selector); + return new DoubleSumAggregator(selector); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java index 7abc27f664dd..0032c0712322 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java @@ -70,7 +70,7 @@ public DoubleSumAggregatorFactory(String name, String fieldName) @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new DoubleSumAggregator(name, getFloatColumnSelector(metricFactory)); + return new DoubleSumAggregator(getFloatColumnSelector(metricFactory)); } @Override @@ -185,12 +185,6 @@ public int getMaxIntermediateSize() return Doubles.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return 0; - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java index 8a3f56c271b8..b3e1f57b273b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java @@ -67,7 +67,7 @@ public long getLong() @Override public String getName() { - return delegate.getName(); + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/FilteredAggregatorFactory.java index 77f54a296408..c04770c0ccdf 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/FilteredAggregatorFactory.java @@ -152,12 +152,6 @@ public int getMaxIntermediateSize() return delegate.getMaxIntermediateSize(); } - @Override - public Object getAggregatorStartValue() - { - return delegate.getAggregatorStartValue(); - } - @JsonProperty public AggregatorFactory getAggregator() { diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java index f9f50a8d494a..d289c46ffdaf 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java @@ -35,17 +35,17 @@ public int compare(Object o, Object o1) } }; - static Object combineHistograms(Object lhs, Object rhs) { + static Object combineHistograms(Object lhs, Object rhs) + { return ((Histogram) lhs).fold((Histogram) rhs); } private final FloatColumnSelector selector; - private final String name; private Histogram histogram; - public HistogramAggregator(String name, FloatColumnSelector selector, float[] breaks) { - this.name = name; + public HistogramAggregator(FloatColumnSelector selector, float[] breaks) + { this.selector = selector; this.histogram = new Histogram(breaks); } @@ -83,7 +83,7 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java index 2aa001b6c5c4..1b90b6e15746 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java @@ -66,11 +66,7 @@ public HistogramAggregatorFactory( @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new HistogramAggregator( - name, - metricFactory.makeFloatColumnSelector(fieldName), - breaks - ); + return new HistogramAggregator(metricFactory.makeFloatColumnSelector(fieldName), breaks); } @Override @@ -159,7 +155,7 @@ public byte[] getCacheKey() .allocate(1 + fieldNameBytes.length + Floats.BYTES * breaks.length) .put(CACHE_TYPE_ID) .put(fieldNameBytes) - .put((byte)0xFF); + .put((byte) 0xFF); buf.asFloatBuffer().put(breaks); return buf.array(); @@ -177,12 +173,6 @@ public int getMaxIntermediateSize() return Longs.BYTES * (breaks.length + 1) + Floats.BYTES * 2; } - @Override - public Object getAggregatorStartValue() - { - return new Histogram(breaks); - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java index b9768b6dd09d..94ea621f4f9e 100644 --- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java @@ -37,15 +37,13 @@ static interface ScriptAggregator public void close(); } - private final String name; private final ObjectColumnSelector[] selectorList; private final ScriptAggregator script; private volatile double current; - public JavaScriptAggregator(String name, List selectorList, ScriptAggregator script) + public JavaScriptAggregator(List selectorList, ScriptAggregator script) { - this.name = name; this.selectorList = Lists.newArrayList(selectorList).toArray(new ObjectColumnSelector[]{}); this.script = script; @@ -85,7 +83,7 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java index 9e1aa2a350b8..ff835abaaac9 100644 --- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java @@ -96,7 +96,6 @@ public JavaScriptAggregatorFactory( public Aggregator factorize(final ColumnSelectorFactory columnFactory) { return new JavaScriptAggregator( - name, Lists.transform( fieldNames, new com.google.common.base.Function() @@ -263,12 +262,6 @@ public int getMaxIntermediateSize() return Doubles.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return getCompiledScript().reset(); - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java index 08915de3a1e9..4348b8ce0c58 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java @@ -35,13 +35,11 @@ static long combineValues(Object lhs, Object rhs) } private final LongColumnSelector selector; - private final String name; private long max; - public LongMaxAggregator(String name, LongColumnSelector selector) + public LongMaxAggregator(LongColumnSelector selector) { - this.name = name; this.selector = selector; reset(); @@ -80,13 +78,13 @@ public long getLong() @Override public String getName() { - return this.name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new LongMaxAggregator(name, selector); + return new LongMaxAggregator(selector); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java index a503452de6e2..de95e16b3d9c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java @@ -54,7 +54,8 @@ public LongMaxAggregatorFactory( Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name"); Preconditions.checkArgument( fieldName == null ^ expression == null, - "Must have a valid, non-null fieldName or expression"); + "Must have a valid, non-null fieldName or expression" + ); this.name = name; this.fieldName = fieldName; @@ -69,7 +70,7 @@ public LongMaxAggregatorFactory(String name, String fieldName) @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new LongMaxAggregator(name, getLongColumnSelector(metricFactory)); + return new LongMaxAggregator(getLongColumnSelector(metricFactory)); } @Override @@ -180,12 +181,6 @@ public int getMaxIntermediateSize() return Longs.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return Long.MIN_VALUE; - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java index e883fbbff886..5e82158f70b8 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java @@ -35,13 +35,11 @@ static long combineValues(Object lhs, Object rhs) } private final LongColumnSelector selector; - private final String name; private long min; - public LongMinAggregator(String name, LongColumnSelector selector) + public LongMinAggregator(LongColumnSelector selector) { - this.name = name; this.selector = selector; reset(); @@ -80,13 +78,13 @@ public long getLong() @Override public String getName() { - return this.name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new LongMinAggregator(name, selector); + return new LongMinAggregator(selector); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java index ca06e4fb5a89..07830de70314 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java @@ -54,7 +54,8 @@ public LongMinAggregatorFactory( Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name"); Preconditions.checkArgument( fieldName == null ^ expression == null, - "Must have a valid, non-null fieldName or expression"); + "Must have a valid, non-null fieldName or expression" + ); this.name = name; this.fieldName = fieldName; @@ -69,7 +70,7 @@ public LongMinAggregatorFactory(String name, String fieldName) @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new LongMinAggregator(name, getLongColumnSelector(metricFactory)); + return new LongMinAggregator(getLongColumnSelector(metricFactory)); } @Override @@ -180,12 +181,6 @@ public int getMaxIntermediateSize() return Longs.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return Long.MAX_VALUE; - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java index 63d4d14ad29d..101b0a99f6f9 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java @@ -37,18 +37,17 @@ public int compare(Object o, Object o1) } }; - static long combineValues(Object lhs, Object rhs) { + static long combineValues(Object lhs, Object rhs) + { return ((Number) lhs).longValue() + ((Number) rhs).longValue(); } private final LongColumnSelector selector; - private final String name; private long sum; - public LongSumAggregator(String name, LongColumnSelector selector) + public LongSumAggregator(LongColumnSelector selector) { - this.name = name; this.selector = selector; this.sum = 0; @@ -87,13 +86,13 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new LongSumAggregator(name, selector); + return new LongSumAggregator(selector); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java index e3e85b62f34e..8984719865bc 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java @@ -54,7 +54,8 @@ public LongSumAggregatorFactory( Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name"); Preconditions.checkArgument( fieldName == null ^ expression == null, - "Must have a valid, non-null fieldName or expression"); + "Must have a valid, non-null fieldName or expression" + ); this.name = name; this.fieldName = fieldName; @@ -69,7 +70,7 @@ public LongSumAggregatorFactory(String name, String fieldName) @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new LongSumAggregator(name, getLongColumnSelector(metricFactory)); + return new LongSumAggregator(getLongColumnSelector(metricFactory)); } @Override @@ -180,12 +181,6 @@ public int getMaxIntermediateSize() return Longs.BYTES; } - @Override - public Object getAggregatorStartValue() - { - return 0; - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java b/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java index 3ba2c15f3621..791bfa80ad82 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java @@ -34,7 +34,6 @@ public class CardinalityAggregator implements Aggregator { private static final String NULL_STRING = "\u0000"; - private final String name; private final List selectorList; private final boolean byRow; @@ -87,12 +86,10 @@ protected static void hashValues(final List selectors, HyperL private HyperLogLogCollector collector; public CardinalityAggregator( - String name, List selectorList, boolean byRow ) { - this.name = name; this.selectorList = selectorList; this.collector = HyperLogLogCollector.makeLatestCollector(); this.byRow = byRow; @@ -135,13 +132,13 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new CardinalityAggregator(name, selectorList, byRow); + return new CardinalityAggregator(selectorList, byRow); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java index 94f597b25403..e7ea88c57932 100644 --- a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java @@ -139,7 +139,7 @@ public Aggregator factorize(final ColumnSelectorFactory columnFactory) return Aggregators.noopAggregator(); } - return new CardinalityAggregator(name, selectors, byRow); + return new CardinalityAggregator(selectors, byRow); } @@ -310,12 +310,6 @@ public int getMaxIntermediateSize() return HyperLogLogCollector.getLatestNumBytesForDenseStorage(); } - @Override - public Object getAggregatorStartValue() - { - return HyperLogLogCollector.makeLatestCollector(); - } - @Override public boolean equals(Object o) { diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java index 41d7aeb9e29a..86db71f3d6cd 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java @@ -26,17 +26,14 @@ */ public class HyperUniquesAggregator implements Aggregator { - private final String name; private final ObjectColumnSelector selector; private HyperLogLogCollector collector; public HyperUniquesAggregator( - String name, ObjectColumnSelector selector ) { - this.name = name; this.selector = selector; this.collector = HyperLogLogCollector.makeLatestCollector(); @@ -76,13 +73,13 @@ public long getLong() @Override public String getName() { - return name; + throw new UnsupportedOperationException("getName is deprecated"); } @Override public Aggregator clone() { - return new HyperUniquesAggregator(name, selector); + return new HyperUniquesAggregator(selector); } @Override diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java index ec1c64b22e8f..0264b5f137e5 100644 --- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java @@ -77,7 +77,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory) final Class classOfObject = selector.classOfObject(); if (classOfObject.equals(Object.class) || HyperLogLogCollector.class.isAssignableFrom(classOfObject)) { - return new HyperUniquesAggregator(name, selector); + return new HyperUniquesAggregator(selector); } throw new IAE( @@ -209,12 +209,6 @@ public int getMaxIntermediateSize() return HyperLogLogCollector.getLatestNumBytesForDenseStorage(); } - @Override - public Object getAggregatorStartValue() - { - return HyperLogLogCollector.makeLatestCollector(); - } - @Override public String toString() { diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java index 6eb31818b323..a8d26860b7fd 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java +++ b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java @@ -61,7 +61,13 @@ public Sequence> process(final TimeseriesQuery que @Override public Result apply(Cursor cursor) { - Aggregator[] aggregators = QueryRunnerHelper.makeAggregators(cursor, aggregatorSpecs); + Aggregator[] aggregators = new Aggregator[aggregatorSpecs.size()]; + String[] aggregatorNames = new String[aggregatorSpecs.size()]; + + for (int i = 0; i < aggregatorSpecs.size(); i++) { + aggregators[i] = aggregatorSpecs.get(i).factorize(cursor); + aggregatorNames[i] = aggregatorSpecs.get(i).getName(); + } if (skipEmptyBuckets && cursor.isDone()) { return null; @@ -77,8 +83,8 @@ public Result apply(Cursor cursor) TimeseriesResultBuilder bob = new TimeseriesResultBuilder(cursor.getTime()); - for (Aggregator aggregator : aggregators) { - bob.addMetric(aggregator); + for (int i = 0; i < aggregatorSpecs.size(); i++) { + bob.addMetric(aggregatorNames[i], aggregators[i]); } Result retVal = bob.build(); diff --git a/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java b/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java index c7beab8aa466..d9de41f3aa74 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java +++ b/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java @@ -42,15 +42,9 @@ public TimeseriesResultBuilder( this.timestamp = timestamp; } - public TimeseriesResultBuilder addMetric(Aggregator aggregator) + public TimeseriesResultBuilder addMetric(String name, Aggregator aggregator) { - metricValues.put(aggregator.getName(), aggregator.get()); - return this; - } - - public TimeseriesResultBuilder addMetric(PostAggregator postAggregator) - { - metricValues.put(postAggregator.getName(), postAggregator.compute(metricValues)); + metricValues.put(name, aggregator.get()); return this; } diff --git a/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java b/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java index f6e83aade346..0b898878d903 100644 --- a/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java +++ b/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java @@ -179,11 +179,11 @@ protected Integer addToFacts( if (null != priorIndex) { aggs = concurrentGet(priorIndex); - doAggregate(aggs, rowContainer, row, reportParseExceptions); + doAggregate(metrics, aggs, rowContainer, row, reportParseExceptions); } else { aggs = new Aggregator[metrics.length]; factorizeAggs(metrics, aggs, rowContainer, row); - doAggregate(aggs, rowContainer, row, reportParseExceptions); + doAggregate(metrics, aggs, rowContainer, row, reportParseExceptions); final Integer rowIndex = indexIncrement.getAndIncrement(); concurrentSet(rowIndex, aggs); @@ -198,7 +198,7 @@ protected Integer addToFacts( } else { // We lost a race aggs = concurrentGet(prev); - doAggregate(aggs, rowContainer, row, reportParseExceptions); + doAggregate(metrics, aggs, rowContainer, row, reportParseExceptions); // Free up the misfire concurrentRemove(rowIndex); // This is expected to occur ~80% of the time in the worst scenarios @@ -224,6 +224,7 @@ private void factorizeAggs( } private void doAggregate( + AggregatorFactory[] metrics, Aggregator[] aggs, ThreadLocal rowContainer, InputRow row, @@ -232,7 +233,8 @@ private void doAggregate( { rowContainer.set(row); - for (Aggregator agg : aggs) { + for (int i = 0 ; i < aggs.length ; i++) { + final Aggregator agg = aggs[i]; synchronized (agg) { try { agg.aggregate(); @@ -240,9 +242,9 @@ private void doAggregate( catch (ParseException e) { // "aggregate" can throw ParseExceptions if a selector expects something but gets something else. if (reportParseExceptions) { - throw new ParseException(e, "Encountered parse error for aggregator[%s]", agg.getName()); + throw new ParseException(e, "Encountered parse error for aggregator[%s]", metrics[i].getName()); } else { - log.debug(e, "Encountered parse error, skipping aggregator[%s].", agg.getName()); + log.debug(e, "Encountered parse error, skipping aggregator[%s].", metrics[i].getName()); } } } diff --git a/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java index 69202e0b89d8..273d6ce344e6 100644 --- a/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java @@ -31,9 +31,7 @@ public class CountAggregatorTest @Test public void testAggregate() { - CountAggregator agg = new CountAggregator("billy"); - - Assert.assertEquals("billy", agg.getName()); + CountAggregator agg = new CountAggregator(); Assert.assertEquals(0L, agg.get()); Assert.assertEquals(0L, agg.get()); @@ -51,7 +49,7 @@ public void testAggregate() @Test public void testComparator() { - CountAggregator agg = new CountAggregator("billy"); + CountAggregator agg = new CountAggregator(); Object first = agg.get(); agg.aggregate(); diff --git a/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java index b1b52ed6acfc..f58892380ecb 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java @@ -59,8 +59,6 @@ public void testDoubleMaxAggregator() { DoubleMaxAggregator agg = (DoubleMaxAggregator) doubleMaxAggFactory.factorize(colSelectorFactory); - Assert.assertEquals("billy", agg.getName()); - aggregate(selector, agg); aggregate(selector, agg); aggregate(selector, agg); diff --git a/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java index 7b89d88801ee..615243c20583 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java @@ -59,8 +59,6 @@ public void testDoubleMinAggregator() { DoubleMinAggregator agg = (DoubleMinAggregator) doubleMinAggFactory.factorize(colSelectorFactory); - Assert.assertEquals("billy", agg.getName()); - aggregate(selector, agg); aggregate(selector, agg); aggregate(selector, agg); diff --git a/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java index 22f7d46ecf67..3380b92fc314 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/DoubleSumAggregatorTest.java @@ -39,9 +39,7 @@ public void testAggregate() { final float[] values = {0.15f, 0.27f}; final TestFloatColumnSelector selector = new TestFloatColumnSelector(values); - DoubleSumAggregator agg = new DoubleSumAggregator("billy", selector); - - Assert.assertEquals("billy", agg.getName()); + DoubleSumAggregator agg = new DoubleSumAggregator(selector); double expectedFirst = new Float(values[0]).doubleValue(); double expectedSecond = new Float(values[1]).doubleValue() + expectedFirst; @@ -63,9 +61,7 @@ public void testAggregate() public void testComparator() { final TestFloatColumnSelector selector = new TestFloatColumnSelector(new float[]{0.15f, 0.27f}); - DoubleSumAggregator agg = new DoubleSumAggregator("billy", selector); - - Assert.assertEquals("billy", agg.getName()); + DoubleSumAggregator agg = new DoubleSumAggregator(selector); Object first = agg.get(); agg.aggregate(); diff --git a/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java index 862eb21a01d0..042c5ed34a68 100644 --- a/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java @@ -75,8 +75,6 @@ public void testAggregate() makeColumnSelector(selector) ); - Assert.assertEquals("billy", agg.getName()); - double expectedFirst = new Float(values[0]).doubleValue(); double expectedSecond = new Float(values[1]).doubleValue() + expectedFirst; double expectedThird = expectedSecond; @@ -235,8 +233,6 @@ public void testAggregateWithOrFilter() makeColumnSelector(selector) ); - Assert.assertEquals("billy", agg.getName()); - double expectedFirst = new Float(values[0]).doubleValue(); double expectedSecond = new Float(values[1]).doubleValue() + expectedFirst; double expectedThird = expectedSecond + new Float(values[2]).doubleValue(); @@ -359,8 +355,6 @@ private void validateFilteredAggs( makeColumnSelector(selector) ); - Assert.assertEquals("billy", agg.getName()); - double expectedFirst = new Float(values[0]).doubleValue(); double expectedSecond = new Float(values[1]).doubleValue() + expectedFirst; double expectedThird = expectedSecond; diff --git a/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java index ca2c5cc95f5e..54c473d2301d 100644 --- a/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/HistogramAggregatorTest.java @@ -59,9 +59,7 @@ public void testAggregate() throws Exception { final TestFloatColumnSelector selector = new TestFloatColumnSelector(values); - HistogramAggregator agg = new HistogramAggregator("billy", selector, breaks); - - Assert.assertEquals("billy", agg.getName()); + HistogramAggregator agg = new HistogramAggregator(selector, breaks); Assert.assertArrayEquals(new long[]{0,0,0,0,0,0}, ((Histogram)agg.get()).bins); Assert.assertArrayEquals(new long[]{0,0,0,0,0,0}, ((Histogram)agg.get()).bins); diff --git a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java index 86ff345d1b00..8c022b5a28d4 100644 --- a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java +++ b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java @@ -53,7 +53,6 @@ protected void setUp() throws Exception Map script = scriptDoubleSum; jsAggregator = new JavaScriptAggregator( - "billy", Lists.asList(MetricSelectorUtils.wrap(selector), new ObjectColumnSelector[]{}), JavaScriptAggregatorFactory.compileScript( script.get("fnAggregate"), @@ -62,7 +61,7 @@ protected void setUp() throws Exception ) ); - doubleAgg = new DoubleSumAggregator("billy", selector); + doubleAgg = new DoubleSumAggregator(selector); } public double timeJavaScriptDoubleSum(int reps) diff --git a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java index 379b0be96933..3bb6d26fe65a 100644 --- a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java @@ -138,7 +138,6 @@ public void testAggregate() Map script = sumLogATimesBPlusTen; JavaScriptAggregator agg = new JavaScriptAggregator( - "billy", Arrays.asList(MetricSelectorUtils.wrap(selector1), MetricSelectorUtils.wrap(selector2)), JavaScriptAggregatorFactory.compileScript( script.get("fnAggregate"), @@ -149,8 +148,6 @@ public void testAggregate() agg.reset(); - Assert.assertEquals("billy", agg.getName()); - double val = 10.; Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -213,7 +210,6 @@ public void testAggregateMissingColumn() Map script = scriptDoubleSum; JavaScriptAggregator agg = new JavaScriptAggregator( - "billy", Collections.singletonList(null), JavaScriptAggregatorFactory.compileScript( script.get("fnAggregate"), @@ -224,8 +220,6 @@ public void testAggregateMissingColumn() final double val = 0; - Assert.assertEquals("billy", agg.getName()); - agg.reset(); Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -247,7 +241,6 @@ public void testAggregateStrings() { final TestObjectColumnSelector ocs = new TestObjectColumnSelector("what", null, new String[]{"hey", "there"}); final JavaScriptAggregator agg = new JavaScriptAggregator( - "billy", Collections.singletonList(ocs), JavaScriptAggregatorFactory.compileScript( "function aggregate(current, a) { if (Array.isArray(a)) { return current + a.length; } else if (typeof a === 'string') { return current + 1; } else { return current; } }", @@ -258,8 +251,6 @@ public void testAggregateStrings() agg.reset(); - Assert.assertEquals("billy", agg.getName()); - double val = 0.; Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -343,7 +334,6 @@ public static void main(String... args) throws Exception Map script = scriptDoubleSum; JavaScriptAggregator aggRhino = new JavaScriptAggregator( - "billy", Lists.asList(MetricSelectorUtils.wrap(selector), new ObjectColumnSelector[]{}), JavaScriptAggregatorFactory.compileScript( script.get("fnAggregate"), @@ -352,7 +342,7 @@ public static void main(String... args) throws Exception ) ); - DoubleSumAggregator doubleAgg = new DoubleSumAggregator("billy", selector); + DoubleSumAggregator doubleAgg = new DoubleSumAggregator(selector); // warmup int i = 0; diff --git a/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java index 803afe3a29d8..9492e2d61591 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java @@ -59,8 +59,6 @@ public void testLongMaxAggregator() { LongMaxAggregator agg = (LongMaxAggregator)longMaxAggFactory.factorize(colSelectorFactory); - Assert.assertEquals("billy", agg.getName()); - aggregate(selector, agg); aggregate(selector, agg); aggregate(selector, agg); diff --git a/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java index bf111e2d1f36..251b07dccf7c 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java @@ -59,8 +59,6 @@ public void testLongMinAggregator() { LongMinAggregator agg = (LongMinAggregator)longMinAggFactory.factorize(colSelectorFactory); - Assert.assertEquals("billy", agg.getName()); - aggregate(selector, agg); aggregate(selector, agg); aggregate(selector, agg); diff --git a/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java index 50dbee1d8fdb..fa2a15ca6895 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/LongSumAggregatorTest.java @@ -38,9 +38,7 @@ private void aggregate(TestLongColumnSelector selector, LongSumAggregator agg) public void testAggregate() { final TestLongColumnSelector selector = new TestLongColumnSelector(new long[]{24L, 20L}); - LongSumAggregator agg = new LongSumAggregator("billy", selector); - - Assert.assertEquals("billy", agg.getName()); + LongSumAggregator agg = new LongSumAggregator(selector); Assert.assertEquals(0L, agg.get()); Assert.assertEquals(0L, agg.get()); @@ -59,9 +57,7 @@ public void testAggregate() public void testComparator() { final TestLongColumnSelector selector = new TestLongColumnSelector(new long[]{18293L}); - LongSumAggregator agg = new LongSumAggregator("billy", selector); - - Assert.assertEquals("billy", agg.getName()); + LongSumAggregator agg = new LongSumAggregator(selector); Object first = agg.get(); agg.aggregate(); diff --git a/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java b/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java index 58aeb930b0af..c690b13cb38a 100644 --- a/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java @@ -42,14 +42,14 @@ public static Iterable constructorFeeder() final ArrayList constructorArrays = new ArrayList<>(); final long longVal = 13789; LongMinAggregator longMinAggregator = new LongMinAggregator( - NAME, new LongColumnSelector() - { - @Override - public long get() - { - return longVal; - } - } + new LongColumnSelector() + { + @Override + public long get() + { + return longVal; + } + } ); LongMinAggregatorFactory longMinAggregatorFactory = new LongMinAggregatorFactory(NAME, FIELD); constructorArrays.add( @@ -81,14 +81,14 @@ public long get() LongSumAggregatorFactory longSumAggregatorFactory = new LongSumAggregatorFactory(NAME, FIELD); LongSumAggregator longSumAggregator = new LongSumAggregator( - NAME, new LongColumnSelector() - { - @Override - public long get() - { - return longVal; - } - } + new LongColumnSelector() + { + @Override + public long get() + { + return longVal; + } + } ); constructorArrays.add( new Object[]{ diff --git a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java index 841fcf0a2b50..a6c7f00033fa 100644 --- a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java @@ -310,7 +310,6 @@ public CardinalityAggregatorTest() public void testAggregateRows() throws Exception { CardinalityAggregator agg = new CardinalityAggregator( - "billy", selectorList, true ); @@ -326,7 +325,6 @@ public void testAggregateRows() throws Exception public void testAggregateValues() throws Exception { CardinalityAggregator agg = new CardinalityAggregator( - "billy", selectorList, false ); @@ -385,8 +383,8 @@ public void testCombineRows() List selector1 = Lists.newArrayList((DimensionSelector) dim1); List selector2 = Lists.newArrayList((DimensionSelector) dim2); - CardinalityAggregator agg1 = new CardinalityAggregator("billy", selector1, true); - CardinalityAggregator agg2 = new CardinalityAggregator("billy", selector2, true); + CardinalityAggregator agg1 = new CardinalityAggregator(selector1, true); + CardinalityAggregator agg2 = new CardinalityAggregator(selector2, true); for (int i = 0; i < values1.size(); ++i) { aggregate(selector1, agg1); @@ -416,8 +414,8 @@ public void testCombineValues() List selector1 = Lists.newArrayList((DimensionSelector) dim1); List selector2 = Lists.newArrayList((DimensionSelector) dim2); - CardinalityAggregator agg1 = new CardinalityAggregator("billy", selector1, false); - CardinalityAggregator agg2 = new CardinalityAggregator("billy", selector2, false); + CardinalityAggregator agg1 = new CardinalityAggregator(selector1, false); + CardinalityAggregator agg2 = new CardinalityAggregator(selector2, false); for (int i = 0; i < values1.size(); ++i) { aggregate(selector1, agg1); @@ -445,7 +443,6 @@ public void testCombineValues() public void testAggregateRowsWithExtraction() throws Exception { CardinalityAggregator agg = new CardinalityAggregator( - "billy", selectorListWithExtraction, true ); @@ -455,7 +452,6 @@ public void testAggregateRowsWithExtraction() throws Exception Assert.assertEquals(9.0, (Double) rowAggregatorFactory.finalizeComputation(agg.get()), 0.05); CardinalityAggregator agg2 = new CardinalityAggregator( - "billy", selectorListConstantVal, true ); @@ -469,7 +465,6 @@ public void testAggregateRowsWithExtraction() throws Exception public void testAggregateValuesWithExtraction() throws Exception { CardinalityAggregator agg = new CardinalityAggregator( - "billy", selectorListWithExtraction, false ); @@ -479,7 +474,6 @@ public void testAggregateValuesWithExtraction() throws Exception Assert.assertEquals(7.0, (Double) valueAggregatorFactory.finalizeComputation(agg.get()), 0.05); CardinalityAggregator agg2 = new CardinalityAggregator( - "billy", selectorListConstantVal, false ); diff --git a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java b/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java index be21e887ccee..fec6fc730016 100644 --- a/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactoryTest.java @@ -36,13 +36,4 @@ public void testDeserializeV0() throws Exception Object v0 = aggregatorFactory.deserialize(V0_BASE64); Assert.assertEquals("deserialized value is HLLCV0", HLLCV0.class, v0.getClass()); } - - @Test - public void testCombineStartValueV0() throws Exception - { - Object combined = aggregatorFactory.getAggregatorStartValue(); - aggregatorFactory.combine(combined, aggregatorFactory.deserialize(V0_BASE64)); - } - - } diff --git a/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java index 5051532534fb..e6fa9f3b86ce 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java @@ -39,14 +39,15 @@ public class ArithmeticPostAggregatorTest @Test public void testCompute() { + final String aggName = "rows"; ArithmeticPostAggregator arithmeticPostAggregator; ExpressionPostAggregator expressionPostAggregator; - CountAggregator agg = new CountAggregator("rows"); + CountAggregator agg = new CountAggregator(); agg.aggregate(); agg.aggregate(); agg.aggregate(); Map metricValues = new HashMap(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put(aggName, agg.get()); List postAggregatorList = Lists.newArrayList( @@ -86,10 +87,11 @@ public void testCompute() @Test public void testComparator() { + final String aggName = "rows"; ArithmeticPostAggregator arithmeticPostAggregator; - CountAggregator agg = new CountAggregator("rows"); + CountAggregator agg = new CountAggregator(); Map metricValues = new HashMap(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put(aggName, agg.get()); List postAggregatorList = Lists.newArrayList( @@ -107,7 +109,7 @@ public void testComparator() agg.aggregate(); agg.aggregate(); agg.aggregate(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put(aggName, agg.get()); Object after = arithmeticPostAggregator.compute(metricValues); Assert.assertEquals(-1, comp.compare(before, after)); diff --git a/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java index 2f8fc2b90b22..3e19a74abd6b 100644 --- a/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java @@ -33,18 +33,19 @@ public class FieldAccessPostAggregatorTest @Test public void testCompute() { + final String aggName = "rows"; FieldAccessPostAggregator fieldAccessPostAggregator; fieldAccessPostAggregator = new FieldAccessPostAggregator("To be, or not to be, that is the question:", "rows"); - CountAggregator agg = new CountAggregator("rows"); + CountAggregator agg = new CountAggregator(); Map metricValues = new HashMap(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put(aggName, agg.get()); Assert.assertEquals(new Long(0L), fieldAccessPostAggregator.compute(metricValues)); agg.aggregate(); agg.aggregate(); agg.aggregate(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put(aggName, agg.get()); Assert.assertEquals(new Long(3L), fieldAccessPostAggregator.compute(metricValues)); } } diff --git a/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java b/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java index 72c25ec9ee8e..7c85101bba83 100644 --- a/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java @@ -142,9 +142,9 @@ public void testRetry2() throws Exception TimeseriesResultBuilder builder = new TimeseriesResultBuilder( new DateTime("2012-01-01T00:00:00Z") ); - CountAggregator rows = new CountAggregator("rows"); + CountAggregator rows = new CountAggregator(); rows.aggregate(); - builder.addMetric(rows); + builder.addMetric("rows", rows); final Result value = builder.build(); final SpecificSegmentQueryRunner queryRunner = new SpecificSegmentQueryRunner(