Skip to content

Commit d34cf01

Browse files
authored
Move field data interfaces for exponential histogram to core. (#138493)
1 parent 1d4c795 commit d34cf01

File tree

10 files changed

+12
-9
lines changed

10 files changed

+12
-9
lines changed

x-pack/plugin/core/src/main/java/module-info.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
requires org.apache.httpcomponents.core5.httpcore5;
2828
requires org.slf4j;
2929
requires com.ibm.icu;
30+
requires org.elasticsearch.exponentialhistogram;
3031

3132
exports org.elasticsearch.index.engine.frozen;
3233
exports org.elasticsearch.license;
@@ -70,6 +71,7 @@
7071
exports org.elasticsearch.xpack.core.eql;
7172
exports org.elasticsearch.xpack.core.esql;
7273
exports org.elasticsearch.xpack.core.esql.action;
74+
exports org.elasticsearch.xpack.core.exponentialhistogram.fielddata;
7375
exports org.elasticsearch.xpack.core.frozen;
7476
exports org.elasticsearch.xpack.core.graph.action;
7577
exports org.elasticsearch.xpack.core.graph;

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/fielddata/ExponentialHistogramValuesReader.java renamed to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/exponentialhistogram/fielddata/ExponentialHistogramValuesReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* 2.0.
66
*/
77

8-
package org.elasticsearch.xpack.exponentialhistogram.fielddata;
8+
package org.elasticsearch.xpack.core.exponentialhistogram.fielddata;
99

1010
import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
1111

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/fielddata/LeafExponentialHistogramFieldData.java renamed to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/exponentialhistogram/fielddata/LeafExponentialHistogramFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
package org.elasticsearch.xpack.exponentialhistogram.fielddata;
7+
package org.elasticsearch.xpack.core.exponentialhistogram.fielddata;
88

99
import org.elasticsearch.index.fielddata.LeafFieldData;
1010

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/ExponentialHistogramFieldMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
import org.elasticsearch.xpack.analytics.mapper.HistogramParser;
6666
import org.elasticsearch.xpack.analytics.mapper.IndexWithCount;
6767
import org.elasticsearch.xpack.analytics.mapper.ParsedHistogramConverter;
68-
import org.elasticsearch.xpack.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
68+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
69+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.LeafExponentialHistogramFieldData;
6970
import org.elasticsearch.xpack.exponentialhistogram.fielddata.IndexExponentialHistogramFieldData;
70-
import org.elasticsearch.xpack.exponentialhistogram.fielddata.LeafExponentialHistogramFieldData;
7171

7272
import java.io.IOException;
7373
import java.util.ArrayList;

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/aggregations/bucket/histogram/ExponentialHistogramBackedHistogramAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.elasticsearch.search.aggregations.bucket.histogram.DoubleBounds;
2222
import org.elasticsearch.search.aggregations.support.AggregationContext;
2323
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
24+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2425
import org.elasticsearch.xpack.exponentialhistogram.aggregations.support.ExponentialHistogramValuesSource;
25-
import org.elasticsearch.xpack.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2626

2727
import java.io.IOException;
2828
import java.util.Map;

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/aggregations/metrics/ExponentialHistogramAvgAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregator;
2323
import org.elasticsearch.search.aggregations.support.AggregationContext;
2424
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
25+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2526
import org.elasticsearch.xpack.exponentialhistogram.aggregations.support.ExponentialHistogramValuesSource;
26-
import org.elasticsearch.xpack.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2727

2828
import java.io.IOException;
2929
import java.util.Map;

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/aggregations/metrics/ExponentialHistogramSumAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.elasticsearch.search.aggregations.metrics.Sum;
2222
import org.elasticsearch.search.aggregations.support.AggregationContext;
2323
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
24+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2425
import org.elasticsearch.xpack.exponentialhistogram.aggregations.support.ExponentialHistogramValuesSource;
25-
import org.elasticsearch.xpack.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2626

2727
import java.io.IOException;
2828
import java.util.Map;

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/aggregations/metrics/ExponentialHistogramValueCountAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregator;
1919
import org.elasticsearch.search.aggregations.support.AggregationContext;
2020
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
21+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2122
import org.elasticsearch.xpack.exponentialhistogram.aggregations.support.ExponentialHistogramValuesSource;
22-
import org.elasticsearch.xpack.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
2323

2424
import java.io.IOException;
2525
import java.util.Map;

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/aggregations/support/ExponentialHistogramValuesSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
1313
import org.elasticsearch.search.aggregations.AggregationErrors;
1414
import org.elasticsearch.search.aggregations.support.AggregationContext;
15+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
1516
import org.elasticsearch.xpack.exponentialhistogram.ExponentialHistogramFieldMapper;
16-
import org.elasticsearch.xpack.exponentialhistogram.fielddata.ExponentialHistogramValuesReader;
1717
import org.elasticsearch.xpack.exponentialhistogram.fielddata.IndexExponentialHistogramFieldData;
1818

1919
import java.io.IOException;

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/fielddata/IndexExponentialHistogramFieldData.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import org.elasticsearch.index.fielddata.IndexFieldData;
1111
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
12+
import org.elasticsearch.xpack.core.exponentialhistogram.fielddata.LeafExponentialHistogramFieldData;
1213
import org.elasticsearch.xpack.exponentialhistogram.aggregations.support.ExponentialHistogramValuesSourceType;
1314

1415
/**

0 commit comments

Comments
 (0)