Skip to content

Commit e62dac9

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 28740aa commit e62dac9

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,9 +2318,11 @@ private Query createKnnBitQuery(
23182318
KnnSearchStrategy searchStrategy
23192319
) {
23202320
elementType.checkDimensions(dims, queryVector.length);
2321-
Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(parentFilter != null
2322-
? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter, searchStrategy)
2323-
: new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter, searchStrategy));
2321+
Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(
2322+
parentFilter != null
2323+
? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter, searchStrategy)
2324+
: new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter, searchStrategy)
2325+
);
23242326
if (similarityThreshold != null) {
23252327
knnQuery = new VectorSimilarityQuery(
23262328
knnQuery,
@@ -2346,9 +2348,11 @@ private Query createKnnByteQuery(
23462348
float squaredMagnitude = VectorUtil.dotProduct(queryVector, queryVector);
23472349
elementType.checkVectorMagnitude(similarity, ElementType.errorByteElementsAppender(queryVector), squaredMagnitude);
23482350
}
2349-
Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(parentFilter != null
2350-
? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter, searchStrategy)
2351-
: new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter, searchStrategy));
2351+
Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(
2352+
parentFilter != null
2353+
? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter, searchStrategy)
2354+
: new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter, searchStrategy)
2355+
);
23522356

23532357
if (similarityThreshold != null) {
23542358
knnQuery = new VectorSimilarityQuery(
@@ -2401,17 +2405,19 @@ && isNotUnitVector(squaredMagnitude)) {
24012405
adjustedK = Math.min((int) Math.ceil(k * oversample), OVERSAMPLE_LIMIT);
24022406
numCands = Math.max(adjustedK, numCands);
24032407
}
2404-
Query knnQuery = PatienceKnnVectorQuery.fromFloatQuery(parentFilter != null
2405-
? new ESDiversifyingChildrenFloatKnnVectorQuery(
2406-
name(),
2407-
queryVector,
2408-
filter,
2409-
adjustedK,
2410-
numCands,
2411-
parentFilter,
2412-
knnSearchStrategy
2413-
)
2414-
: new ESKnnFloatVectorQuery(name(), queryVector, adjustedK, numCands, filter, knnSearchStrategy));
2408+
Query knnQuery = PatienceKnnVectorQuery.fromFloatQuery(
2409+
parentFilter != null
2410+
? new ESDiversifyingChildrenFloatKnnVectorQuery(
2411+
name(),
2412+
queryVector,
2413+
filter,
2414+
adjustedK,
2415+
numCands,
2416+
parentFilter,
2417+
knnSearchStrategy
2418+
)
2419+
: new ESKnnFloatVectorQuery(name(), queryVector, adjustedK, numCands, filter, knnSearchStrategy)
2420+
);
24152421

24162422
if (rescore) {
24172423
knnQuery = new RescoreKnnVectorQuery(

0 commit comments

Comments
 (0)