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

Fix NPE for when fields are missing in `searchNearestVectors` (#13195) 

Related to: https://github.com/apache/lucene/pull/13162

Since this is unreleased, no changelog entry is necessary.
This commit is contained in:
Benjamin Trent 2024-03-20 11:49:30 -04:00 committed by GitHub
parent c78533c53c
commit d5f8853fda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lucene/core/src/java/org/apache/lucene/index/LeafReader.java
View File

@ -246,6 +246,9 @@ public abstract non-sealed class LeafReader extends IndexReader {
public final TopDocs searchNearestVectors( public final TopDocs searchNearestVectors(
String field, float[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException { String field, float[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException {
FieldInfo fi = getFieldInfos().fieldInfo(field); FieldInfo fi = getFieldInfos().fieldInfo(field);
if (fi == null || fi.getVectorDimension() == 0) {
return TopDocsCollector.EMPTY_TOPDOCS;
}
FloatVectorValues floatVectorValues = getFloatVectorValues(fi.name); FloatVectorValues floatVectorValues = getFloatVectorValues(fi.name);
if (floatVectorValues == null) { if (floatVectorValues == null) {
return TopDocsCollector.EMPTY_TOPDOCS; return TopDocsCollector.EMPTY_TOPDOCS;
@ -287,6 +290,9 @@ public abstract non-sealed class LeafReader extends IndexReader {
public final TopDocs searchNearestVectors( public final TopDocs searchNearestVectors(
String field, byte[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException { String field, byte[] target, int k, Bits acceptDocs, int visitedLimit) throws IOException {
FieldInfo fi = getFieldInfos().fieldInfo(field); FieldInfo fi = getFieldInfos().fieldInfo(field);
if (fi == null || fi.getVectorDimension() == 0) {
return TopDocsCollector.EMPTY_TOPDOCS;
}
ByteVectorValues byteVectorValues = getByteVectorValues(fi.name); ByteVectorValues byteVectorValues = getByteVectorValues(fi.name);
if (byteVectorValues == null) { if (byteVectorValues == null) {
return TopDocsCollector.EMPTY_TOPDOCS; return TopDocsCollector.EMPTY_TOPDOCS;

34
lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java
View File

@ -71,6 +71,40 @@ public class TestPerFieldKnnVectorsFormat extends BaseKnnVectorsFormatTestCase {
return codec; return codec;
} }
public void testMissingFieldReturnsNoResults() throws IOException {
try (Directory directory = newDirectory()) {
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(
new AssertingCodec() {
@Override
public KnnVectorsFormat getKnnVectorsFormatForField(String field) {
return TestUtil.getDefaultKnnVectorsFormat();
}
});
try (IndexWriter iwriter = new IndexWriter(directory, iwc)) {
Document doc = new Document();
doc.add(newTextField("id", "1", Field.Store.YES));
iwriter.addDocument(doc);
}
try (IndexReader ireader = DirectoryReader.open(directory)) {
LeafReader reader = ireader.leaves().get(0).reader();
TopDocs hits =
reader.searchNearestVectors(
"missing_field",
new float[] {1, 2, 3},
10,
reader.getLiveDocs(),
Integer.MAX_VALUE);
assertEquals(0, hits.scoreDocs.length);
hits =
reader.searchNearestVectors(
"id", new float[] {1, 2, 3}, 10, reader.getLiveDocs(), Integer.MAX_VALUE);
assertEquals(0, hits.scoreDocs.length);
}
}
}
public void testTwoFieldsTwoFormats() throws IOException { public void testTwoFieldsTwoFormats() throws IOException {
try (Directory directory = newDirectory()) { try (Directory directory = newDirectory()) {
// we don't use RandomIndexWriter because it might add more values than we expect !!!!1 // we don't use RandomIndexWriter because it might add more values than we expect !!!!1