Apache Lucene open-source search software
Rename FieldInfo(s)#hasVectors to hasTermVectors. (#13759)
Adrien Grand3da48d0403e8
diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.mdindex 0bf59e40a8b..a7c7ded80ea 100644--- a/lucene/MIGRATE.md+++ b/lucene/MIGRATE.md@@ -262,6 +262,11 @@ ConcurrentMergeScheduler now disables auto I/O throttling by default. There is shappening at the CPU level, since ConcurrentMergeScheduler has a maximum number of threads it canuse, which is only a fraction of the total number of threads of the host by default.+### FieldInfos#hasVectors and FieldInfo#hasVectors renamed to hasTermVectors++To reduce confusion between term vectors and numeric vectors, `hasVectors` has been renamed to+`hasTermVectors`.+## Migration from Lucene 9.0 to Lucene 9.1### Test framework package migration and module (LUCENE-10301)@@ -860,4 +865,4 @@ method now supports an additional 4th and last argument to optionally enable cre`TotalHitCountCollectorManager` now requires that an array of `LeafSlice`s, retrieved via `IndexSearcher#getSlices`,is provided to its constructor. Depending on whether segment partitions are present among slices, the manager can-optimize the type of collectors it creates and exposes via `newCollector`.\ No newline at end of file+optimize the type of collectors it creates and exposes via `newCollector`.diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene60/Lucene60FieldInfosFormat.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene60/Lucene60FieldInfosFormat.javaindex 9f7f0b83e41..be57d6161bb 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene60/Lucene60FieldInfosFormat.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene60/Lucene60FieldInfosFormat.java@@ -347,7 +347,7 @@ public final class Lucene60FieldInfosFormat extends FieldInfosFormat {output.writeVInt(fi.number);byte bits = 0x0;- if (fi.hasVectors()) bits |= STORE_TERMVECTOR;+ if (fi.hasTermVectors()) bits |= STORE_TERMVECTOR;if (fi.omitsNorms()) bits |= OMIT_NORMS;if (fi.hasPayloads()) bits |= STORE_PAYLOADS;if (fi.isSoftDeletesField()) bits |= SOFT_DELETES_FIELD;diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90FieldInfosFormat.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90FieldInfosFormat.javaindex c4e3dca2873..63a4f0f2bbf 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90FieldInfosFormat.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene90/Lucene90FieldInfosFormat.java@@ -333,7 +333,7 @@ public final class Lucene90FieldInfosFormat extends FieldInfosFormat {output.writeVInt(fi.number);byte bits = 0x0;- if (fi.hasVectors()) bits |= STORE_TERMVECTOR;+ if (fi.hasTermVectors()) bits |= STORE_TERMVECTOR;if (fi.omitsNorms()) bits |= OMIT_NORMS;if (fi.hasPayloads()) bits |= STORE_PAYLOADS;if (fi.isSoftDeletesField()) bits |= SOFT_DELETES_FIELD;diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.javaindex 655938ac67a..90ae65a177c 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java@@ -268,7 +268,7 @@ public class SimpleTextFieldInfosFormat extends FieldInfosFormat {SimpleTextUtil.writeNewline(out);SimpleTextUtil.write(out, STORETV);- SimpleTextUtil.write(out, Boolean.toString(fi.hasVectors()), scratch);+ SimpleTextUtil.write(out, Boolean.toString(fi.hasTermVectors()), scratch);SimpleTextUtil.writeNewline(out);SimpleTextUtil.write(out, PAYLOADS);diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene94/Lucene94FieldInfosFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene94/Lucene94FieldInfosFormat.javaindex 481148cbd0d..6594c7f275a 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene94/Lucene94FieldInfosFormat.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene94/Lucene94FieldInfosFormat.java@@ -399,7 +399,7 @@ public final class Lucene94FieldInfosFormat extends FieldInfosFormat {output.writeVInt(fi.number);byte bits = 0x0;- if (fi.hasVectors()) bits |= STORE_TERMVECTOR;+ if (fi.hasTermVectors()) bits |= STORE_TERMVECTOR;if (fi.omitsNorms()) bits |= OMIT_NORMS;if (fi.hasPayloads()) bits |= STORE_PAYLOADS;if (fi.isSoftDeletesField()) bits |= SOFT_DELETES_FIELD;diff --git a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldMergeState.java b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldMergeState.javaindex 08c0a465859..15e65091aed 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldMergeState.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldMergeState.java@@ -107,7 +107,7 @@ final class PerFieldMergeState {for (FieldInfo fi : src) {if (this.filteredNames.contains(fi.name)) {this.filtered.add(fi);- hasVectors |= fi.hasVectors();+ hasVectors |= fi.hasTermVectors();hasPostings |= fi.getIndexOptions() != IndexOptions.NONE;hasProx |= fi.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;hasFreq |= fi.getIndexOptions() != IndexOptions.DOCS;@@ -172,7 +172,7 @@ final class PerFieldMergeState {}@Override- public boolean hasVectors() {+ public boolean hasTermVectors() {return filteredHasVectors;}diff --git a/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java b/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.javaindex 8dbb21d8c19..4413b921cd0 100644--- a/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java+++ b/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java@@ -66,7 +66,7 @@ public class DocumentStoredFieldVisitor extends StoredFieldVisitor {@Overridepublic void stringField(FieldInfo fieldInfo, String value) throws IOException {final FieldType ft = new FieldType(TextField.TYPE_STORED);- ft.setStoreTermVectors(fieldInfo.hasVectors());+ ft.setStoreTermVectors(fieldInfo.hasTermVectors());ft.setOmitNorms(fieldInfo.omitsNorms());ft.setIndexOptions(fieldInfo.getIndexOptions());doc.add(diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.javaindex 951d819c5c5..d768aaf1ab2 100644--- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java+++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java@@ -3836,7 +3836,7 @@ public final class CheckIndex implements Closeable {// Make sure FieldInfo thinks this field is vector'd:final FieldInfo fieldInfo = fieldInfos.fieldInfo(field);- if (fieldInfo.hasVectors() == false) {+ if (fieldInfo.hasTermVectors() == false) {throw new CheckIndexException("docID="+ jdiff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.javaindex d472302f7e8..fd6ed22bd4d 100644--- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java+++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java@@ -487,7 +487,7 @@ final class DocumentsWriterPerThread implements Accountable, Lock {infoStream.message("DWPT","new segment has "- + (flushState.fieldInfos.hasVectors() ? "vectors" : "no vectors")+ + (flushState.fieldInfos.hasTermVectors() ? "vectors" : "no vectors")+ "; "+ (flushState.fieldInfos.hasNorms() ? "norms" : "no norms")+ "; "diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java b/lucene/core/src/java/org/apache/lucene/index/FieldInfo.javaindex 862c6b37993..edb9bebf900 100644--- a/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java+++ b/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java@@ -641,7 +641,7 @@ public final class FieldInfo {}/** Returns true if any term vectors exist for this field. */- public boolean hasVectors() {+ public boolean hasTermVectors() {return storeTermVector;}diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.javaindex fd0338bfe68..fecd17db0c8 100644--- a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java+++ b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java@@ -52,7 +52,7 @@ public class FieldInfos implements Iterable<FieldInfo> {private final boolean hasProx;private final boolean hasPayloads;private final boolean hasOffsets;- private final boolean hasVectors;+ private final boolean hasTermVectors;private final boolean hasNorms;private final boolean hasDocValues;private final boolean hasPointValues;@@ -73,7 +73,7 @@ public class FieldInfos implements Iterable<FieldInfo> {* as the backing structure.*/public FieldInfos(FieldInfo[] infos) {- boolean hasVectors = false;+ boolean hasTermVectors = false;boolean hasPostings = false;boolean hasProx = false;boolean hasPayloads = false;@@ -111,7 +111,7 @@ public class FieldInfos implements Iterable<FieldInfo> {+ info.name);}- hasVectors |= info.hasVectors();+ hasTermVectors |= info.hasTermVectors();hasPostings |= info.getIndexOptions() != IndexOptions.NONE;hasProx |= info.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;hasFreq |= info.getIndexOptions() != IndexOptions.DOCS;@@ -139,7 +139,7 @@ public class FieldInfos implements Iterable<FieldInfo> {}}- this.hasVectors = hasVectors;+ this.hasTermVectors = hasTermVectors;this.hasPostings = hasPostings;this.hasProx = hasProx;this.hasPayloads = hasPayloads;@@ -275,9 +275,9 @@ public class FieldInfos implements Iterable<FieldInfo> {return hasOffsets;}- /** Returns true if any fields have vectors */- public boolean hasVectors() {- return hasVectors;+ /** Returns true if any fields have term vectors */+ public boolean hasTermVectors() {+ return hasTermVectors;}/** Returns true if any fields have norms */@@ -441,7 +441,7 @@ public class FieldInfos implements Iterable<FieldInfo> {fieldNumber,fi.getIndexOptions(),fi.getIndexOptions() != IndexOptions.NONE- ? new IndexOptionsProperties(fi.hasVectors(), fi.omitsNorms())+ ? new IndexOptionsProperties(fi.hasTermVectors(), fi.omitsNorms()): null,fi.getDocValuesType(),fi.hasDocValuesSkipIndex(),@@ -517,7 +517,7 @@ public class FieldInfos implements Iterable<FieldInfo> {verifySameIndexOptions(fieldName, currentOpts, fi.getIndexOptions());if (currentOpts != IndexOptions.NONE) {boolean curStoreTermVector = fieldProperties.indexOptionsProperties.storeTermVectors;- verifySameStoreTermVectors(fieldName, curStoreTermVector, fi.hasVectors());+ verifySameStoreTermVectors(fieldName, curStoreTermVector, fi.hasTermVectors());boolean curOmitNorms = fieldProperties.indexOptionsProperties.omitNorms;verifySameOmitNorms(fieldName, curOmitNorms, fi.omitsNorms());}@@ -792,7 +792,7 @@ public class FieldInfos implements Iterable<FieldInfo> {new FieldInfo(fi.getName(),fieldNumber,- fi.hasVectors(),+ fi.hasTermVectors(),fi.omitsNorms(),fi.hasPayloads(),fi.getIndexOptions(),diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.javaindex c5f4590dacb..7d1a57bb5ad 100644--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java@@ -5306,7 +5306,7 @@ public class IndexWriter("merge codec=" + codec)+ (" maxDoc=" + merge.info.info.maxDoc())+ ("; merged segment has "- + (mergeState.mergeFieldInfos.hasVectors() ? "vectors" : "no vectors"))+ + (mergeState.mergeFieldInfos.hasTermVectors() ? "vectors" : "no vectors"))+ ("; " + (mergeState.mergeFieldInfos.hasNorms() ? "norms" : "no norms"))+ ("; "+ (mergeState.mergeFieldInfos.hasDocValues() ? "docValues" : "no docValues"))diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexingChain.java b/lucene/core/src/java/org/apache/lucene/index/IndexingChain.javaindex 656ffbdc09b..bb81a1fe577 100644--- a/lucene/core/src/java/org/apache/lucene/index/IndexingChain.java+++ b/lucene/core/src/java/org/apache/lucene/index/IndexingChain.java@@ -1144,7 +1144,7 @@ final class IndexingChain implements Accountable {// segmentnorms = new NormValuesWriter(fieldInfo, bytesUsed);}- if (fieldInfo.hasVectors()) {+ if (fieldInfo.hasTermVectors()) {termVectorsWriter.setHasVectors();}}@@ -1558,7 +1558,7 @@ final class IndexingChain implements Accountable {void assertSameSchema(FieldInfo fi) {assertSame("index options", fi.getIndexOptions(), indexOptions);assertSame("omit norms", fi.omitsNorms(), omitNorms);- assertSame("store term vector", fi.hasVectors(), storeTermVector);+ assertSame("store term vector", fi.hasTermVectors(), storeTermVector);assertSame("doc values type", fi.getDocValuesType(), docValuesType);assertSame("doc values skip index", fi.hasDocValuesSkipIndex(), hasDocValuesSkipIndex);assertSame(diff --git a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.javaindex 2a76f9e6358..68bc8b1f807 100644--- a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java+++ b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java@@ -158,7 +158,7 @@ public class ParallelLeafReader extends LeafReader {// only add these if the reader responsible for that field name is the current:// TODO consider populating 1st leaf with vectors even if the field name has been seen on// a previous leaf- if (fieldInfo.hasVectors()) {+ if (fieldInfo.hasTermVectors()) {tvFieldToReader.put(fieldInfo.name, reader);}// TODO consider populating 1st leaf with terms even if the field name has been seen on adiff --git a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.javaindex 9d4f79a5586..6f54ea16d88 100644--- a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java+++ b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java@@ -708,7 +708,7 @@ final class ReadersAndUpdates {return new FieldInfo(fi.name,fieldNumber,- fi.hasVectors(),+ fi.hasTermVectors(),fi.omitsNorms(),fi.hasPayloads(),fi.getIndexOptions(),diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java b/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.javaindex 68970de6d1b..a29f734ea2f 100644--- a/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java@@ -117,7 +117,7 @@ final class SegmentCoreReaders {.storedFieldsFormat().fieldsReader(cfsDir, si.info, coreFieldInfos, context);- if (coreFieldInfos.hasVectors()) { // open term vector files only as needed+ if (coreFieldInfos.hasTermVectors()) { // open term vector files only as neededtermVectorsReaderOrig =si.info.getCodec()diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java b/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.javaindex b8cb694a530..4cab7c23ba9 100644--- a/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java@@ -176,7 +176,7 @@ final class SegmentMerger {numMerged);}- if (mergeState.mergeFieldInfos.hasVectors()) {+ if (mergeState.mergeFieldInfos.hasTermVectors()) {mergingTasks.add(() -> {mergeWithLogging(this::mergeTermVectors, "term vectors");diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.javaindex de1d4ca98a4..c21c6fbbd4d 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java@@ -290,7 +290,7 @@ public class TestConsistentFieldNumbers extends LuceneTestCase {for (FieldInfo fi : fis) {Field expected = getField(Integer.parseInt(fi.name));assertEquals(expected.fieldType().indexOptions(), fi.getIndexOptions());- assertEquals(expected.fieldType().storeTermVectors(), fi.hasVectors());+ assertEquals(expected.fieldType().storeTermVectors(), fi.hasTermVectors());}}diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.javaindex 026a4b49c78..1ea5da23d4b 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java@@ -269,7 +269,7 @@ public class TestDirectoryReader extends LuceneTestCase {} else {notIndexedFieldNames.add(name);}- if (fieldInfo.hasVectors()) {+ if (fieldInfo.hasTermVectors()) {tvFieldNames.add(name);}}diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.javaindex 8ef60beefd4..d9ff3887aa2 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java@@ -1503,7 +1503,7 @@ public class TestIndexWriter extends LuceneTestCase {DirectoryReader r0 = DirectoryReader.open(dir);for (LeafReaderContext ctx : r0.leaves()) {SegmentReader sr = (SegmentReader) ctx.reader();- assertFalse(sr.getFieldInfos().hasVectors());+ assertFalse(sr.getFieldInfos().hasTermVectors());}r0.close();diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.javaindex bfe6b0a60fa..2f92606ba7d 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java@@ -1447,7 +1447,7 @@ public class TestIndexWriterExceptions extends LuceneTestCase {assertTrue(reader.numDocs() > 0);SegmentInfos.readLatestCommit(dir);for (LeafReaderContext context : reader.leaves()) {- assertFalse(context.reader().getFieldInfos().hasVectors());+ assertFalse(context.reader().getFieldInfos().hasTermVectors());}reader.close();dir.close();diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.javaindex 94a1849a35e..d3f7ec8a803 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java@@ -138,7 +138,7 @@ public class TestSegmentMerger extends LuceneTestCase {int tvCount = 0;for (FieldInfo fieldInfo : mergedReader.getFieldInfos()) {- if (fieldInfo.hasVectors()) {+ if (fieldInfo.hasTermVectors()) {tvCount++;}}diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.javaindex 71bb8b167b1..b2d9d37613d 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java@@ -90,7 +90,7 @@ public class TestSegmentReader extends LuceneTestCase {} else {notIndexedFieldNames.add(name);}- if (fieldInfo.hasVectors()) {+ if (fieldInfo.hasTermVectors()) {tvFieldNames.add(name);} else if (fieldInfo.getIndexOptions() != IndexOptions.NONE) {noTVFieldNames.add(name);diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.javaindex 76693291518..1f3c7382317 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java@@ -190,7 +190,7 @@ public class TestTermVectorsReader extends LuceneTestCase {DirectoryReader reader = DirectoryReader.open(dir);for (LeafReaderContext ctx : reader.leaves()) {SegmentReader sr = (SegmentReader) ctx.reader();- assertTrue(sr.getFieldInfos().hasVectors());+ assertTrue(sr.getFieldInfos().hasTermVectors());}reader.close();}diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.javaindex 97a940446f0..75728bbfee7 100644--- a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java+++ b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java@@ -684,7 +684,7 @@ public class UnifiedHighlighter {* <li>If there's a field info it has {@link* IndexOptions#DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS} then {@link OffsetSource#POSTINGS}* is returned.- * <li>If there's a field info and {@link FieldInfo#hasVectors()} then {@link+ * <li>If there's a field info and {@link FieldInfo#hasTermVectors()} then {@link* OffsetSource#TERM_VECTORS} is returned (note we can't check here if the TV has offsets;* if there isn't then an exception will get thrown down the line).* <li>Fall-back: {@link OffsetSource#ANALYSIS} is returned.@@ -698,11 +698,11 @@ public class UnifiedHighlighter {FieldInfo fieldInfo = getFieldInfo(field);if (fieldInfo != null) {if (fieldInfo.getIndexOptions() == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) {- return fieldInfo.hasVectors()+ return fieldInfo.hasTermVectors()? OffsetSource.POSTINGS_WITH_TERM_VECTORS: OffsetSource.POSTINGS;}- if (fieldInfo.hasVectors()) { // unfortunately we can't also check if the TV has offsets+ if (fieldInfo.hasTermVectors()) { // unfortunately we can't also check if the TV has offsetsreturn OffsetSource.TERM_VECTORS;}}diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.javaindex 292ffb6b3b8..47cfa6fc6c9 100644--- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java+++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java@@ -187,7 +187,7 @@ public abstract class BaseFragmentsBuilder implements FragmentsBuilder {public void stringField(FieldInfo fieldInfo, String value) {Objects.requireNonNull(value, "String value should not be null");FieldType ft = new FieldType(TextField.TYPE_STORED);- ft.setStoreTermVectors(fieldInfo.hasVectors());+ ft.setStoreTermVectors(fieldInfo.hasTermVectors());fields.add(new Field(fieldInfo.name, value, ft));}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/documents/DocumentField.java b/lucene/luke/src/java/org/apache/lucene/luke/models/documents/DocumentField.javaindex 460d1422649..14d3a76b8f3 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/models/documents/DocumentField.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/documents/DocumentField.java@@ -73,7 +73,7 @@ public final class DocumentField {dfield.name = finfo.name;dfield.idxOptions = finfo.getIndexOptions();- dfield.hasTermVectors = finfo.hasVectors();+ dfield.hasTermVectors = finfo.hasTermVectors();dfield.hasPayloads = finfo.hasPayloads();dfield.hasNorms = finfo.hasNorms();diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.javaindex 9dad312d431..8874f4d30c6 100644--- a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java+++ b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java@@ -836,7 +836,7 @@ public class MemoryIndex {new FieldInfo(info.fieldInfo.name,info.fieldInfo.number,- info.fieldInfo.hasVectors(),+ info.fieldInfo.hasTermVectors(),info.fieldInfo.hasPayloads(),info.fieldInfo.hasPayloads(),info.fieldInfo.getIndexOptions(),diff --git a/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java b/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.javaindex ceeea076a3a..56e4fa2d0dd 100644--- a/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java+++ b/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java@@ -210,7 +210,7 @@ public class TestLazyDocument extends LuceneTestCase {@Overridepublic void stringField(FieldInfo fieldInfo, String value) throws IOException {final FieldType ft = new FieldType(TextField.TYPE_STORED);- ft.setStoreTermVectors(fieldInfo.hasVectors());+ ft.setStoreTermVectors(fieldInfo.hasTermVectors());ft.setOmitNorms(fieldInfo.omitsNorms());ft.setIndexOptions(fieldInfo.getIndexOptions());Objects.requireNonNull(value, "String value should not be null");diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsWriter.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsWriter.javaindex 477fa2e4a6c..1be42194dab 100644--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsWriter.java+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/idversion/IDVersionPostingsWriter.java@@ -71,7 +71,7 @@ final class IDVersionPostingsWriter extends PushPostingsWriterBase {// LUCENE-5693: because CheckIndex cross-checks term vectors with postings even for deleted// docs, and because our PF only indexes the// non-deleted documents on flush, CheckIndex will see this as corruption:- if (fieldInfo.hasVectors()) {+ if (fieldInfo.hasTermVectors()) {throw new IllegalArgumentException("field cannot index term vectors: CheckIndex will report this as index corruption");}diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.javaindex 7d4f2839c6d..c7532e1269f 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java@@ -87,7 +87,7 @@ public abstract class BaseFieldInfoFormatTestCase extends BaseIndexFileFormatTesassertFalse(infos2.fieldInfo("field").getDocValuesType() != DocValuesType.NONE);assertFalse(infos2.fieldInfo("field").omitsNorms());assertFalse(infos2.fieldInfo("field").hasPayloads());- assertFalse(infos2.fieldInfo("field").hasVectors());+ assertFalse(infos2.fieldInfo("field").hasTermVectors());assertEquals(0, infos2.fieldInfo("field").getPointDimensionCount());assertEquals(0, infos2.fieldInfo("field").getVectorDimension());assertFalse(infos2.fieldInfo("field").isSoftDeletesField());@@ -418,7 +418,7 @@ public abstract class BaseFieldInfoFormatTestCase extends BaseIndexFileFormatTesassertEquals(expected.getIndexOptions(), actual.getIndexOptions());assertEquals(expected.hasNorms(), actual.hasNorms());assertEquals(expected.hasPayloads(), actual.hasPayloads());- assertEquals(expected.hasVectors(), actual.hasVectors());+ assertEquals(expected.hasTermVectors(), actual.hasTermVectors());assertEquals(expected.omitsNorms(), actual.omitsNorms());assertEquals(expected.getDocValuesGen(), actual.getDocValuesGen());}diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.javaindex 6f2bc38ff64..67d63ad9c65 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java@@ -352,7 +352,7 @@ public abstract class BaseIndexFileFormatTestCase extends LuceneTestCase {new FieldInfo(proto.name,proto.number,- proto.hasVectors(),+ proto.hasTermVectors(),proto.omitsNorms(),proto.hasPayloads(),proto.getIndexOptions(),diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedLeafReader.javaindex ab907b76802..1e070897592 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedLeafReader.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedLeafReader.java@@ -98,7 +98,7 @@ public class MismatchedLeafReader extends FilterLeafReader {new FieldInfo(oldInfo.name, // namei, // number- oldInfo.hasVectors(), // storeTermVector+ oldInfo.hasTermVectors(), // storeTermVectoroldInfo.omitsNorms(), // omitNormsoldInfo.hasPayloads(), // storePayloadsoldInfo.getIndexOptions(), // indexOptions