Allow sub agg in filter rewrite opt

Signed-off-by: Finn Carroll <[email protected]>
finnegancarroll · Aug 18, 2024 · 9e19ad9 · 9e19ad9
1 parent e291bdc
commit 9e19ad9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/...rc/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregator.java b/...rc/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregator.java
@@ -230,7 +230,7 @@ protected long getOrd(int rangeIdx) {
                 return ord;
             }
         };
-        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, subAggregators.length, context);
+        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, context);
     }
 
     @Override

diff --git a/...opensearch/search/aggregations/bucket/filterrewrite/FilterRewriteOptimizationContext.java b/...opensearch/search/aggregations/bucket/filterrewrite/FilterRewriteOptimizationContext.java
@@ -52,21 +52,20 @@ public final class FilterRewriteOptimizationContext {
     public FilterRewriteOptimizationContext(
         AggregatorBridge aggregatorBridge,
         final Object parent,
-        final int subAggLength,
         SearchContext context
     ) throws IOException {
         this.aggregatorBridge = aggregatorBridge;
-        this.canOptimize = this.canOptimize(parent, subAggLength, context);
+        this.canOptimize = this.canOptimize(parent, context);
     }
 
     /**
      * common logic for checking whether the optimization can be applied and prepare at shard level
      * if the aggregation has any special logic, it should be done using {@link AggregatorBridge}
      */
-    private boolean canOptimize(final Object parent, final int subAggLength, SearchContext context) throws IOException {
+    private boolean canOptimize(final Object parent, SearchContext context) throws IOException {
         if (context.maxAggRewriteFilters() == 0) return false;
 
-        if (parent != null || subAggLength != 0) return false;
+        if (parent != null) return false;
 
         boolean canOptimize = aggregatorBridge.canOptimize();
         if (canOptimize) {

diff --git a/...java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregator.java b/...java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregator.java
@@ -213,7 +213,7 @@ protected long getOrd(int rangeIdx) {
                 return ord;
             }
         };
-        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, subAggregators.length, context);
+        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, context);
     }
 
     protected abstract LongKeyedBucketOrds getBucketOrds();

diff --git a/...ain/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/...ain/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java
@@ -158,7 +158,7 @@ protected long getOrd(int rangeIdx) {
                 return ord;
             }
         };
-        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, subAggregators.length, context);
+        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, context);
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/range/RangeAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/range/RangeAggregator.java
@@ -291,7 +291,7 @@ protected void prepare() {
                 buildRanges(ranges);
             }
         };
-        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, subAggregators.length, context);
+        filterRewriteOptimizationContext = new FilterRewriteOptimizationContext(bridge, parent, context);
     }
 
     @Override