Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct quantized HNSW validation to be in-line with HNSW (#13263) 

When intra-merge parallelism was introduced, the validation that numWorkers must ==1 with a null executor service was removed from Lucene99HnswVectorsFormat. However, I forgot to remove that validation from Lucene99HnswScalarQuantizedVectorsFormat.

This corrects that mistake, allowing Lucene99HnswScalarQuantizedVectorsFormat and Lucene99HnswVectorsFormat to take advantage of the merge-schedulers intra-merge threading.
This commit is contained in:
Benjamin Trent 2024-04-04 12:05:25 -04:00 committed by GitHub
parent 2ee537ce16
commit 6104c86abc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswScalarQuantizedVectorsFormat.java
View File

@ -120,10 +120,6 @@ public final class Lucene99HnswScalarQuantizedVectorsFormat extends KnnVectorsFo
} }
this.maxConn = maxConn; this.maxConn = maxConn;
this.beamWidth = beamWidth; this.beamWidth = beamWidth;
if (numMergeWorkers > 1 && mergeExec == null) {
throw new IllegalArgumentException(
"No executor service passed in when " + numMergeWorkers + " merge workers are requested");
}
if (numMergeWorkers == 1 && mergeExec != null) { if (numMergeWorkers == 1 && mergeExec != null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"No executor service is needed as we'll use single thread to merge"); "No executor service is needed as we'll use single thread to merge");

3
lucene/core/src/test/org/apache/lucene/codecs/lucene99/TestLucene99HnswQuantizedVectorsFormat.java
View File

@ -217,9 +217,6 @@ public class TestLucene99HnswQuantizedVectorsFormat extends BaseKnnVectorsFormat
expectThrows( expectThrows(
IllegalArgumentException.class, IllegalArgumentException.class,
() -> new Lucene99HnswScalarQuantizedVectorsFormat(20, 100, 0, 7, false, 0.8f, null)); () -> new Lucene99HnswScalarQuantizedVectorsFormat(20, 100, 0, 7, false, 0.8f, null));
expectThrows(
IllegalArgumentException.class,
() -> new Lucene99HnswScalarQuantizedVectorsFormat(20, 100, 100, 7, false, null, null));
expectThrows( expectThrows(
IllegalArgumentException.class, IllegalArgumentException.class,
() -> () ->