fix low cardinality case

Signed-off-by: Sandesh Kumar <[email protected]>
sandeshkr419 · Feb 15, 2024 · 2cbca9d · 2cbca9d
1 parent 27d8c14
commit 2cbca9d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/.../org/opensearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java b/.../org/opensearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java
@@ -430,17 +430,23 @@ public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucketCol
             final SortedSetDocValues segmentOrds = valuesSource.ordinalsValues(ctx);
             segmentDocCounts = context.bigArrays().grow(segmentDocCounts, 1 + segmentOrds.getValueCount());
             assert sub == LeafBucketCollector.NO_OP_COLLECTOR;
+            mapping = valuesSource.globalOrdinalsMapping(ctx);
 
             if (this.resultStrategy instanceof StandardTermsResults) {
-                LeafBucketCollector termDocFreqCollector = this.termDocFreqCollector(ctx, segmentOrds, this::incrementBucketDocCount);
+                LeafBucketCollector termDocFreqCollector = this.termDocFreqCollector(
+                    ctx,
+                    segmentOrds,
+                    (ord, docCount) -> incrementBucketDocCount(
+                        collectionStrategy.globalOrdToBucketOrd(0, mapping.applyAsLong(ord)),
+                        docCount
+                    )
+                );
                 if (termDocFreqCollector != null) {
                     return termDocFreqCollector;
                 }
             }
 
             final SortedDocValues singleValues = DocValues.unwrapSingleton(segmentOrds);
-            mapping = valuesSource.globalOrdinalsMapping(ctx);
-            // Dense mode doesn't support include/exclude so we don't have to check it here.
             if (singleValues != null) {
                 segmentsWithSingleValuedOrds++;
                 return resultStrategy.wrapCollector(new LeafBucketCollectorBase(sub, segmentOrds) {