Change

Author: Tim-Brooks

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

@@ -10,9 +10,7 @@
 package org.elasticsearch.ingest;
 
 import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.RecyclerBytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -73,7 +71,6 @@ public BytesReference getSerializedKeyBytes() {
             // String key = entry.key();
             // estimate += key == null ? 0 : key.length() + 5;
             // }
-            // try (BytesStreamOutput streamOutput = new BytesStreamOutput()) {
             try (RecyclerBytesStreamOutput streamOutput = new RecyclerBytesStreamOutput(getBytesRefRecycler())) {
                 streamOutput.writeVInt(keys.size());
                 for (ESONEntry entry : keys) {
@@ -102,7 +99,7 @@ public BytesReference getSerializedKeyBytes() {
 
     private static final ThreadLocal<BytesRef> BYTES_REF = ThreadLocal.withInitial(() -> new BytesRef(new byte[16384]));
 
-    private static Recycler<BytesRef> getBytesRefRecycler() {
+    public static Recycler<BytesRef> getBytesRefRecycler() {
         return new Recycler<>() {
 
             private boolean first = true;

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

@@ -10,14 +10,15 @@
 package org.elasticsearch.ingest;
 
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.common.io.stream.RecyclerBytesStreamOutput;
 import org.elasticsearch.common.recycler.Recycler;
-import org.elasticsearch.transport.BytesRefRecycler;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentString;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -28,19 +29,19 @@
 public class ESONSource {
 
     public static class Builder {
-        private final BytesStreamOutput bytes;
+        private final Recycler<BytesRef> refRecycler;
         private final List<ESONEntry> keyArray;
 
         public Builder() {
             this(0);
         }
 
         public Builder(int expectedSize) {
-            this(BytesRefRecycler.NON_RECYCLING_INSTANCE, expectedSize);
+            this(ESONFlat.getBytesRefRecycler(), expectedSize);
         }
 
         public Builder(Recycler<BytesRef> refRecycler, int expectedSize) {
-            this.bytes = new BytesStreamOutput(expectedSize);
+            this.refRecycler = refRecycler;
             this.keyArray = new ArrayList<>();
         }
 
@@ -50,13 +51,21 @@ public ESONIndexed.ESONObject parse(XContentParser parser) throws IOException {
                 throw new IllegalArgumentException("Expected START_OBJECT but got " + token);
             }
 
-            parseObject(parser, bytes, keyArray, null);
+            try (RecyclerBytesStreamOutput bytes = new RecyclerBytesStreamOutput(refRecycler)) {
+                parseObject(parser, bytes, keyArray, null);
+                ByteArrayOutputStream bao = new ByteArrayOutputStream(bytes.size());
+                bytes.bytes().writeTo(bao);
+                return new ESONIndexed.ESONObject(0, new ESONFlat(keyArray, new Values(new BytesArray(bao.toByteArray()))));
+            }
 
-            return new ESONIndexed.ESONObject(0, new ESONFlat(keyArray, new Values(bytes.bytes())));
         }
 
-        private static void parseObject(XContentParser parser, BytesStreamOutput bytes, List<ESONEntry> keyArray, String objectFieldName)
-            throws IOException {
+        private static void parseObject(
+            XContentParser parser,
+            RecyclerBytesStreamOutput bytes,
+            List<ESONEntry> keyArray,
+            String objectFieldName
+        ) throws IOException {
             ESONEntry.ObjectEntry objEntry = new ESONEntry.ObjectEntry(objectFieldName);
             keyArray.add(objEntry);
 
@@ -70,8 +79,12 @@ private static void parseObject(XContentParser parser, BytesStreamOutput bytes,
             objEntry.offsetOrCount(count);
         }
 
-        private static void parseArray(XContentParser parser, BytesStreamOutput bytes, List<ESONEntry> keyArray, String arrayFieldName)
-            throws IOException {
+        private static void parseArray(
+            XContentParser parser,
+            RecyclerBytesStreamOutput bytes,
+            List<ESONEntry> keyArray,
+            String arrayFieldName
+        ) throws IOException {
             ESONEntry.ArrayEntry arrEntry = new ESONEntry.ArrayEntry(arrayFieldName);
             keyArray.add(arrEntry);
 
@@ -92,7 +105,7 @@ private static void parseArray(XContentParser parser, BytesStreamOutput bytes, L
             arrEntry.offsetOrCount(count);
         }
 
-        private static void parseValue(XContentParser parser, String fieldName, BytesStreamOutput bytes, List<ESONEntry> keyArray)
+        private static void parseValue(XContentParser parser, String fieldName, RecyclerBytesStreamOutput bytes, List<ESONEntry> keyArray)
             throws IOException {
             XContentParser.Token token = parser.nextToken();
 
@@ -106,7 +119,7 @@ private static void parseValue(XContentParser parser, String fieldName, BytesStr
             }
         }
 
-        private static Value parseSimpleValue(XContentParser parser, BytesStreamOutput bytes, XContentParser.Token token)
+        private static Value parseSimpleValue(XContentParser parser, RecyclerBytesStreamOutput bytes, XContentParser.Token token)
             throws IOException {
             long position = bytes.position();