Skip to content

Move composite aggregation to aggregations module. #90954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed

Move composite aggregation to aggregations module. #90954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a34265f
Move composite aggregation to aggregations module.
martijnvg Oct 16, 2022
fb61f2d
spotless
martijnvg Oct 18, 2022
609aa41
allow rate tests to use aggs in aggregation module
martijnvg Oct 18, 2022
4dfe728
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Oct 18, 2022
486b63c
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Oct 18, 2022
2abd2c9
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Oct 19, 2022
bda2b45
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Oct 24, 2022
92f2486
updated dependencies
martijnvg Oct 24, 2022
9540a43
fixed test compile issue after merging in master
martijnvg Oct 24, 2022
138412c
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Oct 31, 2022
b2dacbf
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Nov 4, 2022
fbec791
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Nov 7, 2022
1cb4b99
Fix up plugin descriptor dependencies
ChrisHegarty Nov 7, 2022
518819f
fix core serialization tests by taking aggregation plugin into accoun…
martijnvg Nov 7, 2022
5ae9f0c
spotless
martijnvg Nov 7, 2022
f284c42
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Nov 7, 2022
48edb55
Merge remote-tracking branch 'es/main' into move_composite_to_module
martijnvg Jan 4, 2023
25c21c4
fix precommit issues after merging in main
martijnvg Jan 4, 2023
511f18b
fix eql precommit issues after merging in main
martijnvg Jan 4, 2023
bf60a75
fix sql precommit issues after merging in main
martijnvg Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import org.elasticsearch.action.search.SearchScrollRequest;
import org.elasticsearch.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
import org.elasticsearch.aggregations.bucket.adjacency.ParsedAdjacencyMatrix;
import org.elasticsearch.aggregations.bucket.composite.CompositeAggregationBuilder;
import org.elasticsearch.aggregations.bucket.composite.ParsedComposite;
import org.elasticsearch.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder;
import org.elasticsearch.aggregations.bucket.histogram.ParsedAutoDateHistogram;
import org.elasticsearch.aggregations.bucket.timeseries.ParsedTimeSeries;
Expand All @@ -45,8 +47,6 @@
import org.elasticsearch.rest.RestResponse;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.aggregations.Aggregation;
import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.composite.ParsedComposite;
import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilter;
Expand Down
8 changes: 8 additions & 0 deletions ...meseries/support/TimeSeriesMetricsIT.java → ...meseries/support/TimeSeriesMetricsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.ListenableActionFuture;
import org.elasticsearch.aggregations.AggregationsPlugin;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.time.DateFormatter;
Expand All @@ -22,6 +23,7 @@
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.mapper.DateFieldMapper;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.search.aggregations.MultiBucketConsumerService;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.MapMatcher;
Expand All @@ -32,6 +34,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -51,6 +54,11 @@ public class TimeSeriesMetricsIT extends ESIntegTestCase {
private static final int MAX_RESULT_WINDOW = IndexSettings.MAX_RESULT_WINDOW_SETTING.getDefault(Settings.EMPTY);
private static final DateFormatter FORMATTER = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER;

@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return List.of(AggregationsPlugin.class);
}

public void testKeywordDimension() throws Exception {
assertSmallSimple("a", "b", mapping -> mapping.field("type", "keyword"));
}
Expand Down
3 changes: 3 additions & 0 deletions modules/aggregations/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
requires org.elasticsearch.server;
requires org.elasticsearch.xcontent;
requires org.apache.lucene.core;
requires org.apache.logging.log4j;
requires org.elasticsearch.logging;

exports org.elasticsearch.aggregations.bucket.histogram;
exports org.elasticsearch.aggregations.bucket.adjacency;
exports org.elasticsearch.aggregations.bucket.timeseries;
exports org.elasticsearch.aggregations.bucket.composite;
exports org.elasticsearch.aggregations.pipeline;
exports org.elasticsearch.aggregations.metric;

Expand Down
10 changes: 9 additions & 1 deletion modules/aggregations/src/main/java/org/elasticsearch/aggregations/AggregationsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

import org.elasticsearch.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
import org.elasticsearch.aggregations.bucket.adjacency.InternalAdjacencyMatrix;
import org.elasticsearch.aggregations.bucket.composite.CompositeAggregationBuilder;
import org.elasticsearch.aggregations.bucket.composite.InternalComposite;
import org.elasticsearch.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder;
import org.elasticsearch.aggregations.bucket.histogram.InternalAutoDateHistogram;
import org.elasticsearch.aggregations.bucket.timeseries.InternalTimeSeries;
Expand All @@ -24,6 +26,7 @@
import org.elasticsearch.aggregations.pipeline.MovFnPipelineAggregationBuilder;
import org.elasticsearch.aggregations.pipeline.MovingFunctionScript;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.plugins.ExtensiblePlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.plugins.ScriptPlugin;
import org.elasticsearch.plugins.SearchPlugin;
Expand All @@ -32,7 +35,7 @@
import java.util.ArrayList;
import java.util.List;

public class AggregationsPlugin extends Plugin implements SearchPlugin, ScriptPlugin {
public class AggregationsPlugin extends Plugin implements ExtensiblePlugin, SearchPlugin, ScriptPlugin {
Copy link
Member

@nik9000 nik9000 Jan 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we use ExtensiblePlugin yet?

@Override
public List<AggregationSpec> getAggregations() {
List<AggregationSpec> specs = new ArrayList<>();
Expand All @@ -51,6 +54,11 @@ public List<AggregationSpec> getAggregations() {
).addResultReader(InternalAutoDateHistogram::new)
.setAggregatorRegistrar(AutoDateHistogramAggregationBuilder::registerAggregators)
);
specs.add(
new AggregationSpec(CompositeAggregationBuilder.NAME, CompositeAggregationBuilder::new, CompositeAggregationBuilder.PARSER)
.addResultReader(InternalComposite::new)
.setAggregatorRegistrar(CompositeAggregationBuilder::registerAggregators)
);
specs.add(
new AggregationSpec(MatrixStatsAggregationBuilder.NAME, MatrixStatsAggregationBuilder::new, new MatrixStatsParser())
.addResultReader(InternalMatrixStats::new)
Expand Down
2 changes: 1 addition & 1 deletion .../bucket/composite/BinaryValuesSource.java → .../bucket/composite/BinaryValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
Expand Down
2 changes: 1 addition & 1 deletion ...ucket/composite/CompositeAggregation.java → ...ucket/composite/CompositeAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...omposite/CompositeAggregationBuilder.java → ...omposite/CompositeAggregationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down
2 changes: 1 addition & 1 deletion ...omposite/CompositeAggregationFactory.java → ...omposite/CompositeAggregationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.search.aggregations.Aggregator;
import org.elasticsearch.search.aggregations.AggregatorFactories;
Expand Down
2 changes: 1 addition & 1 deletion ...bucket/composite/CompositeAggregator.java → ...bucket/composite/CompositeAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReaderContext;
Expand Down
2 changes: 1 addition & 1 deletion ...ations/bucket/composite/CompositeKey.java → ...ations/bucket/composite/CompositeKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down
2 changes: 1 addition & 1 deletion ...posite/CompositeValuesCollectorQueue.java → ...posite/CompositeValuesCollectorQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
Expand Down
2 changes: 1 addition & 1 deletion ...mposite/CompositeValuesSourceBuilder.java → ...mposite/CompositeValuesSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down
2 changes: 1 addition & 1 deletion ...omposite/CompositeValuesSourceConfig.java → ...omposite/CompositeValuesSourceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.util.BigArrays;
Expand Down
2 changes: 1 addition & 1 deletion ...te/CompositeValuesSourceParserHelper.java → ...te/CompositeValuesSourceParserHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException;
Expand Down
2 changes: 1 addition & 1 deletion .../composite/DateHistogramValuesSource.java → .../composite/DateHistogramValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.common.Rounding;
import org.elasticsearch.common.util.BigArrays;
Expand Down
2 changes: 1 addition & 1 deletion ...ite/DateHistogramValuesSourceBuilder.java → ...ite/DateHistogramValuesSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.elasticsearch.Version;
Expand Down
2 changes: 1 addition & 1 deletion .../bucket/composite/DoubleValuesSource.java → .../bucket/composite/DoubleValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
Expand Down
2 changes: 1 addition & 1 deletion ...osite/GeoTileGridValuesSourceBuilder.java → ...osite/GeoTileGridValuesSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.geo.GeoBoundingBox;
Expand Down
2 changes: 1 addition & 1 deletion ...bucket/composite/GeoTileValuesSource.java → ...bucket/composite/GeoTileValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedNumericDocValues;
Expand Down
2 changes: 1 addition & 1 deletion .../composite/GlobalOrdinalValuesSource.java → .../composite/GlobalOrdinalValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
Expand Down
2 changes: 1 addition & 1 deletion ...cket/composite/HistogramValuesSource.java → ...cket/composite/HistogramValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedNumericDocValues;
Expand Down
2 changes: 1 addition & 1 deletion ...mposite/HistogramValuesSourceBuilder.java → ...mposite/HistogramValuesSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down
2 changes: 1 addition & 1 deletion ...s/bucket/composite/InternalComposite.java → ...s/bucket/composite/InternalComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.PriorityQueue;
Expand Down
2 changes: 1 addition & 1 deletion ...ns/bucket/composite/LongValuesSource.java → ...ns/bucket/composite/LongValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.document.IntPoint;
import org.apache.lucene.document.LongPoint;
Expand Down
2 changes: 1 addition & 1 deletion ...ations/bucket/composite/MissingOrder.java → ...ations/bucket/composite/MissingOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down
2 changes: 1 addition & 1 deletion ...ons/bucket/composite/ParsedComposite.java → ...ons/bucket/composite/ParsedComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.elasticsearch.search.aggregations.ParsedMultiBucketAggregation;
import org.elasticsearch.xcontent.ObjectParser;
Expand Down
2 changes: 1 addition & 1 deletion ...t/composite/PointsSortedDocsProducer.java → ...t/composite/PointsSortedDocsProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PointValues;
Expand Down
2 changes: 1 addition & 1 deletion ...ucket/composite/RoundingValuesSource.java → ...ucket/composite/RoundingValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedNumericDocValues;
Expand Down
2 changes: 1 addition & 1 deletion ...omposite/SingleDimensionValuesSource.java → ...omposite/SingleDimensionValuesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
Expand Down
2 changes: 1 addition & 1 deletion .../bucket/composite/SortedDocsProducer.java → .../bucket/composite/SortedDocsProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.DocIdSet;
Expand Down
2 changes: 1 addition & 1 deletion ...et/composite/TermsSortedDocsProducer.java → ...et/composite/TermsSortedDocsProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PostingsEnum;
Expand Down
2 changes: 1 addition & 1 deletion ...t/composite/TermsValuesSourceBuilder.java → ...t/composite/TermsValuesSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

package org.elasticsearch.search.aggregations.bucket.composite;
package org.elasticsearch.aggregations.bucket.composite;

import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
Expand Down
8 changes: 4 additions & 4 deletions ...timeseries/support/TimeSeriesMetrics.java → ...timeseries/support/TimeSeriesMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.aggregations.bucket.composite.CompositeAggregationBuilder;
import org.elasticsearch.aggregations.bucket.composite.CompositeValuesSourceBuilder;
import org.elasticsearch.aggregations.bucket.composite.InternalComposite;
import org.elasticsearch.aggregations.bucket.composite.TermsValuesSourceBuilder;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.common.document.DocumentField;
import org.elasticsearch.common.settings.Settings;
Expand All @@ -31,10 +35,6 @@
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.aggregations.Aggregation;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.composite.CompositeValuesSourceBuilder;
import org.elasticsearch.search.aggregations.bucket.composite.InternalComposite;
import org.elasticsearch.search.aggregations.bucket.composite.TermsValuesSourceBuilder;
import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter;
import org.elasticsearch.search.aggregations.metrics.InternalTopHits;
Expand Down
0 ...ies/support/TimeSeriesMetricsService.java → ...ies/support/TimeSeriesMetricsService.java
View file
Open in desktop
File renamed without changes.
Loading