address index version support for main

Author: martijnvg

server/src/main/java/org/elasticsearch/index/IndexVersions.java

@@ -150,6 +150,7 @@ private static Version parseUnchecked(String version) {
     public static final IndexVersion TIMESTAMP_DOC_VALUES_SPARSE_INDEX = def(9_011_0_00, Version.LUCENE_10_1_0);
     public static final IndexVersion TIME_SERIES_ID_DOC_VALUES_SPARSE_INDEX = def(9_012_0_00, Version.LUCENE_10_1_0);
     public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD = def(9_013_0_00, Version.LUCENE_10_1_0);
+    public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_IP = def(9_014_0_00, Version.LUCENE_10_1_0);
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _

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

@@ -87,8 +87,9 @@ static String getOffsetsFieldName(
         Mapper.SourceKeepMode indexSourceKeepMode,
         boolean hasDocValues,
         boolean isStored,
+        FieldMapper.Builder fieldMapperBuilder,
         IndexVersion indexCreatedVersion,
-        FieldMapper.Builder fieldMapperBuilder
+        IndexVersion minSupportedVersionMain
     ) {
         var sourceKeepMode = fieldMapperBuilder.sourceKeepMode.orElse(indexSourceKeepMode);
         if (context.isSourceSynthetic()
@@ -97,7 +98,7 @@ static String getOffsetsFieldName(
             && isStored == false
             && fieldMapperBuilder.copyTo.copyToFields().isEmpty()
             && fieldMapperBuilder.multiFieldsBuilder.hasMultiFields() == false
-            && indexVersionSupportStoringArraysNatively(indexCreatedVersion)) {
+            && indexVersionSupportStoringArraysNatively(indexCreatedVersion, minSupportedVersionMain)) {
             // Skip stored, we will be synthesizing from stored fields, no point to keep track of the offsets
             // Skip copy_to and multi fields, supporting that requires more work. However, copy_to usage is rare in metrics and
             // logging use cases
@@ -110,8 +111,11 @@ && indexVersionSupportStoringArraysNatively(indexCreatedVersion)) {
         }
     }
 
-    private static boolean indexVersionSupportStoringArraysNatively(IndexVersion indexCreatedVersion) {
-        return indexCreatedVersion.onOrAfter(IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD)
+    private static boolean indexVersionSupportStoringArraysNatively(
+        IndexVersion indexCreatedVersion,
+        IndexVersion minSupportedVersionMain
+    ) {
+        return indexCreatedVersion.onOrAfter(minSupportedVersionMain)
             || indexCreatedVersion.between(
                 IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD_BACKPORT_8_X,
                 IndexVersions.UPGRADE_TO_LUCENE_10_0_0

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

@@ -199,8 +199,9 @@ public IpFieldMapper build(MapperBuilderContext context) {
                 indexSourceKeepMode,
                 hasDocValues.getValue(),
                 stored.getValue(),
+                this,
                 indexCreatedVersion,
-                this
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_IP
             );
             return new IpFieldMapper(
                 leafName(),

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

@@ -444,8 +444,9 @@ public KeywordFieldMapper build(MapperBuilderContext context) {
                 indexSourceKeepMode,
                 hasDocValues.getValue(),
                 stored.getValue(),
+                this,
                 indexCreatedVersion,
-                this
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD
             );
             return new KeywordFieldMapper(
                 leafName(),