Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,13 @@ public void nextCandidate() {
@Override
public KnnSearchStrategy getSearchStrategy() {
KnnSearchStrategy delegateStrategy = delegate.getSearchStrategy();
assert delegateStrategy instanceof KnnSearchStrategy.Hnsw;
return new KnnSearchStrategy.Patience(
this, ((KnnSearchStrategy.Hnsw) delegateStrategy).filteredSearchThreshold());
if (delegateStrategy instanceof KnnSearchStrategy.Hnsw hnswStrategy) {
return new KnnSearchStrategy.Patience(this, hnswStrategy.filteredSearchThreshold());
} else if (delegateStrategy instanceof KnnSearchStrategy.Seeded seededStrategy) {
if (seededStrategy.originalStrategy() instanceof KnnSearchStrategy.Hnsw hnswStrategy) {
return new KnnSearchStrategy.Patience(this, hnswStrategy.filteredSearchThreshold());
}
}
return delegateStrategy;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public class PatienceKnnVectorQuery extends AbstractKnnVectorQuery {

private final int patience;
private final double saturationThreshold;

final AbstractKnnVectorQuery delegate;
private AbstractKnnVectorQuery delegate;

/**
* Construct a new PatienceKnnVectorQuery instance for a float vector field
Expand Down Expand Up @@ -234,4 +233,18 @@ public KnnCollector newCollector(
patience);
}
}

@Override
public Query rewrite(IndexSearcher indexSearcher) throws IOException {
if (delegate instanceof SeededKnnVectorQuery seededKnnVectorQuery) {
// this is required because SeededKnnVectorQuery now requires its own rewriting logic (to
// create the seed Weight)
delegate =
new SeededKnnVectorQuery(
seededKnnVectorQuery.delegate,
seededKnnVectorQuery.seed,
seededKnnVectorQuery.createSeedWeight(indexSearcher));
}
return super.rewrite(indexSearcher);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,27 @@
import org.apache.lucene.search.knn.KnnSearchStrategy;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.TestVectorUtil;
import org.junit.Before;

public class TestPatienceByteVectorQuery extends BaseKnnVectorQueryTestCase {

private boolean wrapSeeded;

@Before
@Override
public void setUp() throws Exception {
super.setUp();
wrapSeeded = random().nextBoolean();
}

@Override
PatienceKnnVectorQuery getKnnVectorQuery(String field, float[] query, int k, Query queryFilter) {
return PatienceKnnVectorQuery.fromByteQuery(
new KnnByteVectorQuery(field, floatToBytes(query), k, queryFilter));
KnnByteVectorQuery knnQuery =
new KnnByteVectorQuery(field, floatToBytes(query), k, queryFilter);
return wrapSeeded
? PatienceKnnVectorQuery.fromSeededQuery(
SeededKnnVectorQuery.fromByteQuery(knnQuery, new MatchNoDocsQuery()))
: PatienceKnnVectorQuery.fromByteQuery(knnQuery);
}

@Override
Expand Down Expand Up @@ -80,7 +94,13 @@ public void testToString() throws IOException {
IndexReader reader = DirectoryReader.open(indexStore)) {
AbstractKnnVectorQuery query = getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 10);
assertEquals(
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate=KnnByteVectorQuery:field[0,...][10]}",
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate="
+ (wrapSeeded
? "SeededKnnVectorQuery{seed=MatchNoDocsQuery(\"\"), seedWeight=null, delegate="
: "")
+ "KnnByteVectorQuery:field[0,...][10]"
+ (wrapSeeded ? "}" : "")
+ "}",
query.toString("ignored"));

assertDocScoreQueryToString(query.rewrite(newSearcher(reader)));
Expand All @@ -89,7 +109,13 @@ public void testToString() throws IOException {
Query filter = new TermQuery(new Term("id", "text"));
query = getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 10, filter);
assertEquals(
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate=KnnByteVectorQuery:field[0,...][10][id:text]}",
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate="
+ (wrapSeeded
? "SeededKnnVectorQuery{seed=MatchNoDocsQuery(\"\"), seedWeight=null, delegate="
: "")
+ "KnnByteVectorQuery:field[0,...][10][id:text]"
+ (wrapSeeded ? "}" : "")
+ "}",
query.toString("ignored"));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,26 @@
import org.apache.lucene.search.knn.KnnSearchStrategy;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.TestVectorUtil;
import org.junit.Before;

public class TestPatienceFloatVectorQuery extends BaseKnnVectorQueryTestCase {

private boolean wrapSeeded;

@Before
@Override
public void setUp() throws Exception {
super.setUp();
wrapSeeded = random().nextBoolean();
}

@Override
PatienceKnnVectorQuery getKnnVectorQuery(String field, float[] query, int k, Query queryFilter) {
return PatienceKnnVectorQuery.fromFloatQuery(
new KnnFloatVectorQuery(field, query, k, queryFilter));
KnnFloatVectorQuery knnQuery = new KnnFloatVectorQuery(field, query, k, queryFilter);
return wrapSeeded
? PatienceKnnVectorQuery.fromSeededQuery(
SeededKnnVectorQuery.fromFloatQuery(knnQuery, new MatchNoDocsQuery()))
: PatienceKnnVectorQuery.fromFloatQuery(knnQuery);
}

@Override
Expand Down Expand Up @@ -71,7 +84,13 @@ public void testToString() throws IOException {
IndexReader reader = DirectoryReader.open(indexStore)) {
AbstractKnnVectorQuery query = getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 10);
assertEquals(
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate=KnnFloatVectorQuery:field[0.0,...][10]}",
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate="
+ (wrapSeeded
? "SeededKnnVectorQuery{seed=MatchNoDocsQuery(\"\"), seedWeight=null, delegate="
: "")
+ "KnnFloatVectorQuery:field[0.0,...][10]"
+ (wrapSeeded ? "}" : "")
+ "}",
query.toString("ignored"));

assertDocScoreQueryToString(query.rewrite(newSearcher(reader)));
Expand All @@ -80,7 +99,13 @@ public void testToString() throws IOException {
Query filter = new TermQuery(new Term("id", "text"));
query = getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 10, filter);
assertEquals(
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate=KnnFloatVectorQuery:field[0.0,...][10][id:text]}",
"PatienceKnnVectorQuery{saturationThreshold=0.995, patience=7, delegate="
+ (wrapSeeded
? "SeededKnnVectorQuery{seed=MatchNoDocsQuery(\"\"), seedWeight=null, delegate="
: "")
+ "KnnFloatVectorQuery:field[0.0,...][10][id:text]"
+ (wrapSeeded ? "}" : "")
+ "}",
query.toString("ignored"));
}
}
Expand Down