Polymorphic numeric getters for ColumnValueSelector (apache#4623)

* Add methods getFloat(), getDouble() and getLong() to ColumnValueSelector * Fix copy-paste mistake in docs * Spelling
ravikannankr · Aug 9, 2017 · 7454fd8 · 7454fd8
1 parent d5606bc
commit 7454fd8
Show file tree

Hide file tree

Showing 83 changed files with 356 additions and 199 deletions.
diff --git a/benchmarks/src/main/java/io/druid/benchmark/ExpressionBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/ExpressionBenchmark.java
@@ -215,8 +215,8 @@ public void init(final ByteBuffer buf, final int position)
     @Override
     public void aggregate(final ByteBuffer buf, final int position)
     {
-      final float x = xSelector.get();
-      final double n = x > 0 ? x + 1 : ySelector.get() + 1;
+      final float x = xSelector.getFloat();
+      final double n = x > 0 ? x + 1 : ySelector.getFloat() + 1;
       buf.putDouble(0, buf.getDouble(position) + n);
     }
 

diff --git a/benchmarks/src/main/java/io/druid/benchmark/FilterPartitionBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/FilterPartitionBenchmark.java
@@ -542,7 +542,7 @@ public List<Long> apply(Cursor input)
             List<Long> longvals = new ArrayList<Long>();
             LongColumnSelector selector = input.makeLongColumnSelector("sumLongSequential");
             while (!input.isDone()) {
-              long rowval = selector.get();
+              long rowval = selector.getLong();
               blackhole.consume(rowval);
               input.advance();
             }

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
@@ -65,7 +65,7 @@ public ApproximateHistogramAggregator(
   @Override
   public void aggregate()
   {
-    histogram.offer(selector.get());
+    histogram.offer(selector.getFloat());
   }
 
   @Override

diff --git a/.../main/java/io/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java b/.../main/java/io/druid/query/aggregation/histogram/ApproximateHistogramBufferAggregator.java
@@ -68,7 +68,7 @@ public void aggregate(ByteBuffer buf, int position)
     mutationBuffer.position(position);
 
     ApproximateHistogram h0 = ApproximateHistogram.fromBytesDense(mutationBuffer);
-    h0.offer(selector.get());
+    h0.offer(selector.getFloat());
 
     mutationBuffer.position(position);
     h0.toBytesDense(mutationBuffer);

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
@@ -82,7 +82,7 @@ public FloatVarianceAggregator(FloatColumnSelector selector)
     @Override
     public void aggregate()
     {
-      holder.add(selector.get());
+      holder.add(selector.getFloat());
     }
   }
 
@@ -99,7 +99,7 @@ public LongVarianceAggregator(LongColumnSelector selector)
     @Override
     public void aggregate()
     {
-      holder.add(selector.get());
+      holder.add(selector.getLong());
     }
   }
 

diff --git a/...ore/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java b/...ore/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java
@@ -98,7 +98,7 @@ public FloatVarianceAggregator(String name, FloatColumnSelector selector)
     @Override
     public void aggregate(ByteBuffer buf, int position)
     {
-      float v = selector.get();
+      float v = selector.getFloat();
       long count = buf.getLong(position + COUNT_OFFSET) + 1;
       double sum = buf.getDouble(position + SUM_OFFSET) + v;
       buf.putLong(position, count);
@@ -130,7 +130,7 @@ public LongVarianceAggregator(String name, LongColumnSelector selector)
     @Override
     public void aggregate(ByteBuffer buf, int position)
     {
-      long v = selector.get();
+      long v = selector.getLong();
       long count = buf.getLong(position + COUNT_OFFSET) + 1;
       double sum = buf.getDouble(position + SUM_OFFSET) + v;
       buf.putLong(position, count);

diff --git a/...ts/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java b/...ts/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
@@ -146,7 +146,7 @@ private static class FloatHandOver extends TestFloatColumnSelector
     float v;
 
     @Override
-    public float get()
+    public float getFloat()
     {
       return v;
     }

diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMaxAggregator.java
@@ -48,7 +48,7 @@ public DoubleMaxAggregator(DoubleColumnSelector selector)
   @Override
   public void aggregate()
   {
-    max = Math.max(max, selector.get());
+    max = Math.max(max, selector.getDouble());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleMinAggregator.java
@@ -48,7 +48,7 @@ public DoubleMinAggregator(DoubleColumnSelector selector)
   @Override
   public void aggregate()
   {
-    min = Math.min(min, (double) selector.get());
+    min = Math.min(min, selector.getDouble());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregator.java
@@ -57,7 +57,7 @@ public DoubleSumAggregator(DoubleColumnSelector selector)
   @Override
   public void aggregate()
   {
-    sum += selector.get();
+    sum += selector.getDouble();
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FloatMaxAggregator.java
@@ -48,7 +48,7 @@ public FloatMaxAggregator(FloatColumnSelector selector)
   @Override
   public void aggregate()
   {
-    max = Math.max(max, selector.get());
+    max = Math.max(max, selector.getFloat());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FloatMinAggregator.java
@@ -48,7 +48,7 @@ public FloatMinAggregator(FloatColumnSelector selector)
   @Override
   public void aggregate()
   {
-    min = Math.min(min, selector.get());
+    min = Math.min(min, selector.getFloat());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/FloatSumAggregator.java
@@ -56,7 +56,7 @@ public FloatSumAggregator(FloatColumnSelector selector)
   @Override
   public void aggregate()
   {
-    sum += selector.get();
+    sum += selector.getFloat();
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregator.java
@@ -53,7 +53,7 @@ public HistogramAggregator(FloatColumnSelector selector, float[] breaks)
   @Override
   public void aggregate()
   {
-    histogram.offer(selector.get());
+    histogram.offer(selector.getFloat());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/HistogramBufferAggregator.java
@@ -57,7 +57,7 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    final float value = selector.get();
+    final float value = selector.getFloat();
     final int minPos = position + minOffset;
     final int maxPos = position + maxOffset;
 

diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMaxAggregator.java
@@ -48,7 +48,7 @@ public LongMaxAggregator(LongColumnSelector selector)
   @Override
   public void aggregate()
   {
-    max = Math.max(max, selector.get());
+    max = Math.max(max, selector.getLong());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMaxBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMaxBufferAggregator.java
@@ -42,6 +42,6 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    buf.putLong(position, Math.max(buf.getLong(position), selector.get()));
+    buf.putLong(position, Math.max(buf.getLong(position), selector.getLong()));
   }
 }
diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMinAggregator.java
@@ -48,7 +48,7 @@ public LongMinAggregator(LongColumnSelector selector)
   @Override
   public void aggregate()
   {
-    min = Math.min(min, selector.get());
+    min = Math.min(min, selector.getLong());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/LongMinBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongMinBufferAggregator.java
@@ -42,6 +42,6 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    buf.putLong(position, Math.min(buf.getLong(position), selector.get()));
+    buf.putLong(position, Math.min(buf.getLong(position), selector.getLong()));
   }
 }
diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
@@ -56,7 +56,7 @@ public LongSumAggregator(LongColumnSelector selector)
   @Override
   public void aggregate()
   {
-    sum += selector.get();
+    sum += selector.getLong();
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java
@@ -42,6 +42,6 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    buf.putLong(position, buf.getLong(position) + selector.get());
+    buf.putLong(position, buf.getLong(position) + selector.getLong());
   }
 }
diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleDoubleBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/SimpleDoubleBufferAggregator.java
@@ -53,7 +53,7 @@ public DoubleColumnSelector getSelector()
   @Override
   public final void aggregate(ByteBuffer buf, int position)
   {
-    aggregate(buf, position, selector.get());
+    aggregate(buf, position, selector.getDouble());
   }
 
   @Override

diff --git a/processing/src/main/java/io/druid/query/aggregation/SimpleFloatBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/SimpleFloatBufferAggregator.java
@@ -53,7 +53,7 @@ public FloatColumnSelector getSelector()
   @Override
   public final void aggregate(ByteBuffer buf, int position)
   {
-    aggregate(buf, position, selector.get());
+    aggregate(buf, position, selector.getFloat());
   }
 
   @Override

diff --git a/...uery/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java b/...uery/aggregation/cardinality/types/DoubleCardinalityAggregatorColumnSelectorStrategy.java
@@ -30,12 +30,12 @@ public class DoubleCardinalityAggregatorColumnSelectorStrategy implements Cardin
   @Override
   public void hashRow(DoubleColumnSelector dimSelector, Hasher hasher)
   {
-    hasher.putDouble(dimSelector.get());
+    hasher.putDouble(dimSelector.getDouble());
   }
 
   @Override
   public void hashValues(DoubleColumnSelector dimSelector, HyperLogLogCollector collector)
   {
-    collector.add(CardinalityAggregator.hashFn.hashLong(Double.doubleToLongBits(dimSelector.get())).asBytes());
+    collector.add(CardinalityAggregator.hashFn.hashLong(Double.doubleToLongBits(dimSelector.getDouble())).asBytes());
   }
 }
diff --git a/...query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java b/...query/aggregation/cardinality/types/FloatCardinalityAggregatorColumnSelectorStrategy.java
@@ -30,12 +30,12 @@ public class FloatCardinalityAggregatorColumnSelectorStrategy
   @Override
   public void hashRow(FloatColumnSelector dimSelector, Hasher hasher)
   {
-    hasher.putFloat(dimSelector.get());
+    hasher.putFloat(dimSelector.getFloat());
   }
 
   @Override
   public void hashValues(FloatColumnSelector dimSelector, HyperLogLogCollector collector)
   {
-    collector.add(CardinalityAggregator.hashFn.hashInt(Float.floatToIntBits(dimSelector.get())).asBytes());
+    collector.add(CardinalityAggregator.hashFn.hashInt(Float.floatToIntBits(dimSelector.getFloat())).asBytes());
   }
 }
diff --git a/.../query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java b/.../query/aggregation/cardinality/types/LongCardinalityAggregatorColumnSelectorStrategy.java
@@ -30,12 +30,12 @@ public class LongCardinalityAggregatorColumnSelectorStrategy
   @Override
   public void hashRow(LongColumnSelector dimSelector, Hasher hasher)
   {
-    hasher.putLong(dimSelector.get());
+    hasher.putLong(dimSelector.getLong());
   }
 
   @Override
   public void hashValues(LongColumnSelector dimSelector, HyperLogLogCollector collector)
   {
-    collector.add(CardinalityAggregator.hashFn.hashLong(dimSelector.get()).asBytes());
+    collector.add(CardinalityAggregator.hashFn.hashLong(dimSelector.getLong()).asBytes());
   }
 }
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
@@ -50,10 +50,10 @@ public DoubleFirstAggregator(
   @Override
   public void aggregate()
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     if (time < firstTime) {
       firstTime = time;
-      firstValue = valueSelector.get();
+      firstValue = valueSelector.getDouble();
     }
   }
 

diff --git a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstBufferAggregator.java
@@ -48,11 +48,11 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     long firstTime = buf.getLong(position);
     if (time < firstTime) {
       buf.putLong(position, time);
-      buf.putDouble(position + Long.BYTES, valueSelector.get());
+      buf.putDouble(position + Long.BYTES, valueSelector.getDouble());
     }
   }
 

diff --git a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java b/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregator.java
@@ -50,10 +50,10 @@ public FloatFirstAggregator(
   @Override
   public void aggregate()
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     if (time < firstTime) {
       firstTime = time;
-      firstValue = valueSelector.get();
+      firstValue = valueSelector.getFloat();
     }
   }
 

diff --git a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstBufferAggregator.java
@@ -48,11 +48,11 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     long firstTime = buf.getLong(position);
     if (time < firstTime) {
       buf.putLong(position, time);
-      buf.putFloat(position + Long.BYTES, valueSelector.get());
+      buf.putFloat(position + Long.BYTES, valueSelector.getFloat());
     }
   }
 

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
@@ -49,10 +49,10 @@ public LongFirstAggregator(
   @Override
   public void aggregate()
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     if (time < firstTime) {
       firstTime = time;
-      firstValue = valueSelector.get();
+      firstValue = valueSelector.getLong();
     }
   }
 

diff --git a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/first/LongFirstBufferAggregator.java
@@ -48,11 +48,11 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     long firstTime = buf.getLong(position);
     if (time < firstTime) {
       buf.putLong(position, time);
-      buf.putLong(position + Longs.BYTES, valueSelector.get());
+      buf.putLong(position + Longs.BYTES, valueSelector.getLong());
     }
   }
 

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
@@ -50,10 +50,10 @@ public DoubleLastAggregator(
   @Override
   public void aggregate()
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     if (time >= lastTime) {
-      lastTime = timeSelector.get();
-      lastValue = valueSelector.get();
+      lastTime = time;
+      lastValue = valueSelector.getDouble();
     }
   }
 

diff --git a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastBufferAggregator.java
@@ -48,11 +48,11 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     long lastTime = buf.getLong(position);
     if (time >= lastTime) {
       buf.putLong(position, time);
-      buf.putDouble(position + Long.BYTES, valueSelector.get());
+      buf.putDouble(position + Long.BYTES, valueSelector.getDouble());
     }
   }
 

diff --git a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java b/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregator.java
@@ -48,10 +48,10 @@ public FloatLastAggregator(
   @Override
   public void aggregate()
   {
-    long time = timeSelector.get();
+    long time = timeSelector.getLong();
     if (time >= lastTime) {
-      lastTime = timeSelector.get();
-      lastValue = valueSelector.get();
+      lastTime = time;
+      lastValue = valueSelector.getFloat();
     }
   }