Move bwc check to constructor

Author: Kubik42

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

@@ -341,9 +341,10 @@ public boolean newDynamicStringField(DocumentParserContext context, String name)
                         indexSettings.getIndexVersionCreated(),
                         indexSettings.getMode(),
                         context.indexAnalyzers(),
+                        mapperBuilderContext.isSourceSynthetic(),
                         false
                     ).addMultiField(
-                        new KeywordFieldMapper.Builder("keyword", context.indexSettings().getIndexVersionCreated()).ignoreAbove(256)
+                        new KeywordFieldMapper.Builder("keyword", context.indexSettings().getIndexVersionCreated(), true).ignoreAbove(256)
                     ),
                     context
                 );

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

@@ -245,7 +245,7 @@ public static class Builder extends FieldMapper.Builder {
         private final IndexMode indexMode;
 
         private final Parameter<Boolean> index = Parameter.indexParam(m -> ((TextFieldMapper) m).index, true);
-        private final Parameter<Boolean> store = Parameter.storeParam(m -> ((TextFieldMapper) m).store, false);
+        private Parameter<Boolean> store;
 
         final Parameter<SimilarityProvider> similarity = TextParams.similarity(m -> ((TextFieldMapper) m).similarity);
 
@@ -293,14 +293,15 @@ public static class Builder extends FieldMapper.Builder {
         private final boolean isWithinMultiField;
 
         public Builder(String name, IndexAnalyzers indexAnalyzers) {
-            this(name, IndexVersion.current(), null, indexAnalyzers, false);
+            this(name, IndexVersion.current(), null, indexAnalyzers, false, false);
         }
 
         public Builder(
             String name,
             IndexVersion indexCreatedVersion,
             IndexMode indexMode,
             IndexAnalyzers indexAnalyzers,
+            boolean isSyntheticSourceEnabled,
             boolean isWithinMultiField
         ) {
             super(name);
@@ -320,6 +321,21 @@ public Builder(
                 m -> ((TextFieldMapper) m).norms,
                 () -> indexMode != IndexMode.LOGSDB && indexMode != IndexMode.TIME_SERIES
             );
+
+            // // backwards compatibility checks
+            this.store = Parameter.storeParam(m -> ((TextFieldMapper) m).store, () -> {
+                if (keywordMultiFieldsNotStoredWhenIgnored_indexVersionCheck(indexCreatedVersion)) {
+                    return false;
+                }
+
+                if (multiFieldsNotStoredByDefault_indexVersionCheck(indexCreatedVersion)) {
+                    return isSyntheticSourceEnabled
+                        && isWithinMultiField == false
+                        && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+                } else {
+                    return isSyntheticSourceEnabled && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+                }
+            });
         }
 
         public Builder index(boolean index) {
@@ -471,19 +487,6 @@ private SubFieldInfo buildPhraseInfo(FieldType fieldType, TextFieldType parent)
         public TextFieldMapper build(MapperBuilderContext context) {
             this.isSyntheticSourceEnabled = context.isSourceSynthetic();
 
-            // // backwards compatibility checks
-            // if (this.store.isSet() == false && keywordMultiFieldsNotStoredWhenIgnored_indexVersionCheck(indexCreatedVersion) == false) {
-            // this.store = Parameter.storeParam(m -> ((TextFieldMapper) m).store, () -> {
-            // if (multiFieldsNotStoredByDefault_indexVersionCheck(indexCreatedVersion)) {
-            // return isSyntheticSourceEnabled
-            // && isWithinMultiField == false
-            // && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
-            // } else {
-            // return isSyntheticSourceEnabled && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
-            // }
-            // });
-            // }
-
             FieldType fieldType = TextParams.buildFieldType(
                 index,
                 store,
@@ -506,7 +509,14 @@ public TextFieldMapper build(MapperBuilderContext context) {
     }
 
     public static final TypeParser PARSER = createTypeParserWithLegacySupport(
-        (n, c) -> new Builder(n, c.indexVersionCreated(), c.getIndexSettings().getMode(), c.getIndexAnalyzers(), c.isWithinMultiField())
+        (n, c) -> new Builder(
+            n,
+            c.indexVersionCreated(),
+            c.getIndexSettings().getMode(),
+            c.getIndexAnalyzers(),
+            SourceFieldMapper.isSynthetic(c.getIndexSettings()),
+            c.isWithinMultiField()
+        )
     );
 
     private static class PhraseWrappedAnalyzer extends AnalyzerWrapper {
@@ -1381,7 +1391,9 @@ public Map<String, NamedAnalyzer> indexAnalyzers() {
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(leafName(), indexCreatedVersion, indexMode, indexAnalyzers, isWithinMultiField).init(this);
+        return new Builder(leafName(), indexCreatedVersion, indexMode, indexAnalyzers, isSyntheticSourceEnabled, isWithinMultiField).init(
+            this
+        );
     }
 
     @Override

server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java

@@ -739,10 +739,14 @@ public void testNestedObjectWithMultiFieldsgetTotalFieldsCount() {
                     new KeywordFieldMapper.Builder("multi_field_size_4", IndexVersion.current(), true)
                 )
                     .addMultiField(
-                        new TextFieldMapper.Builder("grand_child_size_5", IndexVersion.current(), null, createDefaultIndexAnalyzers(), true)
-                            .addMultiField(
-                                new KeywordFieldMapper.Builder("multi_field_of_multi_field_size_6", IndexVersion.current(), true)
-                            )
+                        new TextFieldMapper.Builder(
+                            "grand_child_size_5",
+                            IndexVersion.current(),
+                            null,
+                            createDefaultIndexAnalyzers(),
+                            false,
+                            true
+                        ).addMultiField(new KeywordFieldMapper.Builder("multi_field_of_multi_field_size_6", IndexVersion.current(), true))
                     )
             )
         );