Skip to content

CNDB-15703: Fix ScoreTracker impl init and reset methods #551

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
merged 5 commits into from
Oct 22, 2025
Merged

CNDB-15703: Fix ScoreTracker impl init and reset methods #551

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f5bb82
CNDB-15703: Fix ScoreTracker impl init and reset methods
michaeljmarshall Oct 21, 2025
b59246d
Use setMaxSize on BoundedLongHeap
michaeljmarshall Oct 22, 2025
d9e9e84
Fix reset, make it use the right new maxSize
michaeljmarshall Oct 22, 2025
56c6f9e
Add test to mimic https://github.com/jbellis/pwtest natively
marianotepper Oct 22, 2025
f2630e6
Add missing license
marianotepper Oct 22, 2025
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
15 changes: 4 additions & 11 deletions jvector-base/src/main/java/io/github/jbellis/jvector/graph/ScoreTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ public ScoreTracker getScoreTracker(boolean pruneSearch, int rerankK, float thre

if (threshold > 0) {
if (twoPhaseTracker == null) {
twoPhaseTracker = new ScoreTracker.TwoPhaseTracker();
twoPhaseTracker = new ScoreTracker.TwoPhaseTracker(threshold);
} else {
twoPhaseTracker.reset(threshold);
}
scoreTracker = twoPhaseTracker;
} else {
if (pruneSearch) {
if (relaxedMonotonicityTracker == null) {
relaxedMonotonicityTracker = new ScoreTracker.RelaxedMonotonicityTracker();
relaxedMonotonicityTracker = new ScoreTracker.RelaxedMonotonicityTracker(rerankK);
} else {
relaxedMonotonicityTracker.reset(rerankK);
}
Expand Down Expand Up @@ -109,10 +109,6 @@ class TwoPhaseTracker implements ScoreTracker {
this.threshold = threshold;
}

TwoPhaseTracker() {
this(0);
}

void reset(double threshold) {
this.bestScores.clear();
this.observationCount = 0;
Expand Down Expand Up @@ -195,10 +191,6 @@ class RelaxedMonotonicityTracker implements ScoreTracker {
this.dSquared = 0;
}

RelaxedMonotonicityTracker() {
this(100);
}

private static int getRecentScoresSize(int bestScoresTracked) {
// A quick empirical study yields that the number of recent scores
// that we need to consider grows by a factor of ~sqrt(bestScoresTracked / 2)
Expand All @@ -211,7 +203,8 @@ void reset(int bestScoresTracked) {
if (this.recentScoresSize > recentScores.length) {
recentScores = ArrayUtil.grow(recentScores, this.recentScoresSize);
}
this.bestScores.clear();
bestScores.clear();
bestScores.setMaxSize(bestScoresTracked);
this.observationCount = 0;
this.mean = 0;
this.dSquared = 0;
Expand Down