Add long/float ColumnSelectorStrategy implementations (apache#3838)

* Add long/float ColumnSelectorStrategy implementations * Address PR comments * Add String strategy with internal dictionary to V2 groupby, remove dict from numeric wrapping selectors, more tests * PR comments * Use BaseSingleValueDimensionSelector for long/float wrapping * remove unused import * Address PR comments * PR comments * PR comments * More PR comments * Fix failing calcite histogram subquery tests * ScanQuery test and comment about isInputRaw * Add outputType to extractionDimensionSpec, tweak SQL tests * Fix limit spec optimization for numerics * Add cardinality sanity checks to TopN * Fix import from merge * Add tests for filtered dimension spec outputType * Address PR comments * Allow filtered dimspecs on numerics * More comments
vogali · Feb 9, 2017 · ca2b04f · ca2b04f
1 parent e08cd00
commit ca2b04f
Show file tree

Hide file tree

Showing 113 changed files with 10,167 additions and 866 deletions.
diff --git a/benchmarks/src/main/java/io/druid/benchmark/DimensionPredicateFilterBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/DimensionPredicateFilterBenchmark.java
@@ -29,6 +29,7 @@
 import io.druid.collections.bitmap.RoaringBitmapFactory;
 import io.druid.collections.spatial.ImmutableRTree;
 import io.druid.query.filter.BitmapIndexSelector;
+import io.druid.query.filter.DruidFloatPredicate;
 import io.druid.query.filter.DruidLongPredicate;
 import io.druid.query.filter.DruidPredicateFactory;
 import io.druid.segment.column.BitmapIndex;
@@ -86,14 +87,13 @@ public boolean apply(String input)
         @Override
         public DruidLongPredicate makeLongPredicate()
         {
-          return new DruidLongPredicate()
-          {
-            @Override
-            public boolean applyLong(long input)
-            {
-              return false;
-            }
-          };
+          return DruidLongPredicate.ALWAYS_FALSE;
+        }
+
+        @Override
+        public DruidFloatPredicate makeFloatPredicate()
+        {
+          return DruidFloatPredicate.ALWAYS_FALSE;
         }
       },
       null

diff --git a/benchmarks/src/main/java/io/druid/benchmark/FilterPartitionBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/FilterPartitionBenchmark.java
@@ -46,6 +46,7 @@
 import io.druid.query.filter.BitmapIndexSelector;
 import io.druid.query.filter.BoundDimFilter;
 import io.druid.query.filter.DimFilter;
+import io.druid.query.filter.DruidFloatPredicate;
 import io.druid.query.filter.DruidLongPredicate;
 import io.druid.query.filter.DruidPredicateFactory;
 import io.druid.query.filter.Filter;
@@ -626,14 +627,13 @@ public boolean apply(String input)
           @Override
           public DruidLongPredicate makeLongPredicate()
           {
-            return new DruidLongPredicate()
-            {
-              @Override
-              public boolean applyLong(long input)
-              {
-                return false;
-              }
-            };
+            return DruidLongPredicate.ALWAYS_FALSE;
+          }
+
+          @Override
+          public DruidFloatPredicate makeFloatPredicate()
+          {
+            return DruidFloatPredicate.ALWAYS_FALSE;
           }
         };