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 18:34:36 UTC
svn commit: r1237378 - in
/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index:
TestPostingsOffsets.java TestSegmentMerger.java TestStressIndexing2.java
Author: rmuir
Date: Sun Jan 29 17:34:36 2012
New Revision: 1237378
URL: http://svn.apache.org/viewvc?rev=1237378&view=rev
Log:
LUCENE-2858: fix tests
Modified:
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1237378&r1=1237377&r2=1237378&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestPostingsOffsets.java Sun Jan 29 17:34:36 2012
@@ -284,11 +284,13 @@ public class TestPostingsOffsets extends
doc.add(new Field("content", new CannedAnalyzer.CannedTokenizer(tokens.toArray(new Token[tokens.size()])), ft));
w.addDocument(doc);
}
- final IndexReader r = w.getReader();
+ final DirectoryReader r = w.getReader();
w.close();
final String[] terms = new String[] {"a", "b", "c", "d"};
- for(IndexReader sub : r.getSequentialSubReaders()) {
+ for(IndexReader reader : r.getSequentialSubReaders()) {
+ // TODO: improve this
+ AtomicIndexReader sub = (AtomicIndexReader) reader;
//System.out.println("\nsub=" + sub);
final TermsEnum termsEnum = sub.fields().terms("content").iterator(null);
DocsEnum docs = null;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1237378&r1=1237377&r2=1237378&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Sun Jan 29 17:34:36 2012
@@ -53,8 +53,8 @@ public class TestSegmentMerger extends L
SegmentInfo info1 = DocHelper.writeDoc(random, merge1Dir, doc1);
DocHelper.setupDoc(doc2);
SegmentInfo info2 = DocHelper.writeDoc(random, merge2Dir, doc2);
- reader1 = new SegmentReader(info1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
- reader2 = new SegmentReader(info2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ reader1 = new SegmentReader(info1, DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ reader2 = new SegmentReader(info2, DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
}
@Override
@@ -87,7 +87,7 @@ public class TestSegmentMerger extends L
//Should be able to open a new SegmentReader against the new directory
SegmentReader mergedReader = new SegmentReader(new SegmentInfo(mergedSegment, docsMerged, mergedDir, false,
codec, fieldInfos),
- IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
assertTrue(mergedReader != null);
assertTrue(mergedReader.numDocs() == 2);
Document newDoc1 = mergedReader.document(0);
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1237378&r1=1237377&r2=1237378&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Sun Jan 29 17:34:36 2012
@@ -66,7 +66,7 @@ public class TestStressIndexing2 extends
// TODO: verify equals using IW.getReader
DocsAndWriter dw = indexRandomIWReader(5, 3, 100, dir);
- IndexReader reader = dw.writer.getReader();
+ DirectoryReader reader = dw.writer.getReader();
dw.writer.commit();
verifyEquals(random, reader, dir, "id");
reader.close();
@@ -265,24 +265,25 @@ public class TestStressIndexing2 extends
w.close();
}
- public static void verifyEquals(Random r, IndexReader r1, Directory dir2, String idField) throws Throwable {
- IndexReader r2 = IndexReader.open(dir2);
+ public static void verifyEquals(Random r, DirectoryReader r1, Directory dir2, String idField) throws Throwable {
+ DirectoryReader r2 = IndexReader.open(dir2);
verifyEquals(r1, r2, idField);
r2.close();
}
public static void verifyEquals(Directory dir1, Directory dir2, String idField) throws Throwable {
- IndexReader r1 = IndexReader.open(dir1);
- IndexReader r2 = IndexReader.open(dir2);
+ DirectoryReader r1 = IndexReader.open(dir1);
+ DirectoryReader r2 = IndexReader.open(dir2);
verifyEquals(r1, r2, idField);
r1.close();
r2.close();
}
- private static void printDocs(IndexReader r) throws Throwable {
+ private static void printDocs(DirectoryReader r) throws Throwable {
IndexReader[] subs = r.getSequentialSubReaders();
for(IndexReader sub : subs) {
- Bits liveDocs = sub.getLiveDocs();
+ // TODO: improve this
+ Bits liveDocs = ((AtomicIndexReader)sub).getLiveDocs();
System.out.println(" " + ((SegmentReader) sub).getSegmentInfo());
for(int docID=0;docID<sub.maxDoc();docID++) {
Document doc = sub.document(docID);
@@ -296,7 +297,7 @@ public class TestStressIndexing2 extends
}
- public static void verifyEquals(IndexReader r1, IndexReader r2, String idField) throws Throwable {
+ public static void verifyEquals(DirectoryReader r1, DirectoryReader r2, String idField) throws Throwable {
if (VERBOSE) {
System.out.println("\nr1 docs:");
printDocs(r1);