Skip to content

Commit 7277b0a

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 3a2ba61 commit 7277b0a

File tree

3 files changed

+15
-24
lines changed

3 files changed

+15
-24
lines changed

server/src/main/java/org/elasticsearch/index/codec/vectors/DefaultIVFVectorsWriter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,17 +264,17 @@ CentroidAssignments calculateAndWriteCentroids(
264264
float[][] parentCentroids = result.centroids();
265265
int[] parentChildAssignments = result.assignments();
266266
// TODO: explore using soar assignments here as well
267-
//int[] parentChildSoarAssignments = result.soarAssignments();
267+
// int[] parentChildSoarAssignments = result.soarAssignments();
268268

269269
AssignmentArraySorter sorter = new AssignmentArraySorter(centroids, centroidOrds, parentChildAssignments);
270270
sorter.sort(0, centroids.length);
271271

272-
for(int i = 0; i < parentChildAssignments.length; i++) {
272+
for (int i = 0; i < parentChildAssignments.length; i++) {
273273
int label = parentChildAssignments[i];
274274
int centroidCount = 0;
275275
int j = i;
276-
for(; j < parentChildAssignments.length; j++) {
277-
if(parentChildAssignments[j] != label) {
276+
for (; j < parentChildAssignments.length; j++) {
277+
if (parentChildAssignments[j] != label) {
278278
break;
279279
}
280280
centroidCount++;
@@ -295,7 +295,7 @@ CentroidAssignments calculateAndWriteCentroids(
295295
}
296296

297297
IntIntMap centroidOrdsToIdx = new IntIntHashMap(centroidOrds.length);
298-
for(int i = 0; i < centroidOrds.length; i++) {
298+
for (int i = 0; i < centroidOrds.length; i++) {
299299
centroidOrdsToIdx.put(centroidOrds[i], i);
300300
}
301301
int[][] assignmentsByCluster = mapAssignmentsByCluster(centroids.length, assignments, soarAssignments, centroidOrdsToIdx);

server/src/main/java/org/elasticsearch/index/codec/vectors/IVFVectorsReader.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -292,12 +292,7 @@ public final void search(String field, float[] target, KnnCollector knnCollector
292292

293293
while (parentCentroidQueue.size() > 0 && (centroidsVisited < nProbe || knnCollectorImpl.numCollected() < knnCollector.k())) {
294294
NeighborQueue centroidQueue = new NeighborQueue(centroidQueryScorer.size(), true);
295-
updateCentroidQueueWNextParent(
296-
parentCentroidQueryScorer,
297-
parentCentroidQueue,
298-
centroidQueryScorer,
299-
centroidQueue
300-
);
295+
updateCentroidQueueWNextParent(parentCentroidQueryScorer, parentCentroidQueue, centroidQueryScorer, centroidQueue);
301296

302297
PostingVisitor scorer = getPostingVisitor(fieldInfo, ivfClusters, target, needsScoring);
303298
// initially we visit only the "centroids to search"
@@ -316,13 +311,8 @@ public final void search(String field, float[] target, KnnCollector knnCollector
316311
// ... would be centroidScore < (nextParentScore + furthestCentroidScore) which is better than just a buffer
317312
// TODO: try a ParentNProbe here that's for instance the sqrt(nProbe) that forces a fixed
318313
// ... number of parents to be explored at each step
319-
while (parentCentroidQueue.size() > 0 && centroidScore < (nextParentScore + nextParentScore * 0.05) ) {
320-
updateCentroidQueueWNextParent(
321-
parentCentroidQueryScorer,
322-
parentCentroidQueue,
323-
centroidQueryScorer,
324-
centroidQueue
325-
);
314+
while (parentCentroidQueue.size() > 0 && centroidScore < (nextParentScore + nextParentScore * 0.05)) {
315+
updateCentroidQueueWNextParent(parentCentroidQueryScorer, parentCentroidQueue, centroidQueryScorer, centroidQueue);
326316
if (parentCentroidQueue.size() > 0) {
327317
nextParentScore = parentCentroidQueue.topScore();
328318
} else {

server/src/test/java/org/elasticsearch/index/codec/vectors/DefaultIVFVectorsWriterTests.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import com.carrotsearch.hppc.IntIntHashMap;
1313
import com.carrotsearch.hppc.IntIntMap;
14+
1415
import org.elasticsearch.test.ESTestCase;
1516

1617
import static org.elasticsearch.index.codec.vectors.DefaultIVFVectorsWriter.mapAssignmentsByCluster;
@@ -30,18 +31,18 @@ public void testAssignmentsByCluster() {
3031
int[] centroidOrds = new int[] { 3, 2, 4, 0, 1 };
3132

3233
IntIntMap centroidOrdsToIdx = new IntIntHashMap(centroidOrds.length);
33-
for(int i = 0; i < centroidOrds.length; i++) {
34+
for (int i = 0; i < centroidOrds.length; i++) {
3435
// idx 0 1 2 3 4 5
3536
// ord 3 2 0 4 1 5
3637
centroidOrdsToIdx.put(centroidOrds[i], i);
3738
}
3839

3940
int[][] assignmentsByCluster = mapAssignmentsByCluster(centroidOrds.length, assignments, soarAssignments, centroidOrdsToIdx);
4041

41-
assertArrayEquals(assignmentsByCluster[0], new int[] {0, 1, 5, 9, 14});
42-
assertArrayEquals(assignmentsByCluster[1], new int[] {2, 4, 6, 8, 12, 13, 13, 14});
43-
assertArrayEquals(assignmentsByCluster[2], new int[] {10, 10, 11, 11});
44-
assertArrayEquals(assignmentsByCluster[3], new int[] {0, 1, 2, 7});
45-
assertArrayEquals(assignmentsByCluster[4], new int[] {3, 3, 4, 5, 6, 7, 8, 9, 12});
42+
assertArrayEquals(assignmentsByCluster[0], new int[] { 0, 1, 5, 9, 14 });
43+
assertArrayEquals(assignmentsByCluster[1], new int[] { 2, 4, 6, 8, 12, 13, 13, 14 });
44+
assertArrayEquals(assignmentsByCluster[2], new int[] { 10, 10, 11, 11 });
45+
assertArrayEquals(assignmentsByCluster[3], new int[] { 0, 1, 2, 7 });
46+
assertArrayEquals(assignmentsByCluster[4], new int[] { 3, 3, 4, 5, 6, 7, 8, 9, 12 });
4647
}
4748
}

0 commit comments

Comments
 (0)