Unmute testSupportedFieldTypes, fix Percentiles/Ranks/Terms tests (#5…

…2734) Also fixes Percentiles which was incorrectly specified to only accept numeric, but in fact also accepts Boolean and Date (because those are numeric on master - thanks `testSupportedFieldTypes` for catching it!)
elastic · Feb 26, 2020 · 898fc70 · 898fc70
1 parent 678164b
commit 898fc70
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 20 deletions.
diff --git a/...main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregatorFactory.java b/...main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregatorFactory.java
@@ -50,7 +50,7 @@ class PercentilesAggregatorFactory extends ValuesSourceAggregatorFactory {
 
     static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
         valuesSourceRegistry.register(PercentilesAggregationBuilder.NAME,
-            List.of(CoreValuesSourceType.NUMERIC, CoreValuesSourceType.HISTOGRAM),
+            List.of(CoreValuesSourceType.NUMERIC, CoreValuesSourceType.HISTOGRAM, CoreValuesSourceType.DATE, CoreValuesSourceType.BOOLEAN),
             new PercentilesAggregatorSupplier() {
                 @Override
                 public Aggregator build(String name, ValuesSource valuesSource, SearchContext context, Aggregator parent,

diff --git a/...rc/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/...rc/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java
@@ -132,7 +132,10 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
     @Override
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
         return List.of(CoreValuesSourceType.NUMERIC,
-            CoreValuesSourceType.BYTES);
+            CoreValuesSourceType.BYTES,
+            CoreValuesSourceType.IP,
+            CoreValuesSourceType.DATE,
+            CoreValuesSourceType.BOOLEAN);
     }
 
     public void testGlobalOrdinalsExecutionHint() throws Exception {

diff --git a/...java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java b/...java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java
@@ -53,7 +53,9 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
 
     @Override
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
-        return List.of(CoreValuesSourceType.NUMERIC);
+        return List.of(CoreValuesSourceType.NUMERIC,
+            CoreValuesSourceType.DATE,
+            CoreValuesSourceType.BOOLEAN);
     }
 
     public void testEmpty() throws IOException {

diff --git a/...est/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java b/...est/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java
@@ -66,7 +66,10 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
 
     @Override
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
-        return List.of(CoreValuesSourceType.NUMERIC);
+        return List.of(CoreValuesSourceType.NUMERIC,
+            CoreValuesSourceType.DATE,
+            CoreValuesSourceType.BOOLEAN,
+            CoreValuesSourceType.HISTOGRAM);
     }
 
     public void testNoDocs() throws IOException {

diff --git a/.../org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksAggregatorTests.java b/.../org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksAggregatorTests.java
@@ -53,7 +53,9 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
 
     @Override
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
-        return List.of(CoreValuesSourceType.NUMERIC);
+        return List.of(CoreValuesSourceType.NUMERIC,
+            CoreValuesSourceType.DATE,
+            CoreValuesSourceType.BOOLEAN);
     }
 
     public void testEmpty() throws IOException {

diff --git a/...java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesAggregatorTests.java b/...java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesAggregatorTests.java
@@ -59,7 +59,10 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
 
     @Override
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
-        return List.of(CoreValuesSourceType.NUMERIC);
+        return List.of(CoreValuesSourceType.NUMERIC,
+            CoreValuesSourceType.DATE,
+            CoreValuesSourceType.BOOLEAN,
+            CoreValuesSourceType.HISTOGRAM);
     }
 
     public void testNoDocs() throws IOException {

diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java
@@ -63,15 +63,12 @@
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
 import org.elasticsearch.index.mapper.BinaryFieldMapper;
-import org.elasticsearch.index.mapper.BooleanFieldMapper;
 import org.elasticsearch.index.mapper.CompletionFieldMapper;
 import org.elasticsearch.index.mapper.ContentPath;
-import org.elasticsearch.index.mapper.DateFieldMapper;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.FieldAliasMapper;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.GeoShapeFieldMapper;
-import org.elasticsearch.index.mapper.IpFieldMapper;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.Mapper.BuilderContext;
@@ -617,7 +614,6 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
      *
      * Exception types/messages are not currently checked, just presence/absence of an exception.
      */
-    @AwaitsFix(bugUrl = "Muted until we can tweak Date/IP/Boolean")
     public final void testSupportedFieldTypes() throws IOException {
         MapperRegistry mapperRegistry = new IndicesModule(Collections.emptyList()).getMapperRegistry();
         Settings settings = Settings.builder().put("index.version.created", Version.CURRENT.id).build();
@@ -689,12 +685,7 @@ private void writeTestDoc(MappedFieldType fieldType, String fieldName, RandomInd
         ValuesSourceType vst = fieldType.getValuesSourceType();
 
         if (vst.equals(CoreValuesSourceType.NUMERIC)) {
-            // TODO note: once VS refactor adds DATE/BOOLEAN, this conditional will go away
-            if (typeName.equals(DateFieldMapper.CONTENT_TYPE) || typeName.equals(DateFieldMapper.DATE_NANOS_CONTENT_TYPE)) {
-                iw.addDocument(singleton(new SortedNumericDocValuesField(fieldName, randomNonNegativeLong())));
-            } else if (typeName.equals(BooleanFieldMapper.CONTENT_TYPE)) {
-                iw.addDocument(singleton(new SortedNumericDocValuesField(fieldName, randomBoolean() ? 0 : 1)));
-            } else if (typeName.equals(NumberFieldMapper.NumberType.DOUBLE.typeName())) {
+            if (typeName.equals(NumberFieldMapper.NumberType.DOUBLE.typeName())) {
                 long encoded = NumericUtils.doubleToSortableLong(Math.abs(randomDouble()));
                 iw.addDocument(singleton(new SortedNumericDocValuesField(fieldName, encoded)));
             } else if (typeName.equals(NumberFieldMapper.NumberType.FLOAT.typeName())) {
@@ -709,13 +700,16 @@ private void writeTestDoc(MappedFieldType fieldType, String fieldName, RandomInd
         } else if (vst.equals(CoreValuesSourceType.BYTES)) {
             if (typeName.equals(BinaryFieldMapper.CONTENT_TYPE)) {
                 iw.addDocument(singleton(new BinaryFieldMapper.CustomBinaryDocValuesField(fieldName, new BytesRef("a").bytes)));
-            } else if (typeName.equals(IpFieldMapper.CONTENT_TYPE)) {
-                // TODO note: once VS refactor adds IP, this conditional will go away
-                boolean v4 = randomBoolean();
-                iw.addDocument(singleton(new SortedSetDocValuesField(fieldName, new BytesRef(InetAddressPoint.encode(randomIp(v4))))));
             } else {
                 iw.addDocument(singleton(new SortedSetDocValuesField(fieldName, new BytesRef("a"))));
             }
+        } else if (vst.equals(CoreValuesSourceType.DATE)) {
+            iw.addDocument(singleton(new SortedNumericDocValuesField(fieldName, randomNonNegativeLong())));
+        } else if (vst.equals(CoreValuesSourceType.BOOLEAN)) {
+            iw.addDocument(singleton(new SortedNumericDocValuesField(fieldName, randomBoolean() ? 0 : 1)));
+        } else if (vst.equals(CoreValuesSourceType.IP)) {
+            boolean v4 = randomBoolean();
+            iw.addDocument(singleton(new SortedSetDocValuesField(fieldName, new BytesRef(InetAddressPoint.encode(randomIp(v4))))));
         } else if (vst.equals(CoreValuesSourceType.RANGE)) {
             Object start;
             Object end;