adding capability for transforming rank rrf queries to the correspond…

…ing retriever
pmpailis · Nov 6, 2024 · 9d10872 · 9d10872
1 parent ecf8c3f
commit 9d10872
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/server/src/main/java/org/elasticsearch/rest/action/search/SearchCapabilities.java b/server/src/main/java/org/elasticsearch/rest/action/search/SearchCapabilities.java
@@ -24,10 +24,13 @@ private SearchCapabilities() {}
     private static final String BIT_DENSE_VECTOR_SYNTHETIC_SOURCE_CAPABILITY = "bit_dense_vector_synthetic_source";
     /** Support Byte and Float with Bit dot product. */
     private static final String BYTE_FLOAT_BIT_DOT_PRODUCT_CAPABILITY = "byte_float_bit_dot_product";
+    /** Support transforming rank rrf queries to the corresponding rrf retriever. */
+    private static final String TRANSFORM_RANK_RRF_TO_RETRIEVER = "transform_rank_rrf_to_retriever";
 
     public static final Set<String> CAPABILITIES = Set.of(
         RANGE_REGEX_INTERVAL_QUERY_CAPABILITY,
         BIT_DENSE_VECTOR_SYNTHETIC_SOURCE_CAPABILITY,
-        BYTE_FLOAT_BIT_DOT_PRODUCT_CAPABILITY
+        BYTE_FLOAT_BIT_DOT_PRODUCT_CAPABILITY,
+        TRANSFORM_RANK_RRF_TO_RETRIEVER
     );
 }
diff --git a/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/100_rank_rrf.yml b/x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/100_rank_rrf.yml
@@ -1,7 +1,11 @@
 setup:
   - requires:
-      cluster_features: 'rrf_retriever_composition_supported'
-      reason: 'test requires rrf retriever composition support'
+      capabilities:
+        - method: POST
+          path: /_search
+          capabilities: [ transform_rank_rrf_to_retriever ]
+      test_runner_features: capabilities
+      reason: "Support for transforming deprecated rank_rrf queries to the corresponding rrf retriever is required"
   - skip:
       features: "warnings"
 

diff --git a/...in/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/150_rank_rrf_pagination.yml b/...in/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/150_rank_rrf_pagination.yml
@@ -5,8 +5,12 @@ setup:
         - contains
 
   - requires:
-      cluster_features: 'rrf_retriever_composition_supported'
-      reason: 'test requires rrf retriever composition support'
+      capabilities:
+        - method: POST
+          path: /_search
+          capabilities: [ transform_rank_rrf_to_retriever ]
+      test_runner_features: capabilities
+      reason: "Support for transforming deprecated rank_rrf queries to the corresponding rrf retriever is required"
 
   - do:
       indices.create:

diff --git a/...plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/200_rank_rrf_script.yml b/...plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/200_rank_rrf_script.yml
@@ -1,8 +1,15 @@
 setup:
+  - skip:
+      features:
+        - close_to
+
   - requires:
-      cluster_features: 'rrf_retriever_composition_supported'
-      reason: 'test requires rrf retriever composition support'
-      test_runner_features: "close_to"
+      capabilities:
+        - method: POST
+          path: /_search
+          capabilities: [ transform_rank_rrf_to_retriever ]
+      test_runner_features: capabilities
+      reason: "Support for transforming deprecated rank_rrf queries to the corresponding rrf retriever is required"
 
   - do:
       indices.create: