Update the feature flag & cluster feature names

Author: thecoop

docs/changelog/135940.yaml

@@ -163,7 +163,7 @@ setup:
 ---
 "dense_vector docvalues with bfloat16":
   - requires:
-      cluster_features: [ "mapper.vectors.hnsw_bfloat16_on_disk_rescoring" ]
+      cluster_features: [ "mapper.vectors.generic_vector_format" ]
       reason: Needs bfloat16 support
   - do:
       indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/200_dense_vector_docvalue_fields.yml

@@ -340,7 +340,7 @@ setup:
 ---
 "Test index configured rescore vector with on-disk rescoring":
   - requires:
-      cluster_features: ["mapper.vectors.hnsw_bfloat16_on_disk_rescoring"]
+      cluster_features: ["mapper.vectors.generic_vector_format"]
       reason: Needs on_disk_rescoring feature
   - skip:
       features: "headers"

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_bbq_hnsw.yml

@@ -1,6 +1,6 @@
 setup:
   - requires:
-      cluster_features: "mapper.vectors.hnsw_bfloat16_on_disk_rescoring"
+      cluster_features: "mapper.vectors.generic_vector_format"
       reason: 'bfloat16 needs to be supported'
   - do:
       indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_bbq_hnsw_bfloat16.yml

@@ -1,6 +1,6 @@
 setup:
   - requires:
-      cluster_features: "mapper.vectors.hnsw_bfloat16_on_disk_rescoring"
+      cluster_features: "mapper.vectors.generic_vector_format"
       reason: 'bfloat16 needs to be supported'
   - do:
       indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/42_knn_search_bbq_flat_bfloat16.yml

@@ -25,7 +25,7 @@
 
 public class ES93GenericFlatVectorsFormat extends AbstractFlatVectorsFormat {
 
-    public static final FeatureFlag ES93_VECTOR_FORMATS = new FeatureFlag("es93_vector_formats");
+    public static final FeatureFlag GENERIC_VECTOR_FORMAT = new FeatureFlag("generic_vector_format");
 
     static final String NAME = "ES93GenericFlatVectorsFormat";
     static final String VECTOR_FORMAT_INFO_EXTENSION = "vfi";

server/src/main/java/org/elasticsearch/index/codec/vectors/es93/ES93GenericFlatVectorsFormat.java

@@ -61,7 +61,7 @@ public class MapperFeatures implements FeatureSpecification {
     );
     static final NodeFeature EXCLUDE_VECTORS_DOCVALUE_BUGFIX = new NodeFeature("mapper.exclude_vectors_docvalue_bugfix");
     static final NodeFeature BASE64_DENSE_VECTORS = new NodeFeature("mapper.base64_dense_vectors");
-    public static final NodeFeature HNSW_BFLOAT16_ON_DISK_RESCORING = new NodeFeature("mapper.vectors.hnsw_bfloat16_on_disk_rescoring");
+    public static final NodeFeature GENERIC_VECTOR_FORMAT = new NodeFeature("mapper.vectors.generic_vector_format");
 
     @Override
     public Set<NodeFeature> getTestFeatures() {
@@ -106,9 +106,9 @@ public Set<NodeFeature> getTestFeatures() {
             EXCLUDE_VECTORS_DOCVALUE_BUGFIX,
             BASE64_DENSE_VECTORS
         );
-        if (ES93GenericFlatVectorsFormat.ES93_VECTOR_FORMATS.isEnabled()) {
+        if (ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()) {
             features = new HashSet<>(features);
-            features.add(HNSW_BFLOAT16_ON_DISK_RESCORING);
+            features.add(GENERIC_VECTOR_FORMAT);
         }
         return features;
     }

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

@@ -242,7 +242,7 @@ public static class Builder extends FieldMapper.Builder {
         private final Parameter<ElementType> elementType = new Parameter<>("element_type", false, () -> ElementType.FLOAT, (n, c, o) -> {
             ElementType elementType = namesToElementType.get((String) o);
             if (elementType == null
-                || (elementType == ElementType.BFLOAT16 && ES93GenericFlatVectorsFormat.ES93_VECTOR_FORMATS.isEnabled() == false)) {
+                || (elementType == ElementType.BFLOAT16 && ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled() == false)) {
                 throw new MapperParsingException("invalid element_type [" + o + "]; available types are " + namesToElementType.keySet());
             }
             return elementType;
@@ -2149,7 +2149,7 @@ public static class HnswIndexOptions extends DenseVectorIndexOptions {
 
         @Override
         public KnnVectorsFormat getVectorsFormat(ElementType elementType) {
-            if (ES93GenericFlatVectorsFormat.ES93_VECTOR_FORMATS.isEnabled()) {
+            if (ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()) {
                 return new ES93HnswVectorsFormat(m, efConstruction, elementType);
             } else {
                 if (elementType == ElementType.BIT) {
@@ -2231,7 +2231,7 @@ public BBQHnswIndexOptions(int m, int efConstruction, boolean onDiskRescore, Res
         @Override
         KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT || elementType == ElementType.BFLOAT16;
-            return ES93GenericFlatVectorsFormat.ES93_VECTOR_FORMATS.isEnabled()
+            return ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()
                 ? new ES93HnswBinaryQuantizedVectorsFormat(m, efConstruction, elementType, onDiskRescore)
                 : new ES818HnswBinaryQuantizedVectorsFormat(m, efConstruction);
         }
@@ -2299,7 +2299,7 @@ static class BBQFlatIndexOptions extends QuantizedIndexOptions {
         @Override
         KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT || elementType == ElementType.BFLOAT16;
-            return ES93GenericFlatVectorsFormat.ES93_VECTOR_FORMATS.isEnabled()
+            return ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()
                 ? new ES93BinaryQuantizedVectorsFormat(elementType, false)
                 : new ES818BinaryQuantizedVectorsFormat();
         }