Merge branch 'knn_patience' of github.com:tteofili/elasticsearch into knn_patience

Author: tteofili

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

@@ -2242,9 +2242,11 @@ private Query createKnnBitQuery(
             BitSetProducer parentFilter
         ) {
             elementType.checkDimensions(dims, queryVector.length);
-            Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(parentFilter != null
-                ? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter)
-                : new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter));
+            Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(
+                parentFilter != null
+                    ? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter)
+                    : new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter)
+            );
             if (similarityThreshold != null) {
                 knnQuery = new VectorSimilarityQuery(
                     knnQuery,
@@ -2269,9 +2271,11 @@ private Query createKnnByteQuery(
                 float squaredMagnitude = VectorUtil.dotProduct(queryVector, queryVector);
                 elementType.checkVectorMagnitude(similarity, ElementType.errorByteElementsAppender(queryVector), squaredMagnitude);
             }
-            Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(parentFilter != null
-                ? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter)
-                : new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter));
+            Query knnQuery = PatienceKnnVectorQuery.fromByteQuery(
+                parentFilter != null
+                    ? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter)
+                    : new ESKnnByteVectorQuery(name(), queryVector, k, numCands, filter)
+            );
             if (similarityThreshold != null) {
                 knnQuery = new VectorSimilarityQuery(
                     knnQuery,
@@ -2322,9 +2326,11 @@ && isNotUnitVector(squaredMagnitude)) {
                 adjustedK = Math.min((int) Math.ceil(k * oversample), OVERSAMPLE_LIMIT);
                 numCands = Math.max(adjustedK, numCands);
             }
-            Query knnQuery = PatienceKnnVectorQuery.fromFloatQuery(parentFilter != null
-                ? new ESDiversifyingChildrenFloatKnnVectorQuery(name(), queryVector, filter, adjustedK, numCands, parentFilter)
-                : new ESKnnFloatVectorQuery(name(), queryVector, adjustedK, numCands, filter));
+            Query knnQuery = PatienceKnnVectorQuery.fromFloatQuery(
+                parentFilter != null
+                    ? new ESDiversifyingChildrenFloatKnnVectorQuery(name(), queryVector, filter, adjustedK, numCands, parentFilter)
+                    : new ESKnnFloatVectorQuery(name(), queryVector, adjustedK, numCands, filter)
+            );
             if (rescore) {
                 knnQuery = new RescoreKnnVectorQuery(
                     name(),