From 6cf083323a1ccda4b67d735cee63c588f1918c4b Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Wed, 30 Jan 2019 01:22:17 -0800 Subject: [PATCH] prefix no-op aggs with "Noop" --- .../distinctcount/DistinctCountAggregatorFactory.java | 4 ++-- ...ggregator.java => NoopDistinctCountAggregator.java} | 5 ++--- ...tor.java => NoopDistinctCountBufferAggregator.java} | 10 +++++----- .../quantiles/DoublesSketchAggregatorFactory.java | 8 ++++---- .../quantiles/DoublesSketchMergeAggregatorFactory.java | 4 ++-- ...ggregator.java => NoopDoublesSketchAggregator.java} | 4 +--- ...tor.java => NoopDoublesSketchBufferAggregator.java} | 4 +--- .../tuple/ArrayOfDoublesSketchAggregatorFactory.java | 8 ++++---- ...or.java => NoopArrayOfDoublesSketchAggregator.java} | 4 ++-- ...a => NoopArrayOfDoublesSketchBufferAggregator.java} | 4 ++-- .../bloom/BloomFilterAggregatorFactory.java | 4 ++-- ...rAggregator.java => NoopBloomFilterAggregator.java} | 4 ++-- ...gator.java => NoopBloomFilterBufferAggregator.java} | 4 ++-- .../apache/druid/query/aggregation/NoopAggregator.java | 8 ++++---- .../druid/query/aggregation/NoopBufferAggregator.java | 1 - 15 files changed, 35 insertions(+), 41 deletions(-) rename extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/{EmptyDistinctCountAggregator.java => NoopDistinctCountAggregator.java} (92%) rename extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/{EmptyDistinctCountBufferAggregator.java => NoopDistinctCountBufferAggregator.java} (82%) rename extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/{DoublesSketchNoOpAggregator.java => NoopDoublesSketchAggregator.java} (95%) rename extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/{DoublesSketchNoOpBufferAggregator.java => NoopDoublesSketchBufferAggregator.java} (96%) rename extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/{ArrayOfDoublesSketchNoOpAggregator.java => NoopArrayOfDoublesSketchAggregator.java} (92%) rename extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/{ArrayOfDoublesSketchNoOpBufferAggregator.java => NoopArrayOfDoublesSketchBufferAggregator.java} (94%) rename extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/{EmptyBloomFilterAggregator.java => NoopBloomFilterAggregator.java} (87%) rename extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/{EmptyBloomFilterBufferAggregator.java => NoopBloomFilterBufferAggregator.java} (87%) diff --git a/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java index 65d5187733a5..524cc3766939 100644 --- a/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountAggregatorFactory.java @@ -67,7 +67,7 @@ public Aggregator factorize(ColumnSelectorFactory columnFactory) { DimensionSelector selector = makeDimensionSelector(columnFactory); if (selector == null) { - return new EmptyDistinctCountAggregator(); + return new NoopDistinctCountAggregator(); } else { return new DistinctCountAggregator( selector, @@ -81,7 +81,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory columnFactory) { DimensionSelector selector = makeDimensionSelector(columnFactory); if (selector == null) { - return EmptyDistinctCountBufferAggregator.instance(); + return NoopDistinctCountBufferAggregator.instance(); } else { return new DistinctCountBufferAggregator(makeDimensionSelector(columnFactory)); } diff --git a/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/NoopDistinctCountAggregator.java similarity index 92% rename from extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/NoopDistinctCountAggregator.java index 1312ef940282..d6b2a1be06b8 100644 --- a/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/NoopDistinctCountAggregator.java @@ -21,10 +21,9 @@ import org.apache.druid.query.aggregation.Aggregator; -public class EmptyDistinctCountAggregator implements Aggregator +public class NoopDistinctCountAggregator implements Aggregator { - - public EmptyDistinctCountAggregator() + public NoopDistinctCountAggregator() { } diff --git a/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/NoopDistinctCountBufferAggregator.java similarity index 82% rename from extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java rename to extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/NoopDistinctCountBufferAggregator.java index 0636b4fb3cb9..1ac10183a99d 100644 --- a/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/EmptyDistinctCountBufferAggregator.java +++ b/extensions-contrib/distinctcount/src/main/java/org/apache/druid/query/aggregation/distinctcount/NoopDistinctCountBufferAggregator.java @@ -26,18 +26,18 @@ /** * The difference from {@link org.apache.druid.query.aggregation.NoopBufferAggregator} is that - * EmptyDistinctCountBufferAggregator returns 0 instead of null from {@link #get(ByteBuffer, int)}. + * NoopDistinctCountBufferAggregator returns 0 instead of null from {@link #get(ByteBuffer, int)}. */ -public final class EmptyDistinctCountBufferAggregator implements BufferAggregator +public final class NoopDistinctCountBufferAggregator implements BufferAggregator { - private static final EmptyDistinctCountBufferAggregator INSTANCE = new EmptyDistinctCountBufferAggregator(); + private static final NoopDistinctCountBufferAggregator INSTANCE = new NoopDistinctCountBufferAggregator(); - static EmptyDistinctCountBufferAggregator instance() + static NoopDistinctCountBufferAggregator instance() { return INSTANCE; } - private EmptyDistinctCountBufferAggregator() + private NoopDistinctCountBufferAggregator() { } diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java index 4b28e268a793..912d2d6af1cd 100644 --- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java @@ -90,13 +90,13 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory) && ValueType.isNumeric(metricFactory.getColumnCapabilities(fieldName).getType())) { final ColumnValueSelector selector = metricFactory.makeColumnValueSelector(fieldName); if (selector instanceof NilColumnValueSelector) { - return new DoublesSketchNoOpAggregator(); + return new NoopDoublesSketchAggregator(); } return new DoublesSketchBuildAggregator(selector, k); } final ColumnValueSelector selector = metricFactory.makeColumnValueSelector(fieldName); if (selector instanceof NilColumnValueSelector) { - return new DoublesSketchNoOpAggregator(); + return new NoopDoublesSketchAggregator(); } return new DoublesSketchMergeAggregator(selector, k); } @@ -108,13 +108,13 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact && ValueType.isNumeric(metricFactory.getColumnCapabilities(fieldName).getType())) { final ColumnValueSelector selector = metricFactory.makeColumnValueSelector(fieldName); if (selector instanceof NilColumnValueSelector) { - return new DoublesSketchNoOpBufferAggregator(); + return new NoopDoublesSketchBufferAggregator(); } return new DoublesSketchBuildBufferAggregator(selector, k, getMaxIntermediateSizeWithNulls()); } final ColumnValueSelector selector = metricFactory.makeColumnValueSelector(fieldName); if (selector instanceof NilColumnValueSelector) { - return new DoublesSketchNoOpBufferAggregator(); + return new NoopDoublesSketchBufferAggregator(); } return new DoublesSketchMergeBufferAggregator(selector, k, getMaxIntermediateSizeWithNulls()); } diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java index 23c10b1a90e8..4955571fbd0a 100644 --- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchMergeAggregatorFactory.java @@ -45,7 +45,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory) { final ColumnValueSelector selector = metricFactory.makeColumnValueSelector(getFieldName()); if (selector instanceof NilColumnValueSelector) { - return new DoublesSketchNoOpAggregator(); + return new NoopDoublesSketchAggregator(); } return new DoublesSketchMergeAggregator(selector, getK()); } @@ -55,7 +55,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact { final ColumnValueSelector selector = metricFactory.makeColumnValueSelector(getFieldName()); if (selector instanceof NilColumnValueSelector) { - return new DoublesSketchNoOpBufferAggregator(); + return new NoopDoublesSketchBufferAggregator(); } return new DoublesSketchMergeBufferAggregator(selector, getK(), getMaxIntermediateSizeWithNulls()); } diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/NoopDoublesSketchAggregator.java similarity index 95% rename from extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/NoopDoublesSketchAggregator.java index c2bc118462c5..8da1fe003184 100644 --- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/NoopDoublesSketchAggregator.java @@ -21,9 +21,8 @@ import org.apache.druid.query.aggregation.Aggregator; -public class DoublesSketchNoOpAggregator implements Aggregator +public class NoopDoublesSketchAggregator implements Aggregator { - @Override public Object get() { @@ -51,5 +50,4 @@ public long getLong() { throw new UnsupportedOperationException("Not implemented"); } - } diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/NoopDoublesSketchBufferAggregator.java similarity index 96% rename from extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/NoopDoublesSketchBufferAggregator.java index fe2348c6005e..5f7808c65ec0 100644 --- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchNoOpBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/NoopDoublesSketchBufferAggregator.java @@ -24,9 +24,8 @@ import java.nio.ByteBuffer; -public class DoublesSketchNoOpBufferAggregator implements BufferAggregator +public class NoopDoublesSketchBufferAggregator implements BufferAggregator { - @Override public void init(final ByteBuffer buf, final int position) { @@ -64,5 +63,4 @@ public void close() public void inspectRuntimeShape(final RuntimeShapeInspector inspector) { } - } diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java index 0b63c3193572..504071eb6a2f 100644 --- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactory.java @@ -93,7 +93,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory) final BaseObjectColumnValueSelector selector = metricFactory .makeColumnValueSelector(fieldName); if (selector instanceof NilColumnValueSelector) { - return new ArrayOfDoublesSketchNoOpAggregator(numberOfValues); + return new NoopArrayOfDoublesSketchAggregator(numberOfValues); } return new ArrayOfDoublesSketchMergeAggregator(selector, nominalEntries, numberOfValues); } @@ -101,7 +101,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory) final DimensionSelector keySelector = metricFactory .makeDimensionSelector(new DefaultDimensionSpec(fieldName, fieldName)); if (DimensionSelector.isNilSelector(keySelector)) { - return new ArrayOfDoublesSketchNoOpAggregator(numberOfValues); + return new NoopArrayOfDoublesSketchAggregator(numberOfValues); } final List valueSelectors = new ArrayList<>(); for (final String column : metricColumns) { @@ -118,7 +118,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact final BaseObjectColumnValueSelector selector = metricFactory .makeColumnValueSelector(fieldName); if (selector instanceof NilColumnValueSelector) { - return new ArrayOfDoublesSketchNoOpBufferAggregator(numberOfValues); + return new NoopArrayOfDoublesSketchBufferAggregator(numberOfValues); } return new ArrayOfDoublesSketchMergeBufferAggregator( selector, @@ -131,7 +131,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact final DimensionSelector keySelector = metricFactory .makeDimensionSelector(new DefaultDimensionSpec(fieldName, fieldName)); if (DimensionSelector.isNilSelector(keySelector)) { - return new ArrayOfDoublesSketchNoOpBufferAggregator(numberOfValues); + return new NoopArrayOfDoublesSketchBufferAggregator(numberOfValues); } final List valueSelectors = new ArrayList<>(); for (final String column : metricColumns) { diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/NoopArrayOfDoublesSketchAggregator.java similarity index 92% rename from extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/NoopArrayOfDoublesSketchAggregator.java index 7866ac967704..e623184b5503 100644 --- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/NoopArrayOfDoublesSketchAggregator.java @@ -23,12 +23,12 @@ import com.yahoo.sketches.tuple.ArrayOfDoublesUpdatableSketchBuilder; import org.apache.druid.query.aggregation.Aggregator; -public class ArrayOfDoublesSketchNoOpAggregator implements Aggregator +public class NoopArrayOfDoublesSketchAggregator implements Aggregator { private final ArrayOfDoublesSketch emptySketch; - public ArrayOfDoublesSketchNoOpAggregator(final int numberOfValues) + public NoopArrayOfDoublesSketchAggregator(final int numberOfValues) { emptySketch = new ArrayOfDoublesUpdatableSketchBuilder().setNumberOfValues(numberOfValues).build().compact(); } diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/NoopArrayOfDoublesSketchBufferAggregator.java similarity index 94% rename from extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java rename to extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/NoopArrayOfDoublesSketchBufferAggregator.java index 03112276fcc9..1853f8ec4d9f 100644 --- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchNoOpBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/NoopArrayOfDoublesSketchBufferAggregator.java @@ -26,12 +26,12 @@ import java.nio.ByteBuffer; -public class ArrayOfDoublesSketchNoOpBufferAggregator implements BufferAggregator +public class NoopArrayOfDoublesSketchBufferAggregator implements BufferAggregator { private final ArrayOfDoublesSketch emptySketch; - public ArrayOfDoublesSketchNoOpBufferAggregator(final int numberOfValues) + public NoopArrayOfDoublesSketchBufferAggregator(final int numberOfValues) { emptySketch = new ArrayOfDoublesUpdatableSketchBuilder().setNumberOfValues(numberOfValues).build().compact(); } diff --git a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorFactory.java b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorFactory.java index af60135afe38..42d379ec6bc7 100644 --- a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorFactory.java +++ b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorFactory.java @@ -94,7 +94,7 @@ public Aggregator factorize(ColumnSelectorFactory columnFactory) BaseNullableColumnValueSelector selector = columnFactory.makeColumnValueSelector(field.getDimension()); if (selector instanceof NilColumnValueSelector) { // BloomKFilter must be the same size so we cannot use a constant for the empty agg - return new EmptyBloomFilterAggregator(filter); + return new NoopBloomFilterAggregator(filter); } throw new IAE( "Cannot create bloom filter buffer aggregator for column selector type [%s]", @@ -124,7 +124,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory columnFactory) if (capabilities == null) { BaseNullableColumnValueSelector selector = columnFactory.makeColumnValueSelector(field.getDimension()); if (selector instanceof NilColumnValueSelector) { - return new EmptyBloomFilterBufferAggregator(maxNumEntries); + return new NoopBloomFilterBufferAggregator(maxNumEntries); } throw new IAE( "Cannot create bloom filter buffer aggregator for column selector type [%s]", diff --git a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/EmptyBloomFilterAggregator.java b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/NoopBloomFilterAggregator.java similarity index 87% rename from extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/EmptyBloomFilterAggregator.java rename to extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/NoopBloomFilterAggregator.java index 57df6f2fe2c6..bc4d429a446d 100644 --- a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/EmptyBloomFilterAggregator.java +++ b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/NoopBloomFilterAggregator.java @@ -22,9 +22,9 @@ import org.apache.druid.query.filter.BloomKFilter; import org.apache.druid.segment.NilColumnValueSelector; -public final class EmptyBloomFilterAggregator extends BaseBloomFilterAggregator +public final class NoopBloomFilterAggregator extends BaseBloomFilterAggregator { - EmptyBloomFilterAggregator(BloomKFilter collector) + NoopBloomFilterAggregator(BloomKFilter collector) { super(NilColumnValueSelector.instance(), collector); } diff --git a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/EmptyBloomFilterBufferAggregator.java b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/NoopBloomFilterBufferAggregator.java similarity index 87% rename from extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/EmptyBloomFilterBufferAggregator.java rename to extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/NoopBloomFilterBufferAggregator.java index 7b6301d37ee9..6a71d4c5a3de 100644 --- a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/EmptyBloomFilterBufferAggregator.java +++ b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/aggregation/bloom/NoopBloomFilterBufferAggregator.java @@ -23,9 +23,9 @@ import java.nio.ByteBuffer; -public final class EmptyBloomFilterBufferAggregator extends BaseBloomFilterBufferAggregator +public final class NoopBloomFilterBufferAggregator extends BaseBloomFilterBufferAggregator { - EmptyBloomFilterBufferAggregator(int maxNumEntries) + NoopBloomFilterBufferAggregator(int maxNumEntries) { super(NilColumnValueSelector.instance(), maxNumEntries); } diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/NoopAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/NoopAggregator.java index c408898cbc3b..45137a30d645 100644 --- a/processing/src/main/java/org/apache/druid/query/aggregation/NoopAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NoopAggregator.java @@ -50,19 +50,19 @@ public float getFloat() } @Override - public double getDouble() + public long getLong() { return 0; } @Override - public void close() + public double getDouble() { + return 0; } @Override - public long getLong() + public void close() { - return 0; } } diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java index ba20c9293453..95774203d03e 100644 --- a/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java +++ b/processing/src/main/java/org/apache/druid/query/aggregation/NoopBufferAggregator.java @@ -58,7 +58,6 @@ public float getFloat(ByteBuffer buf, int position) return 0; } - @Override public long getLong(ByteBuffer buf, int position) {