From 40c461d727e99ea8e0011eb2011acaa6137dd9cd Mon Sep 17 00:00:00 2001
From: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>
Date: Mon, 10 Feb 2025 09:57:58 -0800
Subject: [PATCH] Fix merge

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>
---
 .../GlobalOrdinalsStringTermsAggregator.java  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java
index 3591348588299..5132cb9e38603 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java
@@ -220,20 +220,23 @@ boolean tryCollectFromTermFrequencies(LeafReaderContext ctx, SortedSetDocValues
     @Override
     protected boolean tryPrecomputeAggregationForLeaf(LeafReaderContext ctx) throws IOException {
         SortedSetDocValues globalOrds = valuesSource.globalOrdinalsValues(ctx);
-        collectionStrategy.globalOrdsReady(globalOrds);
 
-        // if (collectionStrategy instanceof DenseGlobalOrds
-        // && this.resultStrategy instanceof StandardTermsResults
-        // && sub == LeafBucketCollector.NO_OP_COLLECTOR) {
-        // LeafBucketCollector termDocFreqCollector = termDocFreqCollector(
-        // ctx,
-        // globalOrds,
-        // (ord, docCount) -> incrementBucketDocCount(collectionStrategy.globalOrdToBucketOrd(0, ord), docCount)
-        // );
-        // if (termDocFreqCollector != null) {
-        // return termDocFreqCollector;
-        // }
-        // }
+        if (collectionStrategy instanceof DenseGlobalOrds
+            && this.resultStrategy instanceof StandardTermsResults
+            && subAggregators.length == 0) {
+            return tryCollectFromTermFrequencies(
+                ctx,
+                globalOrds,
+                (ord, docCount) -> incrementBucketDocCount(collectionStrategy.globalOrdToBucketOrd(0, ord), docCount)
+            );
+        }
+        return false;
+    }
+
+    @Override
+    public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucketCollector sub) throws IOException {
+        SortedSetDocValues globalOrds = valuesSource.globalOrdinalsValues(ctx);
+        collectionStrategy.globalOrdsReady(globalOrds);
 
         SortedDocValues singleValues = DocValues.unwrapSingleton(globalOrds);
         if (singleValues != null) {