jpountz commented on a change in pull request #1473:
URL: https://github.com/apache/lucene-solr/pull/1473#discussion_r418963368
##########
File path:
lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java
##########
@@ -148,56 +155,80 @@ public BlockTreeTermsReader(PostingsReaderBase
postingsReader, SegmentReadState
CodecUtil.retrieveChecksum(termsIn);
// Read per-field details
- seekDir(termsIn);
- seekDir(indexIn);
+ String metaName = IndexFileNames.segmentFileName(segment,
state.segmentSuffix, TERMS_META_EXTENSION);
+ Map<String, FieldReader> fieldMap = null;
+ Throwable priorE = null;
+ try (ChecksumIndexInput metaIn = version >= VERSION_META_FILE ?
state.directory.openChecksumInput(metaName, state.context) : null) {
+ try {
+ final IndexInput indexMetaIn, termsMetaIn;
+ if (version >= VERSION_META_FILE) {
+ CodecUtil.checkIndexHeader(metaIn, TERMS_META_CODEC_NAME, version,
version, state.segmentInfo.getId(), state.segmentSuffix);
+ indexMetaIn = termsMetaIn = metaIn;
+ } else {
+ seekDir(termsIn);
+ seekDir(indexIn);
+ indexMetaIn = indexIn;
+ termsMetaIn = termsIn;
+ }
- final int numFields = termsIn.readVInt();
- if (numFields < 0) {
- throw new CorruptIndexException("invalid numFields: " + numFields,
termsIn);
- }
- fieldMap = new HashMap<>((int) (numFields / 0.75f) + 1);
- for (int i = 0; i < numFields; ++i) {
- final int field = termsIn.readVInt();
- final long numTerms = termsIn.readVLong();
- if (numTerms <= 0) {
- throw new CorruptIndexException("Illegal numTerms for field number:
" + field, termsIn);
- }
- final BytesRef rootCode = readBytesRef(termsIn);
- final FieldInfo fieldInfo = state.fieldInfos.fieldInfo(field);
- if (fieldInfo == null) {
- throw new CorruptIndexException("invalid field number: " + field,
termsIn);
- }
- final long sumTotalTermFreq = termsIn.readVLong();
- // when frequencies are omitted, sumDocFreq=sumTotalTermFreq and only
one value is written.
- final long sumDocFreq = fieldInfo.getIndexOptions() ==
IndexOptions.DOCS ? sumTotalTermFreq : termsIn.readVLong();
- final int docCount = termsIn.readVInt();
- if (version < VERSION_META_LONGS_REMOVED) {
- final int longsSize = termsIn.readVInt();
- if (longsSize < 0) {
- throw new CorruptIndexException("invalid longsSize for field: " +
fieldInfo.name + ", longsSize=" + longsSize, termsIn);
+ final int numFields = termsMetaIn.readVInt();
+ if (numFields < 0) {
+ throw new CorruptIndexException("invalid numFields: " + numFields,
termsMetaIn);
+ }
+ fieldMap = new HashMap<>((int) (numFields / 0.75f) + 1);
+ for (int i = 0; i < numFields; ++i) {
+ final int field = termsMetaIn.readVInt();
+ final long numTerms = termsMetaIn.readVLong();
+ if (numTerms <= 0) {
+ throw new CorruptIndexException("Illegal numTerms for field
number: " + field, termsMetaIn);
+ }
+ final BytesRef rootCode = readBytesRef(termsMetaIn);
+ final FieldInfo fieldInfo = state.fieldInfos.fieldInfo(field);
+ if (fieldInfo == null) {
+ throw new CorruptIndexException("invalid field number: " +
field, termsMetaIn);
+ }
+ final long sumTotalTermFreq = termsMetaIn.readVLong();
+ // when frequencies are omitted, sumDocFreq=sumTotalTermFreq and
only one value is written.
+ final long sumDocFreq = fieldInfo.getIndexOptions() ==
IndexOptions.DOCS ? sumTotalTermFreq : termsMetaIn.readVLong();
+ final int docCount = termsMetaIn.readVInt();
+ if (version < VERSION_META_LONGS_REMOVED) {
+ final int longsSize = termsMetaIn.readVInt();
+ if (longsSize < 0) {
+ throw new CorruptIndexException("invalid longsSize for field:
" + fieldInfo.name + ", longsSize=" + longsSize, termsMetaIn);
+ }
+ }
+ BytesRef minTerm = readBytesRef(termsMetaIn);
+ BytesRef maxTerm = readBytesRef(termsMetaIn);
+ if (docCount < 0 || docCount > state.segmentInfo.maxDoc()) { //
#docs with field must be <= #docs
+ throw new CorruptIndexException("invalid docCount: " + docCount
+ " maxDoc: " + state.segmentInfo.maxDoc(), termsMetaIn);
Review comment:
Not directly, and these things are hard to test, though I agree we could
do better. I opened https://issues.apache.org/jira/browse/LUCENE-9356 to try to
improve the coverage of these code paths.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
