Skip to content

Commit 9e725cb

Browse files
Refactor sparse vector to adjust boost and queryname in the top level
1 parent b88b077 commit 9e725cb

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/search/SparseVectorQueryBuilder.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -153,28 +153,6 @@ private SparseVectorQueryBuilder(SparseVectorQueryBuilder other, SetOnce<TextExp
153153
this.weightedTokensSupplier = weightedTokensSupplier;
154154
}
155155

156-
public static SparseVectorQueryBuilder from(
157-
QueryBuilder queryBuilder,
158-
String fieldName,
159-
@Nullable List<WeightedToken> queryVectors,
160-
@Nullable String inferenceId,
161-
@Nullable String query,
162-
@Nullable Boolean shouldPruneTokens,
163-
@Nullable TokenPruningConfig tokenPruningConfig
164-
) {
165-
SparseVectorQueryBuilder sparseVectorQueryBuilder = new SparseVectorQueryBuilder(
166-
fieldName,
167-
queryVectors,
168-
inferenceId,
169-
query,
170-
shouldPruneTokens,
171-
tokenPruningConfig
172-
);
173-
// sparseVectorQueryBuilder.boost(queryBuilder.boost());
174-
// sparseVectorQueryBuilder.queryName(queryBuilder.queryName());
175-
return sparseVectorQueryBuilder;
176-
}
177-
178156
public String getFieldName() {
179157
return fieldName;
180158
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticSparseVectorQueryRewriteInterceptor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ private QueryBuilder buildNestedQueryFromSparseVectorQuery(QueryBuilder queryBui
109109
SparseVectorQueryBuilder sparseVectorQueryBuilder = (SparseVectorQueryBuilder) queryBuilder;
110110
return QueryBuilders.nestedQuery(
111111
SemanticTextField.getChunksFieldName(sparseVectorQueryBuilder.getFieldName()),
112-
SparseVectorQueryBuilder.from(
113-
queryBuilder,
112+
new SparseVectorQueryBuilder(
114113
SemanticTextField.getEmbeddingsFieldName(sparseVectorQueryBuilder.getFieldName()),
115114
sparseVectorQueryBuilder.getQueryVectors(),
116115
(sparseVectorQueryBuilder.getInferenceId() == null && sparseVectorQueryBuilder.getQuery() != null)

0 commit comments

Comments
 (0)