Removed isIndexed check, swap order of field loader layers

Author: Kubik42

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java

@@ -688,7 +688,6 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
                     final var bytesRef = new BytesRef(utfBytes.bytes(), utfBytes.offset(), utfBytes.length());
                     context.doc().add(new StoredField(fieldName, bytesRef));
                 } else {
-
                     context.doc().add(new StoredField(fieldName, value.string()));
                 }
             }
@@ -735,7 +734,7 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
         var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
             // merge the two field loaders into one
-            return fieldLoader.mergedWith(kwd.syntheticFieldLoader(fullPath(), leafName()));
+            return kwd.syntheticFieldLoader(fullPath(), leafName()).mergedWith(fieldLoader);
         }
 
         return fieldLoader;

plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java

@@ -563,10 +563,10 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
             if (fieldType.omitNorms()) {
                 context.addToFieldNames(fieldType().name());
             }
-        } else if (needsToSupportSyntheticSource() && fieldType.stored() == false) {
-            // if synthetic source needs to be supported, yet the field isn't stored, then we need to rely on something
-            // else to support synthetic source
+        }
 
+        // if synthetic source needs to be supported, yet the field isn't stored, then we need to rely on something else
+        if (needsToSupportSyntheticSource() && fieldType.stored() == false) {
             // if we can rely on the synthetic source delegate for synthetic source, then return
             if (fieldType().canUseSyntheticSourceDelegateForSyntheticSource(value)) {
                 return;
@@ -621,7 +621,7 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
         var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
             // merge the two field loaders into one
-            return fieldLoader.mergedWith(kwd.syntheticFieldLoader(fullPath(), leafName()));
+            return kwd.syntheticFieldLoader(fullPath(), leafName()).mergedWith(fieldLoader);
         }
 
         return fieldLoader;

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

@@ -1450,9 +1450,10 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
             if (phraseFieldInfo != null) {
                 context.doc().add(new Field(phraseFieldInfo.field, value, phraseFieldInfo.fieldType));
             }
-        } else if (needsToSupportSyntheticSource() && fieldType.stored() == false) {
-            // if synthetic source needs to be supported, yet the field isn't stored, then we need to rely on something else
+        }
 
+        // if synthetic source needs to be supported, yet the field isn't stored, then we need to rely on something else
+        if (needsToSupportSyntheticSource() && fieldType.stored() == false) {
             // if we can rely on the synthetic source delegate for synthetic source, then exit as there is nothing to do
             if (fieldType().canUseSyntheticSourceDelegateForSyntheticSource(value)) {
                 return;
@@ -1638,10 +1639,6 @@ protected void write(XContentBuilder b, Object value) throws IOException {
             });
         }
 
-        if (isIndexed()) {
-            return super.syntheticSourceSupport();
-        }
-
         return new SyntheticSourceSupport.Native(() -> syntheticFieldLoader(fullPath(), leafName()));
     }
 
@@ -1664,7 +1661,7 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
         var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
             // merge the two field loaders into one
-            return fieldLoader.mergedWith(kwd.syntheticFieldLoader(fullPath(), leafName()));
+            return kwd.syntheticFieldLoader(fullPath(), leafName()).mergedWith(fieldLoader);
         }
 
         return fieldLoader;