Skip to content

Apache Lucene open-source search software

Fix NPE in PerFieldKnnVectorsFormat.getGraph (Cannot read field number because info is null). (#15304)

Dawid Weissebaa6dbeb58e
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldKnnVectorsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldKnnVectorsFormat.java
index e58f57e7591..c36ab3b7df1 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldKnnVectorsFormat.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldKnnVectorsFormat.java
@@ -319,9 +319,13 @@ public abstract class PerFieldKnnVectorsFormat extends KnnVectorsFormat {
@Override
public HnswGraph getGraph(String field) throws IOException {
final FieldInfo info = fieldInfos.fieldInfo(field);
+ if (info == null) {
+ return null;
+ }
+
KnnVectorsReader knnVectorsReader = fields.get(info.number);
- if (knnVectorsReader instanceof HnswGraphProvider) {
- return ((HnswGraphProvider) knnVectorsReader).getGraph(field);
+ if (knnVectorsReader instanceof HnswGraphProvider hnswGraphProvider) {
+ return hnswGraphProvider.getGraph(field);
} else {
return null;
}