Changes

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

@@ -434,10 +434,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 +582,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/ESONXContentParser.java

@@ -23,6 +23,7 @@
 import java.nio.CharBuffer;
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.List;
 
 /**
  * Simplified XContentParser for flattened ESON structures.
@@ -40,7 +41,7 @@ public class ESONXContentParser extends AbstractXContentParser {
     private final XContentType xContentType;
 
     // Key array iteration state
-    private final ESONSource.KeyEntry[] keyArray;
+    private final List<ESONSource.KeyEntry> keyArray;
     private int currentIndex = 0;
 
     // Current token state
@@ -85,7 +86,7 @@ public ESONXContentParser(
         this.xContentType = xContentType;
 
         // Convert to array for efficient indexed access
-        this.keyArray = root.getKeyArray().toArray(new ESONSource.KeyEntry[0]);
+        this.keyArray = root.getKeyArray();
     }
 
     @Override
@@ -108,20 +109,22 @@ public Token nextToken() throws IOException {
         currentValue = null;
         valueComputed = false;
 
+        int size = keyArray.size();
+
         // First token - start root object
         if (currentToken == null) {
-            if (currentIndex >= keyArray.length) {
+            if (currentIndex >= size) {
                 return null;
             }
-            ESONSource.ObjectEntry rootEntry = (ESONSource.ObjectEntry) keyArray[currentIndex];
+            ESONSource.ObjectEntry rootEntry = (ESONSource.ObjectEntry) keyArray.get(currentIndex);
             containerStack.push(new ContainerContext(ContainerContext.Type.OBJECT, rootEntry.fieldCount));
             currentIndex++;
             currentToken = Token.START_OBJECT;
             return currentToken;
         }
 
         // Check if we've finished parsing
-        if (containerStack.isEmpty() && currentIndex >= keyArray.length) {
+        if (containerStack.isEmpty() && currentIndex >= size) {
             return null;
         }
 
@@ -133,14 +136,14 @@ public Token nextToken() throws IOException {
         }
 
         // If we've exhausted the array but still have containers, close them
-        if (currentIndex >= keyArray.length) {
+        if (currentIndex >= size) {
             ContainerContext ctx = containerStack.pop();
             currentToken = ctx.type == ContainerContext.Type.OBJECT ? Token.END_OBJECT : Token.END_ARRAY;
             return currentToken;
         }
 
         // Process next entry
-        ESONSource.KeyEntry entry = keyArray[currentIndex];
+        ESONSource.KeyEntry entry = keyArray.get(currentIndex);
         ContainerContext currentContainer = containerStack.peek();
 
         if (currentContainer == null) {

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

@@ -78,8 +78,6 @@
 import org.elasticsearch.threadpool.Scheduler;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentParser;
-import org.elasticsearch.xcontent.XContentParserConfiguration;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -1341,21 +1339,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())
+        );
     }
 
     /**