Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5843: woops, I committed too much 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1614423 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2014-07-29 17:21:33 +00:00
parent 03f937fa06
commit ac511e76fe
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lucene/CHANGES.txt
View File

@ -134,6 +134,12 @@ New Features
of footer, this can detect some forms of corruption such as truncation.
(Robert Muir)
* LUCENE-5843: Added IndexWriter.MAX_DOCS which is the maximum number
of documents allowed in a single index, and any operations that add
documents will now throw IllegalStateException if the max count
would be exceeded, instead of silently creating an unusable
index. (Mike McCandless)
API Changes
* LUCENE-5752: Simplified Automaton API to be immutable. (Mike McCandless)
@ -215,12 +221,6 @@ Bug Fixes
Integer.MAX_VALUE - 8 for the maximum array size. (Robert Muir,
Mike McCandless)
* LUCENE-5843: Added IndexWriter.MAX_DOCS which is the maximum number
of documents allowed in a single index, and any operations that add
documents will now throw IllegalStateException if the max count
would be exceeded, instead of silently creating an unusable
index. (Mike McCandless)
Test Framework
* LUCENE-5786: Unflushed/ truncated events file (hung testing subprocess).

2
lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java
View File

@ -913,9 +913,7 @@ final class SegmentTermsEnum extends TermsEnum {
// Pop finished blocks
while (currentFrame.nextEnt == currentFrame.entCount) {
if (!currentFrame.isLastInFloor) {
// Advance to next floor block
currentFrame.loadNextFloorBlock();
break;
} else {
//if (DEBUG) System.out.println(" pop frame");
if (currentFrame.ord == 0) {

16
lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnumFrame.java
View File

@ -539,10 +539,9 @@ final class SegmentTermsEnumFrame {
// keep scanning
if (nextEnt == entCount) {
// nocommit?
//if (exactOnly) {
//fillTerm();
//}
if (exactOnly) {
fillTerm();
}
// We are done scanning this block
break nextTerm;
} else {
@ -659,11 +658,10 @@ final class SegmentTermsEnumFrame {
// keep scanning
if (nextEnt == entCount) {
// nocommit?
//if (exactOnly) {
//fillTerm();
//termExists = true;
//}
if (exactOnly) {
fillTerm();
//termExists = true;
}
// We are done scanning this block
break nextTerm;
} else {