Changes

Author: Tim-Brooks

benchmarks/src/main/java/org/elasticsearch/benchmark/eson/ESONDeserializationBenchmark.java

@@ -130,7 +130,7 @@ public void writeJSONFromESON(Blackhole bh) throws IOException {
     @Benchmark
     public void writeJSONFromESONFlatten(Blackhole bh) throws IOException {
         XContentBuilder builder = XContentFactory.contentBuilder(JsonXContent.jsonXContent.type());
-        ESONXContentSerializer.flattenedToXContent(esonObject, builder, ToXContent.EMPTY_PARAMS);
+        ESONXContentSerializer.flattenToXContent(esonObject, builder, ToXContent.EMPTY_PARAMS);
         BytesReference bytes = BytesReference.bytes(builder);
         bh.consume(bytes);
     }

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

@@ -402,11 +402,6 @@ private void applyPipelinesAndDoInternalExecute(
     ) throws IOException {
         final long relativeStartTimeNanos = relativeTimeNanos();
         if (applyPipelines(task, bulkRequest, executor, listener) == false) {
-            for (DocWriteRequest<?> docWriteRequest : bulkRequest.requests()) {
-                if (docWriteRequest instanceof IndexRequest indexRequest) {
-                    indexRequest.flattenAndSerializeStructuredSource();
-                }
-            }
             doInternalExecute(task, bulkRequest, executor, listener, relativeStartTimeNanos);
         }
     }

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

@@ -425,12 +425,8 @@ public BytesReference source() {
     public void setStructuredSource(ESONSource.ESONObject esonSource) {
         this.useStructuredSource = true;
         this.structuredSource = esonSource;
-    }
-
-    public void flattenAndSerializeStructuredSource() {
-        this.structuredSource = ESONSource.flatten(this.structuredSource);
         try (XContentBuilder builder = XContentFactory.contentBuilder(contentType)) {
-            ESONXContentSerializer.flattenedToXContent(this.structuredSource, builder, ToXContent.EMPTY_PARAMS);
+            ESONXContentSerializer.flattenToXContent(esonSource, builder, ToXContent.EMPTY_PARAMS);
             source = BytesReference.bytes(builder);
         } catch (IOException e) {
             throw new UncheckedIOException(e);

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

@@ -44,7 +44,7 @@ private static class ContainerState {
      * Efficient toXContent for flattened ESON structures.
      * Performs a single pass through the key array with a stack to track nesting.
      */
-    public static XContentBuilder flattenedToXContent(ESONSource.ESONObject rootObject, XContentBuilder builder, ToXContent.Params params)
+    public static XContentBuilder flattenToXContent(ESONSource.ESONObject rootObject, XContentBuilder builder, ToXContent.Params params)
         throws IOException {
         List<ESONSource.KeyEntry> keyArray = rootObject.getKeyArray();
         ESONSource.Values values = rootObject.objectValues();