Change

Author: Tim-Brooks

libs/x-content/src/main/java/org/elasticsearch/xcontent/support/MapXContentParser.java

@@ -11,7 +11,9 @@
 
 import org.elasticsearch.xcontent.DeprecationHandler;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.Text;
 import org.elasticsearch.xcontent.XContentLocation;
+import org.elasticsearch.xcontent.XContentString;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
@@ -137,6 +139,20 @@ public String text() throws IOException {
         }
     }
 
+    @Override
+    public XContentString optimizedText() throws IOException {
+        if (currentToken() == Token.VALUE_STRING) {
+            Object value = iterator.currentValue();
+            if (value instanceof XContentString) {
+                return (XContentString) value;
+            } else {
+                return new Text(value.toString());
+            }
+        } else {
+            throw new IllegalStateException("Cannot get text for the current token " + currentToken());
+        }
+    }
+
     @Override
     public CharBuffer charBuffer() throws IOException {
         throw new UnsupportedOperationException("use text() instead");
@@ -269,7 +285,7 @@ TokenIterator processValue(Object value) {
                 return new ArrayIterator(this, childName(), (List<Object>) value).next();
             } else if (value instanceof Number) {
                 currentToken = Token.VALUE_NUMBER;
-            } else if (value instanceof String) {
+            } else if (value instanceof String || value instanceof XContentString) {
                 currentToken = Token.VALUE_STRING;
             } else if (value instanceof Boolean) {
                 currentToken = Token.VALUE_BOOLEAN;

server/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java

@@ -19,6 +19,7 @@
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.core.Booleans;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.ingest.ESONIndexed;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -337,7 +338,12 @@ private static Map<String, Object> filter(
                 continue;
             }
 
-            Object value = entry.getValue();
+            Object value;
+            if (entry instanceof ESONIndexed.ESONObject.LazyEntry lazyEntry && lazyEntry.isUTF8Bytes()) {
+                value = lazyEntry.utf8Bytes();
+            } else {
+                value = entry.getValue();
+            }
 
             CharacterRunAutomaton subIncludeAutomaton = includeAutomaton;
             int subIncludeState = includeState;

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

@@ -9,11 +9,14 @@
 
 package org.elasticsearch.ingest;
 
+import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.bytes.CompositeBytesReference;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.xcontent.Text;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentString;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -274,7 +277,7 @@ public byte type() {
             return ESONEntry.TYPE_OBJECT;
         }
 
-        private class LazyEntry implements Entry<String, Object> {
+        public class LazyEntry implements Entry<String, Object> {
             private final String key;
             private final ESONSource.Value type;
             private final boolean nullForRawValues;
@@ -296,6 +299,19 @@ public boolean isRawValue() {
                 return type instanceof ESONSource.FixedValue || type instanceof ESONSource.VariableValue;
             }
 
+            public boolean isUTF8Bytes() {
+                return type.type() == ESONEntry.STRING;
+            }
+
+            public XContentString utf8Bytes() {
+                if (type instanceof ESONSource.VariableValue varValue && varValue.type() == ESONEntry.STRING) {
+                    BytesRef bytesRef = ESONSource.Values.readByteSlice(esonFlat.values().data(), varValue.position());
+                    return new Text(new XContentString.UTF8Bytes(bytesRef.bytes, bytesRef.offset, bytesRef.length), bytesRef.length);
+                }
+                throw new IllegalArgumentException();
+
+            }
+
             @Override
             public Object getValue() {
                 if (valueComputed == false) {