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 2013/08/15 09:02:48 UTC
svn commit: r1514184 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java
Author: uschindler
Date: Thu Aug 15 07:02:48 2013
New Revision: 1514184
URL: http://svn.apache.org/r1514184
Log:
Merged revision(s) 1514183 from lucene/dev/trunk:
LUCENE-5176: Reuse new AllDeletedFilterReader in TestAddIndexes
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1514184&r1=1514183&r2=1514184&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java Thu Aug 15 07:02:48 2013
@@ -1228,14 +1228,7 @@ public class TestAddIndexes extends Luce
Directory src = newDirectory(), dest = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), src);
w.addDocument(new Document());
- IndexReader allDeletedReader = new FilterAtomicReader(w.getReader().leaves().get(0).reader()) {
- @Override
- public Bits getLiveDocs() {
- return new Bits.MatchNoBits(in.maxDoc());
- }
- @Override public boolean hasDeletions() { return true; }
- @Override public int numDocs() { return 0; }
- };
+ IndexReader allDeletedReader = new AllDeletedFilterReader(w.getReader().leaves().get(0).reader());
w.close();
w = new RandomIndexWriter(random(), dest);
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java?rev=1514184&r1=1514183&r2=1514184&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java Thu Aug 15 07:02:48 2013
@@ -28,6 +28,7 @@ public class AllDeletedFilterReader exte
public AllDeletedFilterReader(AtomicReader in) {
super(in);
liveDocs = new Bits.MatchNoBits(in.maxDoc());
+ assert maxDoc() == 0 || hasDeletions();
}
@Override