Automatically flatten objects when subobjects:false

docs/changelog/97972.yaml

@@ -0,0 +1,6 @@
+pr: 97972
+summary: Automatically flatten objects when subobjects:false
+area: Mapping
+type: enhancement
+issues:
+ - 88934

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

@@ -18,6 +18,10 @@ public final class ContentPath {
 
     private String[] path = new String[10];
 
+    private int dottedFieldNameIndex = 0;
+
+    private String[] dottedFieldName = new String[10];
+
     private boolean withinLeafObject = false;
 
     public ContentPath() {
@@ -27,20 +31,37 @@ public ContentPath() {
     public void add(String name) {
         path[index++] = name;
         if (index == path.length) { // expand if needed
-            expand();
+            expandPath();
+        }
+    }
+
+    public void addDottedFieldName(String name) {
+        dottedFieldName[dottedFieldNameIndex++] = name;
+        if (dottedFieldNameIndex == dottedFieldName.length) {
+            expandDottedFieldName();
         }
     }
 
-    private void expand() {
+    private void expandPath() {
         String[] newPath = new String[path.length + 10];
         System.arraycopy(path, 0, newPath, 0, path.length);
         path = newPath;
     }
 
+    private void expandDottedFieldName() {
+        String[] newDottedFieldName = new String[dottedFieldName.length + 10];
+        System.arraycopy(dottedFieldName, 0, newDottedFieldName, 0, dottedFieldName.length);
+        dottedFieldName = newDottedFieldName;
+    }
+
     public void remove() {
         path[index--] = null;
     }
 
+    public void removeDottedFieldName() {
+        dottedFieldName[dottedFieldNameIndex--] = null;
+    }
+
     public void setWithinLeafObject(boolean withinLeafObject) {
         this.withinLeafObject = withinLeafObject;
     }
@@ -58,6 +79,15 @@ public String pathAsText(String name) {
         return sb.toString();
     }
 
+    public String dottedFieldName(String name) {
+        sb.setLength(0);
+        for (int i = 0; i < dottedFieldNameIndex; i++) {
+            sb.append(dottedFieldName[i]).append(DELIMITER);
+        }
+        sb.append(name);
+        return sb.toString();
+    }
+
     public int length() {
         return index;
     }

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

@@ -306,11 +306,11 @@ private static void innerParseObject(DocumentParserContext context) throws IOExc
                     parseArray(context, currentFieldName);
                     break;
                 case VALUE_NULL:
-                    parseNullValue(context, currentFieldName);
+                    parseNullValue(context, context.path().dottedFieldName(currentFieldName));
                     break;
                 default:
                     if (token.isValue()) {
-                        parseValue(context, currentFieldName);
+                        parseValue(context, context.path().dottedFieldName(currentFieldName));
                     }
                     break;
             }
@@ -430,7 +430,15 @@ private static void parseObject(final DocumentParserContext context, String curr
             context.path().setWithinLeafObject(false);
             context.path().remove();
         } else {
-            parseObjectDynamic(context, currentFieldName);
+            DynamicTemplate dynamicTemplate = context.findDynamicTemplate(currentFieldName, DynamicTemplate.XContentFieldType.OBJECT);
+            if (context.parent().subobjects() || dynamicTemplate != null) {
+                parseObjectDynamic(context, currentFieldName);
+            } else {
+                context.parser().nextToken(); // Skipping Object-start
+                context.path().addDottedFieldName(currentFieldName);
+                innerParseObject(context);
+                context.path().removeDottedFieldName();
+            }
         }
     }
 
@@ -543,12 +551,12 @@ private static void parseNonDynamicArray(DocumentParserContext context, final St
             } else if (token == XContentParser.Token.START_ARRAY) {
                 parseArray(context, lastFieldName);
             } else if (token == XContentParser.Token.VALUE_NULL) {
-                parseNullValue(context, lastFieldName);
+                parseNullValue(context, context.path().dottedFieldName(lastFieldName));
             } else if (token == null) {
                 throwEOFOnParseArray(arrayFieldName, context);
             } else {
                 assert token.isValue();
-                parseValue(context, lastFieldName);
+                parseValue(context, context.path().dottedFieldName(lastFieldName));
             }
         }
     }