Add ObjectColumnSelector's methods to ColumnValueSelector interface

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

@@ -65,7 +65,7 @@ public TimestampAggregator(
   @Override
   public void aggregate()
   {
-    Long value = TimestampAggregatorFactory.convertLong(timestampSpec, selector.get());
+    Long value = TimestampAggregatorFactory.convertLong(timestampSpec, selector.getObject());
 
     if (value != null) {
       most = comparator.compare(most, value) > 0 ? most : value;

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

@@ -106,7 +106,7 @@ public void reset(ColumnValueSelector selector)
       private long getTimestamp(ColumnValueSelector selector)
       {
         if (selector instanceof ObjectColumnSelector) {
-          Object input = ((ObjectColumnSelector) selector).get();
+          Object input = ((ObjectColumnSelector) selector).getObject();
           return convertLong(timestampSpec, input);
         } else {
           return selector.getLong();

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

@@ -54,7 +54,7 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    Long newTime = TimestampAggregatorFactory.convertLong(timestampSpec, selector.get());
+    Long newTime = TimestampAggregatorFactory.convertLong(timestampSpec, selector.getObject());
     if (newTime != null) {
       long prev = buf.getLong(position);
       buf.putLong(position, comparator.compare(prev, newTime) > 0 ? prev : newTime);

extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java

@@ -81,7 +81,7 @@ public Class classOfObject()
         }
 
         @Override
-        public Map get()
+        public Map getObject()
         {
           final IndexedInts keyIndices = keySelector.getRow();
           final IndexedInts valueIndices = valueSelector.getRow();
@@ -116,7 +116,7 @@ public Class classOfObject()
         }
 
         @Override
-        public String get()
+        public String getObject()
         {
           final IndexedInts keyIndices = keySelector.getRow();
           final IndexedInts valueIndices = valueSelector.getRow();
@@ -142,7 +142,7 @@ public Class classOfObject()
         }
 
         @Override
-        public String get()
+        public String getObject()
         {
           final IndexedInts keyIndices = keySelector.getRow();
           final IndexedInts valueIndices = valueSelector.getRow();

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

@@ -43,7 +43,7 @@ public SketchAggregator(ObjectColumnSelector selector, int size)
   @Override
   public void aggregate()
   {
-    Object update = selector.get();
+    Object update = selector.getObject();
     if (update == null) {
       return;
     }

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

@@ -123,7 +123,7 @@ public void reset(ColumnValueSelector selector)
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        SketchHolder other = ((ObjectColumnSelector<SketchHolder>) selector).get();
+        SketchHolder other = ((ObjectColumnSelector<SketchHolder>) selector).getObject();
         // SketchAggregatorFactory.combine() delegates to SketchHolder.combine() and it doesn't check for nulls, so we
         // neither.
         other.updateUnion(union);
@@ -138,7 +138,7 @@ public Class<SketchHolder> classOfObject()
 
       @Nullable
       @Override
-      public SketchHolder get()
+      public SketchHolder getObject()
       {
         return combined;
       }

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

@@ -58,7 +58,7 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    Object update = selector.get();
+    Object update = selector.getObject();
     if (update == null) {
       return;
     }

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

@@ -128,15 +128,15 @@ public AggregateCombiner makeAggregateCombiner()
       public void reset(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        ApproximateHistogram first = ((ObjectColumnSelector<ApproximateHistogram>) selector).get();
+        ApproximateHistogram first = ((ObjectColumnSelector<ApproximateHistogram>) selector).getObject();
         combined.copy(first);
       }
 
       @Override
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        ApproximateHistogram other = ((ObjectColumnSelector<ApproximateHistogram>) selector).get();
+        ApproximateHistogram other = ((ObjectColumnSelector<ApproximateHistogram>) selector).getObject();
         combined.foldFast(other);
       }
 
@@ -148,7 +148,7 @@ public Class<ApproximateHistogram> classOfObject()
 
       @Nullable
       @Override
-      public ApproximateHistogram get()
+      public ApproximateHistogram getObject()
       {
         return combined;
       }

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

@@ -54,7 +54,7 @@ public ApproximateHistogramFoldingAggregator(
   @Override
   public void aggregate()
   {
-    ApproximateHistogram h = selector.get();
+    ApproximateHistogram h = selector.getObject();
     if (h == null) {
       return;
     }

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

@@ -70,7 +70,7 @@ public Class<ApproximateHistogram> classOfObject()
         }
 
         @Override
-        public ApproximateHistogram get()
+        public ApproximateHistogram getObject()
         {
           return new ApproximateHistogram(0);
         }
@@ -111,7 +111,7 @@ public Class<ApproximateHistogram> classOfObject()
         }
 
         @Override
-        public ApproximateHistogram get()
+        public ApproximateHistogram getObject()
         {
           return new ApproximateHistogram(0);
         }

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

@@ -71,7 +71,7 @@ public void aggregate(ByteBuffer buf, int position)
     ApproximateHistogram h0 = ApproximateHistogram.fromBytesDense(mutationBuffer);
     h0.setLowerLimit(lowerLimit);
     h0.setUpperLimit(upperLimit);
-    ApproximateHistogram hNext = selector.get();
+    ApproximateHistogram hNext = selector.getObject();
     h0.foldFast(hNext, tmpBufferP, tmpBufferB);
 
     mutationBuffer.position(position);

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

@@ -116,7 +116,7 @@ public ObjectVarianceAggregator(ObjectColumnSelector selector)
     @Override
     public void aggregate()
     {
-      VarianceAggregatorCollector.combineValues(holder, selector.get());
+      VarianceAggregatorCollector.combineValues(holder, selector.getObject());
     }
   }
 }

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

@@ -157,15 +157,15 @@ public AggregateCombiner makeAggregateCombiner()
       public void reset(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        VarianceAggregatorCollector first = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).get();
+        VarianceAggregatorCollector first = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).getObject();
         combined.copyFrom(first);
       }
 
       @Override
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        VarianceAggregatorCollector other = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).get();
+        VarianceAggregatorCollector other = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).getObject();
         combined.fold(other);
       }
 
@@ -176,7 +176,7 @@ public Class<VarianceAggregatorCollector> classOfObject()
       }
 
       @Override
-      public VarianceAggregatorCollector get()
+      public VarianceAggregatorCollector getObject()
       {
         return combined;
       }

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

@@ -162,7 +162,7 @@ public ObjectVarianceAggregator(String name, ObjectColumnSelector selector)
     @Override
     public void aggregate(ByteBuffer buf, int position)
     {
-      VarianceAggregatorCollector holder2 = (VarianceAggregatorCollector) selector.get();
+      VarianceAggregatorCollector holder2 = (VarianceAggregatorCollector) selector.getObject();
 
       long count = buf.getLong(position + COUNT_OFFSET);
       if (count == 0) {

extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java

@@ -163,7 +163,7 @@ public Class classOfObject()
     }
 
     @Override
-    public Object get()
+    public Object getObject()
     {
       return v;
     }

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

@@ -38,14 +38,14 @@
  * @see DoubleAggregateCombiner
  * @see ObjectAggregateCombiner
  */
-public interface AggregateCombiner extends ColumnValueSelector
+public interface AggregateCombiner<T> extends ColumnValueSelector<T>
 {
   /**
    * Resets this AggregateCombiner's state value to the value of the given selector, e. g. after calling this method
    * combiner.get*() should return the same value as selector.get*().
    *
    * If the selector is an {@link io.druid.segment.ObjectColumnSelector}, the object returned from {@link
-   * io.druid.segment.ObjectColumnSelector#get()} must not be modified, and must not become a subject for modification
+   * io.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not become a subject for modification
    * during subsequent {@link #fold} calls.
    */
   void reset(ColumnValueSelector selector);
@@ -57,7 +57,7 @@ public interface AggregateCombiner extends ColumnValueSelector
    * aggregatorFactory.combine(combiner.get*(), selector.get*())} call.
    *
    * Unlike {@link AggregatorFactory#combine}, if the selector is an {@link io.druid.segment.ObjectColumnSelector}, the
-   * object returned from {@link io.druid.segment.ObjectColumnSelector#get()} must not be modified, and must not become
+   * object returned from {@link io.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not become
    * a subject for modification during subsequent fold() calls.
    *
    * Since the state of AggregateCombiner is undefined before {@link #reset} is ever called on it, the effects of

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

@@ -25,7 +25,7 @@
 /**
  * Specialization of {@link AggregateCombiner} for primitive double aggregations.
  */
-public abstract class DoubleAggregateCombiner implements AggregateCombiner, DoubleColumnSelector
+public abstract class DoubleAggregateCombiner implements AggregateCombiner<Double>, DoubleColumnSelector
 {
   @Override
   public void inspectRuntimeShape(RuntimeShapeInspector inspector)

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

@@ -104,7 +104,7 @@ public AggregateCombiner makeAggregateCombiner()
       public void reset(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        Histogram first = ((ObjectColumnSelector<Histogram>) selector).get();
+        Histogram first = ((ObjectColumnSelector<Histogram>) selector).getObject();
         if (combined == null) {
           combined = new Histogram(first);
         } else {
@@ -116,7 +116,7 @@ public void reset(ColumnValueSelector selector)
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        Histogram other = ((ObjectColumnSelector<Histogram>) selector).get();
+        Histogram other = ((ObjectColumnSelector<Histogram>) selector).getObject();
         combined.fold(other);
       }
 
@@ -128,7 +128,7 @@ public Class<Histogram> classOfObject()
 
       @Nullable
       @Override
-      public Histogram get()
+      public Histogram getObject()
       {
         return combined;
       }

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

@@ -347,7 +347,7 @@ public double aggregate(final double current, final ObjectColumnSelector[] selec
         for (int i = 0; i < size; i++) {
           final ObjectColumnSelector selector = selectorList[i];
           if (selector != null) {
-            final Object arg = selector.get();
+            final Object arg = selector.getObject();
             if (arg != null && arg.getClass().isArray()) {
               // Context.javaToJS on an array sort of works, although it returns false for Array.isArray(...) and
               // may have other issues too. Let's just copy the array and wrap that.

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

@@ -25,7 +25,7 @@
 /**
  * Specialization of {@link AggregateCombiner} for primitive long aggregations.
  */
-public abstract class LongAggregateCombiner implements AggregateCombiner, LongColumnSelector
+public abstract class LongAggregateCombiner implements AggregateCombiner<Long>, LongColumnSelector
 {
   @Override
   public void inspectRuntimeShape(RuntimeShapeInspector inspector)

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

@@ -24,6 +24,6 @@
 /**
  * Specialization of {@link AggregateCombiner} for object aggregations.
  */
-public abstract class ObjectAggregateCombiner<T> implements AggregateCombiner, ObjectColumnSelector<T>
+public abstract class ObjectAggregateCombiner<T> implements AggregateCombiner<T>, ObjectColumnSelector<T>
 {
 }

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

@@ -42,7 +42,7 @@ public void reset(ColumnValueSelector selector)
   public void fold(ColumnValueSelector selector)
   {
     @SuppressWarnings("unchecked")
-    HyperLogLogCollector other = ((ObjectColumnSelector<HyperLogLogCollector>) selector).get();
+    HyperLogLogCollector other = ((ObjectColumnSelector<HyperLogLogCollector>) selector).getObject();
     if (other == null) {
       return;
     }
@@ -60,7 +60,7 @@ public Class<HyperLogLogCollector> classOfObject()
 
   @Nullable
   @Override
-  public HyperLogLogCollector get()
+  public HyperLogLogCollector getObject()
   {
     return combined;
   }

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

@@ -124,7 +124,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.get();
+            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.getObject();
             if (pair.lhs < firstTime) {
               firstTime = pair.lhs;
               firstValue = pair.rhs;
@@ -142,7 +142,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.get();
+            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.getObject();
             long firstTime = buf.getLong(position);
             if (pair.lhs < firstTime) {
               buf.putLong(position, pair.lhs);

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

@@ -124,7 +124,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.get();
+            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.getObject();
             if (pair.lhs < firstTime) {
               firstTime = pair.lhs;
               firstValue = pair.rhs;
@@ -142,7 +142,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.get();
+            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.getObject();
             long firstTime = buf.getLong(position);
             if (pair.lhs < firstTime) {
               buf.putLong(position, pair.lhs);

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

@@ -117,7 +117,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.get();
+            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.getObject();
             if (pair.lhs < firstTime) {
               firstTime = pair.lhs;
               firstValue = pair.rhs;
@@ -135,7 +135,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.get();
+            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.getObject();
             long firstTime = buf.getLong(position);
             if (pair.lhs < firstTime) {
               buf.putLong(position, pair.lhs);

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

@@ -43,7 +43,7 @@ public HyperUniquesAggregator(
   @Override
   public void aggregate()
   {
-    collector.fold((HyperLogLogCollector) selector.get());
+    collector.fold((HyperLogLogCollector) selector.getObject());
   }
 
   @Override

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

@@ -51,7 +51,7 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    HyperLogLogCollector collector = (HyperLogLogCollector) selector.get();
+    HyperLogLogCollector collector = (HyperLogLogCollector) selector.getObject();
 
     if (collector == null) {
       return;