Change

Author: Tim-Brooks

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

@@ -40,12 +40,15 @@
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.ingest.ESONSource;
 import org.elasticsearch.ingest.IngestService;
-import org.elasticsearch.plugins.internal.XContentParserDecorator;
+import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
+import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -100,7 +103,8 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
     private String routing;
 
     private BytesReference source;
-    private ESONSource structuredSource;
+    private ESONSource.ESONObject structuredSource;
+    private boolean useStructuredSource = false;
 
     private OpType opType = OpType.INDEX;
 
@@ -414,20 +418,31 @@ public boolean isPipelineResolved() {
      * The source of the document to index, recopied to a new array if it is unsafe.
      */
     public BytesReference source() {
+        if (useStructuredSource && source == null) {
+            try {
+                XContentBuilder builder = XContentFactory.contentBuilder(contentType);
+                structuredSource.toXContent(builder, ToXContent.EMPTY_PARAMS);
+                source = BytesReference.bytes(builder);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
         return source;
     }
 
-    public void setStructuredSource(ESONSource esonSource) {
+    public void setStructuredSource(ESONSource.ESONObject esonSource) {
+        this.source = null;
         this.structuredSource = esonSource;
-        source = null;
+        this.useStructuredSource = true;
     }
 
     public Map<String, Object> sourceAsMap() {
-        return XContentHelper.convertToMap(source, false, contentType).v2();
-    }
-
-    public Map<String, Object> sourceAsMap(XContentParserDecorator parserDecorator) {
-        return XContentHelper.convertToMap(source, false, contentType, parserDecorator).v2();
+        if (useStructuredSource) {
+            assert structuredSource != null;
+            return structuredSource;
+        } else {
+            return XContentHelper.convertToMap(source, false, contentType).v2();
+        }
     }
 
     /**
@@ -546,6 +561,15 @@ public static XContentBuilder getXContentBuilder(XContentType xContentType, Obje
     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(false);
+            try {
+                XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, xContentType);
+                structuredSource = builder.parse(parser);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
         return this;
     }
 
@@ -776,7 +800,7 @@ private void writeBody(StreamOutput out) throws IOException {
         }
         out.writeOptionalString(id);
         out.writeOptionalString(routing);
-        out.writeBytesReference(source);
+        out.writeBytesReference(source());
         out.writeByte(opType.getId());
         out.writeLong(version);
         out.writeByte(versionType.getValue());
@@ -924,7 +948,7 @@ public Index getConcreteWriteIndex(IndexAbstraction ia, ProjectMetadata project)
 
     @Override
     public int route(IndexRouting indexRouting) {
-        return indexRouting.indexShard(id, routing, contentType, source);
+        return indexRouting.indexShard(id, routing, contentType, source());
     }
 
     public IndexRequest setRequireAlias(boolean requireAlias) {

server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.index.mapper.RoutingFieldMapper;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.plugins.internal.XContentParserDecorator;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.UpdateCtxMap;
@@ -193,11 +192,7 @@ Result prepareUpdateIndexRequest(IndexShard indexShard, UpdateRequest request, G
         final XContentType updateSourceContentType = sourceAndContent.v1();
         final Map<String, Object> updatedSourceAsMap = sourceAndContent.v2();
 
-        final boolean noop = XContentHelper.update(
-            updatedSourceAsMap,
-            currentRequest.sourceAsMap(XContentParserDecorator.NOOP),
-            detectNoop
-        ) == false;
+        final boolean noop = XContentHelper.update(updatedSourceAsMap, currentRequest.sourceAsMap(), detectNoop) == false;
 
         // We can only actually turn the update into a noop if detectNoop is true to preserve backwards compatibility and to handle cases
         // where users repopulating multi-fields or adding synonyms, etc.

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

@@ -13,7 +13,6 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.util.Strings;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.ResourceNotFoundException;
@@ -78,9 +77,7 @@
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.threadpool.Scheduler;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
 
@@ -1403,13 +1400,7 @@ private static void updateIndexRequestSource(final IndexRequest request, final I
         assert ensureNoSelfReferences == false;
         MapStructuredSource source = (MapStructuredSource) document.getSource();
         ESONSource.ESONObject esonSource = (ESONSource.ESONObject) source.map();
-        try {
-            XContentBuilder builder = XContentFactory.contentBuilder(request.getContentType());
-            esonSource.toXContent(builder, ToXContent.EMPTY_PARAMS);
-            request.source(BytesReference.bytes(builder), builder.contentType());
-        } catch (IOException e) {
-            throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
-        }
+        request.setStructuredSource(esonSource);
     }
 
     /**