Remove deprecated Aggregator/AggregatorFactory methods (#3894)

extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java

@@ -64,12 +64,6 @@ public class DistinctCountAggregator implements Aggregator
     return (float) mutableBitmap.size();
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java

@@ -50,12 +50,6 @@ public class EmptyDistinctCountAggregator implements Aggregator
     return (float) 0;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java

@@ -85,12 +85,6 @@ public class TimestampAggregator implements Aggregator
     return (float) most;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java

@@ -166,12 +166,6 @@ public class TimestampAggregatorFactory extends AggregatorFactory
     return Longs.BYTES;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    return initValue;
-  }
-
   @Override
   public boolean equals(Object o)
   {

extensions-contrib/time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java

@@ -133,8 +133,6 @@ public class TimestampMinMaxAggregatorTest
   {
     TimestampAggregator aggregator = (TimestampAggregator) aggregatorFactory.factorize(selectorFactory);
 
-    Assert.assertEquals(aggType, aggregator.getName());
-
     for (Timestamp value: values) {
       aggregate(selector, aggregator);
     }

extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/EmptySketchAggregator.java

@@ -55,12 +55,6 @@ public class EmptySketchAggregator implements Aggregator
     throw new UnsupportedOperationException("Not implemented");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java

@@ -80,12 +80,6 @@ public class SketchAggregator implements Aggregator
     throw new UnsupportedOperationException("Not implemented");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java

@@ -92,12 +92,6 @@ public class ApproximateHistogramAggregator implements Aggregator
     throw new UnsupportedOperationException("ApproximateHistogramAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java

@@ -90,12 +90,6 @@ public class ApproximateHistogramFoldingAggregator implements Aggregator
     throw new UnsupportedOperationException("ApproximateHistogramFoldingAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java

@@ -46,12 +46,6 @@ public abstract class VarianceAggregator implements Aggregator
     return holder;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/Aggregator.java

@@ -38,10 +38,6 @@ public interface Aggregator {
   Object get();
   float getFloat();
 
-  /**
-   * Deprecated, to be removed in 0.10.0. See https://github.com/druid-io/druid/issues/3588.
-   */
-  @Deprecated String getName();
   void close();
 
   long getLong();

processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java

@@ -126,15 +126,6 @@ public abstract class AggregatorFactory
    */
   public abstract int getMaxIntermediateSize();
 
-  /**
-   * Deprecated, to be removed in 0.10.0. See https://github.com/druid-io/druid/issues/3588.
-   */
-  @Deprecated
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException("getAggregatorStartValue is deprecated");
-  }
-
   /**
    * Merges the list of AggregatorFactory[] (presumable from metadata of some segments being merged) and
    * returns merged AggregatorFactory[] (for the metadata for merged segment).

processing/src/main/java/io/druid/query/aggregation/Aggregators.java

@@ -53,12 +53,6 @@ public class Aggregators
         return 0;
       }
 
-      @Override
-      public String getName()
-      {
-        throw new UnsupportedOperationException("getName is deprecated");
-      }
-
       @Override
       public void close()
       {

processing/src/main/java/io/druid/query/aggregation/CountAggregator.java

@@ -68,12 +68,6 @@ public class CountAggregator implements Aggregator
     return count;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java

@@ -75,12 +75,6 @@ public class DoubleMaxAggregator implements Aggregator
     return (long) max;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java

@@ -75,12 +75,6 @@ public class DoubleMinAggregator implements Aggregator
     return (long) min;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java

@@ -84,12 +84,6 @@ public class DoubleSumAggregator implements Aggregator
     return (long) sum;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java

@@ -64,12 +64,6 @@ public class FilteredAggregator implements Aggregator
     return delegate.getLong();
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java

@@ -80,12 +80,6 @@ public class HistogramAggregator implements Aggregator
     throw new UnsupportedOperationException("HistogramAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java

@@ -80,12 +80,6 @@ public class JavaScriptAggregator implements Aggregator
     return (long) current;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java

@@ -75,12 +75,6 @@ public class LongMaxAggregator implements Aggregator
     return max;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java

@@ -75,12 +75,6 @@ public class LongMinAggregator implements Aggregator
     return min;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java

@@ -83,12 +83,6 @@ public class LongSumAggregator implements Aggregator
     return sum;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregator.java

@@ -112,12 +112,6 @@ public class CardinalityAggregator implements Aggregator
     throw new UnsupportedOperationException("CardinalityAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregator.java

@@ -76,12 +76,6 @@ public class DoubleFirstAggregator implements Aggregator
     return (float) firstValue;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java

@@ -225,12 +225,6 @@ public class DoubleFirstAggregatorFactory extends AggregatorFactory
     return Longs.BYTES + Doubles.BYTES;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean equals(Object o)
   {

processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregator.java

@@ -75,12 +75,6 @@ public class LongFirstAggregator implements Aggregator
     return (float) firstValue;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java

@@ -215,12 +215,6 @@ public class LongFirstAggregatorFactory extends AggregatorFactory
     return Longs.BYTES * 2;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean equals(Object o)
   {

processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java

@@ -70,12 +70,6 @@ public class HyperUniquesAggregator implements Aggregator
     throw new UnsupportedOperationException("HyperUniquesAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregator.java

@@ -76,12 +76,6 @@ public class DoubleLastAggregator implements Aggregator
     return (float) lastValue;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java

@@ -208,12 +208,6 @@ public class DoubleLastAggregatorFactory extends AggregatorFactory
     return Longs.BYTES + Doubles.BYTES;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean equals(Object o)
   {

processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregator.java

@@ -74,12 +74,6 @@ public class LongLastAggregator implements Aggregator
     return (float) lastValue;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java

@@ -208,12 +208,6 @@ public class LongLastAggregatorFactory extends AggregatorFactory
     return Longs.BYTES * 2;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean equals(Object o)
   {

processing/src/test/java/io/druid/query/aggregation/first/DoubleFirstAggregationTest.java

@@ -73,8 +73,6 @@ public class DoubleFirstAggregationTest
   {
     DoubleFirstAggregator agg = (DoubleFirstAggregator) doubleFirstAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);
@@ -126,8 +124,6 @@ public class DoubleFirstAggregationTest
   {
     DoubleFirstAggregator agg = (DoubleFirstAggregator) combiningAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);

processing/src/test/java/io/druid/query/aggregation/first/LongFirstAggregationTest.java

@@ -72,8 +72,6 @@ public class LongFirstAggregationTest
   {
     LongFirstAggregator agg = (LongFirstAggregator) longFirstAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);
@@ -125,8 +123,6 @@ public class LongFirstAggregationTest
   {
     LongFirstAggregator agg = (LongFirstAggregator) combiningAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);

processing/src/test/java/io/druid/query/aggregation/last/DoubleLastAggregationTest.java

@@ -73,8 +73,6 @@ public class DoubleLastAggregationTest
   {
     DoubleLastAggregator agg = (DoubleLastAggregator) doubleLastAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);
@@ -126,8 +124,6 @@ public class DoubleLastAggregationTest
   {
     DoubleLastAggregator agg = (DoubleLastAggregator) combiningAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);

processing/src/test/java/io/druid/query/aggregation/last/LongLastAggregationTest.java

@@ -72,8 +72,6 @@ public class LongLastAggregationTest
   {
     LongLastAggregator agg = (LongLastAggregator) longLastAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);
@@ -125,8 +123,6 @@ public class LongLastAggregationTest
   {
     LongLastAggregator agg = (LongLastAggregator) combiningAggFactory.factorize(colSelectorFactory);
 
-    Assert.assertEquals("billy", agg.getName());
-
     aggregate(agg);
     aggregate(agg);
     aggregate(agg);