iter

javanna · Apr 2, 2024 · aa9a371 · aa9a371
1 parent 2fd6901
commit aa9a371
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java
@@ -30,6 +30,7 @@
 import org.elasticsearch.common.util.LongObjectPagedHashMap.Cursor;
 import org.elasticsearch.core.Releasables;
 import org.elasticsearch.index.query.SearchExecutionContext;
+import org.elasticsearch.search.NestedDocuments;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.AggregationExecutionContext;
@@ -218,7 +219,14 @@ public InternalAggregation buildAggregation(long owningBucketOrdinal) throws IOE
 
     private static FetchSearchResult runFetchPhase(SubSearchContext subSearchContext, int[] docIdsToLoad) {
         // Fork the search execution context for each slice, because the fetch phase does not support concurrent execution yet.
-        SearchExecutionContext searchExecutionContext = new SearchExecutionContext(subSearchContext.getSearchExecutionContext());
+        SearchExecutionContext searchExecutionContext = new SearchExecutionContext(subSearchContext.getSearchExecutionContext()) {
+            @Override
+            public NestedDocuments getNestedDocuments() {
+                // this is a horrible hack: AggregationTestCase mocks SearchExecutionContext to override the resolution of nested documents.
+                // That gets lost as we fork the search execution context: overriding this method preserves that.
+                return subSearchContext.getSearchExecutionContext().getNestedDocuments();
+            }
+        };
         SubSearchContext fetchSubSearchContext = new SubSearchContext(subSearchContext) {
             @Override
             public SearchExecutionContext getSearchExecutionContext() {