You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by mi...@apache.org on 2010/07/13 18:48:30 UTC
svn commit: r963790 - in /lucene/java/branches/lucene_2_4: ./ contrib/
contrib/analyzers/ contrib/highlighter/src/test/
contrib/instantiated/src/test/org/apache/lucene/store/instantiated/ src/
src/java/org/apache/lucene/analysis/ src/java/org/apache/lu...
Author: mikemccand
Date: Tue Jul 13 16:48:29 2010
New Revision: 963790
URL: http://svn.apache.org/viewvc?rev=963790&view=rev
Log:
LUCENE-2536: fix IW.rollback to not apply buffered deletes against flushed segments
Added:
lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestRollback.java
- copied unchanged from r963788, lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestRollback.java
Modified:
lucene/java/branches/lucene_2_4/ (props changed)
lucene/java/branches/lucene_2_4/CHANGES.txt (contents, props changed)
lucene/java/branches/lucene_2_4/build.xml (props changed)
lucene/java/branches/lucene_2_4/contrib/ (props changed)
lucene/java/branches/lucene_2_4/contrib/analyzers/ (props changed)
lucene/java/branches/lucene_2_4/contrib/highlighter/src/test/ (props changed)
lucene/java/branches/lucene_2_4/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/java/branches/lucene_2_4/src/ (props changed)
lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/ (props changed)
lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
Propchange: lucene/java/branches/lucene_2_4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -1 +1,3 @@
+/lucene/dev/trunk/lucene:963781
+/lucene/java/branches/lucene_3_0:963788
/lucene/java/trunk:708549,709456,712233,718540,719716,723149,734415,735043,746661,747251,748534,749326,750162,770625
Modified: lucene/java/branches/lucene_2_4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_4/CHANGES.txt?rev=963790&r1=963789&r2=963790&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_4/CHANGES.txt (original)
+++ lucene/java/branches/lucene_2_4/CHANGES.txt Tue Jul 13 16:48:29 2010
@@ -13,6 +13,10 @@ Bug fixes
contain field names with non-ascii characters. (Mike Streeton via
Mike McCandless)
+3. LUCENE-2536: IndexWriter.rollback was failing to properly rollback
+ buffered deletions against segments that were flushed (Mark Harwood
+ via Mike McCandless)
+
======================= Release 2.4.1 2009-03-09 =======================
Bug fixes
Propchange: lucene/java/branches/lucene_2_4/CHANGES.txt
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/dev/trunk/lucene/CHANGES.txt:963781
Propchange: lucene/java/branches/lucene_2_4/build.xml
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/dev/trunk/lucene/build.xml:963781
Propchange: lucene/java/branches/lucene_2_4/contrib/
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/dev/trunk/lucene/contrib:963781
Propchange: lucene/java/branches/lucene_2_4/contrib/analyzers/
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/dev/trunk/lucene/contrib/analyzers:963781
Propchange: lucene/java/branches/lucene_2_4/contrib/highlighter/src/test/
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/dev/trunk/lucene/contrib/highlighter/src/test:963781
Propchange: lucene/java/branches/lucene_2_4/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -0,0 +1 @@
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:963781
Propchange: lucene/java/branches/lucene_2_4/src/
------------------------------------------------------------------------------
svn:mergeinfo = /lucene/dev/trunk/lucene/src:963781
Propchange: lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -0,0 +1 @@
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:963781
Modified: lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=963790&r1=963789&r2=963790&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/index/DocumentsWriter.java Tue Jul 13 16:48:29 2010
@@ -449,6 +449,7 @@ final class DocumentsWriter {
}
deletesInRAM.clear();
+ deletesFlushed.clear();
openFiles.clear();
Propchange: lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -0,0 +1 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:963781
Propchange: lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -0,0 +1 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:963781
Propchange: lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -0,0 +1 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:963781
Propchange: lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -0,0 +1 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index:963781
Propchange: lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 13 16:48:29 2010
@@ -0,0 +1 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:963781