cleaned up

Author: Kubik42

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

@@ -335,20 +335,6 @@ public final void addIgnoredField(IgnoredSourceFieldMapper.NameValue values) {
         }
     }
 
-    /**
-     * This function acts as a more "readable" wrapper around adding ignored fields.
-     *
-     * This is useful when we want to reuse the existing logic that {@link IgnoredSourceFieldMapper} provides for synthetic source, without
-     * explicitly calling addIgnoredField(). Without this, it's a bit confusing why fields that are not meant to be ignored, are being
-     * added to ignored source.
-     */
-    public final void storeFieldForSyntheticSource(String fullPath, String leafName, BytesRef valueBytes, LuceneDocument doc) {
-        if (canAddIgnoredField()) {
-            var fieldData = new IgnoredSourceFieldMapper.NameValue(fullPath, fullPath.lastIndexOf(leafName), valueBytes, doc);
-            ignoredFieldValues.add(fieldData);
-        }
-    }
-
     /**
      * Return the collection of values for fields that have been ignored so far.
      */

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

@@ -1221,14 +1221,6 @@ private boolean indexValue(DocumentParserContext context, String value) {
         return indexValue(context, new Text(value));
     }
 
-    /**
-     * Returns whether this field should be stored separately as a {@link StoredField} for supporting synthetic source.
-     */
-    private boolean storeIgnoredValuesForSyntheticSource() {
-        // skip all fields that are multi-fields
-        return fieldType().isSyntheticSourceEnabled && fieldType().isWithinMultiField == false;
-    }
-
     private boolean indexValue(DocumentParserContext context, XContentString value) {
         // nothing to index
         if (value == null) {
@@ -1240,11 +1232,12 @@ private boolean indexValue(DocumentParserContext context, XContentString value)
             return false;
         }
 
-        // if the value's length exceeds ignore_above, then don't index it
-        if (value.stringLength() > fieldType().ignoreAbove()) {
+        // if the value's length exceeds ignore_above, then don't index it. Instead, store it in ignored source
+        // that being said, don't store multi fields in ignored source as thats the responsibility of the parent
+        if (value.stringLength() > fieldType().ignoreAbove() && isWithinMultiField == false) {
             context.addIgnoredField(fullPath());
-            // unless, synthetic source is enabled, then store a copy of the value so that synthetic source be load it
-            if (storeIgnoredValuesForSyntheticSource()) {
+            // unless synthetic source is enabled, then store a copy of the value so that synthetic source be load it
+            if (fieldType().isSyntheticSourceEnabled) {
                 var utfBytes = value.bytes();
                 var bytesRef = new BytesRef(utfBytes.bytes(), utfBytes.offset(), utfBytes.length());
                 final String fieldName = fieldType().syntheticSourceFallbackFieldName();