You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/10/17 19:19:16 UTC
svn commit: r1533167 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
Author: mikemccand
Date: Thu Oct 17 17:19:16 2013
New Revision: 1533167
URL: http://svn.apache.org/r1533167
Log:
LUCENE-5289: IndexWriter.hasUncommittedChanges was returning false when only deletes were buffered
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1533167&r1=1533166&r2=1533167&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Thu Oct 17 17:19:16 2013
@@ -86,6 +86,10 @@ Bug Fixes
* LUCENE-5272: OpenBitSet.ensureCapacity did not modify numBits, causing
false assertion errors in fastSet. (Shai Erera)
+* LUCENE-5289: IndexWriter.hasUncommittedChanges was returning false
+ when there were buffered delete-by-Term. (Shalin Shekhar Mangar,
+ Mike McCandless)
+
API Changes:
* LUCENE-5222: Add SortField.needsScores(). Previously it was not possible
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1533167&r1=1533166&r2=1533167&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Oct 17 17:19:16 2013
@@ -2918,7 +2918,7 @@ public class IndexWriter implements Clos
/** Returns true if there are changes that have not been committed */
public final boolean hasUncommittedChanges() {
- return changeCount != lastCommitChangeCount;
+ return changeCount != lastCommitChangeCount || docWriter.anyChanges() || bufferedDeletesStream.any();
}
private final void commitInternal() throws IOException {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1533167&r1=1533166&r2=1533167&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Thu Oct 17 17:19:16 2013
@@ -2308,6 +2308,17 @@ public class TestIndexWriter extends Luc
assertFalse(writer.hasUncommittedChanges());
writer.addDocument(doc);
assertTrue(writer.hasUncommittedChanges());
+ writer.commit();
+ doc = new Document();
+ doc.add(newStringField("id", "xyz", Field.Store.YES));
+ writer.addDocument(doc);
+ assertTrue(writer.hasUncommittedChanges());
+ writer.commit();
+ assertFalse(writer.hasUncommittedChanges());
+ writer.deleteDocuments(new Term("id", "xyz"));
+ assertTrue(writer.hasUncommittedChanges());
+ writer.commit();
+ assertFalse(writer.hasUncommittedChanges());
writer.close();
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));