Change

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java

@@ -126,27 +126,14 @@ public String documentDescription() {
 
     private XContentParser getParser(SourceToParse source, @Nullable Map<String, Object> structuredSource, XContentType xContentType)
         throws IOException {
+        XContentParserConfiguration config = parserConfiguration.withIncludeSourceOnError(source.getIncludeSourceOnError());
         if (structuredSource == null) {
-            return XContentHelper.createParser(
-                parserConfiguration.withIncludeSourceOnError(source.getIncludeSourceOnError()),
-                source.source(),
-                xContentType
-            );
+            return XContentHelper.createParser(config, source.source(), xContentType);
         } else {
             if (structuredSource instanceof ESONSource.ESONObject esonObject) {
-                return new ESONXContentParser(
-                    esonObject,
-                    NamedXContentRegistry.EMPTY,
-                    DeprecationHandler.IGNORE_DEPRECATIONS,
-                    xContentType
-                );
+                return new ESONXContentParser(esonObject, config.registry(), config.deprecationHandler(), xContentType);
             } else {
-                return new MapXContentParser(
-                    NamedXContentRegistry.EMPTY,
-                    DeprecationHandler.IGNORE_DEPRECATIONS,
-                    structuredSource,
-                    xContentType
-                );
+                return new MapXContentParser(config.registry(), config.deprecationHandler(), structuredSource, xContentType);
             }
         }
     }

server/src/main/java/org/elasticsearch/ingest/IngestService.java

@@ -1195,6 +1195,8 @@ private void executePipelines(
                         ingestDocument.doNoSelfReferencesCheck(false);
                     }
                 } catch (IllegalArgumentException ex) {
+                    // TODO: Hack to delete mutated source
+                    indexRequest.source(indexRequest.source(), indexRequest.getContentType());
                     // An IllegalArgumentException can be thrown when an ingest processor creates a source map that is self-referencing.
                     // In that case, we catch and wrap the exception, so we can include more details
                     exceptionHandler.accept(

x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java

@@ -440,7 +440,6 @@ public void testSelectGroupByScore() throws Exception {
     public void testCountAndCountDistinct() throws IOException {
         String mode = randomMode();
         index(
-            "test",
             "{\"gender\":\"m\", \"langs\": 1}",
             "{\"gender\":\"m\", \"langs\": 1}",
             "{\"gender\":\"m\", \"langs\": 2}",