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:01:16 UTC
svn commit: r1237345 - in
/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene: search/
search/spans/ store/
Author: rmuir
Date: Sun Jan 29 17:01:16 2012
New Revision: 1237345
URL: http://svn.apache.org/viewvc?rev=1237345&view=rev
Log:
LUCENE-2858: fix more tests
Modified:
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Sun Jan 29 17:01:16 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SerialMergeScheduler;
@@ -114,7 +115,7 @@ public class TestCachingWrapperFilter ex
}
private static void assertDocIdSetCacheable(IndexReader reader, Filter filter, boolean shouldCacheable) throws IOException {
- assertTrue(reader.getTopReaderContext().isAtomic);
+ assertTrue(reader.getTopReaderContext() instanceof AtomicReaderContext);
AtomicReaderContext context = (AtomicReaderContext) reader.getTopReaderContext();
final CachingWrapperFilter cacher = new CachingWrapperFilter(filter);
final DocIdSet originalSet = filter.getDocIdSet(context, context.reader().getLiveDocs());
@@ -171,7 +172,7 @@ public class TestCachingWrapperFilter ex
// flipping a coin) may give us a newly opened reader,
// but we use .reopen on this reader below and expect to
// (must) get an NRT reader:
- IndexReader reader = IndexReader.open(writer.w, true);
+ DirectoryReader reader = IndexReader.open(writer.w, true);
// same reason we don't wrap?
IndexSearcher searcher = newSearcher(reader, false);
@@ -298,9 +299,9 @@ public class TestCachingWrapperFilter ex
dir.close();
}
- private static IndexReader refreshReader(IndexReader reader) throws IOException {
- IndexReader oldReader = reader;
- reader = IndexReader.openIfChanged(reader);
+ private static DirectoryReader refreshReader(DirectoryReader reader) throws IOException {
+ DirectoryReader oldReader = reader;
+ reader = DirectoryReader.openIfChanged(reader);
if (reader != null) {
oldReader.close();
return reader;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Sun Jan 29 17:01:16 2012
@@ -175,7 +175,7 @@ public class TestDisjunctionMaxQuery ext
dq.add(tq("dek", "DOES_NOT_EXIST"));
QueryUtils.check(random, dq, s);
- assertTrue(s.getTopReaderContext().isAtomic);
+ assertTrue(s.getTopReaderContext() instanceof AtomicReaderContext);
final Weight dw = s.createNormalizedWeight(dq);
AtomicReaderContext context = (AtomicReaderContext)s.getTopReaderContext();
final Scorer ds = dw.scorer(context, true, false, context.reader().getLiveDocs());
@@ -190,7 +190,7 @@ public class TestDisjunctionMaxQuery ext
final DisjunctionMaxQuery dq = new DisjunctionMaxQuery(0.0f);
dq.add(tq("dek", "albino"));
dq.add(tq("dek", "DOES_NOT_EXIST"));
- assertTrue(s.getTopReaderContext().isAtomic);
+ assertTrue(s.getTopReaderContext() instanceof AtomicReaderContext);
QueryUtils.check(random, dq, s);
final Weight dw = s.createNormalizedWeight(dq);
AtomicReaderContext context = (AtomicReaderContext)s.getTopReaderContext();
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java Sun Jan 29 17:01:16 2012
@@ -101,7 +101,6 @@ public class TestFilteredSearch extends
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
assertNull("acceptDocs should be null, as we have an index without deletions", acceptDocs);
- assert context.isAtomic;
final FixedBitSet set = new FixedBitSet(context.reader().maxDoc());
int docBase = context.docBase;
final int limit = docBase+context.reader().maxDoc();
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java Sun Jan 29 17:01:16 2012
@@ -28,6 +28,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.AtomicIndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.IndexReader;
@@ -209,7 +210,7 @@ public class TestPositionIncrement exten
writer.addDocument(doc);
final IndexReader readerFromWriter = writer.getReader();
- SlowCompositeReaderWrapper r = SlowCompositeReaderWrapper.wrap(readerFromWriter);
+ AtomicIndexReader r = SlowCompositeReaderWrapper.wrap(readerFromWriter);
DocsAndPositionsEnum tp = r.termPositionsEnum(r.getLiveDocs(),
"content",
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/TestTermScorer.java Sun Jan 29 17:01:16 2012
@@ -76,7 +76,7 @@ public class TestTermScorer extends Luce
TermQuery termQuery = new TermQuery(allTerm);
Weight weight = indexSearcher.createNormalizedWeight(termQuery);
- assertTrue(indexSearcher.getTopReaderContext().isAtomic);
+ assertTrue(indexSearcher.getTopReaderContext() instanceof AtomicReaderContext);
AtomicReaderContext context = (AtomicReaderContext)indexSearcher.getTopReaderContext();
Scorer ts = weight.scorer(context, true, true, context.reader().getLiveDocs());
// we have 2 documents with the term all in them, one document for all the
@@ -138,7 +138,7 @@ public class TestTermScorer extends Luce
TermQuery termQuery = new TermQuery(allTerm);
Weight weight = indexSearcher.createNormalizedWeight(termQuery);
- assertTrue(indexSearcher.getTopReaderContext().isAtomic);
+ assertTrue(indexSearcher.getTopReaderContext() instanceof AtomicReaderContext);
AtomicReaderContext context = (AtomicReaderContext) indexSearcher.getTopReaderContext();
Scorer ts = weight.scorer(context, true, true, context.reader().getLiveDocs());
assertTrue("next did not return a doc",
@@ -157,7 +157,7 @@ public class TestTermScorer extends Luce
TermQuery termQuery = new TermQuery(allTerm);
Weight weight = indexSearcher.createNormalizedWeight(termQuery);
- assertTrue(indexSearcher.getTopReaderContext().isAtomic);
+ assertTrue(indexSearcher.getTopReaderContext() instanceof AtomicReaderContext);
AtomicReaderContext context = (AtomicReaderContext) indexSearcher.getTopReaderContext();
Scorer ts = weight.scorer(context, true, true, context.reader().getLiveDocs());
assertTrue("Didn't skip", ts.advance(3) != DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java Sun Jan 29 17:01:16 2012
@@ -62,7 +62,7 @@ public class MultiSpansWrapper extends S
}
AtomicReaderContext[] leaves = ReaderUtil.leaves(topLevelReaderContext);
if(leaves.length == 1) {
- return query.getSpans(leaves[0], leaves[0].reader.getLiveDocs(), termContexts);
+ return query.getSpans(leaves[0], leaves[0].reader().getLiveDocs(), termContexts);
}
return new MultiSpansWrapper(leaves, query, termContexts);
}
@@ -73,14 +73,14 @@ public class MultiSpansWrapper extends S
return false;
}
if (current == null) {
- current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader.getLiveDocs(), termContexts);
+ current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader().getLiveDocs(), termContexts);
}
while(true) {
if (current.next()) {
return true;
}
if (++leafOrd < leaves.length) {
- current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader.getLiveDocs(), termContexts);
+ current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader().getLiveDocs(), termContexts);
} else {
current = null;
break;
@@ -98,17 +98,17 @@ public class MultiSpansWrapper extends S
int subIndex = ReaderUtil.subIndex(target, leaves);
assert subIndex >= leafOrd;
if (subIndex != leafOrd) {
- current = query.getSpans(leaves[subIndex], leaves[subIndex].reader.getLiveDocs(), termContexts);
+ current = query.getSpans(leaves[subIndex], leaves[subIndex].reader().getLiveDocs(), termContexts);
leafOrd = subIndex;
} else if (current == null) {
- current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader.getLiveDocs(), termContexts);
+ current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader().getLiveDocs(), termContexts);
}
while (true) {
if (current.skipTo(target - leaves[leafOrd].docBase)) {
return true;
}
if (++leafOrd < leaves.length) {
- current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader.getLiveDocs(), termContexts);
+ current = query.getSpans(leaves[leafOrd], leaves[leafOrd].reader().getLiveDocs(), termContexts);
} else {
current = null;
break;
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Sun Jan 29 17:01:16 2012
@@ -168,7 +168,7 @@ public class TestNearSpansOrdered extend
Weight w = searcher.createNormalizedWeight(q);
ReaderContext topReaderContext = searcher.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
- Scorer s = w.scorer(leaves[0], true, false, leaves[0].reader.getLiveDocs());
+ Scorer s = w.scorer(leaves[0], true, false, leaves[0].reader().getLiveDocs());
assertEquals(1, s.advance(1));
}
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Sun Jan 29 17:01:16 2012
@@ -433,7 +433,7 @@ public class TestSpans extends LuceneTes
slop,
ordered);
- spanScorer = searcher.createNormalizedWeight(snq).scorer(leaves[i], true, false, leaves[i].reader.getLiveDocs());
+ spanScorer = searcher.createNormalizedWeight(snq).scorer(leaves[i], true, false, leaves[i].reader().getLiveDocs());
} finally {
searcher.setSimilarityProvider(oldSim);
}
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java?rev=1237345&r1=1237344&r2=1237345&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java Sun Jan 29 17:01:16 2012
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -55,7 +56,7 @@ public class TestNRTCachingDirectory ext
}
final List<BytesRef> ids = new ArrayList<BytesRef>();
- IndexReader r = null;
+ DirectoryReader r = null;
for(int docCount=0;docCount<numDocs;docCount++) {
final Document doc = docs.nextDoc();
ids.add(new BytesRef(doc.get("docid")));
@@ -64,7 +65,7 @@ public class TestNRTCachingDirectory ext
if (r == null) {
r = IndexReader.open(w.w, false);
} else {
- final IndexReader r2 = IndexReader.openIfChanged(r);
+ final DirectoryReader r2 = DirectoryReader.openIfChanged(r);
if (r2 != null) {
r.close();
r = r2;