Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Aggregator.reset() (#5177)

This commit is contained in:
Roman Leventov 2017-12-20 01:09:17 +03:00 committed by Slim
parent d337f49034
commit f18eba50ee
46 changed files with 23 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,12 +49,6 @@ public class DistinctCountAggregator implements Aggregator
}
}
@Override
public void reset()
{
mutableBitmap.clear();
}
@Override
public Object get()
{

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

@ -33,11 +33,6 @@ public class EmptyDistinctCountAggregator implements Aggregator
{
}
@Override
public void reset()
{
}
@Override
public Object get()
{

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

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

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

@ -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

6
extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchBuildAggregator.java
View File

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

6
extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregator.java
View File

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

5
extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java
View File

@ -35,11 +35,6 @@ public class DoublesSketchNoOpAggregator implements Aggregator
{
}
@Override
public void reset()
{
}
@Override
public void close()
{

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

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

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

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

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

@ -66,12 +66,6 @@ public class ApproximateHistogramFoldingAggregator implements Aggregator
}
}
@Override
public void reset()
{
this.histogram = new ApproximateHistogram(resolution, lowerLimit, upperLimit);
}
@Override
public Object get()
{

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

@ -34,12 +34,6 @@ public abstract class VarianceAggregator implements Aggregator
{
}
@Override
public void reset()
{
holder.reset();
}
@Override
public Object get()
{

3
extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorTest.java
View File

@ -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)

5
processing/src/main/java/io/druid/query/aggregation/Aggregator.java
View File

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

6
processing/src/main/java/io/druid/query/aggregation/CountAggregator.java
View File

@ -44,12 +44,6 @@ public class CountAggregator implements Aggregator
++count;
}
@Override
public void reset()
{
count = 0;
}
@Override
public Object get()
{

9
processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java
View File

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

9
processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java
View File

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

6
processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java
View File

@ -60,12 +60,6 @@ public class DoubleSumAggregator implements Aggregator
sum += selector.getDouble();
}
@Override
public void reset()
{
sum = 0;
}
@Override
public Object get()
{

6
processing/src/main/java/io/druid/query/aggregation/FilteredAggregator.java
View File

@ -40,12 +40,6 @@ public class FilteredAggregator implements Aggregator
}
}
@Override
public void reset()
{
delegate.reset();
}
@Override
public Object get()
{

9
processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java
View File

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

9
processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java
View File

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

6
processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java
View File

@ -59,12 +59,6 @@ public class FloatSumAggregator implements Aggregator
sum += selector.getFloat();
}
@Override
public void reset()
{
sum = 0;
}
@Override
public Object get()
{

6
processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java
View File

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

6
processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregator.java
View File

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

9
processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java
View File

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

9
processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java
View File

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

6
processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
View File

@ -59,12 +59,6 @@ public class LongSumAggregator implements Aggregator
sum += selector.getLong();
}
@Override
public void reset()
{
sum = 0;
}
@Override
public Object get()
{

5
processing/src/main/java/io/druid/query/aggregation/NoopAggregator.java
View File

@ -37,11 +37,6 @@ public final class NoopAggregator implements Aggregator
{
}
@Override
public void reset()
{
}
@Override
public Object get()
{

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

@ -100,12 +100,6 @@ public class CardinalityAggregator implements Aggregator
}
}
@Override
public void reset()
{
collector = HyperLogLogCollector.makeLatestCollector();
}
@Override
public Object get()
{

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

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

10
processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java
View File

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

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

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

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

@ -51,12 +51,6 @@ public class HyperUniquesAggregator implements Aggregator
collector.fold((HyperLogLogCollector) object);
}
@Override
public void reset()
{
collector = null;
}
@Nullable
@Override
public Object get()

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

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

10
processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java
View File

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

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

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

3
processing/src/test/java/io/druid/query/aggregation/DoubleMaxAggregationTest.java
View File

@ -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

3
processing/src/test/java/io/druid/query/aggregation/DoubleMinAggregationTest.java
View File

@ -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

5
processing/src/test/java/io/druid/query/aggregation/JavaScriptAggregatorTest.java
View File

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

3
processing/src/test/java/io/druid/query/aggregation/LongMaxAggregationTest.java
View File

@ -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

3
processing/src/test/java/io/druid/query/aggregation/LongMinAggregationTest.java
View File

@ -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

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

@ -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<Long, Double>) 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<Long, Double>) agg.get()).rhs, 0.0001);
}
@Test

6
processing/src/test/java/io/druid/query/aggregation/first/FloatFirstAggregationTest.java
View File

@ -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<Long, Float>) 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<Long, Float>) agg.get()).rhs, 0.0001);
}
@Test

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

@ -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<Long, Long>) 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<Long, Long>) agg.get()).rhs, 0.0001);
}
@Test

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

@ -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<Long, Double>) 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<Long, Double>) agg.get()).rhs, 0.0001);
}
@Test

6
processing/src/test/java/io/druid/query/aggregation/last/FloatLastAggregationTest.java
View File

@ -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<Long, Float>) 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<Long, Float>) agg.get()).rhs, 0.0001);
}
@Test

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

@ -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<Long, Long>) 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<Long, Long>) agg.get()).rhs.longValue());
}
@Test