Include 8.x backport version in index version checks for offset encoding

Author: jordan-powers

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

@@ -136,6 +136,7 @@ private static Version parseUnchecked(String version) {
     public static final IndexVersion LOGSB_OPTIONAL_SORTING_ON_HOST_NAME_BACKPORT = def(8_525_0_00, parseUnchecked("9.12.1"));
     public static final IndexVersion USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BY_DEFAULT_BACKPORT = def(8_526_0_00, parseUnchecked("9.12.1"));
     public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD_BACKPORT_8_X = def(8_527_0_00, Version.LUCENE_9_12_1);
+    public static final IndexVersion SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_NUMBER_BACKPORT_8_X = def(8_528_0_00, Version.LUCENE_9_12_1);
     public static final IndexVersion UPGRADE_TO_LUCENE_10_0_0 = def(9_000_0_00, Version.LUCENE_10_0_0);
     public static final IndexVersion LOGSDB_DEFAULT_IGNORE_DYNAMIC_BEYOND_LIMIT = def(9_001_0_00, Version.LUCENE_10_0_0);
     public static final IndexVersion TIME_BASED_K_ORDERED_DOC_ID = def(9_002_0_00, Version.LUCENE_10_0_0);

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

@@ -90,7 +90,8 @@ static String getOffsetsFieldName(
         boolean isStored,
         FieldMapper.Builder fieldMapperBuilder,
         IndexVersion indexCreatedVersion,
-        IndexVersion minSupportedVersionMain
+        IndexVersion minSupportedVersionMain,
+        IndexVersion minSupportedVersion8x
     ) {
         var sourceKeepMode = fieldMapperBuilder.sourceKeepMode.orElse(indexSourceKeepMode);
         if (context.isSourceSynthetic()
@@ -100,7 +101,7 @@ static String getOffsetsFieldName(
             && context.isInNestedContext() == false
             && fieldMapperBuilder.copyTo.copyToFields().isEmpty()
             && fieldMapperBuilder.multiFieldsBuilder.hasMultiFields() == false
-            && indexVersionSupportStoringArraysNatively(indexCreatedVersion, minSupportedVersionMain)) {
+            && indexVersionSupportStoringArraysNatively(indexCreatedVersion, minSupportedVersionMain, minSupportedVersion8x)) {
             // 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
@@ -115,13 +116,11 @@ && indexVersionSupportStoringArraysNatively(indexCreatedVersion, minSupportedVer
 
     private static boolean indexVersionSupportStoringArraysNatively(
         IndexVersion indexCreatedVersion,
-        IndexVersion minSupportedVersionMain
+        IndexVersion minSupportedVersionMain,
+        IndexVersion minSupportedVersion8x
     ) {
         return indexCreatedVersion.onOrAfter(minSupportedVersionMain)
-            || indexCreatedVersion.between(
-                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD_BACKPORT_8_X,
-                IndexVersions.UPGRADE_TO_LUCENE_10_0_0
-            );
+            || indexCreatedVersion.between(minSupportedVersion8x, IndexVersions.UPGRADE_TO_LUCENE_10_0_0);
     }
 
     private static class Offsets {

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

@@ -201,7 +201,8 @@ public IpFieldMapper build(MapperBuilderContext context) {
                 stored.getValue(),
                 this,
                 indexCreatedVersion,
-                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_IP
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_IP,
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD_BACKPORT_8_X
             );
             return new IpFieldMapper(
                 leafName(),

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

@@ -446,7 +446,8 @@ public KeywordFieldMapper build(MapperBuilderContext context) {
                 stored.getValue(),
                 this,
                 indexCreatedVersion,
-                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD,
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD_BACKPORT_8_X
             );
             return new KeywordFieldMapper(
                 leafName(),

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

@@ -297,7 +297,8 @@ public NumberFieldMapper build(MapperBuilderContext context) {
                 stored.getValue(),
                 this,
                 indexCreatedVersion,
-                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_NUMBER
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_NUMBER,
+                IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_NUMBER_BACKPORT_8_X
             );
             return new NumberFieldMapper(leafName(), ft, builderParams(this, context), context.isSourceSynthetic(), this, offsetsFieldName);
         }