remove date histogram boolean support

not-napoleon · Dec 11, 2024 · bbc27d8 · bbc27d8
1 parent 912d37a
commit bbc27d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 47 deletions.
diff --git a/...rg/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java b/...rg/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java
@@ -42,49 +42,6 @@ public static void registerAggregators(ValuesSourceRegistry.Builder builder) {
         );
 
         builder.register(DateHistogramAggregationBuilder.REGISTRY_KEY, CoreValuesSourceType.RANGE, DateRangeHistogramAggregator::new, true);
-
-        builder.register(
-            DateHistogramAggregationBuilder.REGISTRY_KEY,
-            CoreValuesSourceType.BOOLEAN,
-            (
-                name,
-                factories,
-                rounding,
-                order,
-                keyed,
-                minDocCount,
-                downsampledResultsOffset,
-                extendedBounds,
-                hardBounds,
-                valuesSourceConfig,
-                context,
-                parent,
-                cardinality,
-                metadata) -> {
-                DEPRECATION_LOGGER.warn(
-                    DeprecationCategory.AGGREGATIONS,
-                    "date-histogram-boolean",
-                    "Running DateHistogram aggregations on [boolean] fields is deprecated"
-                );
-                return DateHistogramAggregator.build(
-                    name,
-                    factories,
-                    rounding,
-                    order,
-                    keyed,
-                    minDocCount,
-                    downsampledResultsOffset,
-                    extendedBounds,
-                    hardBounds,
-                    valuesSourceConfig,
-                    context,
-                    parent,
-                    cardinality,
-                    metadata
-                );
-            },
-            true
-        );
     }
 
     private final DateHistogramAggregationSupplier aggregatorSupplier;

diff --git a/.../org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java b/.../org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java
@@ -83,9 +83,9 @@ public class DateHistogramAggregatorTests extends DateHistogramAggregatorTestCas
         "2017-12-12T22:55:46"
     );
 
-    public void testBooleanFieldDeprecated() throws IOException {
+    public void testBooleanFieldUnsupported() throws IOException {
         final String fieldName = "bogusBoolean";
-        testCase(iw -> {
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> testCase(iw -> {
             Document d = new Document();
             d.add(new SortedNumericDocValuesField(fieldName, 0));
             iw.addDocument(d);
@@ -95,8 +95,8 @@ public void testBooleanFieldDeprecated() throws IOException {
                 new DateHistogramAggregationBuilder("name").calendarInterval(DateHistogramInterval.HOUR).field(fieldName),
                 new BooleanFieldMapper.BooleanFieldType(fieldName)
             )
-        );
-        assertWarnings("Running DateHistogram aggregations on [boolean] fields is deprecated");
+        ));
+        assertThat(e.getMessage(), equalTo("Field [bogusBoolean] of type [boolean] is not supported for aggregation [date_histogram]"));
     }
 
     public void testMatchNoDocs() throws IOException {