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/29 15:59:46 UTC
svn commit: r1237307 - in /lucene/dev/branches/lucene2858/lucene/src:
test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
Author: rmuir
Date: Sun Jan 29 14:59:46 2012
New Revision: 1237307
URL: http://svn.apache.org/viewvc?rev=1237307&view=rev
Log:
LUCENE-2858: fix test
Modified:
lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
Modified: lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1237307&r1=1237306&r2=1237307&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java Sun Jan 29 14:59:46 2012
@@ -328,7 +328,7 @@ public class RandomIndexWriter implement
w.deleteAll();
}
- public IndexReader getReader() throws IOException {
+ public DirectoryReader getReader() throws IOException {
return getReader(true);
}
@@ -367,7 +367,7 @@ public class RandomIndexWriter implement
switchDoDocValues();
}
- public IndexReader getReader(boolean applyDeletions) throws IOException {
+ public DirectoryReader getReader(boolean applyDeletions) throws IOException {
getReaderCalled = true;
if (r.nextInt(4) == 2) {
doRandomForceMerge();
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java?rev=1237307&r1=1237306&r2=1237307&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java Sun Jan 29 14:59:46 2012
@@ -26,7 +26,9 @@ import org.apache.lucene.codecs.nestedpu
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicIndexReader;
import org.apache.lucene.index.CheckIndex;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -51,10 +53,10 @@ public class TestPulsingReuse extends Lu
Document doc = new Document();
doc.add(new Field("foo", "a b b c c c d e f g g h i i j j k", TextField.TYPE_UNSTORED));
iw.addDocument(doc);
- IndexReader ir = iw.getReader();
+ DirectoryReader ir = iw.getReader();
iw.close();
- IndexReader segment = ir.getSequentialSubReaders()[0];
+ AtomicIndexReader segment = getOnlySegmentReader(ir);
DocsEnum reuse = null;
Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<DocsEnum,Boolean>();
TermsEnum te = segment.terms("foo").iterator(null);
@@ -93,10 +95,10 @@ public class TestPulsingReuse extends Lu
// this is because we only track the 'last' enum we reused (not all).
// but this seems 'good enough' for now.
iw.addDocument(doc);
- IndexReader ir = iw.getReader();
+ DirectoryReader ir = iw.getReader();
iw.close();
- IndexReader segment = ir.getSequentialSubReaders()[0];
+ AtomicIndexReader segment = getOnlySegmentReader(ir);
DocsEnum reuse = null;
Map<DocsEnum,Boolean> allEnums = new IdentityHashMap<DocsEnum,Boolean>();
TermsEnum te = segment.terms("foo").iterator(null);