Apache Lucene open-source search software
LUCENE-10398: Add static method for getting Terms from LeafReader (#678)
spike.liufc3c790ab421
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.javaindex 4cc762c2bc3..c020d7487cb 100644--- a/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.java+++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/NearestFuzzyQuery.java@@ -203,13 +203,11 @@ public class NearestFuzzyQuery extends Query {// equal to 1TermStates termStates = new TermStates(reader.getContext());for (LeafReaderContext leafContext : reader.leaves()) {- Terms terms = leafContext.reader().terms(term.field());- if (terms != null) {- TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(term.bytes())) {- int freq = 1 - termStates.docFreq(); // we want the total df and ttf to be 1- termStates.register(termsEnum.termState(), leafContext.ord, freq, freq);- }+ Terms terms = Terms.getTerms(leafContext.reader(), term.field());+ TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(term.bytes())) {+ int freq = 1 - termStates.docFreq(); // we want the total df and ttf to be 1+ termStates.register(termsEnum.termState(), leafContext.ord, freq, freq);}}return new TermQuery(term, termStates);diff --git a/lucene/core/src/java/org/apache/lucene/document/FeatureDoubleValuesSource.java b/lucene/core/src/java/org/apache/lucene/document/FeatureDoubleValuesSource.javaindex 452577a9290..e77f83c136a 100644--- a/lucene/core/src/java/org/apache/lucene/document/FeatureDoubleValuesSource.java+++ b/lucene/core/src/java/org/apache/lucene/document/FeatureDoubleValuesSource.java@@ -56,17 +56,13 @@ class FeatureDoubleValuesSource extends DoubleValuesSource {@Overridepublic DoubleValues getValues(LeafReaderContext ctx, DoubleValues scores) throws IOException {- Terms terms = ctx.reader().terms(field);- if (terms == null) {- return DoubleValues.EMPTY;+ Terms terms = Terms.getTerms(ctx.reader(), field);+ TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(featureName)) {+ PostingsEnum currentReaderPostingsValues = termsEnum.postings(null, PostingsEnum.FREQS);+ return new FeatureDoubleValues(currentReaderPostingsValues);} else {- TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(featureName) == false) {- return DoubleValues.EMPTY;- } else {- PostingsEnum currentReaderPostingsValues = termsEnum.postings(null, PostingsEnum.FREQS);- return new FeatureDoubleValues(currentReaderPostingsValues);- }+ return DoubleValues.EMPTY;}}diff --git a/lucene/core/src/java/org/apache/lucene/document/FeatureQuery.java b/lucene/core/src/java/org/apache/lucene/document/FeatureQuery.javaindex bdd00efa8f1..5d8350c4d51 100644--- a/lucene/core/src/java/org/apache/lucene/document/FeatureQuery.java+++ b/lucene/core/src/java/org/apache/lucene/document/FeatureQuery.java@@ -111,10 +111,7 @@ final class FeatureQuery extends Query {@Overridepublic Scorer scorer(LeafReaderContext context) throws IOException {- Terms terms = context.reader().terms(fieldName);- if (terms == null) {- return null;- }+ Terms terms = Terms.getTerms(context.reader(), fieldName);TermsEnum termsEnum = terms.iterator();if (termsEnum.seekExact(new BytesRef(featureName)) == false) {return null;diff --git a/lucene/core/src/java/org/apache/lucene/document/FeatureSortField.java b/lucene/core/src/java/org/apache/lucene/document/FeatureSortField.javaindex 2a286802dcd..dc9569ecd09 100644--- a/lucene/core/src/java/org/apache/lucene/document/FeatureSortField.java+++ b/lucene/core/src/java/org/apache/lucene/document/FeatureSortField.java@@ -101,17 +101,13 @@ final class FeatureSortField extends SortField {@Overrideprotected void doSetNextReader(LeafReaderContext context) throws IOException {- Terms terms = context.reader().terms(field);- if (terms == null) {- currentReaderPostingsValues = null;+ Terms terms = Terms.getTerms(context.reader(), field);+ TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(featureName)) {+ currentReaderPostingsValues =+ termsEnum.postings(currentReaderPostingsValues, PostingsEnum.FREQS);} else {- TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(featureName) == false) {- currentReaderPostingsValues = null;- } else {- currentReaderPostingsValues =- termsEnum.postings(currentReaderPostingsValues, PostingsEnum.FREQS);- }+ currentReaderPostingsValues = null;}}diff --git a/lucene/core/src/java/org/apache/lucene/index/LeafReader.java b/lucene/core/src/java/org/apache/lucene/index/LeafReader.javaindex 729db64b71e..37d005af7ef 100644--- a/lucene/core/src/java/org/apache/lucene/index/LeafReader.java+++ b/lucene/core/src/java/org/apache/lucene/index/LeafReader.java@@ -71,10 +71,7 @@ public abstract class LeafReader extends IndexReader {@Overridepublic final int docFreq(Term term) throws IOException {- final Terms terms = terms(term.field());- if (terms == null) {- return 0;- }+ final Terms terms = Terms.getTerms(this, term.field());final TermsEnum termsEnum = terms.iterator();if (termsEnum.seekExact(term.bytes())) {return termsEnum.docFreq();@@ -90,10 +87,7 @@ public abstract class LeafReader extends IndexReader {*/@Overridepublic final long totalTermFreq(Term term) throws IOException {- final Terms terms = terms(term.field());- if (terms == null) {- return 0;- }+ final Terms terms = Terms.getTerms(this, term.field());final TermsEnum termsEnum = terms.iterator();if (termsEnum.seekExact(term.bytes())) {return termsEnum.totalTermFreq();@@ -143,12 +137,10 @@ public abstract class LeafReader extends IndexReader {public final PostingsEnum postings(Term term, int flags) throws IOException {assert term.field() != null;assert term.bytes() != null;- final Terms terms = terms(term.field());- if (terms != null) {- final TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(term.bytes())) {- return termsEnum.postings(null, flags);- }+ final Terms terms = Terms.getTerms(this, term.field());+ final TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(term.bytes())) {+ return termsEnum.postings(null, flags);}return null;}diff --git a/lucene/core/src/java/org/apache/lucene/index/TermStates.java b/lucene/core/src/java/org/apache/lucene/index/TermStates.javaindex dbf4743f6c8..d1c10401190 100644--- a/lucene/core/src/java/org/apache/lucene/index/TermStates.java+++ b/lucene/core/src/java/org/apache/lucene/index/TermStates.java@@ -112,12 +112,10 @@ public final class TermStates {}private static TermsEnum loadTermsEnum(LeafReaderContext ctx, Term term) throws IOException {- final Terms terms = ctx.reader().terms(term.field());- if (terms != null) {- final TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(term.bytes())) {- return termsEnum;- }+ final Terms terms = Terms.getTerms(ctx.reader(), term.field());+ final TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(term.bytes())) {+ return termsEnum;}return null;}diff --git a/lucene/core/src/java/org/apache/lucene/index/Terms.java b/lucene/core/src/java/org/apache/lucene/index/Terms.javaindex 37f5deddad7..4343eedf20c 100644--- a/lucene/core/src/java/org/apache/lucene/index/Terms.java+++ b/lucene/core/src/java/org/apache/lucene/index/Terms.java@@ -31,6 +31,20 @@ public abstract class Terms {/** Sole constructor. (For invocation by subclass constructors, typically implicit.) */protected Terms() {}+ /**+ * Returns the {@link Terms} index for this field, or {@link #EMPTY} if it has none.+ *+ * @return terms instance, or an empty instance if {@code field} does not exist in this reader+ * @throws IOException if an I/O error occurs.+ */+ public static Terms getTerms(LeafReader reader, String field) throws IOException {+ Terms terms = reader.terms(field);+ if (terms == null) {+ return EMPTY;+ }+ return terms;+ }+/** Returns an iterator that will step through all terms. This method will not return null. */public abstract TermsEnum iterator() throws IOException;@@ -213,4 +227,53 @@ public abstract class Terms {sb.append(",sumDocFreq=").append(getSumDocFreq());return sb.toString();}++ /** An empty {@link Terms} which returns no terms */+ private static final Terms EMPTY =+ new Terms() {+ @Override+ public TermsEnum iterator() throws IOException {+ return TermsEnum.EMPTY;+ }++ @Override+ public long size() throws IOException {+ return 0;+ }++ @Override+ public long getSumTotalTermFreq() throws IOException {+ return 0;+ }++ @Override+ public long getSumDocFreq() throws IOException {+ return 0;+ }++ @Override+ public int getDocCount() throws IOException {+ return 0;+ }++ @Override+ public boolean hasFreqs() {+ return false;+ }++ @Override+ public boolean hasOffsets() {+ return false;+ }++ @Override+ public boolean hasPositions() {+ return false;+ }++ @Override+ public boolean hasPayloads() {+ return false;+ }+ };}diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMatchesIterator.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMatchesIterator.javaindex 925d1303ca5..fa86505088d 100644--- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMatchesIterator.java+++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMatchesIterator.java@@ -83,8 +83,7 @@ final class DisjunctionMatchesIterator implements MatchesIterator {LeafReaderContext context, int doc, Query query, String field, BytesRefIterator terms)throws IOException {Objects.requireNonNull(field);- Terms t = context.reader().terms(field);- if (t == null) return null;+ Terms t = Terms.getTerms(context.reader(), field);TermsEnum te = t.iterator();PostingsEnum reuse = null;for (BytesRef term = terms.next(); term != null; term = terms.next()) {diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.javaindex abb3e4996f0..5d47bbe7a99 100644--- a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java+++ b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java@@ -963,10 +963,7 @@ public class IndexSearcher {long sumTotalTermFreq = 0;long sumDocFreq = 0;for (LeafReaderContext leaf : reader.leaves()) {- final Terms terms = leaf.reader().terms(field);- if (terms == null) {- continue;- }+ final Terms terms = Terms.getTerms(leaf.reader(), field);docCount += terms.getDocCount();sumTotalTermFreq += terms.getSumTotalTermFreq();sumDocFreq += terms.getSumDocFreq();diff --git a/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java b/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.javaindex b798baa640a..a77b735378e 100644--- a/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java+++ b/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java@@ -244,8 +244,8 @@ public class TermInSetQuery extends Query implements Accountable {@Overridepublic Matches matches(LeafReaderContext context, int doc) throws IOException {- Terms terms = context.reader().terms(field);- if (terms == null || terms.hasPositions() == false) {+ Terms terms = Terms.getTerms(context.reader(), field);+ if (terms.hasPositions() == false) {return super.matches(context, doc);}return MatchesUtils.forField(diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.javaindex e841d48a6c0..0291f3dadf7 100644--- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java+++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java@@ -356,17 +356,15 @@ public class DirectoryTaxonomyWriter implements TaxonomyWriter {new BytesRef(FacetsConfig.pathToString(categoryPath.components, categoryPath.length));PostingsEnum docs = null; // reusefor (LeafReaderContext ctx : reader.leaves()) {- Terms terms = ctx.reader().terms(Consts.FULL);- if (terms != null) {- // TODO: share per-segment TermsEnum here!- TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(catTerm)) {- // liveDocs=null because the taxonomy has no deletes- docs = termsEnum.postings(docs, 0 /* freqs not required */);- // if the term was found, we know it has exactly one document.- doc = docs.nextDoc() + ctx.docBase;- break;- }+ Terms terms = Terms.getTerms(ctx.reader(), Consts.FULL);+ // TODO: share per-segment TermsEnum here!+ TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(catTerm)) {+ // liveDocs=null because the taxonomy has no deletes+ docs = termsEnum.postings(docs, 0 /* freqs not required */);+ // if the term was found, we know it has exactly one document.+ doc = docs.nextDoc() + ctx.docBase;+ break;}}} finally {@@ -614,28 +612,26 @@ public class DirectoryTaxonomyWriter implements TaxonomyWriter {try {PostingsEnum postingsEnum = null;for (LeafReaderContext ctx : reader.leaves()) {- Terms terms = ctx.reader().terms(Consts.FULL);- if (terms != null) { // cannot really happen, but be on the safe side- // TODO: share per-segment TermsEnum here!- TermsEnum termsEnum = terms.iterator();- while (termsEnum.next() != null) {- if (!cache.isFull()) {- BytesRef t = termsEnum.term();- // Since we guarantee uniqueness of categories, each term has exactly- // one document. Also, since we do not allow removing categories (and- // hence documents), there are no deletions in the index. Therefore, it- // is sufficient to call next(), and then doc(), exactly once with no- // 'validation' checks.- FacetLabel cp = new FacetLabel(FacetsConfig.stringToPath(t.utf8ToString()));- postingsEnum = termsEnum.postings(postingsEnum, PostingsEnum.NONE);- boolean res = cache.put(cp, postingsEnum.nextDoc() + ctx.docBase);- assert !res : "entries should not have been evicted from the cache";- } else {- // the cache is full and the next put() will evict entries from it, therefore abort- // the iteration.- aborted = true;- break;- }+ Terms terms = Terms.getTerms(ctx.reader(), Consts.FULL);+ // TODO: share per-segment TermsEnum here!+ TermsEnum termsEnum = terms.iterator();+ while (termsEnum.next() != null) {+ if (!cache.isFull()) {+ BytesRef t = termsEnum.term();+ // Since we guarantee uniqueness of categories, each term has exactly+ // one document. Also, since we do not allow removing categories (and+ // hence documents), there are no deletions in the index. Therefore, it+ // is sufficient to call next(), and then doc(), exactly once with no+ // 'validation' checks.+ FacetLabel cp = new FacetLabel(FacetsConfig.stringToPath(t.utf8ToString()));+ postingsEnum = termsEnum.postings(postingsEnum, PostingsEnum.NONE);+ boolean res = cache.put(cp, postingsEnum.nextDoc() + ctx.docBase);+ assert !res : "entries should not have been evicted from the cache";+ } else {+ // the cache is full and the next put() will evict entries from it, therefore abort+ // the iteration.+ aborted = true;+ break;}}if (aborted) {diff --git a/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.java b/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.javaindex e44ecb8dc7c..1d55c5ee7c2 100644--- a/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.java+++ b/lucene/monitor/src/java/org/apache/lucene/monitor/QueryIndex.java@@ -225,13 +225,11 @@ class QueryIndex implements Closeable {for (LeafReaderContext ctx : reader.leaves()) {for (FieldInfo fi : ctx.reader().getFieldInfos()) {BytesRefHash terms = termsHash.computeIfAbsent(fi.name, f -> new BytesRefHash());- Terms t = ctx.reader().terms(fi.name);- if (t != null) {- TermsEnum te = t.iterator();- BytesRef term;- while ((term = te.next()) != null) {- terms.add(term);- }+ Terms t = Terms.getTerms(ctx.reader(), fi.name);+ TermsEnum te = t.iterator();+ BytesRef term;+ while ((term = te.next()) != null) {+ terms.add(term);}}}diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/IndexReaderFunctions.java b/lucene/queries/src/java/org/apache/lucene/queries/function/IndexReaderFunctions.javaindex b1b23728b4b..864302ecbab 100644--- a/lucene/queries/src/java/org/apache/lucene/queries/function/IndexReaderFunctions.java+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/IndexReaderFunctions.java@@ -212,10 +212,10 @@ public final class IndexReaderFunctions {@Overridepublic DoubleValues getValues(LeafReaderContext ctx, DoubleValues scores) throws IOException {- Terms terms = ctx.reader().terms(term.field());- TermsEnum te = terms == null ? null : terms.iterator();+ Terms terms = Terms.getTerms(ctx.reader(), term.field());+ TermsEnum te = terms.iterator();- if (te == null || te.seekExact(term.bytes()) == false) {+ if (te.seekExact(term.bytes()) == false) {return DoubleValues.EMPTY;}diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.javaindex b1ca3a5d02c..922a306adcb 100644--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java@@ -57,8 +57,7 @@ public class SumTotalTermFreqValueSource extends ValueSource {public void createWeight(Map<Object, Object> context, IndexSearcher searcher) throws IOException {long sumTotalTermFreq = 0;for (LeafReaderContext readerContext : searcher.getTopReaderContext().leaves()) {- Terms terms = readerContext.reader().terms(indexedField);- if (terms == null) continue;+ Terms terms = Terms.getTerms(readerContext.reader(), indexedField);long v = terms.getSumTotalTermFreq();assert v != -1;sumTotalTermFreq += v;diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.javaindex 72baacd8e8e..4e37396b546 100644--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java@@ -50,7 +50,7 @@ public class TFValueSource extends TermFreqValueSource {@Overridepublic FunctionValues getValues(Map<Object, Object> context, LeafReaderContext readerContext)throws IOException {- final Terms terms = readerContext.reader().terms(indexedField);+ final Terms terms = Terms.getTerms(readerContext.reader(), indexedField);IndexSearcher searcher = (IndexSearcher) context.get("searcher");final TFIDFSimilarity similarity =IDFValueSource.asTFIDF(searcher.getSimilarity(), indexedField);@@ -71,13 +71,9 @@ public class TFValueSource extends TermFreqValueSource {public void reset() throws IOException {// no one should call us for deleted docs?- if (terms != null) {- final TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(indexedBytes)) {- docs = termsEnum.postings(null);- } else {- docs = null;- }+ final TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(indexedBytes)) {+ docs = termsEnum.postings(null);} else {docs = null;}diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.javaindex 1e9866d716a..45e5453f7ce 100644--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java@@ -46,7 +46,7 @@ public class TermFreqValueSource extends DocFreqValueSource {@Overridepublic FunctionValues getValues(Map<Object, Object> context, LeafReaderContext readerContext)throws IOException {- final Terms terms = readerContext.reader().terms(indexedField);+ final Terms terms = Terms.getTerms(readerContext.reader(), indexedField);return new IntDocValues(this) {PostingsEnum docs;@@ -60,13 +60,9 @@ public class TermFreqValueSource extends DocFreqValueSource {public void reset() throws IOException {// no one should call us for deleted docs?- if (terms != null) {- final TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(indexedBytes)) {- docs = termsEnum.postings(null);- } else {- docs = null;- }+ final TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(indexedBytes)) {+ docs = termsEnum.postings(null);} else {docs = null;}diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.javaindex a98a4793426..6193d27a99f 100644--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java@@ -265,13 +265,11 @@ public class FuzzyLikeThisQuery extends Query {// equal to 1TermStates context = new TermStates(reader.getContext());for (LeafReaderContext leafContext : reader.leaves()) {- Terms terms = leafContext.reader().terms(term.field());- if (terms != null) {- TermsEnum termsEnum = terms.iterator();- if (termsEnum.seekExact(term.bytes())) {- int freq = 1 - context.docFreq(); // we want the total df and ttf to be 1- context.register(termsEnum.termState(), leafContext.ord, freq, freq);- }+ Terms terms = Terms.getTerms(leafContext.reader(), term.field());+ TermsEnum termsEnum = terms.iterator();+ if (termsEnum.seekExact(term.bytes())) {+ int freq = 1 - context.docFreq(); // we want the total df and ttf to be 1+ context.register(termsEnum.termState(), leafContext.ord, freq, freq);}}return new TermQuery(term, context);diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/PhraseWildcardQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/PhraseWildcardQuery.javaindex 2affa87f6bd..c4fc7189fe1 100644--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/PhraseWildcardQuery.java+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/PhraseWildcardQuery.java@@ -1034,8 +1034,8 @@ public class PhraseWildcardQuery extends Query {}private long getTermsSize(LeafReaderContext leafReaderContext) throws IOException {- Terms terms = leafReaderContext.reader().terms(field);- return terms == null ? 0 : terms.size();+ Terms terms = Terms.getTerms(leafReaderContext.reader(), field);+ return terms.size();}}diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.javaindex 09266b1e6da..ca99bf69c98 100644--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java@@ -54,22 +54,20 @@ public abstract class ShapeFieldCacheProvider<T extends Shape> {idx = new ShapeFieldCache<>(reader.maxDoc(), defaultSize);PostingsEnum docs = null;- Terms terms = reader.terms(shapeField);- if (terms != null) {- TermsEnum te = terms.iterator();- BytesRef term = te.next();- while (term != null) {- T shape = readShape(term);- if (shape != null) {- docs = te.postings(docs, PostingsEnum.NONE);- Integer docid = docs.nextDoc();- while (docid != DocIdSetIterator.NO_MORE_DOCS) {- idx.add(docid, shape);- docid = docs.nextDoc();- }+ Terms terms = Terms.getTerms(reader, shapeField);+ TermsEnum te = terms.iterator();+ BytesRef term = te.next();+ while (term != null) {+ T shape = readShape(term);+ if (shape != null) {+ docs = te.postings(docs, PostingsEnum.NONE);+ Integer docid = docs.nextDoc();+ while (docid != DocIdSetIterator.NO_MORE_DOCS) {+ idx.add(docid, shape);+ docid = docs.nextDoc();}- term = te.next();}+ term = te.next();}sidx.put(reader, idx);return idx;