forked from apache/lucene
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Add TwoPhaseKnnVectorQuery #29
Open
dungba88
wants to merge
15
commits into
main
Choose a base branch
from
two-phase-vector
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
edef1b2
Initial commit: Add TwoPhaseKnnVectorQuery
dungba88 bbc7081
Add tests
dungba88 96d2987
Remove forbidden API
dungba88 e2ab4bc
Remove forbidden API
dungba88 4e32971
Add javadoc
dungba88 ccd3e25
Make the Query experimental
dungba88 f9da336
Use Math.ceil instead of rounding
dungba88 8d88cab
Store target separately in child class
dungba88 b67637a
Change abstraction to wrap around KNN query
dungba88 8cd3ccf
Fix doc ord bug & flush writer multiple times
dungba88 30e377a
Add null check
dungba88 5d1910c
Refactor test case
dungba88 22288e5
Merge branch 'main' into two-phase-vector
dungba88 feda6af
Simplify Codec
dungba88 3178bbc
short-circuit for case there is no oversample
dungba88 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
138 changes: 138 additions & 0 deletions
138
lucene/core/src/java/org/apache/lucene/search/TwoPhaseKnnVectorQuery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.lucene.search; | ||
|
||
import java.io.IOException; | ||
import java.util.Arrays; | ||
import java.util.Objects; | ||
import org.apache.lucene.document.KnnFloatVectorField; | ||
import org.apache.lucene.index.FieldInfo; | ||
import org.apache.lucene.index.FloatVectorValues; | ||
import org.apache.lucene.index.LeafReaderContext; | ||
import org.apache.lucene.search.knn.KnnCollectorManager; | ||
import org.apache.lucene.util.ArrayUtil; | ||
import org.apache.lucene.util.Bits; | ||
|
||
/** | ||
* A subclass of KnnFloatVectorQuery which does oversampling and full-precision reranking. | ||
* | ||
* @lucene.experimental | ||
*/ | ||
public class TwoPhaseKnnVectorQuery extends KnnFloatVectorQuery { | ||
|
||
private final int originalK; | ||
private final double oversample; | ||
private final float[] target; | ||
|
||
/** | ||
* Find the <code>k</code> nearest documents to the target vector according to the vectors in the | ||
* given field. <code>target</code> vector. It also over-samples by oversample parameter and does | ||
* full precision reranking if oversample > 0 | ||
* | ||
* @param field a field that has been indexed as a {@link KnnFloatVectorField}. | ||
* @param target the target of the search | ||
* @param k the number of documents to find | ||
* @param oversample the oversampling factor, a value of 0 means no oversampling | ||
* @param filter a filter applied before the vector search | ||
* @throws IllegalArgumentException if <code>k</code> is less than 1 | ||
*/ | ||
public TwoPhaseKnnVectorQuery( | ||
String field, float[] target, int k, double oversample, Query filter) { | ||
super(field, target, k + (int) Math.ceil(k * oversample), filter); | ||
if (oversample < 0) { | ||
throw new IllegalArgumentException("oversample must be non-negative, got " + oversample); | ||
} | ||
this.target = target; | ||
this.originalK = k; | ||
this.oversample = oversample; | ||
} | ||
|
||
@Override | ||
protected TopDocs mergeLeafResults(TopDocs[] perLeafResults) { | ||
return TopDocs.merge(originalK, perLeafResults); | ||
} | ||
|
||
@Override | ||
protected TopDocs approximateSearch( | ||
LeafReaderContext context, | ||
Bits acceptDocs, | ||
int visitedLimit, | ||
KnnCollectorManager knnCollectorManager) | ||
throws IOException { | ||
TopDocs results = | ||
super.approximateSearch(context, acceptDocs, visitedLimit, knnCollectorManager); | ||
if (results.scoreDocs.length <= originalK) { | ||
// short-circuit: no re-ranking needed. we got what we need | ||
return results; | ||
} | ||
FieldInfo fi = context.reader().getFieldInfos().fieldInfo(field); | ||
if (fi == null) { | ||
return results; | ||
} | ||
FloatVectorValues floatVectorValues = context.reader().getFloatVectorValues(field); | ||
if (floatVectorValues == null) { | ||
return results; | ||
} | ||
|
||
for (int i = 0; i < results.scoreDocs.length; i++) { | ||
// get the raw vector value | ||
float[] vectorValue = floatVectorValues.vectorValue(results.scoreDocs[i].doc); | ||
|
||
// recompute the score | ||
results.scoreDocs[i].score = fi.getVectorSimilarityFunction().compare(vectorValue, target); | ||
} | ||
|
||
// Sort the ScoreDocs by the new scores in descending order | ||
Arrays.sort(results.scoreDocs, (a, b) -> Float.compare(b.score, a.score)); | ||
|
||
// Select the top-k ScoreDocs after re-ranking | ||
ScoreDoc[] topKDocs = ArrayUtil.copyOfSubArray(results.scoreDocs, 0, originalK); | ||
|
||
assert topKDocs.length == originalK; | ||
|
||
return new TopDocs(results.totalHits, topKDocs); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
int result = super.hashCode(); | ||
result = 31 * result + Objects.hash(originalK, oversample); | ||
return result; | ||
} | ||
|
||
@Override | ||
public boolean equals(Object o) { | ||
if (this == o) return true; | ||
if (super.equals(o) == false) return false; | ||
TwoPhaseKnnVectorQuery that = (TwoPhaseKnnVectorQuery) o; | ||
return oversample == that.oversample && originalK == that.originalK; | ||
} | ||
|
||
@Override | ||
public String toString(String field) { | ||
return getClass().getSimpleName() | ||
+ ":" | ||
+ this.field | ||
+ "[" | ||
+ target[0] | ||
+ ",...][" | ||
+ originalK | ||
+ "][" | ||
+ oversample | ||
+ "]"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
lucene/core/src/test/org/apache/lucene/search/TestTwoPhaseKnnVectorQuery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.lucene.search; | ||
|
||
import java.util.HashMap; | ||
import java.util.Map; | ||
import java.util.Random; | ||
import org.apache.lucene.codecs.FilterCodec; | ||
import org.apache.lucene.codecs.KnnVectorsFormat; | ||
import org.apache.lucene.codecs.lucene100.Lucene100Codec; | ||
import org.apache.lucene.codecs.lucene99.Lucene99HnswScalarQuantizedVectorsFormat; | ||
import org.apache.lucene.document.Document; | ||
import org.apache.lucene.document.Field; | ||
import org.apache.lucene.document.IntField; | ||
import org.apache.lucene.document.KnnFloatVectorField; | ||
import org.apache.lucene.index.DirectoryReader; | ||
import org.apache.lucene.index.IndexReader; | ||
import org.apache.lucene.index.IndexWriter; | ||
import org.apache.lucene.index.IndexWriterConfig; | ||
import org.apache.lucene.index.VectorSimilarityFunction; | ||
import org.apache.lucene.store.ByteBuffersDirectory; | ||
import org.apache.lucene.store.Directory; | ||
import org.apache.lucene.tests.util.LuceneTestCase; | ||
import org.junit.Assert; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
public class TestTwoPhaseKnnVectorQuery extends LuceneTestCase { | ||
|
||
private static final String FIELD = "vector"; | ||
public static final VectorSimilarityFunction VECTOR_SIMILARITY_FUNCTION = | ||
VectorSimilarityFunction.COSINE; | ||
private Directory directory; | ||
private IndexWriterConfig config; | ||
private static final int NUM_VECTORS = 1000; | ||
private static final int VECTOR_DIMENSION = 128; | ||
|
||
@Before | ||
@Override | ||
public void setUp() throws Exception { | ||
super.setUp(); | ||
directory = new ByteBuffersDirectory(); | ||
|
||
// Set up the IndexWriterConfig to use quantized vector storage | ||
config = new IndexWriterConfig(); | ||
config.setCodec(new QuantizedCodec()); | ||
} | ||
|
||
@Test | ||
public void testTwoPhaseKnnVectorQuery() throws Exception { | ||
Map<Integer, float[]> vectors = new HashMap<>(); | ||
|
||
Random random = random(); | ||
|
||
// Step 1: Index random vectors in quantized format | ||
try (IndexWriter writer = new IndexWriter(directory, config)) { | ||
for (int i = 0; i < NUM_VECTORS; i++) { | ||
float[] vector = randomFloatVector(VECTOR_DIMENSION, random); | ||
Document doc = new Document(); | ||
doc.add(new IntField("id", i, Field.Store.YES)); | ||
doc.add(new KnnFloatVectorField(FIELD, vector, VECTOR_SIMILARITY_FUNCTION)); | ||
writer.addDocument(doc); | ||
vectors.put(i, vector); | ||
} | ||
} | ||
|
||
// Step 2: Run TwoPhaseKnnVectorQuery with a random target vector | ||
try (IndexReader reader = DirectoryReader.open(directory)) { | ||
IndexSearcher searcher = new IndexSearcher(reader); | ||
float[] targetVector = randomFloatVector(VECTOR_DIMENSION, random); | ||
int k = 10; | ||
double oversample = 1.0; | ||
|
||
TwoPhaseKnnVectorQuery query = | ||
new TwoPhaseKnnVectorQuery(FIELD, targetVector, k, oversample, null); | ||
TopDocs topDocs = searcher.search(query, k); | ||
|
||
// Step 3: Verify that TopDocs scores match similarity with unquantized vectors | ||
for (ScoreDoc scoreDoc : topDocs.scoreDocs) { | ||
Document retrievedDoc = searcher.storedFields().document(scoreDoc.doc); | ||
float[] docVector = vectors.get(retrievedDoc.getField("id").numericValue().intValue()); | ||
float expectedScore = VECTOR_SIMILARITY_FUNCTION.compare(targetVector, docVector); | ||
Assert.assertEquals( | ||
"Score does not match expected similarity for docId: " + scoreDoc.doc, | ||
expectedScore, | ||
scoreDoc.score, | ||
1e-5); | ||
} | ||
} | ||
} | ||
|
||
private float[] randomFloatVector(int dimension, Random random) { | ||
float[] vector = new float[dimension]; | ||
for (int i = 0; i < dimension; i++) { | ||
vector[i] = random.nextFloat(); | ||
} | ||
return vector; | ||
} | ||
|
||
public static class QuantizedCodec extends FilterCodec { | ||
|
||
public QuantizedCodec() { | ||
super("QuantizedCodec", new Lucene100Codec()); | ||
} | ||
|
||
@Override | ||
public KnnVectorsFormat knnVectorsFormat() { | ||
return new Lucene99HnswScalarQuantizedVectorsFormat(); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we would need a brand new query that doesn't build on top of AbstractKnnVectorQuery. Instead, gets passed the desired knn query as a parameter & the desired target then the outer reranking query can call the
knn
query via rewrite.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh that's a cleaner idea actually. Let me try it in next rev.