Remove supportsParallelCollection implementation for some aggs (elast…

…ic#99654) enable Cardinality, composite, nested and Frequent imters aggregations for concurrent execution.
nik9000 · Sep 19, 2023 · 61562f6 · 61562f6
1 parent bf8429b
commit 61562f6
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 28 deletions.
diff --git a/...a/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java b/...a/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java
@@ -97,11 +97,6 @@ public boolean supportsSampling() {
         return true;
     }
 
-    @Override
-    public boolean supportsParallelCollection() {
-        return false;
-    }
-
     public CompositeAggregationBuilder(StreamInput in) throws IOException {
         super(in);
         int num = in.readVInt();

diff --git a/...search/search/aggregations/bucket/histogram/VariableWidthHistogramAggregationBuilder.java b/...search/search/aggregations/bucket/histogram/VariableWidthHistogramAggregationBuilder.java
@@ -137,11 +137,6 @@ public BucketCardinality bucketCardinality() {
         return BucketCardinality.MANY;
     }
 
-    @Override
-    public boolean supportsParallelCollection() {
-        return false;
-    }
-
     @Override
     protected AggregationBuilder shallowCopy(AggregatorFactories.Builder factoriesBuilder, Map<String, Object> metaData) {
         return new VariableWidthHistogramAggregationBuilder(this, factoriesBuilder, metaData);

diff --git a/...in/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java b/...in/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java
@@ -81,11 +81,6 @@ public BucketCardinality bucketCardinality() {
         return BucketCardinality.ONE;
     }
 
-    @Override
-    public boolean supportsParallelCollection() {
-        return false;
-    }
-
     @Override
     protected AggregatorFactory doBuild(AggregationContext context, AggregatorFactory parent, Builder subFactoriesBuilder)
         throws IOException {

diff --git a/...ain/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java b/...ain/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
@@ -113,11 +113,6 @@ public boolean supportsSampling() {
         return true;
     }
 
-    @Override
-    public boolean supportsParallelCollection() {
-        return false;
-    }
-
     @Override
     protected boolean serializeTargetValueType(TransportVersion version) {
         return true;

diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java
@@ -334,19 +334,19 @@ public void testSupportsParallelCollection() {
         {
             AggregatorFactories.Builder builder = new AggregatorFactories.Builder();
             builder.addAggregator(new CardinalityAggregationBuilder("cardinality"));
-            assertFalse(builder.supportsParallelCollection());
+            assertTrue(builder.supportsParallelCollection());
         }
         {
             AggregatorFactories.Builder builder = new AggregatorFactories.Builder();
             builder.addAggregator(new NestedAggregationBuilder("nested", "path"));
-            assertFalse(builder.supportsParallelCollection());
+            assertTrue(builder.supportsParallelCollection());
         }
         {
             AggregatorFactories.Builder builder = new AggregatorFactories.Builder();
             builder.addAggregator(
                 new CompositeAggregationBuilder("composite", Collections.singletonList(new TermsValuesSourceBuilder("name")))
             );
-            assertFalse(builder.supportsParallelCollection());
+            assertTrue(builder.supportsParallelCollection());
         }
         {
             AggregatorFactories.Builder builder = new AggregatorFactories.Builder();

diff --git a/.../org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java b/.../org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java
@@ -182,11 +182,6 @@ public boolean supportsSampling() {
         return true;
     }
 
-    @Override
-    public boolean supportsParallelCollection() {
-        return false;
-    }
-
     @Override
     protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
         return new FrequentItemSetsAggregationBuilder(name, fields, minimumSupport, minimumSetSize, size, filter, executionHint);