Spotless

Author: carlosdelest

server/src/main/java/org/elasticsearch/search/vectors/RescoreKnnVectorQuery.java

@@ -70,6 +70,8 @@ public RescoreKnnVectorQuery(
 
     @Override
     public Query rewrite(IndexSearcher searcher) throws IOException {
+        assert byteTarget == null ^ floatTarget == null : "Either byteTarget or floatTarget must be set";
+
         Query rewritten = super.rewrite(searcher);
         if (rewritten != this) {
             return rewritten;

server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldTypeTests.java

@@ -424,7 +424,7 @@ public void testRescoreOversampleUsedWithoutQuantization() {
         );
 
         Query knnQuery = nonQuantizedField.createKnnQuery(
-            new VectorData(null, new byte[]{1, 4, 10}),
+            new VectorData(null, new byte[] { 1, 4, 10 }),
             10,
             100,
             randomFloatBetween(1.0F, 10.0F, false),
@@ -474,7 +474,7 @@ private static void checkRescoreQueryParameters(
         int expectedK,
         int expectedCandidates
     ) {
-        Query query = fieldType.createKnnQuery(new VectorData(null, new byte[] { 1, 4, 10}), k, candidates, oversample, null, null, null);
+        Query query = fieldType.createKnnQuery(new VectorData(null, new byte[] { 1, 4, 10 }), k, candidates, oversample, null, null, null);
 
         RescoreKnnVectorQuery rescoreQuery = (RescoreKnnVectorQuery) query;
         if (fieldType.getElementType() == BYTE) {

server/src/test/java/org/elasticsearch/search/vectors/AbstractKnnVectorQueryBuilderTestCase.java

@@ -23,8 +23,6 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
-import org.elasticsearch.index.mapper.vectors.VectorSimilarityByteValueSource;
-import org.elasticsearch.index.mapper.vectors.VectorSimilarityFloatValueSource;
 import org.elasticsearch.index.query.InnerHitsRewriteContext;
 import org.elasticsearch.index.query.MatchNoneQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;

server/src/test/java/org/elasticsearch/search/vectors/RescoreKnnVectorQueryTests.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.search.vectors;
 
-
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.KnnFloatVectorField;
 import org.apache.lucene.index.DirectoryReader;
@@ -60,8 +59,7 @@ private void testRescoreDocs(int numDocs, Integer k) throws Exception {
                 for (int i = 0; i < numDocs; i++) {
                     Document document = new Document();
                     float[] vector = randomVector(numDims);
-                    KnnFloatVectorField vectorField = new KnnFloatVectorField(
-                        FIELD_NAME, vector);
+                    KnnFloatVectorField vectorField = new KnnFloatVectorField(FIELD_NAME, vector);
                     document.add(vectorField);
                     w.addDocument(document);
                 }
@@ -73,14 +71,17 @@ private void testRescoreDocs(int numDocs, Integer k) throws Exception {
                 float[] queryVector = randomVector(numDims);
 
                 RescoreKnnVectorQuery rescoreKnnVectorQuery = new RescoreKnnVectorQuery(
-                    FIELD_NAME, queryVector, VectorSimilarityFunction.COSINE, k, new MatchAllDocsQuery());
+                    FIELD_NAME,
+                    queryVector,
+                    VectorSimilarityFunction.COSINE,
+                    k,
+                    new MatchAllDocsQuery()
+                );
 
                 IndexSearcher searcher = newSearcher(reader, true, false);
                 TopDocs docs = searcher.search(rescoreKnnVectorQuery, numDocs);
-                Map<Integer, Float> rescoredDocs = Arrays.stream(docs.scoreDocs).collect(Collectors.toMap(
-                    scoreDoc -> scoreDoc.doc,
-                    scoreDoc -> scoreDoc.score)
-                );
+                Map<Integer, Float> rescoredDocs = Arrays.stream(docs.scoreDocs)
+                    .collect(Collectors.toMap(scoreDoc -> scoreDoc.doc, scoreDoc -> scoreDoc.score));
 
                 assertThat(rescoredDocs.size(), equalTo(k));
 
@@ -107,7 +108,7 @@ private void testRescoreDocs(int numDocs, Integer k) throws Exception {
                 // Check top scoring docs are contained in rescored docs
                 for (int i = 0; i < k; i++) {
                     Float topScore = topK.poll();
-                    if (rescoredScores.contains(topScore) == false ) {
+                    if (rescoredScores.contains(topScore) == false) {
                         fail("Top score " + topScore + " not contained in rescored doc scores " + rescoredScores);
                     }
                 }