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

LUCENE-3661: fix TODO, pass core to these SR ctors and remove code duplciation 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3661@1237077 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-01-28 15:47:08 +00:00
parent 59bdbb04c0
commit 509ad87610
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/src/java/org/apache/lucene/index/DirectoryReader.java
View File

@ -166,7 +166,9 @@ final class DirectoryReader extends BaseMultiReader<SegmentReader> {
} else {
readerShared[i] = false;
// Steal the ref returned by SegmentReader ctor:
newReaders[i] = new SegmentReader(infos.info(i), newReaders[i], IOContext.READ);
assert infos.info(i).dir == newReaders[i].getSegmentInfo().dir;
assert infos.info(i).hasDeletions();
newReaders[i] = new SegmentReader(infos.info(i), newReaders[i].core, IOContext.READ);
}
}
success = true;

2
lucene/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -551,7 +551,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
}
shared = true;
if (liveDocs != null) {
return new SegmentReader(reader, liveDocs, info.docCount - info.getDelCount() - pendingDeleteCount);
return new SegmentReader(reader.getSegmentInfo(), reader.core, liveDocs, info.docCount - info.getDelCount() - pendingDeleteCount);
} else {
reader.incRef();
return reader;

31
lucene/src/java/org/apache/lucene/index/SegmentReader.java
View File

@ -42,7 +42,7 @@ public final class SegmentReader extends IndexReader {
// tells us the docCount:
private final int numDocs;
private final SegmentCoreReaders core;
final SegmentCoreReaders core;
/**
* @throws CorruptIndexException if the index is corrupt
@ -74,38 +74,21 @@ public final class SegmentReader extends IndexReader {
}
}
// TODO: really these next 2 ctors could take
// SegmentCoreReaders... that's all we do w/ the parent
// SR:
// Create new SegmentReader sharing core from a previous
// SegmentReader and loading new live docs from a new
// deletes file. Used by openIfChanged.
SegmentReader(SegmentInfo si, SegmentReader parent, IOContext context) throws IOException {
assert si.dir == parent.getSegmentInfo().dir;
this.si = si;
// It's no longer possible to unDeleteAll, so, we can
// only be created if we have deletions:
assert si.hasDeletions();
// ... but load our own deleted docs:
liveDocs = si.getCodec().liveDocsFormat().readLiveDocs(si.dir, si, context);
numDocs = si.docCount - si.getDelCount();
// We share core w/ parent:
parent.core.incRef();
core = parent.core;
SegmentReader(SegmentInfo si, SegmentCoreReaders core, IOContext context) throws IOException {
this(si, core, si.getCodec().liveDocsFormat().readLiveDocs(si.dir, si, context), si.docCount - si.getDelCount());
}
// Create new SegmentReader sharing core from a previous
// SegmentReader and using the provided in-memory
// liveDocs. Used by IndexWriter to provide a new NRT
// reader:
SegmentReader(SegmentReader parent, Bits liveDocs, int numDocs) throws IOException {
this.si = parent.si;
parent.core.incRef();
this.core = parent.core;
SegmentReader(SegmentInfo si, SegmentCoreReaders core, Bits liveDocs, int numDocs) throws IOException {
this.si = si;
this.core = core;
core.incRef();
assert liveDocs != null;
this.liveDocs = liveDocs;