Improvements

Author: Tim-Brooks

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

@@ -38,6 +38,7 @@
 import org.elasticsearch.index.VersionType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.ingest.ESONFlat;
 import org.elasticsearch.ingest.ESONIndexed;
 import org.elasticsearch.ingest.ESONSource;
 import org.elasticsearch.ingest.ESONXContentSerializer;
@@ -105,7 +106,7 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
     private String routing;
 
     private BytesReference source;
-    private ESONIndexed.ESONObject structuredSource;
+    private ESONFlat structuredSource;
     private boolean useStructuredSource = false;
 
     private OpType opType = OpType.INDEX;
@@ -425,7 +426,7 @@ public BytesReference source() {
 
     public void setStructuredSource(ESONIndexed.ESONObject esonSource) {
         this.useStructuredSource = true;
-        this.structuredSource = esonSource;
+        this.structuredSource = esonSource.esonFlat();
         try (XContentBuilder builder = XContentFactory.contentBuilder(contentType)) {
             ESONXContentSerializer.flattenToXContent(esonSource.esonFlat(), builder, ToXContent.EMPTY_PARAMS);
             source = BytesReference.bytes(builder);
@@ -444,7 +445,7 @@ public void ensureStructureSource() {
     private void createStructuredSource() {
         ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
         try (XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, contentType)) {
-            structuredSource = builder.parse(parser);
+            structuredSource = builder.parse(parser).esonFlat();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
@@ -455,13 +456,13 @@ public boolean isStructuredSource() {
     }
 
     public ESONIndexed.ESONObject structuredSource() {
-        return structuredSource;
+        return ESONIndexed.fromFlat(structuredSource);
     }
 
     public Map<String, Object> sourceAsMap() {
         if (useStructuredSource) {
             assert structuredSource != null;
-            return structuredSource;
+            return ESONIndexed.fromFlat(structuredSource);
         } else {
             return XContentHelper.convertToMap(source, false, contentType).v2();
         }

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

@@ -35,6 +35,10 @@
 
 public class ESONIndexed {
 
+    public static ESONObject fromFlat(ESONFlat esonFlat) {
+        return new ESONObject(0, esonFlat);
+    }
+
     public static class ESONObject implements ESONSource.Value, Map<String, Object>, ToXContent {
         private final int keyArrayIndex;
         private final ESONEntry.ObjectEntry objEntry;
@@ -533,7 +537,8 @@ private static int skipContainer(List<ESONEntry> keyArray, ESONEntry entry, int
     }
 
     public static ESONIndexed.ESONObject flatten(ESONIndexed.ESONObject original) {
-        BytesStreamOutput newValuesOut = new BytesStreamOutput();
+        // TODO: Add a better estimate of the size to be added
+        BytesStreamOutput newValuesOut = new BytesStreamOutput(128);
         List<ESONEntry> flatKeyArray = new ArrayList<>(original.esonFlat.keys().size());
         BytesReference originalData = original.esonFlat.values().data();
 

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

@@ -226,12 +226,13 @@ public Object getValue(Values source) {
         }
 
         public void writeToXContent(XContentBuilder builder, Values values) throws IOException {
+            BytesReference slice = values.data.slice(position, length);
+
             byte[] bytes;
             int offset;
-            if (values.data().hasArray()) {
-                BytesRef bytesRef = values.data().toBytesRef();
-                bytes = bytesRef.bytes;
-                offset = bytesRef.offset + position;
+            if (slice.hasArray()) {
+                bytes = slice.array();
+                offset = slice.arrayOffset() + position;
             } else {
                 bytes = values.readByteArray(position, length);
                 offset = 0;
@@ -279,12 +280,13 @@ private byte[] readByteArray(int position, int length) {
         }
 
         public String readString(int position, int length) {
+            BytesReference slice = data.slice(position, length);
+
             final byte[] bytes;
             final int offset;
-            // TODO: Maybe slice to improve chance of backing array
-            if (data.hasArray()) {
-                bytes = data.array();
-                offset = data.arrayOffset() + position;
+            if (slice.hasArray()) {
+                bytes = slice.array();
+                offset = slice.arrayOffset() + position;
             } else {
                 bytes = readByteArray(position, length);
                 offset = 0;