Change

Author: Tim-Brooks

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

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.ingest.ESONSource;
+import org.elasticsearch.ingest.ESONXContentSerializer;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
@@ -126,6 +127,14 @@ public void writeJSONFromESON(Blackhole bh) throws IOException {
         bh.consume(bytes);
     }
 
+    @Benchmark
+    public void writeJSONFromESONFlatten(Blackhole bh) throws IOException {
+        XContentBuilder builder = XContentFactory.contentBuilder(JsonXContent.jsonXContent.type());
+        ESONXContentSerializer.flattedToXContent(esonObject, builder, ToXContent.EMPTY_PARAMS);
+        BytesReference bytes = BytesReference.bytes(builder);
+        bh.consume(bytes);
+    }
+
     @Benchmark
     public void readMap(Blackhole bh) throws IOException {
         Tuple<XContentType, Map<String, Object>> tuple = XContentHelper.convertToMap(source, false, XContentType.JSON);
@@ -143,7 +152,7 @@ public void readESON(Blackhole bh) throws IOException {
                 source.length()
             )
         ) {
-            ESONSource.ESONObject eson = new ESONSource.Builder(refRecycler).parse(parser);
+            ESONSource.ESONObject eson = new ESONSource.Builder().parse(parser);
             bh.consume(eson);
         }
     }

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

@@ -564,7 +564,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();
+            ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
             try {
                 XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, xContentType);
                 structuredSource = builder.parse(parser);

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

@@ -17,6 +17,7 @@
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentString;
 
 import java.io.IOException;
 import java.util.AbstractCollection;
@@ -39,11 +40,15 @@ public static class Builder {
         private final List<KeyEntry> keyArray;
 
         public Builder() {
-            this(BytesRefRecycler.NON_RECYCLING_INSTANCE);
+            this(0);
         }
 
-        public Builder(Recycler<BytesRef> refRecycler) {
-            this.bytes = new BytesStreamOutput(128);
+        public Builder(int expectedSize) {
+            this(BytesRefRecycler.NON_RECYCLING_INSTANCE, expectedSize);
+        }
+
+        public Builder(Recycler<BytesRef> refRecycler, int expectedSize) {
+            this.bytes = new BytesStreamOutput(expectedSize);
             this.keyArray = new ArrayList<>();
         }
 
@@ -115,9 +120,9 @@ private static Type parseSimpleValue(XContentParser parser, BytesStreamOutput by
 
             return switch (token) {
                 case VALUE_STRING -> {
-                    byte[] stringBytes = parser.text().getBytes(java.nio.charset.StandardCharsets.UTF_8);
-                    bytes.write(stringBytes);
-                    yield new VariableValue((int) position, stringBytes.length, ValueType.STRING);
+                    XContentString.UTF8Bytes stringBytes = parser.optimizedText().bytes();
+                    bytes.write(stringBytes.bytes(), stringBytes.offset(), stringBytes.length());
+                    yield new VariableValue((int) position, stringBytes.length(), ValueType.STRING);
                 }
                 case VALUE_NUMBER -> {
                     XContentParser.NumberType numberType = parser.numberType();

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

@@ -1341,14 +1341,9 @@ static String getProcessorName(Processor processor) {
      * Builds a new ingest document from the passed-in index request.
      */
     private static IngestDocument newIngestDocument(final IndexRequest request) {
-        ESONSource.Builder builder = new ESONSource.Builder();
-        try (
-            XContentParser parser = XContentHelper.createParser(
-                XContentParserConfiguration.EMPTY,
-                request.source(),
-                request.getContentType()
-            );
-        ) {
+        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(),