Merge branch 'structured_source' into structured_source_benchmark

Author: Tim-Brooks

modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/260_logs_failure_store.yml

@@ -76,4 +76,5 @@ teardown:
             match_all: {}
   - length: { hits.hits: 1 }
   - match: { hits.hits.0._source.document.source.message.struct.value: 42 }
+    # TODO: For some reason changed to illegal argument exception sometimes?
   - match: { hits.hits.0._source.error.type: "document_parsing_exception" }

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

@@ -12,7 +12,6 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
-import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.recycler.Recycler;
 import org.elasticsearch.transport.BytesRefRecycler;
 import org.elasticsearch.xcontent.ToXContent;
@@ -184,29 +183,26 @@ public enum ValueType {
         BINARY
     }
 
-    public interface KeyEntry {
+    public abstract static class KeyEntry {
 
-        String key();
-
-        default void writeTo(StreamOutput out) throws IOException {
+        private final String key;
 
+        KeyEntry(String key) {
+            this.key = key;
         }
 
+        public String key() {
+            return key;
+        }
     }
 
-    public static class ObjectEntry implements KeyEntry {
+    public static class ObjectEntry extends KeyEntry {
 
-        private final String key;
         public int fieldCount = 0;
         private Map<String, Type> mutationMap = null;
 
         public ObjectEntry(String key) {
-            this.key = key;
-        }
-
-        @Override
-        public String key() {
-            return key;
+            super(key);
         }
 
         public boolean hasMutations() {
@@ -215,23 +211,17 @@ public boolean hasMutations() {
 
         @Override
         public String toString() {
-            return "ObjectEntry{" + "key='" + key + '\'' + ", fieldCount=" + fieldCount + ", hasMutations=" + hasMutations() + '}';
+            return "ObjectEntry{" + "key='" + key() + '\'' + ", fieldCount=" + fieldCount + ", hasMutations=" + hasMutations() + '}';
         }
     }
 
-    public static class ArrayEntry implements KeyEntry {
+    public static class ArrayEntry extends KeyEntry {
 
-        private final String key;
         public int elementCount = 0;
         private List<Type> mutationArray = null;
 
         public ArrayEntry(String key) {
-            this.key = key;
-        }
-
-        @Override
-        public String key() {
-            return key;
+            super(key);
         }
 
         public boolean hasMutations() {
@@ -240,27 +230,21 @@ public boolean hasMutations() {
 
         @Override
         public String toString() {
-            return "ArrayEntry{" + "key='" + key + '\'' + ", elementCount=" + elementCount + ", hasMutations=" + hasMutations() + '}';
+            return "ArrayEntry{" + "key='" + key() + '\'' + ", elementCount=" + elementCount + ", hasMutations=" + hasMutations() + '}';
         }
     }
 
-    public static class FieldEntry implements KeyEntry {
-        public final String key;
+    public static class FieldEntry extends KeyEntry {
         public final Type type;
 
         public FieldEntry(String key, Type type) {
-            this.key = key;
+            super(key);
             this.type = type;
         }
 
-        @Override
-        public String key() {
-            return key;
-        }
-
         @Override
         public String toString() {
-            return "FieldEntry{" + "key='" + key + '\'' + ", type=" + type + '}';
+            return "FieldEntry{" + "key='" + key() + '\'' + ", type=" + type + '}';
         }
     }
 
@@ -397,7 +381,7 @@ private void ensureMaterializedMap() {
                 for (int i = 0; i < objEntry.fieldCount; i++) {
                     KeyEntry entry = keyArray.get(currentIndex);
                     if (entry instanceof FieldEntry fieldEntry) {
-                        materializedMap.put(fieldEntry.key, fieldEntry.type);
+                        materializedMap.put(fieldEntry.key(), fieldEntry.type);
                         currentIndex++;
                     } else {
                         if (entry instanceof ObjectEntry) {
@@ -1056,23 +1040,4 @@ private static void flattenArray(ESONArray arr, String arrayFieldName, List<KeyE
             newArrEntry.elementCount = elementCount;
         }
     }
-
-    public void writeToStream(ESONObject object, StreamOutput out) throws IOException {
-        out.writeByte((byte) 'E');
-        out.writeByte((byte) 'S');
-        out.writeByte((byte) 'O');
-        out.writeByte((byte) 'N');
-        // TODO: How to write size
-        // TODO: Assert flattened or support transition to flattened
-        for (KeyEntry entry : object.getKeyArray()) {
-            if (entry instanceof ObjectEntry) {
-
-            } else if (entry instanceof ArrayEntry) {
-
-            } else {
-
-            }
-            entry.writeTo(out);
-        }
-    }
 }

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

@@ -86,8 +86,8 @@ public static XContentBuilder flattenToXContent(ESONSource.ESONObject rootObject
             // Process the current entry
             if (entry instanceof ESONSource.FieldEntry fieldEntry) {
                 // Simple field with a value
-                if (currentContainer.isArray == false && fieldEntry.key != null) {
-                    builder.field(fieldEntry.key);
+                if (currentContainer.isArray == false && fieldEntry.key() != null) {
+                    builder.field(fieldEntry.key());
                 }
 
                 writeValue(values, builder, fieldEntry.type, params);