Fix tests

kderusso · Dec 2, 2024 · bcb93c3 · bcb93c3
1 parent a1c3e66
commit bcb93c3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/query/InferenceQueryBuilderService.java b/server/src/main/java/org/elasticsearch/index/query/InferenceQueryBuilderService.java
@@ -18,6 +18,8 @@ public class InferenceQueryBuilderService {
     }
 
     public AbstractQueryBuilder<?> getDefaultInferenceQueryBuilder(String fieldName, String query, boolean throwOnUnsupportedQueries) {
-        return defaultInferenceQueryBuilder.apply(fieldName, query, throwOnUnsupportedQueries);
+        return defaultInferenceQueryBuilder != null
+            ? defaultInferenceQueryBuilder.apply(fieldName, query, throwOnUnsupportedQueries)
+            : null;
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/InferenceQueryBuilderServiceBuilder.java b/server/src/main/java/org/elasticsearch/index/query/InferenceQueryBuilderServiceBuilder.java
@@ -37,9 +37,14 @@ public InferenceQueryBuilderService build() {
             }
         }
 
+        if (definedInferenceQueryBuilders.isEmpty()) {
+            // Backwards compatibility
+            return new InferenceQueryBuilderService(null);
+        }
+
         if (definedInferenceQueryBuilders.size() != 1) {
             throw new IllegalStateException(
-                "Expected exactly one default inference query builder, but found " + definedInferenceQueryBuilders.size()
+                "Expected a single default inference query builder, but found " + definedInferenceQueryBuilders.size()
             );
         }
 

diff --git a/server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java
@@ -418,9 +418,12 @@ protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws
     }
 
     private QueryBuilder createInferenceSubQuery(InferenceQueryBuilderService inferenceQueryBuilderService, String indexName) {
+        QueryBuilder inferenceClause = inferenceQueryBuilderService.getDefaultInferenceQueryBuilder(fieldName, value.toString(), false);
         BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
-        boolQueryBuilder.must(inferenceQueryBuilderService.getDefaultInferenceQueryBuilder(fieldName, value.toString(), false));
-        boolQueryBuilder.filter(new TermQueryBuilder(IndexFieldMapper.NAME, indexName));
+        if (inferenceClause != null) {
+            boolQueryBuilder.must(inferenceClause);
+            boolQueryBuilder.filter(new TermQueryBuilder(IndexFieldMapper.NAME, indexName));
+        }
         return boolQueryBuilder;
     }
 

diff --git a/...rence/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java b/...rence/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java
@@ -387,7 +387,7 @@ public InferenceFieldMetadata getMetadata(Set<String> sourcePaths) {
         String[] copyFields = sourcePaths.toArray(String[]::new);
         // ensure consistent order
         Arrays.sort(copyFields);
-        return new InferenceFieldMetadata(fullPath(), fieldType().inferenceId, fieldType().searchInferenceId, copyFields);
+        return new InferenceFieldMetadata(fullPath(), fieldType().getInferenceId(), fieldType().getSearchInferenceId(), copyFields);
     }
 
     @Override
@@ -441,7 +441,7 @@ public SemanticTextFieldType(
         ) {
             super(name, true, false, false, TextSearchInfo.NONE, meta);
             this.inferenceId = inferenceId;
-            this.searchInferenceId = searchInferenceId == null ? inferenceId : searchInferenceId;
+            this.searchInferenceId = searchInferenceId;
             ;
             this.modelSettings = modelSettings;
             this.inferenceField = inferenceField;
@@ -458,7 +458,7 @@ public String getInferenceId() {
         }
 
         public String getSearchInferenceId() {
-            return searchInferenceId;
+            return searchInferenceId == null ? inferenceId : searchInferenceId;
         }
 
         public SemanticTextField.ModelSettings getModelSettings() {