Skip to content

Commit 1a709ca

Browse files
csoulioscsoulios
authored
[TSDB] Removed summary and histogram metric types (#89937)
It seems that for now we don't have a good use for the histogram and summary metric types. They had been left as place holders for a while, but at this point there is no concrete plan forward for them. This PR removes the histogram and summary metric types. We may add them back in the future. Also, this PR completely removes the time_series_metric mapping parameter from the histogram field type and only allows the gauge metric type for aggregate_metric_double fields.
1 parent 7154765 commit 1a709ca

File tree

23 files changed

+38
-222
lines changed

23 files changed

+38
-222
lines changed

‎docs/reference/data-streams/tsds.asciidoc

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ A TSDS document is uniquely identified by its time series and timestamp, both of
8989
which are used to generate the document `_id`. So, two documents with the same
9090
dimensions and the same timestamp are considered to be duplicates. When you use
9191
the `_bulk` endpoint to add documents to a TSDS, a second document with the same
92-
timestamp and dimensions overwrites the first. When you use the
92+
timestamp and dimensions overwrites the first. When you use the
9393
`PUT /<target>/_create/<_id>` format to add an individual document and a document
9494
with the same `_id` already exists, an error is generated.
9595

@@ -105,16 +105,16 @@ parameter:
105105
* <<number,`long`>>
106106
* <<number,`unsigned_long`>>
107107

108-
[[dimension-limits]]
109-
.Dimension limits
110-
****
108+
[[dimension-limits]]
109+
.Dimension limits
110+
****
111111
In a TSDS, {es} uses dimensions to
112112
generate the document `_id` and <<tsid,`_tsid`>> values. The resulting `_id` is
113113
always a short encoded hash. To prevent the `_tsid` value from being overly
114114
large, {es} limits the number of dimensions for an index using the
115115
<<index-mapping-dimension-fields-limit,`index.mapping.dimension_fields.limit`>>
116116
index setting. While you can increase this limit, the resulting document `_tsid`
117-
value can't exceed 32KB.
117+
value can't exceed 32KB.
118118
****
119119

120120
[discrete]
@@ -157,20 +157,6 @@ available disk space.
157157
Only numeric and `aggregate_metric_double` fields support the `gauge` metric
158158
type.
159159
160-
// tag::time-series-metric-histogram[]
161-
`histogram`:: A pair of numeric arrays that measure the distribution of values
162-
across predefined buckets. For example, server response times by percentile.
163-
// end::time-series-metric-histogram[]
164-
+
165-
Only `histogram` fields support the `histogram` metric type.
166-
167-
// tag::time-series-metric-summary[]
168-
`summary`:: An array of aggregated values, such as `sum`, `avg`, `value_count`,
169-
`min`, and `max`.
170-
// end::time-series-metric-summary[]
171-
+
172-
Only `aggregate_metric_double` fields support the `gauge` metric type.
173-
174160
// tag::time-series-metric-null[]
175161
`null` (Default):: Not a time series metric.
176162
// end::time-series-metric-null[]
@@ -303,4 +289,4 @@ Now that you know the basics, you're ready to <<set-up-tsds,create a TSDS>> or
303289
<<set-up-tsds,convert an existing data stream to a TSDS>>.
304290

305291
include::set-up-tsds.asciidoc[]
306-
include::tsds-index-settings.asciidoc[]
292+
include::tsds-index-settings.asciidoc[]

‎docs/reference/mapping/types/aggregate-metric-double.asciidoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ include::numeric.asciidoc[tag=time_series_metric]
6464
.Valid `time_series_metric` values for `aggregate_metric_double` fields
6565
[%collapsible%open]
6666
====
67-
include::{es-repo-dir}/data-streams/tsds.asciidoc[tag=time-series-metric-counter]
6867
6968
include::{es-repo-dir}/data-streams/tsds.asciidoc[tag=time-series-metric-gauge]
7069
71-
include::{es-repo-dir}/data-streams/tsds.asciidoc[tag=time-series-metric-summary]
72-
7370
include::{es-repo-dir}/data-streams/tsds.asciidoc[tag=time-series-metric-null]
7471
====
7572

‎docs/reference/mapping/types/histogram.asciidoc

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,6 @@ per document. Nested arrays are not supported.
2424
========
2525

2626
[role="child_attributes"]
27-
[[histogram-params]]
28-
==== Parameters
29-
30-
ifeval::["{release-state}"=="unreleased"]
31-
`time_series_metric`::
32-
preview:[] (Optional, string)
33-
include::numeric.asciidoc[tag=time_series_metric]
34-
+
35-
.Valid `time_series_metric` values for `histogram` fields
36-
[%collapsible%open]
37-
====
38-
include::{es-repo-dir}/data-streams/tsds.asciidoc[tag=time-series-metric-histogram]
39-
40-
include::{es-repo-dir}/data-streams/tsds.asciidoc[tag=time-series-metric-null]
41-
====
42-
endif::[]
43-
4427
[[histogram-uses]]
4528
==== Uses
4629

‎server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesParams.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ private TimeSeriesParams() {}
2424

2525
public enum MetricType {
2626
gauge(new String[] { "max", "min", "value_count", "sum" }),
27-
counter(new String[] { "last_value" }),
28-
histogram(new String[] { "value_count" }), // TODO Add more aggs
29-
summary(new String[] { "value_count", "sum", "min", "max" });
27+
counter(new String[] { "last_value" });
3028

3129
private final String[] supportedAggs;
3230

‎x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.elasticsearch.index.mapper.SourceLoader;
3636
import org.elasticsearch.index.mapper.SourceValueFetcher;
3737
import org.elasticsearch.index.mapper.TextSearchInfo;
38-
import org.elasticsearch.index.mapper.TimeSeriesParams;
3938
import org.elasticsearch.index.mapper.ValueFetcher;
4039
import org.elasticsearch.index.query.SearchExecutionContext;
4140
import org.elasticsearch.script.field.DocValuesScriptFieldFactory;
@@ -74,12 +73,6 @@ public static class Builder extends FieldMapper.Builder {
7473
private final Parameter<Map<String, String>> meta = Parameter.metaParam();
7574
private final Parameter<Explicit<Boolean>> ignoreMalformed;
7675

77-
/**
78-
* Parameter that marks this field as a time series metric defining its time series metric type.
79-
* For {@link HistogramFieldMapper} fields only the histogram metric type is supported.
80-
*/
81-
private final Parameter<TimeSeriesParams.MetricType> metric;
82-
8376
public Builder(String name, boolean ignoreMalformedByDefault) {
8477
super(name);
8578
this.ignoreMalformed = Parameter.explicitBoolParam(
@@ -88,20 +81,18 @@ public Builder(String name, boolean ignoreMalformedByDefault) {
8881
m -> toType(m).ignoreMalformed,
8982
ignoreMalformedByDefault
9083
);
91-
92-
this.metric = TimeSeriesParams.metricParam(m -> toType(m).metricType, TimeSeriesParams.MetricType.histogram);
9384
}
9485

9586
@Override
9687
protected Parameter<?>[] getParameters() {
97-
return new Parameter<?>[] { ignoreMalformed, meta, metric };
88+
return new Parameter<?>[] { ignoreMalformed, meta };
9889
}
9990

10091
@Override
10192
public HistogramFieldMapper build(MapperBuilderContext context) {
10293
return new HistogramFieldMapper(
10394
name,
104-
new HistogramFieldType(context.buildFullName(name), meta.getValue(), metric.getValue()),
95+
new HistogramFieldType(context.buildFullName(name), meta.getValue()),
10596
multiFieldsBuilder.build(this, context),
10697
copyTo.build(),
10798
this
@@ -117,9 +108,6 @@ public HistogramFieldMapper build(MapperBuilderContext context) {
117108
private final Explicit<Boolean> ignoreMalformed;
118109
private final boolean ignoreMalformedByDefault;
119110

120-
/** The metric type (gauge, counter, summary) if field is a time series metric */
121-
private final TimeSeriesParams.MetricType metricType;
122-
123111
public HistogramFieldMapper(
124112
String simpleName,
125113
MappedFieldType mappedFieldType,
@@ -130,7 +118,6 @@ public HistogramFieldMapper(
130118
super(simpleName, mappedFieldType, multiFields, copyTo);
131119
this.ignoreMalformed = builder.ignoreMalformed.getValue();
132120
this.ignoreMalformedByDefault = builder.ignoreMalformed.getDefaultValue().value();
133-
this.metricType = builder.metric.getValue();
134121
}
135122

136123
boolean ignoreMalformed() {
@@ -154,11 +141,8 @@ protected void parseCreateField(DocumentParserContext context) {
154141

155142
public static class HistogramFieldType extends MappedFieldType {
156143

157-
private final TimeSeriesParams.MetricType metricType;
158-
159-
public HistogramFieldType(String name, Map<String, String> meta, TimeSeriesParams.MetricType metricType) {
144+
public HistogramFieldType(String name, Map<String, String> meta) {
160145
super(name, false, false, true, TextSearchInfo.NONE, meta);
161-
this.metricType = metricType;
162146
}
163147

164148
@Override
@@ -262,14 +246,6 @@ public Query termQuery(Object value, SearchExecutionContext context) {
262246
"[" + CONTENT_TYPE + "] field do not support searching, " + "use dedicated aggregations instead: [" + name() + "]"
263247
);
264248
}
265-
266-
/**
267-
* If field is a time series metric field, returns its metric type
268-
* @return the metric type or null
269-
*/
270-
public TimeSeriesParams.MetricType getMetricType() {
271-
return metricType;
272-
}
273249
}
274250

275251
@Override

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/histogram/HistoBackedHistogramAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
235235
}
236236

237237
private MappedFieldType defaultFieldType(String fieldName) {
238-
return new HistogramFieldMapper.HistogramFieldType(fieldName, Collections.emptyMap(), null);
238+
return new HistogramFieldMapper.HistogramFieldType(fieldName, Collections.emptyMap());
239239
}
240240

241241
}

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/range/HistoBackedRangeAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
373373

374374
private MappedFieldType defaultFieldType(String fieldName) {
375375
if (fieldName.equals(HISTO_FIELD_NAME)) {
376-
return new HistogramFieldMapper.HistogramFieldType(fieldName, Collections.emptyMap(), null);
376+
return new HistogramFieldMapper.HistogramFieldType(fieldName, Collections.emptyMap());
377377
} else {
378378
return new NumberFieldMapper.NumberFieldType(fieldName, NumberFieldMapper.NumberType.DOUBLE);
379379
}

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentileRanksAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void testSimple() throws IOException {
9090
PercentileRanksAggregationBuilder aggBuilder = new PercentileRanksAggregationBuilder("my_agg", new double[] { 0.1, 0.5, 12 })
9191
.field("field")
9292
.method(PercentilesMethod.HDR);
93-
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap(), null);
93+
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap());
9494
try (IndexReader reader = w.getReader()) {
9595
IndexSearcher searcher = new IndexSearcher(reader);
9696
PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType);

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentilesAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private void testCase(Query query, CheckedConsumer<RandomIndexWriter, IOExceptio
149149
PercentilesAggregationBuilder builder = new PercentilesAggregationBuilder("test").field("number")
150150
.method(PercentilesMethod.HDR);
151151

152-
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("number", Collections.emptyMap(), null);
152+
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("number", Collections.emptyMap());
153153
Aggregator aggregator = createAggregator(builder, indexSearcher, fieldType);
154154
aggregator.preCollection();
155155
indexSearcher.search(query, aggregator.asCollector());

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistoBackedAvgAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
136136
}
137137

138138
private MappedFieldType defaultFieldType() {
139-
return new HistogramFieldMapper.HistogramFieldType(HistoBackedAvgAggregatorTests.FIELD_NAME, Collections.emptyMap(), null);
139+
return new HistogramFieldMapper.HistogramFieldType(HistoBackedAvgAggregatorTests.FIELD_NAME, Collections.emptyMap());
140140
}
141141
}

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistoBackedMaxAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
135135
}
136136

137137
private MappedFieldType defaultFieldType() {
138-
return new HistogramFieldMapper.HistogramFieldType(HistoBackedMaxAggregatorTests.FIELD_NAME, Collections.emptyMap(), null);
138+
return new HistogramFieldMapper.HistogramFieldType(HistoBackedMaxAggregatorTests.FIELD_NAME, Collections.emptyMap());
139139
}
140140
}

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistoBackedMinAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
135135
}
136136

137137
private MappedFieldType defaultFieldType() {
138-
return new HistogramFieldMapper.HistogramFieldType(HistoBackedMinAggregatorTests.FIELD_NAME, Collections.emptyMap(), null);
138+
return new HistogramFieldMapper.HistogramFieldType(HistoBackedMinAggregatorTests.FIELD_NAME, Collections.emptyMap());
139139
}
140140
}

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistoBackedSumAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
135135
}
136136

137137
private MappedFieldType defaultFieldType() {
138-
return new HistogramFieldMapper.HistogramFieldType(HistoBackedSumAggregatorTests.FIELD_NAME, Collections.emptyMap(), null);
138+
return new HistogramFieldMapper.HistogramFieldType(HistoBackedSumAggregatorTests.FIELD_NAME, Collections.emptyMap());
139139
}
140140
}

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistoBackedValueCountAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,6 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
140140
}
141141

142142
private MappedFieldType defaultFieldType() {
143-
return new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap(), null);
143+
return new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap());
144144
}
145145
}

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentileRanksAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void testSimple() throws IOException {
7070
PercentileRanksAggregationBuilder aggBuilder = new PercentileRanksAggregationBuilder("my_agg", new double[] { 0.1, 0.5, 12 })
7171
.field("field")
7272
.method(PercentilesMethod.TDIGEST);
73-
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap(), null);
73+
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap());
7474
try (IndexReader reader = w.getReader()) {
7575
IndexSearcher searcher = new IndexSearcher(reader);
7676
PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType);

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentilesAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private void testCase(
130130
PercentilesAggregationBuilder builder = new PercentilesAggregationBuilder("test").field("number")
131131
.method(PercentilesMethod.TDIGEST);
132132

133-
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("number", Collections.emptyMap(), null);
133+
MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("number", Collections.emptyMap());
134134
Aggregator aggregator = createAggregator(builder, indexSearcher, fieldType);
135135
aggregator.preCollection();
136136
indexSearcher.search(query, aggregator.asCollector());

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapperTests.java

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.elasticsearch.index.mapper.DocumentMapper;
1010
import org.elasticsearch.index.mapper.MappedFieldType;
1111
import org.elasticsearch.index.mapper.MapperParsingException;
12-
import org.elasticsearch.index.mapper.MapperService;
1312
import org.elasticsearch.index.mapper.MapperTestCase;
1413
import org.elasticsearch.index.mapper.ParsedDocument;
1514
import org.elasticsearch.index.mapper.SourceToParse;
@@ -318,37 +317,6 @@ public void testCannotBeUsedInMultifields() {
318317
assertThat(e.getMessage(), containsString("Field [hist] of type [histogram] can't be used in multifields"));
319318
}
320319

321-
public void testMetricType() throws IOException {
322-
// Test default setting
323-
MapperService mapperService = createMapperService(fieldMapping(b -> minimalMapping(b)));
324-
HistogramFieldMapper.HistogramFieldType ft = (HistogramFieldMapper.HistogramFieldType) mapperService.fieldType("field");
325-
assertNull(ft.getMetricType());
326-
assertMetricType("histogram", HistogramFieldMapper.HistogramFieldType::getMetricType);
327-
328-
{
329-
// Test invalid metric type for this field type
330-
Exception e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
331-
minimalMapping(b);
332-
b.field("time_series_metric", "gauge");
333-
})));
334-
assertThat(
335-
e.getCause().getMessage(),
336-
containsString("Unknown value [gauge] for field [time_series_metric] - accepted values are [histogram]")
337-
);
338-
}
339-
{
340-
// Test invalid metric type for this field type
341-
Exception e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
342-
minimalMapping(b);
343-
b.field("time_series_metric", "unknown");
344-
})));
345-
assertThat(
346-
e.getCause().getMessage(),
347-
containsString("Unknown value [unknown] for field [time_series_metric] - accepted values are [histogram]")
348-
);
349-
}
350-
}
351-
352320
@Override
353321
protected IngestScriptSupport ingestScriptSupport() {
354322
throw new AssumptionViolatedException("not supported");

‎x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/rate/RateAggregatorTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ public void testFormatter() throws IOException {
719719
}
720720

721721
public void testHistogramFieldMonthToMonth() throws IOException {
722-
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap(), null);
722+
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap());
723723
MappedFieldType dateType = dateFieldType(DATE_FIELD);
724724
RateAggregationBuilder rateAggregationBuilder = new RateAggregationBuilder("my_rate").rateUnit("month").field("val");
725725
if (randomBoolean()) {
@@ -742,7 +742,7 @@ public void testHistogramFieldMonthToMonth() throws IOException {
742742
}
743743

744744
public void testHistogramFieldMonthToYear() throws IOException {
745-
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap(), null);
745+
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap());
746746
MappedFieldType dateType = dateFieldType(DATE_FIELD);
747747
RateAggregationBuilder rateAggregationBuilder = new RateAggregationBuilder("my_rate").rateUnit("month").field("val");
748748
if (randomBoolean()) {
@@ -762,7 +762,7 @@ public void testHistogramFieldMonthToYear() throws IOException {
762762
}
763763

764764
public void testHistogramFieldMonthToMonthValueCount() throws IOException {
765-
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap(), null);
765+
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap());
766766
MappedFieldType dateType = dateFieldType(DATE_FIELD);
767767
RateAggregationBuilder rateAggregationBuilder = new RateAggregationBuilder("my_rate").rateUnit("month")
768768
.rateMode("value_count")
@@ -784,7 +784,7 @@ public void testHistogramFieldMonthToMonthValueCount() throws IOException {
784784
}
785785

786786
public void testHistogramFieldMonthToYearValueCount() throws IOException {
787-
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap(), null);
787+
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap());
788788
MappedFieldType dateType = dateFieldType(DATE_FIELD);
789789
RateAggregationBuilder rateAggregationBuilder = new RateAggregationBuilder("my_rate").rateUnit("month")
790790
.rateMode("value_count")
@@ -805,7 +805,7 @@ public void testHistogramFieldMonthToYearValueCount() throws IOException {
805805
}
806806

807807
public void testFilterWithHistogramField() throws IOException {
808-
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap(), null);
808+
MappedFieldType histType = new HistogramFieldMapper.HistogramFieldType("val", Collections.emptyMap());
809809
MappedFieldType dateType = dateFieldType(DATE_FIELD);
810810
MappedFieldType keywordType = new KeywordFieldMapper.KeywordFieldType("term");
811811
RateAggregationBuilder rateAggregationBuilder = new RateAggregationBuilder("my_rate").rateUnit("month").field("val");

‎x-pack/plugin/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ tasks.named("yamlRestTestV7CompatTest").configure {
7979
'unsigned_long/50_script_values/script_score query',
8080
'unsigned_long/50_script_values/Script query',
8181
'data_stream/140_data_stream_aliases/Fix IndexNotFoundException error when handling remove alias action',
82+
'aggregate-metrics/90_tsdb_mappings/aggregate_double_metric with time series mappings',
83+
'aggregate-metrics/90_tsdb_mappings/aggregate_double_metric with wrong time series mappings',
84+
'analytics/histogram/histogram with wrong time series mappings',
85+
'analytics/histogram/histogram with time series mappings',
8286
].join(',')
8387
}
8488

0 commit comments

Comments
 (0)