Change

Author: Tim-Brooks

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

@@ -11,7 +11,7 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.io.stream.RecyclerBytesStreamOutput;
+import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.recycler.Recycler;
 import org.elasticsearch.transport.BytesRefRecycler;
 import org.elasticsearch.xcontent.ToXContent;
@@ -36,15 +36,16 @@ public class ESONSource {
 
     public static class Builder {
 
-        private final RecyclerBytesStreamOutput bytes;
+        private final BytesStreamOutput bytes;
         private final boolean ordered;
 
         public Builder(boolean ordered) {
             this(BytesRefRecycler.NON_RECYCLING_INSTANCE, ordered);
         }
 
         public Builder(Recycler<BytesRef> refRecycler, boolean ordered) {
-            this.bytes = new RecyclerBytesStreamOutput(refRecycler);
+            // this.bytes = new RecyclerBytesStreamOutput(refRecycler);
+            this.bytes = new BytesStreamOutput(128);
             this.ordered = ordered;
         }
 
@@ -67,7 +68,7 @@ public ESONObject parse(XContentParser parser) throws IOException {
             return rootObject;
         }
 
-        private static ESONObject parseObject(XContentParser parser, RecyclerBytesStreamOutput bytes, Supplier<Values> valuesSupplier)
+        private static ESONObject parseObject(XContentParser parser, BytesStreamOutput bytes, Supplier<Values> valuesSupplier)
             throws IOException {
             Map<String, Type> map = new HashMap<>();
             String currentFieldName;
@@ -79,7 +80,7 @@ private static ESONObject parseObject(XContentParser parser, RecyclerBytesStream
             return new ESONObject(map, valuesSupplier);
         }
 
-        private static ESONArray parseArray(XContentParser parser, RecyclerBytesStreamOutput bytes, Supplier<Values> valuesSupplier)
+        private static ESONArray parseArray(XContentParser parser, BytesStreamOutput bytes, Supplier<Values> valuesSupplier)
             throws IOException {
             List<Type> elements = new ArrayList<>();
             XContentParser.Token token;
@@ -92,7 +93,7 @@ private static ESONArray parseArray(XContentParser parser, RecyclerBytesStreamOu
 
         private static Type parseValue(
             XContentParser parser,
-            RecyclerBytesStreamOutput bytes,
+            BytesStreamOutput bytes,
             Supplier<Values> valuesSupplier,
             XContentParser.Token token
         ) throws IOException {
@@ -131,7 +132,7 @@ private static Type parseValue(
             }
         }
 
-        private static ValueType handleNumber(XContentParser parser, RecyclerBytesStreamOutput bytes) throws IOException {
+        private static ValueType handleNumber(XContentParser parser, BytesStreamOutput bytes) throws IOException {
             switch (parser.numberType()) {
                 case INT -> {
                     int value = parser.intValue();
@@ -181,11 +182,11 @@ private static ValueType handleNumber(XContentParser parser, RecyclerBytesStream
             }
         }
 
-        private static void writeByteArray(RecyclerBytesStreamOutput bytes, byte[] value, int offset, int length) {
+        private static void writeByteArray(BytesStreamOutput bytes, byte[] value, int offset, int length) {
             bytes.writeBytes(value, offset, length);
         }
 
-        private static void writeString(RecyclerBytesStreamOutput bytes, String value) throws IOException {
+        private static void writeString(BytesStreamOutput bytes, String value) throws IOException {
             byte[] utf8Bytes = value.getBytes(java.nio.charset.StandardCharsets.UTF_8);
             writeByteArray(bytes, utf8Bytes, 0, utf8Bytes.length);
         }
@@ -391,13 +392,15 @@ public boolean remove(Object o) {
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject();
+            // TODO: Maybe need explicit null type to ensure not lost
             for (Entry<String, Type> entry : map.entrySet()) {
                 builder.field(entry.getKey());
                 switch (entry.getValue()) {
                     case ESONObject o -> o.toXContent(builder, params);
                     case ESONArray a -> a.toXContent(builder, params);
                     case FixedValue v -> v.writeToXContent(builder, objectValues.get());
                     case VariableValue v -> v.writeToXContent(builder, objectValues.get());
+                    case Mutation m -> builder.value(m.object());
                     default -> throw new IllegalArgumentException("Unknown type: " + entry.getValue());
                 }
             }
@@ -556,7 +559,14 @@ public Object getValue(Values source) {
         }
 
         public void writeToXContent(XContentBuilder builder, Values values) throws IOException {
-            builder.value(getValue(values));
+            switch (valueType) {
+                case INT -> builder.value(values.readInt(position));
+                case LONG -> builder.value(values.readLong(position));
+                case FLOAT -> builder.value(values.readFloat(position));
+                case DOUBLE -> builder.value(values.readDouble(position));
+                case BOOLEAN -> builder.value(values.readBoolean(position));
+                default -> throw new IllegalArgumentException("Invalid value type: " + valueType);
+            }
         }
     }
 

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

@@ -13,6 +13,7 @@
 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;
@@ -77,7 +78,9 @@
 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;
 
@@ -1398,7 +1401,15 @@ private static void updateIndexRequestSource(final IndexRequest request, final I
         // we already check for self references elsewhere (and clear the bit), so this should always be false,
         // keeping the check and assert as a guard against extraordinarily surprising circumstances
         assert ensureNoSelfReferences == false;
-        request.source(document.getSource(), request.getContentType(), ensureNoSelfReferences);
+        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);
+        }
     }
 
     /**