WIP

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java

@@ -25,6 +25,8 @@
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
+import org.elasticsearch.ingest.ESONSource;
+import org.elasticsearch.ingest.ESONXContentParser;
 import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
 import org.elasticsearch.search.lookup.SearchLookup;
 import org.elasticsearch.search.lookup.Source;
@@ -131,12 +133,21 @@ private XContentParser getParser(SourceToParse source, @Nullable Map<String, Obj
                 xContentType
             );
         } else {
-            return new MapXContentParser(
-                NamedXContentRegistry.EMPTY,
-                DeprecationHandler.IGNORE_DEPRECATIONS,
-                structuredSource,
-                xContentType
-            );
+            if (structuredSource instanceof ESONSource.ESONObject esonObject) {
+                return new ESONXContentParser(
+                    esonObject,
+                    NamedXContentRegistry.EMPTY,
+                    DeprecationHandler.IGNORE_DEPRECATIONS,
+                    xContentType
+                );
+            } else {
+                return new MapXContentParser(
+                    NamedXContentRegistry.EMPTY,
+                    DeprecationHandler.IGNORE_DEPRECATIONS,
+                    structuredSource,
+                    xContentType
+                );
+            }
         }
     }
 

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

@@ -321,6 +321,10 @@ public int size() {
         // TODO: test remove
         @Override
         public Set<Entry<String, Object>> entrySet() {
+            return entrySet(true);
+        }
+
+        public Set<Entry<String, Object>> entrySet(boolean shouldComputeValue) {
             return new AbstractSet<>() {
                 @Override
                 public Iterator<Entry<String, Object>> iterator() {
@@ -335,7 +339,7 @@ public boolean hasNext() {
                         @Override
                         public Entry<String, Object> next() {
                             Map.Entry<String, Type> mapEntry = mapIterator.next();
-                            return new LazyEntry(mapEntry.getKey(), mapEntry.getValue());
+                            return new LazyEntry(mapEntry.getKey(), mapEntry.getValue(), shouldComputeValue);
                         }
 
                         @Override
@@ -421,11 +425,15 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
         private class LazyEntry implements Entry<String, Object> {
             private final String key;
+            private final Type type;
+            private final boolean shouldComputeValue;
             private Object cachedValue;
             private boolean valueComputed = false;
 
-            LazyEntry(String key, Type type) {
+            LazyEntry(String key, Type type, boolean shouldComputeValue) {
                 this.key = key;
+                this.type = type;
+                this.shouldComputeValue = shouldComputeValue;
             }
 
             @Override
@@ -435,8 +443,14 @@ public String getKey() {
 
             @Override
             public Object getValue() {
-                if (valueComputed == false) {
-                    cachedValue = ESONObject.this.get(key); // Use the object's get method to handle modifications
+                if (shouldComputeValue && valueComputed == false) {
+                    if (type == null) {
+                        cachedValue = null;
+                    } else if (type instanceof Mutation mutation) {
+                        cachedValue = mutation.object();
+                    } else {
+                        cachedValue = convertTypeToValue(type);
+                    }
                     valueComputed = true;
                 }
                 return cachedValue;
@@ -445,7 +459,9 @@ public Object getValue() {
             @Override
             public Object setValue(Object value) {
                 Object oldValue = ESONObject.this.put(key, value);
-                cachedValue = value;
+                if (shouldComputeValue) {
+                    cachedValue = value;
+                }
                 return oldValue;
             }
 
@@ -492,6 +508,18 @@ public ESONArray(List<Type> elements, Supplier<Values> arrayValues) {
             this.arrayValues = arrayValues;
         }
 
+        public Supplier<Values> arrayValues() {
+            return arrayValues;
+        }
+
+        public Iterator<?> iterator(boolean shouldMaterialize) {
+            if (shouldMaterialize) {
+                return super.iterator();
+            } else {
+                return elements.iterator();
+            }
+        }
+
         @Override
         public Object get(int index) {
             Type type = elements.get(index);