Cleanup

kderusso · Dec 16, 2024 · 05c45e2 · 05c45e2
1 parent d28cd8b
commit 05c45e2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/.../main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryRewriteInterceptor.java b/.../main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryRewriteInterceptor.java
@@ -143,19 +143,5 @@ public Map<String, List<String>> getInferenceIdsIndices() {
                     )
                 );
         }
-
-        // public String getSearchInferenceId() {
-        // List<String> searchInferenceIds = inferenceIndicesMetadata.values()
-        // .stream()
-        // .map(InferenceFieldMetadata::getSearchInferenceId)
-        // .distinct()
-        // .toList();
-        // if (searchInferenceIds.size() > 1) {
-        // throw new IllegalStateException(
-        // "Conflicting searchInferenceIds for field [" + fieldName + "]: Found [" + searchInferenceIds + "]"
-        // );
-        // }
-        // return searchInferenceIds.getFirst();
-        // }
     }
 }
diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/sparse_vector_search.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/sparse_vector_search.yml
@@ -280,8 +280,25 @@ setup:
 
   - match: { status: 400 }
 
+---
+"Test sparse_vector returns an error if inference ID not specified with query":
+  - do:
+      catch: bad_request # This is for BWC, the actual error message is tested in a subsequent test
+      search:
+        index: index-with-sparse-vector
+        body:
+          query:
+            sparse_vector:
+              field: text
+              query: "octopus comforter smells"
+
+  - match: { status: 400 }
+
 ---
 "Test sparse_vector requires an inference ID to be specified on sparse_vector fields":
+  - requires:
+      cluster_features: [ "search.semantic_sparse_vector_query_rewrite_interception_supported" ]
+      reason: "Error message changed in 8.18"
   - do:
       catch: /inference_id required to perform vector search on query string/
       search: