You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/06/17 19:31:32 UTC
svn commit: r1351131 - in /lucene/dev/branches/lucene_solr_3_6: ./ lucene/
lucene/core/src/ lucene/core/src/java/org/apache/lucene/util/ReaderUtil.java
Author: uschindler
Date: Sun Jun 17 17:31:31 2012
New Revision: 1351131
URL: http://svn.apache.org/viewvc?rev=1351131&view=rev
Log:
Merged revision(s) 1351129 from lucene/dev/trunk:
The base calculation in ReaderUtil.Gather is so complicated, add some assert to verify that it is still correct. The code lead to another bug I fixed in CompositeReaderContext long time ago (at least it explains why Simon did it wrong...)
Modified:
lucene/dev/branches/lucene_solr_3_6/ (props changed)
lucene/dev/branches/lucene_solr_3_6/lucene/ (props changed)
lucene/dev/branches/lucene_solr_3_6/lucene/core/src/ (props changed)
lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/util/ReaderUtil.java
Modified: lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/util/ReaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/util/ReaderUtil.java?rev=1351131&r1=1351130&r2=1351131&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/util/ReaderUtil.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/util/ReaderUtil.java Sun Jun 17 17:31:31 2012
@@ -74,20 +74,21 @@ public final class ReaderUtil {
return run(docBase, topReader);
}
- private int run(int base, IndexReader reader) throws IOException {
+ private int run(final int base, final IndexReader reader) throws IOException {
IndexReader[] subReaders = reader.getSequentialSubReaders();
if (subReaders == null) {
// atomic reader
add(base, reader);
- base += reader.maxDoc();
+ return base + reader.maxDoc();
} else {
// composite reader
+ int newBase = base;
for (int i = 0; i < subReaders.length; i++) {
- base = run(base, subReaders[i]);
+ newBase = run(newBase, subReaders[i]);
}
+ assert newBase == base + reader.maxDoc();
+ return newBase;
}
-
- return base;
}
protected abstract void add(int base, IndexReader r) throws IOException;