From d382d32290aef102349f1267f24a4bf266dab297 Mon Sep 17 00:00:00 2001 From: "navis.ryu" Date: Tue, 23 Aug 2016 09:47:38 +0900 Subject: [PATCH 1/2] Deprecate Aggregator#getName() --- .../java/io/druid/indexer/InputRowSerde.java | 4 ++-- .../java/io/druid/query/QueryRunnerHelper.java | 10 ++++++++++ .../io/druid/query/aggregation/Aggregator.java | 1 + .../io/druid/query/aggregation/Aggregators.java | 1 - .../query/timeseries/TimeseriesQueryEngine.java | 8 ++++---- .../timeseries/TimeseriesResultBuilder.java | 4 ++-- .../incremental/OnheapIncrementalIndex.java | 17 +++++++++-------- .../query/aggregation/CountAggregatorTest.java | 2 -- .../aggregation/FilteredAggregatorTest.java | 6 ------ .../spec/SpecificSegmentQueryRunnerTest.java | 2 +- 10 files changed, 29 insertions(+), 26 deletions(-) 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 20cf221a7f89..5d5ab7d98918 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/InputRowSerde.java @@ -98,9 +98,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 860a4e0b406f..83f26abac9cd 100644 --- a/processing/src/main/java/io/druid/query/QueryRunnerHelper.java +++ b/processing/src/main/java/io/druid/query/QueryRunnerHelper.java @@ -55,6 +55,16 @@ public static Aggregator[] makeAggregators(Cursor cursor, List aggregatorSpecs) + { + String[] aggregators = new String[aggregatorSpecs.size()]; + int aggregatorIndex = 0; + for (AggregatorFactory spec : aggregatorSpecs) { + aggregators[aggregatorIndex++] = spec.getName(); + } + 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..4af06c99b20f 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/Aggregator.java @@ -37,6 +37,7 @@ public interface Aggregator { void reset(); Object get(); float getFloat(); + @Deprecated String getName(); void close(); 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..0ccd4f752787 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregators.java +++ b/processing/src/main/java/io/druid/query/aggregation/Aggregators.java @@ -53,7 +53,6 @@ public float getFloat() return 0; } - @Override public String getName() { return null; 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 dbb16b0d4def..3cf96093164e 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java +++ b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java @@ -61,6 +61,7 @@ public Sequence> process(final TimeseriesQuery que @Override public Result apply(Cursor cursor) { + String[] aggregatorNames = QueryRunnerHelper.makeAggregatorNames(aggregatorSpecs); Aggregator[] aggregators = QueryRunnerHelper.makeAggregators(cursor, aggregatorSpecs); if (skipEmptyBuckets && cursor.isDone()) { @@ -77,12 +78,11 @@ public Result apply(Cursor cursor) TimeseriesResultBuilder bob = new TimeseriesResultBuilder(cursor.getTime()); - for (Aggregator aggregator : aggregators) { - bob.addMetric(aggregator); + for (int i = 0; i < aggregators.length; i++) { + bob.addMetric(aggregatorNames[i], aggregators[i]); } - Result retVal = bob.build(); - return retVal; + return bob.build(); } finally { // cleanup 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..c2f62e8a8663 100644 --- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java +++ b/processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java @@ -42,9 +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()); + 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 d18a1c527151..c92f0746b39c 100644 --- a/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java +++ b/processing/src/main/java/io/druid/segment/incremental/OnheapIncrementalIndex.java @@ -186,11 +186,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); @@ -205,7 +205,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 @@ -231,6 +231,7 @@ private void factorizeAggs( } private void doAggregate( + AggregatorFactory[] metrics, Aggregator[] aggs, ThreadLocal rowContainer, InputRow row, @@ -239,17 +240,17 @@ private void doAggregate( { rowContainer.set(row); - for (Aggregator agg : aggs) { - synchronized (agg) { + for (int i = 0; i < aggs.length; i++) { + synchronized (aggs[i]) { try { - agg.aggregate(); + aggs[i].aggregate(); } 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..6971155b43da 100644 --- a/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/CountAggregatorTest.java @@ -33,8 +33,6 @@ public void testAggregate() { CountAggregator agg = new CountAggregator("billy"); - Assert.assertEquals("billy", agg.getName()); - Assert.assertEquals(0L, agg.get()); Assert.assertEquals(0L, agg.get()); Assert.assertEquals(0L, agg.get()); 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 73523879b22e..f3a86bab175f 100644 --- a/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/FilteredAggregatorTest.java @@ -74,8 +74,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; @@ -228,8 +226,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(); @@ -352,8 +348,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/spec/SpecificSegmentQueryRunnerTest.java b/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java index ebce3ecefeda..e5d86da2028e 100644 --- a/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java @@ -141,7 +141,7 @@ public void testRetry2() throws Exception ); CountAggregator rows = new CountAggregator("rows"); rows.aggregate(); - builder.addMetric(rows); + builder.addMetric(rows.getName(), rows); final Result value = builder.build(); final SpecificSegmentQueryRunner queryRunner = new SpecificSegmentQueryRunner( From 1b8296b9d2949a1be45e93898cf3da6808d7ce0a Mon Sep 17 00:00:00 2001 From: "navis.ryu" Date: Tue, 23 Aug 2016 10:14:38 +0900 Subject: [PATCH 2/2] removed getName() --- .../DistinctCountAggregator.java | 9 -------- .../DistinctCountAggregatorFactory.java | 3 +-- .../EmptyDistinctCountAggregator.java | 14 ------------ .../theta/EmptySketchAggregator.java | 13 ----------- .../datasketches/theta/SketchAggregator.java | 12 +--------- .../theta/SketchAggregatorFactory.java | 4 ++-- .../ApproximateHistogramAggregator.java | 9 -------- ...ApproximateHistogramAggregatorFactory.java | 1 - ...ApproximateHistogramFoldingAggregator.java | 9 -------- ...mateHistogramFoldingAggregatorFactory.java | 1 - ...pproximateHistogramPostAggregatorTest.java | 4 ++-- .../variance/VarianceAggregator.java | 22 +++---------------- .../variance/VarianceAggregatorFactory.java | 4 +--- .../variance/VarianceAggregatorTest.java | 2 -- .../druid/query/aggregation/Aggregator.java | 2 -- .../druid/query/aggregation/Aggregators.java | 5 ----- .../query/aggregation/CountAggregator.java | 14 +----------- .../aggregation/CountAggregatorFactory.java | 2 +- .../aggregation/DoubleMaxAggregator.java | 12 ++-------- .../DoubleMaxAggregatorFactory.java | 2 +- .../aggregation/DoubleMinAggregator.java | 12 ++-------- .../DoubleMinAggregatorFactory.java | 2 +- .../aggregation/DoubleSumAggregator.java | 12 ++-------- .../DoubleSumAggregatorFactory.java | 1 - .../query/aggregation/FilteredAggregator.java | 6 ----- .../aggregation/HistogramAggregator.java | 10 +-------- .../HistogramAggregatorFactory.java | 1 - .../aggregation/JavaScriptAggregator.java | 10 +-------- .../JavaScriptAggregatorFactory.java | 1 - .../query/aggregation/LongMaxAggregator.java | 12 ++-------- .../aggregation/LongMaxAggregatorFactory.java | 2 +- .../query/aggregation/LongMinAggregator.java | 12 ++-------- .../aggregation/LongMinAggregatorFactory.java | 2 +- .../query/aggregation/LongSumAggregator.java | 12 ++-------- .../aggregation/LongSumAggregatorFactory.java | 1 - .../cardinality/CardinalityAggregator.java | 11 +--------- .../CardinalityAggregatorFactory.java | 2 +- .../hyperloglog/HyperUniquesAggregator.java | 11 +--------- .../HyperUniquesAggregatorFactory.java | 2 +- .../aggregation/CountAggregatorTest.java | 4 ++-- .../aggregation/DoubleMaxAggregationTest.java | 2 -- .../aggregation/DoubleMinAggregationTest.java | 2 -- .../aggregation/DoubleSumAggregatorTest.java | 8 ++----- .../aggregation/HistogramAggregatorTest.java | 4 +--- .../JavaScriptAggregatorBenchmark.java | 3 +-- .../aggregation/JavaScriptAggregatorTest.java | 12 +--------- .../aggregation/LongMaxAggregationTest.java | 2 -- .../aggregation/LongMinAggregationTest.java | 2 -- .../aggregation/LongSumAggregatorTest.java | 8 ++----- .../aggregation/MetricManipulatorFnsTest.java | 4 ++-- .../CardinalityAggregatorTest.java | 10 ++++----- .../post/ArithmeticPostAggregatorTest.java | 10 ++++----- .../post/FieldAccessPostAggregatorTest.java | 6 ++--- .../spec/SpecificSegmentQueryRunnerTest.java | 4 ++-- 54 files changed, 59 insertions(+), 288 deletions(-) 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..3fa6feb8195c 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; } @@ -67,12 +64,6 @@ public float getFloat() return (float) mutableBitmap.size(); } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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 656eac37499f..cb061fb2f168 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 @@ -68,10 +68,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() ); 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..b4f130229ab4 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 @@ -23,14 +23,6 @@ public class EmptyDistinctCountAggregator implements Aggregator { - - private final String name; - - public EmptyDistinctCountAggregator(String name) - { - this.name = name; - } - @Override public void aggregate() { @@ -53,12 +45,6 @@ public float getFloat() return (float) 0; } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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..255f39fee7ff 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,13 +23,6 @@ public class EmptySketchAggregator implements Aggregator { - private final String name; - - public EmptySketchAggregator(String name) - { - this.name = name; - } - @Override public void aggregate() { @@ -58,12 +51,6 @@ public long getLong() throw new UnsupportedOperationException("Not implemented"); } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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 8e1e7643f321..2e9e965246fa 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 @@ -36,16 +36,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)); } @@ -89,12 +85,6 @@ public long getLong() throw new UnsupportedOperationException("Not implemented"); } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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 457d5f6b12b5..92f18a1fd95b 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 @@ -77,9 +77,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); } } 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..988c3049d0f3 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; @@ -95,12 +92,6 @@ public long getLong() throw new UnsupportedOperationException("ApproximateHistogramAggregator does not support getLong()"); } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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 c3d5f6f9ffac..ca49ac82deb6 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 @@ -80,7 +80,6 @@ public ApproximateHistogramAggregatorFactory( public Aggregator factorize(ColumnSelectorFactory metricFactory) { return new ApproximateHistogramAggregator( - name, metricFactory.makeFloatColumnSelector(fieldName), resolution, lowerLimit, 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..04ef463d6620 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; @@ -93,12 +90,6 @@ public long getLong() throw new UnsupportedOperationException("ApproximateHistogramFoldingAggregator does not support getLong()"); } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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 f42e8c365646..264807002f58 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 @@ -79,7 +79,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..d24092d30223 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,15 +28,8 @@ */ public abstract class VarianceAggregator implements Aggregator { - protected final String name; - protected final VarianceAggregatorCollector holder = new VarianceAggregatorCollector(); - public VarianceAggregator(String name) - { - this.name = name; - } - @Override public void reset() { @@ -49,12 +42,6 @@ public Object get() return holder; } - @Override - public String getName() - { - return name; - } - @Override public void close() { @@ -76,9 +63,8 @@ public static final class FloatVarianceAggregator extends VarianceAggregator { private final FloatColumnSelector selector; - public FloatVarianceAggregator(String name, FloatColumnSelector selector) + public FloatVarianceAggregator(FloatColumnSelector selector) { - super(name); this.selector = selector; } @@ -93,9 +79,8 @@ public static final class LongVarianceAggregator extends VarianceAggregator { private final LongColumnSelector selector; - public LongVarianceAggregator(String name, LongColumnSelector selector) + public LongVarianceAggregator(LongColumnSelector selector) { - super(name); this.selector = selector; } @@ -110,9 +95,8 @@ public static final class ObjectVarianceAggregator extends VarianceAggregator { private final ObjectColumnSelector selector; - public ObjectVarianceAggregator(String name, ObjectColumnSelector selector) + public ObjectVarianceAggregator(ObjectColumnSelector selector) { - super(name); 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 d5b85718f348..c3bd3c98e2b3 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,16 +99,14 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory) if ("float".equalsIgnoreCase(inputType)) { return new VarianceAggregator.FloatVarianceAggregator( - name, metricFactory.makeFloatColumnSelector(fieldName) ); } else if ("long".equalsIgnoreCase(inputType)) { return new VarianceAggregator.LongVarianceAggregator( - name, 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 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/processing/src/main/java/io/druid/query/aggregation/Aggregator.java b/processing/src/main/java/io/druid/query/aggregation/Aggregator.java index 4af06c99b20f..b11a70356e3d 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/Aggregator.java @@ -37,8 +37,6 @@ public interface Aggregator { void reset(); Object get(); float getFloat(); - @Deprecated - String getName(); void close(); long getLong(); 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 0ccd4f752787..068784d8d6e1 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregators.java +++ b/processing/src/main/java/io/druid/query/aggregation/Aggregators.java @@ -53,11 +53,6 @@ public float getFloat() return 0; } - public String getName() - { - return null; - } - @Override public void close() { 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..c578d45145cf 100644 --- a/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java @@ -33,12 +33,6 @@ static Object combineValues(Object lhs, Object rhs) } long count = 0; - private final String name; - - public CountAggregator(String name) - { - this.name = name; - } @Override public void aggregate() @@ -70,16 +64,10 @@ public long getLong() return count; } - @Override - public String getName() - { - return this.name; - } - @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..ac661fe35ad4 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 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..1c5f5fc960ee 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(); @@ -77,16 +75,10 @@ public long getLong() return (long) max; } - @Override - public String getName() - { - return this.name; - } - @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 029bc86afafb..f1e032adbded 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregatorFactory.java @@ -56,7 +56,7 @@ public DoubleMaxAggregatorFactory( @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new DoubleMaxAggregator(name, metricFactory.makeFloatColumnSelector(fieldName)); + return new DoubleMaxAggregator(metricFactory.makeFloatColumnSelector(fieldName)); } @Override 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..f72efa55ed70 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(); @@ -77,16 +75,10 @@ public long getLong() return (long) min; } - @Override - public String getName() - { - return this.name; - } - @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 04f1de0ede39..a3368ecd60c3 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregatorFactory.java @@ -56,7 +56,7 @@ public DoubleMinAggregatorFactory( @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new DoubleMinAggregator(name, metricFactory.makeFloatColumnSelector(fieldName)); + return new DoubleMinAggregator(metricFactory.makeFloatColumnSelector(fieldName)); } @Override 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..bb293527d635 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; @@ -86,16 +84,10 @@ public long getLong() return (long) sum; } - @Override - public String getName() - { - return this.name; - } - @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 a05d76a10948..4d08afeba0ce 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java @@ -57,7 +57,6 @@ public DoubleSumAggregatorFactory( public Aggregator factorize(ColumnSelectorFactory metricFactory) { return new DoubleSumAggregator( - name, metricFactory.makeFloatColumnSelector(fieldName) ); } 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..1c92d3c9992e 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java @@ -64,12 +64,6 @@ public long getLong() return delegate.getLong(); } - @Override - public String getName() - { - return delegate.getName(); - } - @Override public void close() { 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..adf2dcb2f244 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java @@ -40,12 +40,10 @@ static Object combineHistograms(Object lhs, Object 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); } @@ -80,12 +78,6 @@ public long getLong() throw new UnsupportedOperationException("HistogramAggregator does not support getLong()"); } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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 318158f51511..0c8e1ade1a17 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java @@ -67,7 +67,6 @@ public HistogramAggregatorFactory( public Aggregator factorize(ColumnSelectorFactory metricFactory) { return new HistogramAggregator( - name, metricFactory.makeFloatColumnSelector(fieldName), breaks ); 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..f6ccf3e07f75 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; @@ -82,12 +80,6 @@ public long getLong() return (long) current; } - @Override - public String getName() - { - return name; - } - @Override public void close() { 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 73bff8d34687..b9294fd308d2 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() 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..569665624cb4 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(); @@ -77,16 +75,10 @@ public long getLong() return max; } - @Override - public String getName() - { - return this.name; - } - @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 91f8c11fee34..d9bffcaa4252 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregatorFactory.java @@ -56,7 +56,7 @@ public LongMaxAggregatorFactory( @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new LongMaxAggregator(name, metricFactory.makeLongColumnSelector(fieldName)); + return new LongMaxAggregator(metricFactory.makeLongColumnSelector(fieldName)); } @Override 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..49c8a2243f53 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(); @@ -77,16 +75,10 @@ public long getLong() return min; } - @Override - public String getName() - { - return this.name; - } - @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 82f2111a43a5..ef618f0a8535 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregatorFactory.java @@ -56,7 +56,7 @@ public LongMinAggregatorFactory( @Override public Aggregator factorize(ColumnSelectorFactory metricFactory) { - return new LongMinAggregator(name, metricFactory.makeLongColumnSelector(fieldName)); + return new LongMinAggregator(metricFactory.makeLongColumnSelector(fieldName)); } @Override 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..df54899a36f0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java @@ -42,13 +42,11 @@ static long combineValues(Object lhs, Object rhs) { } 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; @@ -84,16 +82,10 @@ public long getLong() return sum; } - @Override - public String getName() - { - return name; - } - @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 33b65d2fb61f..f9285a724c9b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java @@ -57,7 +57,6 @@ public LongSumAggregatorFactory( public Aggregator factorize(ColumnSelectorFactory metricFactory) { return new LongSumAggregator( - name, metricFactory.makeLongColumnSelector(fieldName) ); } 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..1d27cf279309 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; @@ -132,16 +129,10 @@ public long getLong() throw new UnsupportedOperationException("CardinalityAggregator does not support getLong()"); } - @Override - public String getName() - { - return name; - } - @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 ee06c65f34b6..81ec372be446 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 @@ -82,7 +82,7 @@ public Aggregator factorize(final ColumnSelectorFactory columnFactory) return Aggregators.noopAggregator(); } - return new CardinalityAggregator(name, selectors, byRow); + return new CardinalityAggregator(selectors, byRow); } 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 ca1f45fc4329..71b74da10bc0 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(); @@ -72,16 +69,10 @@ public long getLong() throw new UnsupportedOperationException("HyperUniquesAggregator does not support getLong()"); } - @Override - public String getName() - { - return name; - } - @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 5744b762bd2e..c33d31394a0e 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( 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 6971155b43da..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,7 +31,7 @@ public class CountAggregatorTest @Test public void testAggregate() { - CountAggregator agg = new CountAggregator("billy"); + CountAggregator agg = new CountAggregator(); Assert.assertEquals(0L, agg.get()); Assert.assertEquals(0L, agg.get()); @@ -49,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/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 87c5bc3e318d..f974d5e05f6f 100644 --- a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java +++ b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorBenchmark.java @@ -54,7 +54,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"), @@ -63,7 +62,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 fb8004e89ed8..9c1ecb5ca982 100644 --- a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java @@ -131,7 +131,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"), @@ -142,8 +141,6 @@ public void testAggregate() agg.reset(); - Assert.assertEquals("billy", agg.getName()); - double val = 10.; Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -206,7 +203,6 @@ public void testAggregateMissingColumn() Map script = scriptDoubleSum; JavaScriptAggregator agg = new JavaScriptAggregator( - "billy", Collections.singletonList(null), JavaScriptAggregatorFactory.compileScript( script.get("fnAggregate"), @@ -217,8 +213,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()); @@ -240,7 +234,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; } }", @@ -251,8 +244,6 @@ public void testAggregateStrings() agg.reset(); - Assert.assertEquals("billy", agg.getName()); - double val = 0.; Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -336,7 +327,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"), @@ -345,7 +335,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..6f329a8a1bb7 100644 --- a/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/MetricManipulatorFnsTest.java @@ -42,7 +42,7 @@ public static Iterable constructorFeeder() final ArrayList constructorArrays = new ArrayList<>(); final long longVal = 13789; LongMinAggregator longMinAggregator = new LongMinAggregator( - NAME, new LongColumnSelector() + new LongColumnSelector() { @Override public long get() @@ -81,7 +81,7 @@ public long get() LongSumAggregatorFactory longSumAggregatorFactory = new LongSumAggregatorFactory(NAME, FIELD); LongSumAggregator longSumAggregator = new LongSumAggregator( - NAME, new LongColumnSelector() + new LongColumnSelector() { @Override public long get() 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 0a4c2eb42dd5..8a628cb69f87 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 @@ -265,7 +265,6 @@ public CardinalityAggregatorTest() public void testAggregateRows() throws Exception { CardinalityAggregator agg = new CardinalityAggregator( - "billy", selectorList, true ); @@ -281,7 +280,6 @@ public void testAggregateRows() throws Exception public void testAggregateValues() throws Exception { CardinalityAggregator agg = new CardinalityAggregator( - "billy", selectorList, false ); @@ -340,8 +338,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); @@ -371,8 +369,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); 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 07d8f4840048..da806184c08d 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 @@ -40,12 +40,12 @@ public class ArithmeticPostAggregatorTest public void testCompute() { ArithmeticPostAggregator arithmeticPostAggregator; - 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("rows", agg.get()); List postAggregatorList = Lists.newArrayList( @@ -74,9 +74,9 @@ public void testCompute() public void testComparator() { ArithmeticPostAggregator arithmeticPostAggregator; - CountAggregator agg = new CountAggregator("rows"); + CountAggregator agg = new CountAggregator(); Map metricValues = new HashMap(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put("rows", agg.get()); List postAggregatorList = Lists.newArrayList( @@ -94,7 +94,7 @@ public void testComparator() agg.aggregate(); agg.aggregate(); agg.aggregate(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put("rows", 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..dd96e5dfaafb 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 @@ -36,15 +36,15 @@ public void testCompute() 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("rows", agg.get()); Assert.assertEquals(new Long(0L), fieldAccessPostAggregator.compute(metricValues)); agg.aggregate(); agg.aggregate(); agg.aggregate(); - metricValues.put(agg.getName(), agg.get()); + metricValues.put("rows", 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 e5d86da2028e..91b581d85fbc 100644 --- a/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/spec/SpecificSegmentQueryRunnerTest.java @@ -139,9 +139,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.getName(), rows); + builder.addMetric("rows", rows); final Result value = builder.build(); final SpecificSegmentQueryRunner queryRunner = new SpecificSegmentQueryRunner(