Merge branch 'main' into pkar/msearch-mrt-fix

Author: pawankartik-elastic

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/MapperServiceFactory.java

@@ -83,7 +83,8 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
                 }
             },
             bitsetFilterCache::getBitSetProducer,
-            MapperMetrics.NOOP
+            MapperMetrics.NOOP,
+            null
         );
 
         try {

benchmarks/src/main/java/org/elasticsearch/benchmark/indices/common/MappingParsingBenchmark.java

@@ -153,7 +153,8 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
                     }
                 },
                 bitsetFilterCache::getBitSetProducer,
-                MapperMetrics.NOOP
+                MapperMetrics.NOOP,
+                null
             );
 
             mapperServices.add(mapperService);

benchmarks/src/main/java/org/elasticsearch/benchmark/search/QueryParserHelperBenchmark.java

@@ -191,7 +191,8 @@ public <T> T compile(Script script, ScriptContext<T> scriptContext) {
                 }
             },
             query -> { throw new UnsupportedOperationException(); },
-            MapperMetrics.NOOP
+            MapperMetrics.NOOP,
+            null
         );
 
         try {

docs/changelog/138489.yaml

@@ -0,0 +1,5 @@
+pr: 138489
+summary: Use existing `DocumentMapper` when creating new `MapperService`
+area: Mapping
+type: enhancement
+issues: []