Added more bwc checks

Author: Kubik42

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

@@ -684,7 +684,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
         // match_only_text isn't stored, so if synthetic source needs to be supported, we must do something about it
         if (needsToSupportSyntheticSource()) {
             // check if we can use the delegate
-            if (fieldType().textFieldType.canUseSyntheticSourceDelegateForSyntheticSource(value.string())) {
+            if (fieldType().textFieldType.canUseSyntheticSourceDelegateForSyntheticSource(value.string(), indexCreatedVersion)) {
                 return;
             }
 

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

@@ -584,7 +584,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
         // 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)) {
+            if (fieldType().canUseSyntheticSourceDelegateForSyntheticSource(value, indexCreatedVersion)) {
                 return;
             }
 

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

@@ -1226,7 +1226,10 @@ private boolean indexValue(DocumentParserContext context, String value) {
      */
     private boolean storeIgnoredValuesForSyntheticSource() {
         // skip all fields that are multi-fields
-        return fieldType().isSyntheticSourceEnabled && fieldType().isWithinMultiField == false;
+        if (TextFamilyFieldMapper.keywordMultiFieldsNotStoredWhenIgnored_indexVersionCheck(indexCreatedVersion)) {
+            return fieldType().isSyntheticSourceEnabled && fieldType().isWithinMultiField == false;
+        }
+        return fieldType().isSyntheticSourceEnabled;
     }
 
     private boolean indexValue(DocumentParserContext context, XContentString value) {

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

@@ -1041,10 +1041,13 @@ public boolean canUseSyntheticSourceDelegateForQuerying() {
         /**
          * Returns whether this field can use its delegate keyword field for synthetic source.
          */
-        public boolean canUseSyntheticSourceDelegateForSyntheticSource(final String value) {
+        public boolean canUseSyntheticSourceDelegateForSyntheticSource(final String value, final IndexVersion indexCreatedVersion) {
             if (syntheticSourceDelegate.isPresent()) {
-                // if the keyword field is going to be ignored, then we can't rely on it for synthetic source
-                return syntheticSourceDelegate.get().isIgnored(value) == false;
+                if (TextFamilyFieldMapper.keywordMultiFieldsNotStoredWhenIgnored_indexVersionCheck(indexCreatedVersion)) {
+                    // if the keyword field is going to be ignored, then we can't rely on it for synthetic source
+                    return syntheticSourceDelegate.get().isIgnored(value) == false;
+                }
+                return true;
             }
             return false;
         }
@@ -1418,7 +1421,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
         // 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)) {
+            if (fieldType().canUseSyntheticSourceDelegateForSyntheticSource(value, indexCreatedVersion)) {
                 return;
             }