apache · fjy · Feb 1, 2017 · Feb 1, 2017
diff --git a/...count/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java b/...count/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java
@@ -64,12 +64,6 @@ public float getFloat()
     return (float) mutableBitmap.size();
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/.../src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java b/.../src/main/java/io/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java
@@ -50,12 +50,6 @@ public float getFloat()
     return (float) 0;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/...ns-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java b/...ns-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java
@@ -85,12 +85,6 @@ public float getFloat()
     return (float) most;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

diff --git a/...rib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java b/...rib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java
@@ -166,12 +166,6 @@ public int getMaxIntermediateSize()
     return Longs.BYTES;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    return initValue;
-  }
-
   @Override
   public boolean equals(Object o)
   {

diff --git a/.../time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java b/.../time-min-max/src/test/java/io/druid/query/aggregation/TimestampMinMaxAggregatorTest.java
@@ -133,8 +133,6 @@ public void testAggregator()
   {
     TimestampAggregator aggregator = (TimestampAggregator) aggregatorFactory.factorize(selectorFactory);
 
-    Assert.assertEquals(aggType, aggregator.getName());
-
     for (Timestamp value: values) {
       aggregate(selector, aggregator);
     }

diff --git a/...es/src/main/java/io/druid/query/aggregation/datasketches/theta/EmptySketchAggregator.java b/...es/src/main/java/io/druid/query/aggregation/datasketches/theta/EmptySketchAggregator.java
@@ -55,12 +55,6 @@ public long getLong()
     throw new UnsupportedOperationException("Not implemented");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/...ketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java b/...ketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java
@@ -80,12 +80,6 @@ public long getLong()
     throw new UnsupportedOperationException("Not implemented");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/...am/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java b/...am/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregator.java
@@ -92,12 +92,6 @@ public long getLong()
     throw new UnsupportedOperationException("ApproximateHistogramAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/...main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java b/...main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java
@@ -90,12 +90,6 @@ public long getLong()
     throw new UnsupportedOperationException("ApproximateHistogramFoldingAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/...ions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java b/...ions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java
@@ -46,12 +46,6 @@ public Object get()
     return holder;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/Aggregator.java b/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();

diff --git a/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java
@@ -126,15 +126,6 @@ public AggregatorFactory getMergingFactory(AggregatorFactory other) throws Aggre
    */
   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).

diff --git a/processing/src/main/java/io/druid/query/aggregation/Aggregators.java b/processing/src/main/java/io/druid/query/aggregation/Aggregators.java
@@ -53,12 +53,6 @@ public float getFloat()
         return 0;
       }
 
-      @Override
-      public String getName()
-      {
-        throw new UnsupportedOperationException("getName is deprecated");
-      }
-
       @Override
       public void close()
       {

diff --git a/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java b/processing/src/main/java/io/druid/query/aggregation/CountAggregator.java
@@ -68,12 +68,6 @@ public long getLong()
     return count;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java
@@ -75,12 +75,6 @@ public long getLong()
     return (long) max;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java
@@ -75,12 +75,6 @@ public long getLong()
     return (long) min;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java
@@ -84,12 +84,6 @@ public long getLong()
     return (long) sum;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java
@@ -64,12 +64,6 @@ public long getLong()
     return delegate.getLong();
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java
@@ -80,12 +80,6 @@ public long getLong()
     throw new UnsupportedOperationException("HistogramAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java
@@ -80,12 +80,6 @@ public long getLong()
     return (long) current;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public void close()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java
@@ -75,12 +75,6 @@ public long getLong()
     return max;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java
@@ -75,12 +75,6 @@ public long getLong()
     return min;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
@@ -83,12 +83,6 @@ public long getLong()
     return sum;
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

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
@@ -112,12 +112,6 @@ public long getLong()
     throw new UnsupportedOperationException("CardinalityAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

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
@@ -76,12 +76,6 @@ public float getFloat()
     return (float) firstValue;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java
@@ -225,12 +225,6 @@ public int getMaxIntermediateSize()
     return Longs.BYTES + Doubles.BYTES;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean equals(Object o)
   {

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
@@ -75,12 +75,6 @@ public float getFloat()
     return (float) firstValue;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java
@@ -215,12 +215,6 @@ public int getMaxIntermediateSize()
     return Longs.BYTES * 2;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean equals(Object o)
   {

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
@@ -70,12 +70,6 @@ public long getLong()
     throw new UnsupportedOperationException("HyperUniquesAggregator does not support getLong()");
   }
 
-  @Override
-  public String getName()
-  {
-    throw new UnsupportedOperationException("getName is deprecated");
-  }
-
   @Override
   public Aggregator clone()
   {

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
@@ -76,12 +76,6 @@ public float getFloat()
     return (float) lastValue;
   }
 
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
   @Override
   public void close()
   {

diff --git a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java
@@ -208,12 +208,6 @@ public int getMaxIntermediateSize()
     return Longs.BYTES + Doubles.BYTES;
   }
 
-  @Override
-  public Object getAggregatorStartValue()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean equals(Object o)
   {