diff --git a/docs/changelog/134887.yaml b/docs/changelog/134887.yaml new file mode 100644 index 0000000000000..aa566ad8fdcf5 --- /dev/null +++ b/docs/changelog/134887.yaml @@ -0,0 +1,5 @@ +pr: 134887 +summary: Avoid holding references to `SearchExecutionContext` in `SourceConfirmedTextQuery` +area: Mapping +type: bug +issues: [] diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java index 0fe56a0100369..8f7abc08beaef 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java @@ -295,9 +295,9 @@ private IOFunction, IOExcepti String name = storedFieldNameForSyntheticSource(); return storedFieldFetcher(name); } + ValueFetcher valueFetcher = valueFetcher(searchExecutionContext, null); + SourceProvider sourceProvider = searchExecutionContext.lookup(); return context -> { - ValueFetcher valueFetcher = valueFetcher(searchExecutionContext, null); - SourceProvider sourceProvider = searchExecutionContext.lookup(); valueFetcher.setNextReader(context); return docID -> { try {