You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/28 16:32:13 UTC
svn commit: r1237075 - in
/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index:
IndexWriter.java SegmentReader.java
Author: rmuir
Date: Sat Jan 28 15:32:13 2012
New Revision: 1237075
URL: http://svn.apache.org/viewvc?rev=1237075&view=rev
Log:
LUCENE-3661: remove MutableBits from SegmentReader, add back nocommit
Modified:
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1237075&r1=1237074&r2=1237075&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sat Jan 28 15:32:13 2012
@@ -476,6 +476,7 @@ public class IndexWriter implements Clos
if (reader == null) {
reader = new SegmentReader(info, config.getReaderTermsIndexDivisor(), context);
if (liveDocs == null) {
+ // nocommit: still don't like this cast, gotta be a cleaner way.
liveDocs = (MutableBits) reader.getLiveDocs();
}
//System.out.println("ADD seg=" + rld.info + " isMerge=" + isMerge + " " + readerMap.size() + " in pool");
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1237075&r1=1237074&r2=1237075&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java Sat Jan 28 15:32:13 2012
@@ -26,7 +26,6 @@ import org.apache.lucene.codecs.TermVect
import org.apache.lucene.search.FieldCache; // javadocs
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.MutableBits;
/**
* @lucene.experimental
@@ -103,7 +102,7 @@ public final class SegmentReader extends
// SegmentReader and using the provided in-memory
// liveDocs. Used by IndexWriter to provide a new NRT
// reader:
- SegmentReader(SegmentReader parent, MutableBits liveDocs, int numDocs) throws IOException {
+ SegmentReader(SegmentReader parent, Bits liveDocs, int numDocs) throws IOException {
this.si = parent.si;
parent.core.incRef();
this.core = parent.core;