fixed duplicate centroid check

john-wagster · john-wagster · commit 09c7c0ed0d8f · 2025-07-15T10:57:12.000-05:00
diff --git a/server/src/main/java/org/elasticsearch/index/codec/vectors/IVFVectorsReader.java b/server/src/main/java/org/elasticsearch/index/codec/vectors/IVFVectorsReader.java
@@ -330,16 +330,14 @@ public final void search(String field, float[] target, KnnCollector knnCollector
                 }
 
                 int centroidOrdinal = centroidQueue.pop();
-                if (priorVisitedCentroids.getAndSet(centroidOrdinal)) {
+                int clusterOrdinal = centroidQueryScorer.getClusterOrdinal(centroidOrdinal);
+                if (priorVisitedCentroids.getAndSet(clusterOrdinal)) {
                     continue;
                 }
                 centroidsVisited++;
 
                 // TODO need direct access to the raw centroid???, this is used for quantizing, maybe hydrating and quantizing is enough?
-                expectedDocs += scorer.resetPostingsScorer(
-                    centroidQueryScorer.getClusterOrdinal(centroidOrdinal),
-                    centroidQueryScorer.centroid(centroidOrdinal)
-                );
+                expectedDocs += scorer.resetPostingsScorer(clusterOrdinal, centroidQueryScorer.centroid(centroidOrdinal));
                 actualDocs += scorer.visit(knnCollector);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -330,16 +330,14 @@ public final void search(String field, float[] target, KnnCollector knnCollector`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`int centroidOrdinal = centroidQueue.pop();`
`333`		`- if (priorVisitedCentroids.getAndSet(centroidOrdinal)) {`
	`333`	`+ int clusterOrdinal = centroidQueryScorer.getClusterOrdinal(centroidOrdinal);`
	`334`	`+ if (priorVisitedCentroids.getAndSet(clusterOrdinal)) {`
`334`	`335`	`continue;`
`335`	`336`	`}`
`336`	`337`	`centroidsVisited++;`
`337`	`338`
`338`	`339`	`// TODO need direct access to the raw centroid???, this is used for quantizing, maybe hydrating and quantizing is enough?`
`339`		`- expectedDocs += scorer.resetPostingsScorer(`
`340`		`- centroidQueryScorer.getClusterOrdinal(centroidOrdinal),`
`341`		`- centroidQueryScorer.centroid(centroidOrdinal)`
`342`		`- );`
	`340`	`+ expectedDocs += scorer.resetPostingsScorer(clusterOrdinal, centroidQueryScorer.centroid(centroidOrdinal));`
`343`	`341`	`actualDocs += scorer.visit(knnCollector);`
`344`	`342`	`}`
`345`	`343`