Happy path early index validation works now; edge cases surrounding default BBQ remain

Author: kderusso

server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java

@@ -1640,7 +1640,7 @@ public boolean supportsDimension(int dims) {
         },
         BBQ_IVF("bbq_ivf", true) {
             @Override
-            public IndexOptions parseIndexOptions(String fieldName, Map<String, ?> indexOptionsMap, IndexVersion indexVersion) {
+            public DenseVectorIndexOptions parseIndexOptions(String fieldName, Map<String, ?> indexOptionsMap, IndexVersion indexVersion) {
                 Object clusterSizeNode = indexOptionsMap.remove("cluster_size");
                 int clusterSize = IVFVectorsFormat.DEFAULT_VECTORS_PER_CLUSTER;
                 if (clusterSizeNode != null) {
@@ -1685,7 +1685,7 @@ public boolean supportsDimension(int dims) {
             }
         };
 
-        static Optional<VectorIndexType> fromString(String type) {
+        public static Optional<VectorIndexType> fromString(String type) {
             return Stream.of(VectorIndexType.values())
                 .filter(vectorIndexType -> vectorIndexType != VectorIndexType.BBQ_IVF || IVF_FORMAT.isEnabled())
                 .filter(vectorIndexType -> vectorIndexType.name.equals(type))

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java

@@ -334,7 +334,7 @@ public SemanticTextFieldMapper build(MapperBuilderContext context) {
                 validateServiceSettings(modelSettings.get(), resolvedModelSettings);
             }
 
-            if (indexOptions.get() != null) {
+            if (context.getMergeReason() != MapperService.MergeReason.MAPPING_RECOVERY && indexOptions.get() != null) {
                 validateIndexOptions(indexOptions.get(), inferenceId.getValue(), resolvedModelSettings);
             }
             final String fullName = context.buildFullName(leafName());