fixed updated logic for reducing buckets

Signed-off-by: Vinay Krishna Pudyodu <[email protected]>

Author: vinaykpud

server/src/main/java/org/opensearch/search/aggregations/bucket/terms/InternalTerms.java

@@ -464,33 +464,36 @@ For backward compatibility, we disable the merge sort and use ({@link InternalTe
             }
             final int size = Math.min(localBucketCountThresholds.getRequiredSize(), reducedBuckets.size());
             final Comparator<MultiBucketsAggregation.Bucket> cmp = order.comparator();
-            if (size < reducedBuckets.size()) {
-                ArrayUtil.select(reducedBucketsArr, 0, reducedBuckets.size(), size, cmp);
-            }
-            int selectedSize = 0;
+
             for (B bucket : reducedBucketsArr) {
                 if (sumDocCountError == -1) {
                     bucket.setDocCountError(-1);
                 } else {
                     final long finalSumDocCountError = sumDocCountError;
                     bucket.setDocCountError(docCountError -> docCountError + finalSumDocCountError);
                 }
-                if (bucket.getDocCount() >= localBucketCountThresholds.getMinDocCount()) {
-                    B removed = ((selectedSize == size) ? bucket : null);
-                    if (removed != null) {
-                        otherDocCount += removed.getDocCount();
-                        reduceContext.consumeBucketsAndMaybeBreak(-countInnerBucket(removed));
-                    } else {
-                        selectedSize++;
-                        reduceContext.consumeBucketsAndMaybeBreak(1);
-                    }
-                } else {
+
+                if (bucket.getDocCount() < localBucketCountThresholds.getMinDocCount()) {
                     reduceContext.consumeBucketsAndMaybeBreak(-countInnerBucket(bucket));
                 }
             }
+            if (size < reducedBuckets.size()) {
+                ArrayUtil.select(reducedBucketsArr, 0, reducedBuckets.size(), size, cmp);
+            }
+
+            int selectedSize = 0;
+            for (B bucket : reducedBucketsArr) {
+                B removed = ((selectedSize == size) ? bucket : null);
+                if (removed != null) {
+                    otherDocCount += removed.getDocCount();
+                    reduceContext.consumeBucketsAndMaybeBreak(-countInnerBucket(removed));
+                } else {
+                    selectedSize++;
+                    reduceContext.consumeBucketsAndMaybeBreak(1);
+                }
+            }
             if (selectedSize != size) {
                 list = createBucketsArray(selectedSize);
-                System.arraycopy(reducedBucketsArr, 0, list, 0, selectedSize);
             } else {
                 list = reducedBucketsArr;
             }