Apache Lucene open-source search software
LUCENE-8519: MultiDocValues.getNormValues should not call getMergedFieldInfos (#902)
Rushabh Shahd17c6056d8ca
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 88ebf205167..4858e3082e7 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -79,7 +79,7 @@ ImprovementsOptimizations----------------------(No changes)+* LUCENE-8519: MultiDocValues.getNormValues should not call getMergedFieldInfos (Rushabh Shah)Bug Fixes---------------------diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.javaindex b085dd775a9..145c0e34f3e 100644--- a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java+++ b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java@@ -53,8 +53,18 @@ public class MultiDocValues {} else if (size == 1) {return leaves.get(0).reader().getNormValues(field);}- FieldInfo fi = FieldInfos.getMergedFieldInfos(r).fieldInfo(field); // TODO avoid merging- if (fi == null || fi.hasNorms() == false) {++ // Check if any of the leaf reader which has this field has norms.+ boolean normFound = false;+ for (LeafReaderContext leaf : leaves) {+ LeafReader reader = leaf.reader();+ FieldInfo info = reader.getFieldInfos().fieldInfo(field);+ if (info != null && info.hasNorms()) {+ normFound = true;+ break;+ }+ }+ if (normFound == false) {return null;}