Work

Author: Tim-Brooks

benchmarks/src/main/java/org/elasticsearch/benchmark/eson/ESONDeserializationBenchmark.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.ingest.ESONSource;
+import org.elasticsearch.ingest.ESONXContentSerializer;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
@@ -126,6 +127,14 @@ public void writeJSONFromESON(Blackhole bh) throws IOException {
         bh.consume(bytes);
     }
 
+    @Benchmark
+    public void writeJSONFromESONFlatten(Blackhole bh) throws IOException {
+        XContentBuilder builder = XContentFactory.contentBuilder(JsonXContent.jsonXContent.type());
+        ESONXContentSerializer.flattedToXContent(esonObject, builder, ToXContent.EMPTY_PARAMS);
+        BytesReference bytes = BytesReference.bytes(builder);
+        bh.consume(bytes);
+    }
+
     @Benchmark
     public void readMap(Blackhole bh) throws IOException {
         Tuple<XContentType, Map<String, Object>> tuple = XContentHelper.convertToMap(source, false, XContentType.JSON);

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessor.java

@@ -75,7 +75,7 @@ public IngestDocument execute(IngestDocument ingestDocument) throws Exception {
 
         Map<String, Object> matches = grok.captures(fieldValue);
         if (matches == null) {
-            logger.warn(">[{}] Grok expressions do not match field value: [{}]", tag, fieldValue);
+            logger.warn(">[{}] Grok expressions do not match field value: [{}][{}]", tag, matchField, fieldValue);
             throw new IllegalArgumentException("Provided Grok expressions do not match field value: [" + fieldValue + "]");
         }
 

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

@@ -17,6 +17,7 @@
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentString;
 
 import java.io.IOException;
 import java.util.AbstractCollection;
@@ -115,9 +116,9 @@ private static Type parseSimpleValue(XContentParser parser, BytesStreamOutput by
 
             return switch (token) {
                 case VALUE_STRING -> {
-                    byte[] stringBytes = parser.text().getBytes(java.nio.charset.StandardCharsets.UTF_8);
-                    bytes.write(stringBytes);
-                    yield new VariableValue((int) position, stringBytes.length, ValueType.STRING);
+                    XContentString.UTF8Bytes stringBytes = parser.optimizedText().bytes();
+                    bytes.write(stringBytes.bytes(), stringBytes.offset(), stringBytes.length());
+                    yield new VariableValue((int) position, stringBytes.length(), ValueType.STRING);
                 }
                 case VALUE_NUMBER -> {
                     XContentParser.NumberType numberType = parser.numberType();