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 b6b55d24607..0903209b1f9 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 class DistinctCountAggregator implements Aggregator } } - @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 01c8d0b24a1..4f8b76c2a6e 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 class EmptyDistinctCountAggregator implements Aggregator { } - @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 517a54e355f..c2dbb7ed2d9 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 class TimestampAggregator implements Aggregator this.comparator = comparator; this.initValue = initValue; - reset(); + most = this.initValue; } @Override @@ -72,12 +72,6 @@ public class TimestampAggregator implements Aggregator } } - @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 595b9f5a714..a832e7a46ca 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 class TimestampMinMaxAggregatorTest { 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 f957f5bb0ce..dd74fe2f14e 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 class DoublesSketchBuildAggregator implements Aggregator 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 6152ff417a3..a206d49c8f1 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 class DoublesSketchMergeAggregator implements Aggregator 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 2cfeb03a534..5e991eb4e52 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 class DoublesSketchNoOpAggregator implements Aggregator { } - @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 d383b0e3757..7f98a25e72f 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 class SketchAggregator implements Aggregator 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 35b6a8942ef..1d9d13bc7fb 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 class ApproximateHistogramAggregator implements Aggregator 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 e3d4634ac2b..2ebd8b2bced 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 class ApproximateHistogramFoldingAggregator implements Aggregator } } - @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 0bb32de6f02..f3577477e51 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 abstract class VarianceAggregator implements Aggregator { } - @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 0945705bdb5..b982a7a0285 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 class VarianceAggregatorTest 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 1282b45f07b..a13eebf1b37 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 @@ import java.io.Closeable; 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 6b5a363dc68..96b9f4e7508 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 class CountAggregator implements Aggregator ++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 fdd318b35a3..f5b37745b8b 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 @@ public class DoubleMaxAggregator implements Aggregator public DoubleMaxAggregator(BaseDoubleColumnValueSelector selector) { this.selector = selector; - - reset(); + this.max = Double.NEGATIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public class DoubleMaxAggregator implements Aggregator 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 8319a67b8a9..9d374344a12 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 @@ public class DoubleMinAggregator implements Aggregator public DoubleMinAggregator(BaseDoubleColumnValueSelector selector) { this.selector = selector; - - reset(); + this.min = Double.POSITIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public class DoubleMinAggregator implements Aggregator 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 3d131ba5707..928076158d7 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 class DoubleSumAggregator implements Aggregator 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 c9812e64ea4..32418b25898 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 class FilteredAggregator implements Aggregator } } - @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 2707528a81d..b941b594348 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 @@ public class FloatMaxAggregator implements Aggregator public FloatMaxAggregator(BaseFloatColumnValueSelector selector) { this.selector = selector; - - reset(); + this.max = Float.NEGATIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public class FloatMaxAggregator implements Aggregator 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 685d0315333..74cf9817fd5 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 @@ public class FloatMinAggregator implements Aggregator public FloatMinAggregator(BaseFloatColumnValueSelector selector) { this.selector = selector; - - reset(); + this.min = Float.POSITIVE_INFINITY; } @Override @@ -47,12 +46,6 @@ public class FloatMinAggregator implements Aggregator 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 bb756b2cbba..b259bcd2b3f 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 class FloatSumAggregator implements Aggregator 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 0c6c6028a4f..fa065e9a08b 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 class HistogramAggregator implements Aggregator 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 f42650d6e3f..e095c4cef20 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 class JavaScriptAggregator implements Aggregator 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 b66df6c6942..2a80f6f4c1b 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 @@ public class LongMaxAggregator implements Aggregator public LongMaxAggregator(BaseLongColumnValueSelector selector) { this.selector = selector; - - reset(); + this.max = Long.MIN_VALUE; } @Override @@ -51,12 +50,6 @@ public class LongMaxAggregator implements Aggregator 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 b17268066ab..7bc3d37d9f4 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 @@ public class LongMinAggregator implements Aggregator public LongMinAggregator(BaseLongColumnValueSelector selector) { this.selector = selector; - - reset(); + this.min = Long.MAX_VALUE; } @Override @@ -51,12 +50,6 @@ public class LongMinAggregator implements Aggregator 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 8637673f9b5..c4821d64f34 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 class LongSumAggregator implements Aggregator 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 4f41dd5ccee..e4b793117ec 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 final class NoopAggregator implements Aggregator { } - @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 5b71dcb1584..2bb8a3c1558 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 class CardinalityAggregator implements Aggregator } } - @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 128d72d8339..f8db43fb4d3 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 class DoubleFirstAggregator implements Aggregator this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + firstTime = Long.MAX_VALUE; + firstValue = 0; } @Override @@ -51,13 +52,6 @@ public class DoubleFirstAggregator implements Aggregator } } - @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 c4614d645ea..fd7e6b18b52 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 class FloatFirstAggregator implements Aggregator this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + firstTime = Long.MAX_VALUE; + firstValue = 0; } @Override @@ -54,13 +55,6 @@ public class FloatFirstAggregator implements Aggregator } } - @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 bf5b0925c5e..1b4b94820f2 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 class LongFirstAggregator implements Aggregator this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + firstTime = Long.MAX_VALUE; + firstValue = 0; } @Override @@ -50,13 +51,6 @@ public class LongFirstAggregator implements Aggregator } } - @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 787418c8e37..0b2ea7c7423 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 class HyperUniquesAggregator implements Aggregator 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 5bdea14ded4..a1fd7981529 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 class DoubleLastAggregator implements Aggregator this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + lastTime = Long.MIN_VALUE; + lastValue = 0; } @Override @@ -51,13 +52,6 @@ public class DoubleLastAggregator implements Aggregator } } - @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 e4db711f460..a0386e6f5e9 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 class FloatLastAggregator implements Aggregator this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + lastTime = Long.MIN_VALUE; + lastValue = 0; } @Override @@ -51,13 +52,6 @@ public class FloatLastAggregator implements Aggregator } } - @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 6081e763b48..2916f676980 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 class LongLastAggregator implements Aggregator this.valueSelector = valueSelector; this.timeSelector = timeSelector; - reset(); + lastTime = Long.MIN_VALUE; + lastValue = 0; } @Override @@ -49,13 +50,6 @@ public class LongLastAggregator implements Aggregator } } - @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 7fa6cbbd357..bcf85922ea2 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 class DoubleMaxAggregationTest 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 54d3b8711d1..d198989e980 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 class DoubleMinAggregationTest 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 795155e8848..ad9d9170c8f 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 class JavaScriptAggregatorTest ) ); - agg.reset(); - double val = 10.; Assert.assertEquals(val, agg.get()); Assert.assertEquals(val, agg.get()); @@ -199,7 +197,6 @@ public class JavaScriptAggregatorTest 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 class JavaScriptAggregatorTest ) ); - 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 7419a2379cc..90a8f27f8b9 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 class LongMaxAggregationTest 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 fdbdd7830bd..b907c08019b 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 class LongMinAggregationTest 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 746d36aa42d..8aba7090aba 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 class DoubleFirstAggregationTest 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 class DoubleFirstAggregationTest 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 246dcf68f03..ff0f00f5eb0 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 class FloatFirstAggregationTest 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 class FloatFirstAggregationTest 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 186d086e9fd..36a8b5cb3f6 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 class LongFirstAggregationTest 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 class LongFirstAggregationTest 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 7f88266124d..c5453e18171 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 class DoubleLastAggregationTest 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 class DoubleLastAggregationTest 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 1e1215aea89..1938f838733 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 class FloatLastAggregationTest 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 class FloatLastAggregationTest 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 389d6b12f25..25d9160e15f 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 class LongLastAggregationTest 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 class LongLastAggregationTest 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