Apache Lucene open-source search software
Revert "SlowCompositeCodecWrapper: remove redundant FieldInfo lookup in its PointsReader.getValues method"
Mike McCandless9ec938f2efff
diff --git a/lucene/core/src/java/org/apache/lucene/index/SlowCompositeCodecReaderWrapper.java b/lucene/core/src/java/org/apache/lucene/index/SlowCompositeCodecReaderWrapper.javaindex 2753b5f7510..0376f1e6243 100644--- a/lucene/core/src/java/org/apache/lucene/index/SlowCompositeCodecReaderWrapper.java+++ b/lucene/core/src/java/org/apache/lucene/index/SlowCompositeCodecReaderWrapper.java@@ -565,10 +565,12 @@ final class SlowCompositeCodecReaderWrapper extends CodecReader {private static class SlowCompositePointsReaderWrapper extends PointsReader {+ private final CodecReader[] codecReaders;private final PointsReader[] readers;private final int[] docStarts;SlowCompositePointsReaderWrapper(CodecReader[] codecReaders, int[] docStarts) {+ this.codecReaders = codecReaders;this.readers =Arrays.stream(codecReaders).map(CodecReader::getPointsReader)@@ -594,9 +596,12 @@ final class SlowCompositeCodecReaderWrapper extends CodecReader {public PointValues getValues(String field) throws IOException {List<PointValuesSub> values = new ArrayList<>();for (int i = 0; i < readers.length; ++i) {- if (readers[i] != null) {+ FieldInfo fi = codecReaders[i].getFieldInfos().fieldInfo(field);+ if (fi != null && fi.getPointDimensionCount() > 0) {PointValues v = readers[i].getValues(field);if (v != null) {+ // Apparently FieldInfo can claim a field has points, yet the returned+ // PointValues is nullvalues.add(new PointValuesSub(v, docStarts[i]));}}