Added cluster features

Author: mridula-s109

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/RankRRFFeatures.java

@@ -22,10 +22,11 @@
 public class RankRRFFeatures implements FeatureSpecification {
 
     public static final NodeFeature LINEAR_RETRIEVER_SUPPORTED = new NodeFeature("linear_retriever_supported");
+    public static final NodeFeature LINEAR_RETRIEVER_TOP_LEVEL_NORMALIZER = new NodeFeature("linear_retriever.top_level_normalizer");
 
     @Override
     public Set<NodeFeature> getFeatures() {
-        return Set.of(LINEAR_RETRIEVER_SUPPORTED);
+        return Set.of(LINEAR_RETRIEVER_SUPPORTED, LINEAR_RETRIEVER_TOP_LEVEL_NORMALIZER);
     }
 
     @Override

x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/linear/10_linear_retriever.yml

@@ -1336,6 +1336,9 @@ setup:
 
 ---
 "linear retriever with top-level normalizer - minmax":
+  - requires:
+      cluster_features: [ "linear_retriever.top_level_normalizer" ]
+      reason: "Support for top-level normalizer in linear retriever"
   - do:
       search:
         index: test
@@ -1383,8 +1386,8 @@ setup:
 ---
 "linear retriever with top-level normalizer - l2_norm":
   - requires:
-      cluster_features: [ "linear_retriever.l2_norm" ]
-      reason: "Requires l2_norm normalization support in linear retriever"
+      cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
+      reason: "Support for L2 normalization and top-level normalizer in linear retriever"
   - do:
       search:
         index: test
@@ -1431,6 +1434,9 @@ setup:
 
 ---
 "linear retriever with top-level normalizer and per-retriever override":
+  - requires:
+      cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
+      reason: "Support for L2 normalization and top-level normalizer in linear retriever"
   - do:
       search:
         index: test
@@ -1476,24 +1482,11 @@ setup:
   - match: { hits.hits.2._id: "2" }
   - close_to: { hits.hits.2._score: { value: 0.45, error: 0.01} }
 
----
-"linear retriever with top-level normalizer - multi-field format":
-  - do:
-      search:
-        index: test
-        body:
-          retriever:
-            linear:
-              normalizer: minmax
-              query: one
-              fields: [keyword, text]
-
-  - match: { hits.total.value: 1 }
-  - match: { hits.hits.0._id: "1" }
-  - close_to: { hits.hits.0._score: { value: 1.0, error: 0.001} }
-
 ---
 "linear retriever with top-level normalizer - empty results":
+  - requires:
+      cluster_features: [ "linear_retriever.top_level_normalizer" ]
+      reason: "Support for top-level normalizer in linear retriever"
   - do:
       search:
         index: test
@@ -1524,9 +1517,8 @@ setup:
 ---
 "Linear retriever with per-retriever normalizer override":
   - requires:
-      cluster_features: [ "linear_retriever.l2_norm" ]
-      reason: "Support for L2 normalization"
-
+      cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
+      reason: "Support for L2 normalization and top-level normalizer in linear retriever"
   - do:
       search:
         index: test
@@ -1668,6 +1660,9 @@ setup:
 
 ---
 "Linear retriever with identity normalizer (no normalization)":
+  - requires:
+      cluster_features: [ "linear_retriever.top_level_normalizer" ]
+      reason: "Support for top-level normalizer in linear retriever"
   - do:
       search:
         index: test
@@ -1803,6 +1798,9 @@ setup:
 
 ---
 "Linear retriever normalization with zero scores":
+  - requires:
+      cluster_features: [ "linear_retriever.top_level_normalizer" ]
+      reason: "Support for top-level normalizer in linear retriever"
   - do:
       search:
         index: test
@@ -1853,26 +1851,11 @@ setup:
   - match: { hits.hits.0._id: "1" }
   - close_to: { hits.hits.0._score: { value: 2.0, error: 0.001} }
 
----
-"Linear retriever with field+query format and normalizer inheritance":
-  - requires:
-      cluster_features: [ "linear_retriever.multi_fields_query_format_support" ]
-      reason: "Support for multi-fields query format"
-
-  - do:
-      search:
-        index: test
-        body:
-          retriever:
-            linear:
-              fields: ["keyword", "other_keyword"]
-              query: "other"
-              normalizer: l2_norm
-
-  - match: { hits.total.value: 2 }
-
 ---
 "Linear retriever error handling - invalid normalizer":
+  - requires:
+      cluster_features: [ "linear_retriever.top_level_normalizer" ]
+      reason: "Support for top-level normalizer in linear retriever"
   - do:
       catch: /Unknown normalizer \[invalid\]/
       search:
@@ -1897,9 +1880,8 @@ setup:
 ---
 "Linear retriever with large score differences and L2 normalization":
   - requires:
-      cluster_features: [ "linear_retriever.l2_norm" ]
-      reason: "Support for L2 normalization"
-
+      cluster_features: [ "linear_retriever.l2_norm", "linear_retriever.top_level_normalizer" ]
+      reason: "Support for L2 normalization and top-level normalizer in linear retriever"
   - do:
       search:
         index: test