fix tests

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>

Author: harshavamsi

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml

@@ -716,25 +716,6 @@ setup:
           - '{"index": {}}'
           - '{"number": 500000}'
 
-  - do:
-      catch: /circuit_breaking_exception/
-      search:
-        index: test_cb
-        body:
-          size: 0
-          aggs:
-            histo:
-              histogram:
-                field: number
-                interval: 10
-                extended_bounds:
-                  min: 0
-                  max: 174155895372
-
-  - match: { error.type: "search_phase_execution_exception" }
-  - match: { error.caused_by.type: "circuit_breaking_exception"}
-  - match: { status: 429 }
-
   - do:
       catch: /too_many_buckets_exception/
       search:
@@ -745,7 +726,7 @@ setup:
             histo:
               histogram:
                 field: number
-                interval: 100000
+                interval: 10
                 extended_bounds:
                   min: 0
                   max: 174155895372

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml

@@ -195,7 +195,7 @@ setup:
           - '{"date": "2016-03-01"}'
 
   - do:
-      catch: /circuit_breaking_exception/
+      catch: /too_many_buckets_exception/
       search:
         index: test_cb
         body:
@@ -210,5 +210,5 @@ setup:
                   max: 174155895372
 
   - match: { error.type: "search_phase_execution_exception" }
-  - match: { error.caused_by.type: "circuit_breaking_exception"}
-  - match: { status: 429 }
+  - match: { error.caused_by.type: "too_many_buckets_exception"}
+  - match: { status: 503 }

server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogram.java

@@ -401,7 +401,7 @@ protected Bucket reduceBucket(List<Bucket> buckets, ReduceContext context) {
     private int estimateTotalBucketCount(List<Bucket> list) {
         LongBounds bounds = emptyBucketInfo.bounds;
         int bucketCount = 0;
-        if (bounds != null && bounds.getMin() != null && bounds.getMax() != null) {
+        if (bounds != null && bounds.getMin() != null && bounds.getMax() != null && !list.isEmpty()) {
             long min = min(bounds.getMin() + offset, list.getFirst().key);
             long max = max(bounds.getMax() + offset, list.getLast().key);
             long intervalWidth = 0;
@@ -431,16 +431,17 @@ void addEmptyBuckets(List<Bucket> list, ReduceContext reduceContext) {
         final int originalSize = list.size();
         // we use counts here only to add those values to the CircuitBreaker, list's count has already been added in #reduce, so we only
         // need to add emptyBucketCount
-        final int estimateEmptyBucketCount = estimateTotalBucketCount(list) - originalSize;
-        assert estimateEmptyBucketCount >= 0;
+        final int estimateEmptyBucketCount = Math.max(0, estimateTotalBucketCount(list) - originalSize);
 
         // First check bucket count limit before attempting memory allocation
-        reduceContext.consumeBucketsAndMaybeBreak(estimateEmptyBucketCount);
+        if (estimateEmptyBucketCount > 0) {
+            reduceContext.consumeBucketsAndMaybeBreak(estimateEmptyBucketCount);
 
-        CircuitBreaker breaker = reduceContext.getBreaker();
-        if (breaker != null) {
-            // 50 bytes memory usage for each empty bucket
-            breaker.addEstimateBytesAndMaybeBreak(50L * estimateEmptyBucketCount, "empty date histogram buckets");
+            CircuitBreaker breaker = reduceContext.getBreaker();
+            if (breaker != null) {
+                // 50 bytes memory usage for each empty bucket
+                breaker.addEstimateBytesAndMaybeBreak(50L * estimateEmptyBucketCount, "empty date histogram buckets");
+            }
         }
 
         ListIterator<Bucket> iter = list.listIterator();

server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/InternalHistogram.java

@@ -388,7 +388,7 @@ private double round(double key) {
 
     private int estimateTotalBucketCount(List<Bucket> list) {
         int bucketCount = 0;
-        if (emptyBucketInfo != null) {
+        if (emptyBucketInfo != null && !list.isEmpty()) {
             double min = min(emptyBucketInfo.minBound, list.getFirst().key);
             double max = max(emptyBucketInfo.maxBound, list.getLast().key);
 
@@ -416,16 +416,17 @@ void addEmptyBuckets(List<Bucket> list, ReduceContext reduceContext) {
         final int originalSize = list.size();
         // we use counts here only to add those values to the CircuitBreaker, list's count has already been added in #reduce, so we only
         // need to add emptyBucketCount
-        final int estimateEmptyBucketCount = estimateTotalBucketCount(list) - originalSize;
-        assert estimateEmptyBucketCount >= 0;
+        final int estimateEmptyBucketCount = Math.max(0, estimateTotalBucketCount(list) - originalSize);
 
         // First check bucket count limit before attempting memory allocation
-        reduceContext.consumeBucketsAndMaybeBreak(estimateEmptyBucketCount);
+        if (estimateEmptyBucketCount > 0) {
+            reduceContext.consumeBucketsAndMaybeBreak(estimateEmptyBucketCount);
 
-        CircuitBreaker breaker = reduceContext.getBreaker();
-        if (breaker != null) {
-            // 50 bytes memory usage for each empty bucket
-            breaker.addEstimateBytesAndMaybeBreak(50L * estimateEmptyBucketCount, "empty histogram buckets");
+            CircuitBreaker breaker = reduceContext.getBreaker();
+            if (breaker != null) {
+                // 50 bytes memory usage for each empty bucket
+                breaker.addEstimateBytesAndMaybeBreak(50L * estimateEmptyBucketCount, "empty histogram buckets");
+            }
         }
 
         ListIterator<Bucket> iter = list.listIterator();