Always structure source

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/action/bulk/TransportAbstractBulkAction.java

@@ -181,6 +181,11 @@ private void forkAndExecute(Task task, BulkRequest bulkRequest, Executor executo
         executor.execute(new ActionRunnable<>(releasingListener) {
             @Override
             protected void doRun() throws IOException {
+                for (DocWriteRequest<?> actionRequest : bulkRequest.requests) {
+                    if (actionRequest instanceof IndexRequest ir) {
+                        ir.ensureStructureSource();
+                    }
+                }
                 applyPipelinesAndDoInternalExecute(task, bulkRequest, executor, releasingListener);
             }
         });

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -12,6 +12,7 @@
 import org.apache.lucene.util.RamUsageEstimator;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchGenerationException;
+import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
@@ -40,7 +41,9 @@
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.ingest.ESONSource;
 import org.elasticsearch.ingest.ESONXContentSerializer;
+import org.elasticsearch.ingest.IngestDocument;
 import org.elasticsearch.ingest.IngestService;
+import org.elasticsearch.ingest.MapStructuredSource;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
@@ -434,10 +437,28 @@ public void setStructuredSource(ESONSource.ESONObject esonSource) {
         }
     }
 
+    public void ensureStructureSource() {
+        if (useStructuredSource == false) {
+            this.useStructuredSource = true;
+            ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
+            try {
+                XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, contentType);
+                structuredSource = builder.parse(parser);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+    }
+
     public boolean isStructuredSource() {
         return useStructuredSource;
     }
 
+    public ESONSource.ESONObject structuredSource() {
+        return structuredSource;
+    }
+
     public Map<String, Object> sourceAsMap() {
         if (useStructuredSource) {
             assert structuredSource != null;
@@ -564,13 +585,7 @@ public IndexRequest source(BytesReference source, XContentType xContentType) {
         this.source = Objects.requireNonNull(source);
         this.contentType = Objects.requireNonNull(xContentType);
         if (useStructuredSource) {
-            ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
-            try {
-                XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, xContentType);
-                structuredSource = builder.parse(parser);
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
+            ensureStructureSource();
         }
         return this;
     }

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

@@ -1341,21 +1341,15 @@ static String getProcessorName(Processor processor) {
      * Builds a new ingest document from the passed-in index request.
      */
     private static IngestDocument newIngestDocument(final IndexRequest request) {
-        BytesReference source = request.source();
-        ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
-        try (XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, request.getContentType());) {
-            ESONSource.ESONObject esonObject = builder.parse(parser);
-            return new IngestDocument(
-                request.index(),
-                request.id(),
-                request.version(),
-                request.routing(),
-                request.versionType(),
-                new MapStructuredSource(esonObject)
-            );
-        } catch (IOException e) {
-            throw new ElasticsearchParseException("Failed to parse content to type", e);
-        }
+        request.ensureStructureSource();
+        return new IngestDocument(
+            request.index(),
+            request.id(),
+            request.version(),
+            request.routing(),
+            request.versionType(),
+            new MapStructuredSource(request.structuredSource())
+        );
     }
 
     /**