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 b6b55d24607a..0903209b1f95 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 @@ -49,12 +49,6 @@ public void aggregate() } } - @Override - public void reset() - { - mutableBitmap.clear(); - } - @Override public Object get() { 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 01c8d0b24a11..4f8b76c2a6e9 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 @@ -33,11 +33,6 @@ public void aggregate() { } - @Override - public void reset() - { - } - @Override public Object get() { diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java index 517a54e355f7..c2dbb7ed2d9c 100644 --- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java +++ b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java @@ -59,7 +59,7 @@ public TimestampAggregator( this.comparator = comparator; this.initValue = initValue; - reset(); + most = this.initValue; } @Override @@ -72,12 +72,6 @@ public void aggregate() } } - @Override - public void reset() - { - most = initValue; - } - @Override public Object get() { diff --git a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java b/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java index 595b9f5a7142..a832e7a46cad 100644 --- a/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java +++ b/extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java @@ -134,15 +134,13 @@ public void testAggregator() { TimestampAggregator aggregator = (TimestampAggregator) aggregatorFactory.factorize(selectorFactory); - for (Timestamp value: values) { + Assert.assertEquals(initValue, aggregator.get()); + + for (Timestamp value : values) { aggregate(selector, aggregator); } Assert.assertEquals(expected, new Timestamp(aggregator.getLong())); - - aggregator.reset(); - - Assert.assertEquals(initValue, aggregator.get()); } @Test diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java index f957f5bb0ce1..dd74fe2f14e9 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java @@ -63,12 +63,6 @@ public long getLong() throw new UnsupportedOperationException("Not implemented"); } - @Override - public synchronized void reset() - { - sketch = UpdateDoublesSketch.builder().setK(size).build(); - } - @Override public synchronized void close() { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java index 6152ff417a34..a206d49c8f12 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java @@ -65,12 +65,6 @@ public long getLong() throw new UnsupportedOperationException("Not implemented"); } - @Override - public synchronized void reset() - { - union.reset(); - } - @Override public synchronized void close() { diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java index 2cfeb03a534b..5e991eb4e52e 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java @@ -35,11 +35,6 @@ public void aggregate() { } - @Override - public void reset() - { - } - @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 d383b0e3757b..7f98a25e72f9 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 @@ -58,14 +58,6 @@ public void aggregate() updateUnion(union, update); } - @Override - public void reset() - { - if (union != null) { - union.reset(); - } - } - @Override public Object get() { 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 35b6a8942ef9..1d9d13bc7fb0 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 @@ -68,12 +68,6 @@ public void aggregate() histogram.offer(selector.getFloat()); } - @Override - public void reset() - { - this.histogram = new ApproximateHistogram(resolution, lowerLimit, upperLimit); - } - @Override public Object get() { 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 e3d4634ac2b3..2ebd8b2bced8 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 @@ -66,12 +66,6 @@ public void aggregate() } } - @Override - public void reset() - { - this.histogram = new ApproximateHistogram(resolution, lowerLimit, upperLimit); - } - @Override public Object get() { 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 0bb32de6f020..f3577477e515 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 @@ -34,12 +34,6 @@ public VarianceAggregator() { } - @Override - public void reset() - { - holder.reset(); - } - @Override public Object get() { 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 0945705bdb57..b982a7a02851 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 @@ -83,9 +83,6 @@ public void testDoubleVarianceAggregator() assertValues((VarianceAggregatorCollector) agg.get(), 3, 7.3d, 2.9866d); aggregate(selector, agg); assertValues((VarianceAggregatorCollector) agg.get(), 4, 8.6d, 3.95d); - - agg.reset(); - assertValues((VarianceAggregatorCollector) agg.get(), 0, 0d, 0d); } private void assertValues(VarianceAggregatorCollector holder, long count, double sum, double nvariance) 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 1282b45f07be..a13eebf1b371 100644 --- a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/Aggregator.java @@ -37,10 +37,7 @@ public interface Aggregator extends Closeable { void aggregate(); - /** @deprecated unused, to be removed in Druid 0.12 (or hopefully the whole Aggregator class is removed) */ - @Deprecated - @SuppressWarnings("unused") - void reset(); + @Nullable Object get(); float getFloat(); 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 6b5a363dc681..96b9f4e75089 100644 --- a/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java @@ -44,12 +44,6 @@ public void aggregate() ++count; } - @Override - public void reset() - { - count = 0; - } - @Override public Object get() { 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 fdd318b35a36..f5b37745b8bc 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java @@ -37,8 +37,7 @@ static double combineValues(Object lhs, Object rhs) public DoubleMaxAggregator(BaseDoubleColumnValueSelector selector) { this.selector = selector; - - reset(); + this.max = Double.NEGATIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public void aggregate() max = Math.max(max, selector.getDouble()); } - @Override - public void reset() - { - max = Double.NEGATIVE_INFINITY; - } - @Override public Object get() { 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 8319a67b8a92..9d374344a128 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java @@ -37,8 +37,7 @@ static double combineValues(Object lhs, Object rhs) public DoubleMinAggregator(BaseDoubleColumnValueSelector selector) { this.selector = selector; - - reset(); + this.min = Double.POSITIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public void aggregate() min = Math.min(min, selector.getDouble()); } - @Override - public void reset() - { - min = Double.POSITIVE_INFINITY; - } - @Override public Object get() { 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 3d131ba5707d..928076158d7b 100644 --- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java @@ -60,12 +60,6 @@ public void aggregate() sum += selector.getDouble(); } - @Override - public void reset() - { - sum = 0; - } - @Override public Object get() { 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 c9812e64ea42..32418b25898e 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java @@ -40,12 +40,6 @@ public void aggregate() } } - @Override - public void reset() - { - delegate.reset(); - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java index 2707528a81da..b941b594348f 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java @@ -37,8 +37,7 @@ static double combineValues(Object lhs, Object rhs) public FloatMaxAggregator(BaseFloatColumnValueSelector selector) { this.selector = selector; - - reset(); + this.max = Float.NEGATIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public void aggregate() max = Math.max(max, selector.getFloat()); } - @Override - public void reset() - { - max = Float.NEGATIVE_INFINITY; - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java index 685d0315333b..74cf9817fd58 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java @@ -37,8 +37,7 @@ static double combineValues(Object lhs, Object rhs) public FloatMinAggregator(BaseFloatColumnValueSelector selector) { this.selector = selector; - - reset(); + this.min = Float.POSITIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public void aggregate() min = Math.min(min, selector.getFloat()); } - @Override - public void reset() - { - min = Float.POSITIVE_INFINITY; - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java index bb756b2cbba2..b259bcd2b3f0 100644 --- a/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java @@ -59,12 +59,6 @@ public void aggregate() sum += selector.getFloat(); } - @Override - public void reset() - { - sum = 0; - } - @Override public Object get() { 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 0c6c6028a4fe..fa065e9a08b9 100644 --- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java @@ -56,12 +56,6 @@ public void aggregate() histogram.offer(selector.getFloat()); } - @Override - public void reset() - { - this.histogram = new Histogram(histogram.breaks); - } - @Override public Object get() { 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 f42650d6e3fa..e095c4cef20e 100644 --- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java @@ -55,12 +55,6 @@ public void aggregate() current = script.aggregate(current, selectorList); } - @Override - public void reset() - { - current = script.reset(); - } - @Override public Object get() { 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 b66df6c6942a..2a80f6f4c1bf 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java @@ -41,8 +41,7 @@ static long combineValues(Object lhs, Object rhs) public LongMaxAggregator(BaseLongColumnValueSelector selector) { this.selector = selector; - - reset(); + this.max = Long.MIN_VALUE; } @Override @@ -51,12 +50,6 @@ public void aggregate() max = Math.max(max, selector.getLong()); } - @Override - public void reset() - { - max = Long.MIN_VALUE; - } - @Override public Object get() { 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 b17268066abe..7bc3d37d9f43 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java @@ -41,8 +41,7 @@ static long combineValues(Object lhs, Object rhs) public LongMinAggregator(BaseLongColumnValueSelector selector) { this.selector = selector; - - reset(); + this.min = Long.MAX_VALUE; } @Override @@ -51,12 +50,6 @@ public void aggregate() min = Math.min(min, selector.getLong()); } - @Override - public void reset() - { - min = Long.MAX_VALUE; - } - @Override public Object get() { 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 8637673f9b58..c4821d64f34c 100644 --- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java @@ -59,12 +59,6 @@ public void aggregate() sum += selector.getLong(); } - @Override - public void reset() - { - sum = 0; - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java b/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java index 4f41dd5cceec..e4b793117ecf 100644 --- a/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java @@ -37,11 +37,6 @@ public void aggregate() { } - @Override - public void reset() - { - } - @Override public Object get() { 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 5b71dcb1584d..2bb8a3c1558f 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 @@ -100,12 +100,6 @@ public void aggregate() } } - @Override - public void reset() - { - collector = HyperLogLogCollector.makeLatestCollector(); - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java b/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java index 128d72d8339c..f8db43fb4d3a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java @@ -38,7 +38,8 @@ public DoubleFirstAggregator(BaseLongColumnValueSelector timeSelector, BaseDoubl this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + firstTime = Long.MAX_VALUE; + firstValue = 0; } @Override @@ -51,13 +52,6 @@ public void aggregate() } } - @Override - public void reset() - { - firstTime = Long.MAX_VALUE; - firstValue = 0; - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java b/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java index c4614d645eae..fd7e6b18b52a 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java @@ -41,7 +41,8 @@ public FloatFirstAggregator( this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + firstTime = Long.MAX_VALUE; + firstValue = 0; } @Override @@ -54,13 +55,6 @@ public void aggregate() } } - @Override - public void reset() - { - firstTime = Long.MAX_VALUE; - firstValue = 0; - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java b/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java index bf5b0925c5e0..1b4b94820f23 100644 --- a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java @@ -37,7 +37,8 @@ public LongFirstAggregator(BaseLongColumnValueSelector timeSelector, BaseLongCol this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + firstTime = Long.MAX_VALUE; + firstValue = 0; } @Override @@ -50,13 +51,6 @@ public void aggregate() } } - @Override - public void reset() - { - firstTime = Long.MAX_VALUE; - firstValue = 0; - } - @Override public Object get() { 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 787418c8e372..0b2ea7c7423f 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 @@ -51,12 +51,6 @@ public void aggregate() collector.fold((HyperLogLogCollector) object); } - @Override - public void reset() - { - collector = null; - } - @Nullable @Override public Object get() diff --git a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java b/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java index 5bdea14ded44..a1fd79815298 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java @@ -38,7 +38,8 @@ public DoubleLastAggregator(BaseLongColumnValueSelector timeSelector, BaseDouble this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + lastTime = Long.MIN_VALUE; + lastValue = 0; } @Override @@ -51,13 +52,6 @@ public void aggregate() } } - @Override - public void reset() - { - lastTime = Long.MIN_VALUE; - lastValue = 0; - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java b/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java index e4db711f4600..a0386e6f5e95 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java @@ -38,7 +38,8 @@ public FloatLastAggregator(BaseLongColumnValueSelector timeSelector, BaseFloatCo this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + lastTime = Long.MIN_VALUE; + lastValue = 0; } @Override @@ -51,13 +52,6 @@ public void aggregate() } } - @Override - public void reset() - { - lastTime = Long.MIN_VALUE; - lastValue = 0; - } - @Override public Object get() { diff --git a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java b/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java index 6081e763b48d..2916f6769800 100644 --- a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java +++ b/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java @@ -36,7 +36,8 @@ public LongLastAggregator(BaseLongColumnValueSelector timeSelector, BaseLongColu this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + lastTime = Long.MIN_VALUE; + lastValue = 0; } @Override @@ -49,13 +50,6 @@ public void aggregate() } } - @Override - public void reset() - { - lastTime = Long.MIN_VALUE; - lastValue = 0; - } - @Override public double getDouble() { 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 7fa6cbbd3575..bcf85922ea24 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java @@ -67,9 +67,6 @@ public void testDoubleMaxAggregator() Assert.assertEquals(values[2], ((Double) agg.get()).doubleValue(), 0.0001); Assert.assertEquals((long) values[2], agg.getLong()); Assert.assertEquals(values[2], agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(Double.NEGATIVE_INFINITY, (Double) agg.get(), 0.0001); } @Test 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 54d3b8711d16..d198989e9807 100644 --- a/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java @@ -67,9 +67,6 @@ public void testDoubleMinAggregator() Assert.assertEquals(values[2], ((Double) agg.get()).doubleValue(), 0.0001); Assert.assertEquals((long) values[2], agg.getLong()); Assert.assertEquals(values[2], agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(Double.POSITIVE_INFINITY, (Double) agg.get(), 0.0001); } @Test 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 795155e88481..ad9d9170c8f9 100644 --- a/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java @@ -125,8 +125,6 @@ public void testAggregate() ) ); - agg.reset(); - double val = 10.; Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -199,7 +197,6 @@ public void testAggregateMissingColumn() final double val = 0; - agg.reset(); Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -230,8 +227,6 @@ public void testAggregateStrings() ) ); - agg.reset(); - double val = 0.; Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); 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 7419a2379cc7..90a8f27f8b92 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java @@ -67,9 +67,6 @@ public void testLongMaxAggregator() Assert.assertEquals(values[2], ((Long) agg.get()).longValue()); Assert.assertEquals(values[2], agg.getLong()); Assert.assertEquals((float) values[2], agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(Long.MIN_VALUE, agg.getLong()); } @Test 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 fdbdd7830bd3..b907c08019b9 100644 --- a/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java @@ -67,9 +67,6 @@ public void testLongMinAggregator() Assert.assertEquals(values[2], ((Long) agg.get()).longValue()); Assert.assertEquals(values[2], agg.getLong()); Assert.assertEquals((float) values[2], agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(Long.MAX_VALUE, agg.getLong()); } @Test diff --git a/processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java index 746d36aa42d8..8aba7090aba7 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java @@ -84,9 +84,6 @@ public void testDoubleFirstAggregator() Assert.assertEquals(doubleValues[1], result.rhs, 0.0001); Assert.assertEquals((long) doubleValues[1], agg.getLong()); Assert.assertEquals(doubleValues[1], agg.getDouble(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test @@ -136,9 +133,6 @@ public void testDoubleFirstCombiningAggregator() Assert.assertEquals(expected.rhs, result.rhs, 0.0001); Assert.assertEquals(expected.rhs.longValue(), agg.getLong()); Assert.assertEquals(expected.rhs, agg.getDouble(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test diff --git a/processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java index 246dcf68f03f..ff0f00f5eb0b 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java @@ -84,9 +84,6 @@ public void testDoubleFirstAggregator() Assert.assertEquals(floats[1], result.rhs, 0.0001); Assert.assertEquals((long) floats[1], agg.getLong()); Assert.assertEquals(floats[1], agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test @@ -136,9 +133,6 @@ public void testDoubleFirstCombiningAggregator() Assert.assertEquals(expected.rhs, result.rhs, 0.0001); Assert.assertEquals(expected.rhs.longValue(), agg.getLong()); Assert.assertEquals(expected.rhs, agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test diff --git a/processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java index 186d086e9fd2..36a8b5cb3f6a 100644 --- a/processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java @@ -83,9 +83,6 @@ public void testLongFirstAggregator() Assert.assertEquals(longValues[3], result.rhs.longValue()); Assert.assertEquals(longValues[3], agg.getLong()); Assert.assertEquals(longValues[3], agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test @@ -135,9 +132,6 @@ public void testLongFirstCombiningAggregator() Assert.assertEquals(expected.rhs, result.rhs); Assert.assertEquals(expected.rhs.longValue(), agg.getLong()); Assert.assertEquals(expected.rhs, agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test diff --git a/processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java index 7f88266124dc..c5453e18171a 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java @@ -84,9 +84,6 @@ public void testDoubleLastAggregator() Assert.assertEquals(doubles[0], result.rhs, 0.0001); Assert.assertEquals((long) doubles[0], agg.getLong()); Assert.assertEquals(doubles[0], agg.getDouble(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test @@ -136,9 +133,6 @@ public void testDoubleLastCombiningAggregator() Assert.assertEquals(expected.rhs, result.rhs, 0.0001); Assert.assertEquals(expected.rhs.longValue(), agg.getLong()); Assert.assertEquals(expected.rhs, agg.getDouble(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test diff --git a/processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java index 1e1215aea896..1938f8387339 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java @@ -84,9 +84,6 @@ public void testDoubleLastAggregator() Assert.assertEquals(floats[0], result.rhs, 0.0001); Assert.assertEquals((long) floats[0], agg.getLong()); Assert.assertEquals(floats[0], agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test @@ -136,9 +133,6 @@ public void testDoubleLastCombiningAggregator() Assert.assertEquals(expected.rhs, result.rhs, 0.0001); Assert.assertEquals(expected.rhs.longValue(), agg.getLong()); Assert.assertEquals(expected.rhs, agg.getFloat(), 0.0001); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs, 0.0001); } @Test diff --git a/processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java b/processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java index 389d6b12f25d..25d9160e15f7 100644 --- a/processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java +++ b/processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java @@ -83,9 +83,6 @@ public void testLongLastAggregator() Assert.assertEquals(longValues[2], result.rhs.longValue()); Assert.assertEquals(longValues[2], agg.getLong()); Assert.assertEquals(longValues[2], agg.getFloat(), 1); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs.longValue()); } @Test @@ -135,9 +132,6 @@ public void testLongLastCombiningAggregator() Assert.assertEquals(expected.rhs, result.rhs); Assert.assertEquals(expected.rhs.longValue(), agg.getLong()); Assert.assertEquals(expected.rhs, agg.getFloat(), 1); - - agg.reset(); - Assert.assertEquals(0, ((Pair) agg.get()).rhs.longValue()); } @Test