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 2010/07/13 18:17:10 UTC
svn commit: r963781 - in /lucene/dev/trunk/lucene: CHANGES.txt
src/java/org/apache/lucene/index/DocumentsWriter.java
src/test/org/apache/lucene/index/TestRollback.java
Author: mikemccand
Date: Tue Jul 13 16:17:10 2010
New Revision: 963781
URL: http://svn.apache.org/viewvc?rev=963781&view=rev
Log:
LUCENE-2536: fix IW.rollback to not apply buffered deletes against flushed segments
Added:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java (with props)
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=963781&r1=963780&r2=963781&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Tue Jul 13 16:17:10 2010
@@ -419,6 +419,10 @@ Bug fixes
MultiTermsEnum.docs/AndPositionsEnum. (Robert Muir, Mike
McCandless)
+* LUCENE-2536: IndexWriter.rollback was failing to properly rollback
+ buffered deletions against segments that were flushed (Mark Harwood
+ via Mike McCandless)
+
New features
* LUCENE-2128: Parallelized fetching document frequencies during weight
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=963781&r1=963780&r2=963781&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java Tue Jul 13 16:17:10 2010
@@ -42,7 +42,6 @@ import org.apache.lucene.store.RAMFile;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.ThreadInterruptedException;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.RamUsageEstimator;
/**
@@ -509,6 +508,7 @@ final class DocumentsWriter {
}
deletesInRAM.clear();
+ deletesFlushed.clear();
openFiles.clear();
Added: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java?rev=963781&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java (added)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java Tue Jul 13 16:17:10 2010
@@ -0,0 +1,60 @@
+package org.apache.lucene.index;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.MockRAMDirectory;
+import org.apache.lucene.util.LuceneTestCase;
+
+public class TestRollback extends LuceneTestCase {
+
+ // LUCENE-2536
+ public void testRollbackIntegrityWithBufferFlush() throws Exception {
+ Directory dir = new MockRAMDirectory();
+ RandomIndexWriter rw = new RandomIndexWriter(newRandom(), dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
+ for (int i = 0; i < 5; i++) {
+ Document doc = new Document();
+ doc.add(new Field("pk", Integer.toString(i), Store.YES, Index.ANALYZED_NO_NORMS));
+ rw.addDocument(doc);
+ }
+ rw.close();
+
+ // If buffer size is small enough to cause a flush, errors ensue...
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2).setOpenMode(IndexWriterConfig.OpenMode.APPEND));
+
+ Term pkTerm = new Term("pk", "");
+ for (int i = 0; i < 3; i++) {
+ Document doc = new Document();
+ String value = Integer.toString(i);
+ doc.add(new Field("pk", value, Store.YES, Index.ANALYZED_NO_NORMS));
+ doc.add(new Field("text", "foo", Store.YES, Index.ANALYZED_NO_NORMS));
+ w.updateDocument(pkTerm.createTerm(value), doc);
+ }
+ w.rollback();
+
+ IndexReader r = IndexReader.open(dir, true);
+ assertEquals("index should contain same number of docs post rollback", 5, r.numDocs());
+ r.close();
+ dir.close();
+ }
+}
Propchange: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java
------------------------------------------------------------------------------
svn:eol-style = native