Add capability for BwC tests

carlosdelest · Dec 2, 2024 · 0d77521 · 0d77521
1 parent ee904b0
commit 0d77521
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 1 deletion.
diff --git a/...c/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_bbq_hnsw.yml b/...c/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_bbq_hnsw.yml
@@ -89,6 +89,13 @@ setup:
 
 ---
 "Vector rescoring has similar ordering as knn, same scoring as exact search for kNN section":
+  - requires:
+      reason: 'Quantized vector rescoring is required'
+      test_runner_features: [capabilities]
+      capabilities:
+        - method: GET
+          path: /_search
+          capabilities: [knn_quantized_vector_rescore]
   - skip:
       features: "headers"
   - do:

diff --git a/...yamlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_byte_quantized.yml b/...yamlRestTest/resources/rest-api-spec/test/search.vectors/41_knn_search_byte_quantized.yml
@@ -372,9 +372,15 @@ setup:
 ---
 # Won't be true for larger datasets, but this helps checking kNN vs rescoring vs exact search
 "Vector rescoring has same ordering as knn, same scoring as exact search for kNN section":
+  - requires:
+      reason: 'Quantized vector rescoring is required'
+      test_runner_features: [capabilities]
+      capabilities:
+        - method: GET
+          path: /_search
+          capabilities: [knn_quantized_vector_rescore]
   - skip:
       features: "headers"
-
   # kNN search
   - do:
       headers:

diff --git a/...estTest/resources/rest-api-spec/test/search.vectors/41_knn_search_half_byte_quantized.yml b/...estTest/resources/rest-api-spec/test/search.vectors/41_knn_search_half_byte_quantized.yml
@@ -550,6 +550,13 @@ setup:
   - match: { hits.hits.2._id: "3"}
 ---
 "Vector rescoring has same ordering as knn, same scoring as exact search for kNN section":
+  - requires:
+      reason: 'Quantized vector rescoring is required'
+      test_runner_features: [capabilities]
+      capabilities:
+        - method: GET
+          path: /_search
+          capabilities: [knn_quantized_vector_rescore]
   - skip:
       features: "headers"
   - do:

diff --git a/...c/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/42_knn_search_bbq_flat.yml b/...c/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/42_knn_search_bbq_flat.yml
@@ -88,6 +88,13 @@ setup:
   - match: { hits.hits.2._id: "1" }
 ---
 "Vector rescoring has similar ordering as knn, same scoring as exact search for kNN section":
+  - requires:
+      reason: 'Quantized vector rescoring is required'
+      test_runner_features: [capabilities]
+      capabilities:
+        - method: GET
+          path: /_search
+          capabilities: [knn_quantized_vector_rescore]
   - skip:
       features: "headers"
   - do:
@@ -147,6 +154,7 @@ setup:
         Content-Type: application/json
       search:
         rest_total_hits_as_int: true
+        index: bbq_flat
         body:
           query:
             script_score:

diff --git a/.../src/yamlRestTest/resources/rest-api-spec/test/search.vectors/42_knn_search_int4_flat.yml b/.../src/yamlRestTest/resources/rest-api-spec/test/search.vectors/42_knn_search_int4_flat.yml
@@ -346,6 +346,13 @@ setup:
           vector: [1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
 ---
 "Vector rescoring has same ordering as knn, same scoring as exact search for kNN section":
+  - requires:
+      reason: 'Quantized vector rescoring is required'
+      test_runner_features: [capabilities]
+      capabilities:
+        - method: GET
+          path: /_search
+          capabilities: [knn_quantized_vector_rescore]
   - skip:
       features: "headers"
   - do:

diff --git a/.../src/yamlRestTest/resources/rest-api-spec/test/search.vectors/42_knn_search_int8_flat.yml b/.../src/yamlRestTest/resources/rest-api-spec/test/search.vectors/42_knn_search_int8_flat.yml
@@ -263,6 +263,13 @@ setup:
   - lte: {hits.hits.2._score: 0.791}
 ---
 "Vector rescoring has same ordering as knn, same scoring as exact search for kNN section":
+  - requires:
+      reason: 'Quantized vector rescoring is required'
+      test_runner_features: [capabilities]
+      capabilities:
+        - method: GET
+          path: /_search
+          capabilities: [knn_quantized_vector_rescore]
   - skip:
       features: "headers"
   - do:

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
@@ -44,6 +44,7 @@ private SearchCapabilities() {}
     private static final String MULTI_DENSE_VECTOR_SCRIPT_MAX_SIM = "multi_dense_vector_script_max_sim_with_bugfix";
 
     private static final String RANDOM_SAMPLER_WITH_SCORED_SUBAGGS = "random_sampler_with_scored_subaggs";
+    private static final String KNN_QUANTIZED_VECTOR_RESCORE = "knn_quantized_vector_rescore";
 
     public static final Set<String> CAPABILITIES;
     static {
@@ -55,6 +56,7 @@ private SearchCapabilities() {}
         capabilities.add(TRANSFORM_RANK_RRF_TO_RETRIEVER);
         capabilities.add(NESTED_RETRIEVER_INNER_HITS_SUPPORT);
         capabilities.add(RANDOM_SAMPLER_WITH_SCORED_SUBAGGS);
+        capabilities.add(KNN_QUANTIZED_VECTOR_RESCORE);
         if (MultiDenseVectorFieldMapper.FEATURE_FLAG.isEnabled()) {
             capabilities.add(MULTI_DENSE_VECTOR_FIELD_MAPPER);
             capabilities.add(MULTI_DENSE_VECTOR_SCRIPT_ACCESS);