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

LUCENE-5843: this is a bug not a feature! 

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

12
lucene/CHANGES.txt
View File

@ -134,12 +134,6 @@ New Features
of footer, this can detect some forms of corruption such as truncation. of footer, this can detect some forms of corruption such as truncation.
(Robert Muir) (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 API Changes
* LUCENE-5752: Simplified Automaton API to be immutable. (Mike McCandless) * LUCENE-5752: Simplified Automaton API to be immutable. (Mike McCandless)
@ -221,6 +215,12 @@ Bug Fixes
Integer.MAX_VALUE - 8 for the maximum array size. (Robert Muir, Integer.MAX_VALUE - 8 for the maximum array size. (Robert Muir,
Mike McCandless) 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 Test Framework
* LUCENE-5786: Unflushed/ truncated events file (hung testing subprocess). * LUCENE-5786: Unflushed/ truncated events file (hung testing subprocess).

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

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

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

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