Remove Aggregator.reset()

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()
   {

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()
   {

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()
   {

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

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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)

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();

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {

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()
   {