Skip to content

Fix VectorScorerOSQBenchmark.score to read corrections properly #143137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldematte merged 3 commits into from
Feb 27, 2026
Merged

Fix VectorScorerOSQBenchmark.score to read corrections properly #143137

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ba28a8
Fix VectorScorerOSQBenchmark to read corrections properly
thecoop Feb 26, 2026
861e0ba
Use existing scratch buffer
thecoop Feb 26, 2026
1a75090
Merge branch 'main' into fix-osq-benchmark-bulk-reading
thecoop Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions ...rks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerOSQBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public enum VectorImplementation {
IndexInput input;

float[] scratchScores;
float[] corrections;

record VectorData(
VectorScorerTestUtils.OSQVectorData[] indexVectors,
Expand Down Expand Up @@ -194,7 +193,6 @@ void setup(VectorData data) throws IOException {
.newESNextOSQVectorsScorer(input, (byte) queryBits, (byte) docBits, dims, data.binaryIndexLength, BULK_SIZE);
};
scratchScores = new float[BULK_SIZE];
corrections = new float[3];
}

Path createTempDirectory(String name) throws IOException {
Expand All @@ -210,26 +208,37 @@ public void teardown() throws IOException {
@Benchmark
public float[] score() throws IOException {
float[] results = new float[NUM_QUERIES * NUM_VECTORS];

float[] lowerIntervals = new float[BULK_SIZE];
float[] upperIntervals = new float[BULK_SIZE];
int[] sums = new int[BULK_SIZE];
float[] additional = new float[BULK_SIZE];

for (int j = 0; j < NUM_QUERIES; j++) {
input.seek(0);
for (int i = 0; i < NUM_VECTORS; i++) {
float qDist = scorer.quantizeScore(binaryQueries[j].quantizedVector());
input.readFloats(corrections, 0, corrections.length);
int addition = Short.toUnsignedInt(input.readShort());
float score = scorer.score(
binaryQueries[j].lowerInterval(),
binaryQueries[j].upperInterval(),
binaryQueries[j].quantizedComponentSum(),
binaryQueries[j].additionalCorrection(),
similarityFunction,
centroidDp,
corrections[0],
corrections[1],
addition,
corrections[2],
qDist
);
results[j * NUM_VECTORS + i] = score;
for (int i = 0; i < NUM_VECTORS; i += BULK_SIZE) {
scorer.quantizeScoreBulk(binaryQueries[j].quantizedVector(), BULK_SIZE, scratchScores);
input.readFloats(lowerIntervals, 0, BULK_SIZE);
input.readFloats(upperIntervals, 0, BULK_SIZE);
input.readInts(sums, 0, BULK_SIZE);
input.readFloats(additional, 0, BULK_SIZE);

for (int b = 0; b < BULK_SIZE; b++) {
float score = scorer.score(
binaryQueries[j].lowerInterval(),
binaryQueries[j].upperInterval(),
binaryQueries[j].quantizedComponentSum(),
binaryQueries[j].additionalCorrection(),
similarityFunction,
centroidDp,
lowerIntervals[b],
upperIntervals[b],
sums[b],
additional[b],
scratchScores[b]
);
results[j * NUM_VECTORS + i + b] = score;
}
}
}
return results;
Expand Down