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 2010/11/20 19:46:56 UTC
svn commit: r1037294 - in /lucene/dev/trunk/lucene:
contrib/misc/src/java/org/apache/lucene/index/
contrib/queries/src/test/org/apache/lucene/search/
src/java/org/apache/lucene/index/ src/test/org/apache/lucene/index/
src/test/org/apache/lucene/search/...
Author: uschindler
Date: Sat Nov 20 18:46:55 2010
New Revision: 1037294
URL: http://svn.apache.org/viewvc?rev=1037294&view=rev
Log:
LUCENE-2772: SlowMultiReaderWrapper should be closeable. The wrap() method was removed, so even for 1-segment indexes its better to wrap which is no real overhead at all.
Modified:
lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
Modified: lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Sat Nov 20 18:46:55 2010
@@ -177,8 +177,8 @@ public class MultiPassIndexSplitter {
OpenBitSet dels;
OpenBitSet oldDels = null;
- public FakeDeleteIndexReader(IndexReader in) throws IOException {
- super(SlowMultiReaderWrapper.wrap(in));
+ public FakeDeleteIndexReader(IndexReader in) {
+ super(new SlowMultiReaderWrapper(in));
dels = new OpenBitSet(in.maxDoc());
if (in.hasDeletions()) {
oldDels = new OpenBitSet(in.maxDoc());
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Sat Nov 20 18:46:55 2010
@@ -32,7 +32,6 @@ import org.apache.lucene.util.LuceneTest
public class BooleanFilterTest extends LuceneTestCase {
private Directory directory;
- private IndexReader mainReader;
private IndexReader reader;
@Override
@@ -47,14 +46,13 @@ public class BooleanFilterTest extends L
addDoc(writer, "guest", "020", "20050101","Y");
addDoc(writer, "admin", "020", "20050101","Maybe");
addDoc(writer, "admin guest", "030", "20050101","N");
- mainReader = writer.getReader();
- reader = SlowMultiReaderWrapper.wrap(mainReader);
+ reader = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
}
@Override
public void tearDown() throws Exception {
- mainReader.close();
+ reader.close();
directory.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java Sat Nov 20 18:46:55 2010
@@ -60,10 +60,8 @@ public class TermsFilterTest extends Luc
doc.add(newField(fieldName,""+term,Field.Store.YES,Field.Index.NOT_ANALYZED));
w.addDocument(doc);
}
- IndexReader mainReader = w.getReader();
+ IndexReader reader = new SlowMultiReaderWrapper(w.getReader());
w.close();
-
- IndexReader reader = SlowMultiReaderWrapper.wrap(mainReader);
TermsFilter tf=new TermsFilter();
tf.addTerm(new Term(fieldName,"19"));
@@ -82,7 +80,7 @@ public class TermsFilterTest extends Luc
bits = (OpenBitSet)tf.getDocIdSet(reader);
assertEquals("Must match 2", 2, bits.cardinality());
- mainReader.close();
+ reader.close();
rd.close();
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java Sat Nov 20 18:46:55 2010
@@ -18,10 +18,8 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.ReaderUtil;
+import org.apache.lucene.util.ReaderUtil; // javadoc
import org.apache.lucene.index.DirectoryReader; // javadoc
import org.apache.lucene.index.MultiReader; // javadoc
@@ -49,22 +47,8 @@ import org.apache.lucene.index.MultiRead
*/
public final class SlowMultiReaderWrapper extends FilterIndexReader {
- /** This method may return the reader back, if the
- * incoming reader is already atomic. */
- public static IndexReader wrap(IndexReader reader) throws IOException {
- final List<IndexReader> subs = new ArrayList<IndexReader>();
- ReaderUtil.gatherSubReaders(subs, reader);
- if (subs == null) {
- // already an atomic reader
- return reader;
- } else if (subs.size() == 1) {
- return subs.get(0);
- } else {
- return new SlowMultiReaderWrapper(reader);
- }
- }
- private SlowMultiReaderWrapper(IndexReader other) throws IOException {
+ public SlowMultiReaderWrapper(IndexReader other) {
super(other);
}
@@ -79,12 +63,8 @@ public final class SlowMultiReaderWrappe
}
@Override
- public void doClose() throws IOException {
- throw new UnsupportedOperationException("please call close on the original reader instead");
- }
-
- @Override
public IndexReader[] getSequentialSubReaders() {
return null;
- }
+ }
+
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java Sat Nov 20 18:46:55 2010
@@ -19,8 +19,6 @@ package org.apache.lucene.index;
import org.apache.lucene.util.LuceneTestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -109,7 +107,7 @@ public class TestFilterIndexReader exten
}
public TestReader(IndexReader reader) {
- super(reader);
+ super(new SlowMultiReaderWrapper(reader));
}
@Override
@@ -117,12 +115,6 @@ public class TestFilterIndexReader exten
return new TestFields(super.fields());
}
}
-
-
- /** Main for running test case by itself. */
- public static void main(String args[]) {
- TestRunner.run (new TestSuite(TestIndexReader.class));
- }
/**
* Tests the IndexReader.getFieldNames implementation
@@ -146,10 +138,9 @@ public class TestFilterIndexReader exten
writer.close();
- //IndexReader reader = new TestReader(IndexReader.open(directory, true));
Directory target = newDirectory();
writer = new IndexWriter(target, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
- IndexReader reader = new TestReader(SlowMultiReaderWrapper.wrap(IndexReader.open(directory, true)));
+ IndexReader reader = new TestReader(IndexReader.open(directory, true));
writer.addIndexes(reader);
writer.close();
reader.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Sat Nov 20 18:46:55 2010
@@ -1151,22 +1151,20 @@ public class TestIndexReader extends Luc
w.commit();
doc.add(newField("f", "who", Field.Store.NO, Field.Index.NOT_ANALYZED));
w.addDocument(doc);
- IndexReader r = w.getReader();
- IndexReader wr = SlowMultiReaderWrapper.wrap(r);
+ IndexReader r = new SlowMultiReaderWrapper(w.getReader());
w.close();
- assertNull(wr.getDeletedDocs());
+ assertNull(r.getDeletedDocs());
r.close();
- r = IndexReader.open(dir, false);
- wr = SlowMultiReaderWrapper.wrap(r);
+ r = new SlowMultiReaderWrapper(IndexReader.open(dir, false));
- assertNull(wr.getDeletedDocs());
+ assertNull(r.getDeletedDocs());
assertEquals(1, r.deleteDocuments(new Term("f", "doctor")));
- assertNotNull(wr.getDeletedDocs());
- assertTrue(wr.getDeletedDocs().get(0));
+ assertNotNull(r.getDeletedDocs());
+ assertTrue(r.getDeletedDocs().get(0));
assertEquals(1, r.deleteDocuments(new Term("f", "who")));
- assertTrue(wr.getDeletedDocs().get(1));
+ assertTrue(r.getDeletedDocs().get(1));
r.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Sat Nov 20 18:46:55 2010
@@ -130,17 +130,16 @@ public class TestCachingWrapperFilter ex
writer.addDocument(new Document());
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
- IndexReader slowReader = SlowMultiReaderWrapper.wrap(reader);
+ IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir, true));
// not cacheable:
- assertDocIdSetCacheable(slowReader, new QueryWrapperFilter(new TermQuery(new Term("test","value"))), false);
+ assertDocIdSetCacheable(reader, new QueryWrapperFilter(new TermQuery(new Term("test","value"))), false);
// returns default empty docidset, always cacheable:
- assertDocIdSetCacheable(slowReader, NumericRangeFilter.newIntRange("test", Integer.valueOf(10000), Integer.valueOf(-10000), true, true), true);
+ assertDocIdSetCacheable(reader, NumericRangeFilter.newIntRange("test", Integer.valueOf(10000), Integer.valueOf(-10000), true, true), true);
// is cacheable:
- assertDocIdSetCacheable(slowReader, FieldCacheRangeFilter.newIntRange("test", Integer.valueOf(10), Integer.valueOf(20), true, true), true);
+ assertDocIdSetCacheable(reader, FieldCacheRangeFilter.newIntRange("test", Integer.valueOf(10), Integer.valueOf(20), true, true), true);
// a openbitset filter is always cacheable
- assertDocIdSetCacheable(slowReader, new Filter() {
+ assertDocIdSetCacheable(reader, new Filter() {
@Override
public DocIdSet getDocIdSet(IndexReader reader) {
return new OpenBitSet();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Sat Nov 20 18:46:55 2010
@@ -143,9 +143,9 @@ public class TestDisjunctionMaxQuery ext
writer.addDocument(d4);
}
- r = writer.getReader();
+ r = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
- s = new IndexSearcher(SlowMultiReaderWrapper.wrap(r));
+ s = new IndexSearcher(r);
s.setSimilarity(sim);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java Sat Nov 20 18:46:55 2010
@@ -243,12 +243,11 @@ public class TestPositionIncrement exten
"a a b c d e a f g h i j a b k k")));
writer.addDocument(doc);
- IndexReader r = writer.getReader();
+ IndexReader r = new SlowMultiReaderWrapper(writer.getReader());
- DocsAndPositionsEnum tp = MultiFields.getTermPositionsEnum(r,
- MultiFields.getDeletedDocs(r),
- "content",
- new BytesRef("a"));
+ DocsAndPositionsEnum tp = r.termPositionsEnum(r.getDeletedDocs(),
+ "content",
+ new BytesRef("a"));
int count = 0;
assertTrue(tp.nextDoc() != tp.NO_MORE_DOCS);
@@ -263,7 +262,7 @@ public class TestPositionIncrement exten
// only one doc has "a"
assertEquals(tp.NO_MORE_DOCS, tp.nextDoc());
- IndexSearcher is = new IndexSearcher(SlowMultiReaderWrapper.wrap(r));
+ IndexSearcher is = new IndexSearcher(r);
SpanTermQuery stq1 = new SpanTermQuery(new Term("content", "a"));
SpanTermQuery stq2 = new SpanTermQuery(new Term("content", "k"));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java Sat Nov 20 18:46:55 2010
@@ -45,7 +45,7 @@ public class TestSpanQueryFilter extends
SpanTermQuery query = new SpanTermQuery(new Term("field", English.intToEnglish(10).trim()));
SpanQueryFilter filter = new SpanQueryFilter(query);
- SpanFilterResult result = filter.bitSpans(SlowMultiReaderWrapper.wrap(reader));
+ SpanFilterResult result = filter.bitSpans(new SlowMultiReaderWrapper(reader));
DocIdSet docIdSet = result.getDocIdSet();
assertTrue("docIdSet is null and it shouldn't be", docIdSet != null);
assertContainsDocId("docIdSet doesn't contain docId 10", docIdSet, 10);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java Sat Nov 20 18:46:55 2010
@@ -52,9 +52,9 @@ public class TestTermScorer extends Luce
Field.Index.ANALYZED));
writer.addDocument(doc);
}
- indexReader = writer.getReader();
+ indexReader = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
- indexSearcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(indexReader));
+ indexSearcher = new IndexSearcher(indexReader);
}
@Override
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Sat Nov 20 18:46:55 2010
@@ -127,10 +127,10 @@ public class PayloadHelper {
doc.add(new Field(NO_PAYLOAD_FIELD, English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
- reader = IndexReader.open(writer);
+ reader = new SlowMultiReaderWrapper(IndexReader.open(writer));
writer.close();
- IndexSearcher searcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ IndexSearcher searcher = new IndexSearcher(reader);
searcher.setSimilarity(similarity);
return searcher;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Sat Nov 20 18:46:55 2010
@@ -121,10 +121,10 @@ public class TestPayloadTermQuery extend
doc.add(newField("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
- reader = writer.getReader();
+ reader = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
- searcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ searcher = new IndexSearcher(reader);
searcher.setSimilarity(similarity);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Sat Nov 20 18:46:55 2010
@@ -79,8 +79,8 @@ public class TestBasics extends LuceneTe
doc.add(newField("field", English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
- reader = writer.getReader();
- searcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ reader = new SlowMultiReaderWrapper(writer.getReader());
+ searcher = new IndexSearcher(reader);
writer.close();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Sat Nov 20 18:46:55 2010
@@ -110,9 +110,9 @@ public class TestFieldMaskingSpanQuery e
field("gender", "male"),
field("first", "bubba"),
field("last", "jones") }));
- reader = writer.getReader();
+ reader = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
- searcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ searcher = new IndexSearcher(reader);
}
@Override
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Sat Nov 20 18:46:55 2010
@@ -60,9 +60,9 @@ public class TestNearSpansOrdered extend
doc.add(newField(FIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
- reader = writer.getReader();
+ reader = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
- searcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ searcher = new IndexSearcher(reader);
}
protected String[] docFields = {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Sat Nov 20 18:46:55 2010
@@ -120,7 +120,7 @@ public class TestPayloadSpans extends Lu
IndexReader reader = writer.getReader();
writer.close();
- checkSpans(snq.getSpans(SlowMultiReaderWrapper.wrap(reader)), 1,new int[]{2});
+ checkSpans(snq.getSpans(new SlowMultiReaderWrapper(reader)), 1,new int[]{2});
reader.close();
directory.close();
}
@@ -261,8 +261,8 @@ public class TestPayloadSpans extends Lu
doc.add(new Field("content", new StringReader("a b c d e f g h i j a k")));
writer.addDocument(doc);
- IndexReader reader = writer.getReader();
- IndexSearcher is = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ IndexReader reader = new SlowMultiReaderWrapper(writer.getReader());
+ IndexSearcher is = new IndexSearcher(reader);
writer.close();
SpanTermQuery stq1 = new SpanTermQuery(new Term("content", "a"));
@@ -298,8 +298,8 @@ public class TestPayloadSpans extends Lu
Document doc = new Document();
doc.add(new Field("content", new StringReader("a b a d k f a h i k a k")));
writer.addDocument(doc);
- IndexReader reader = writer.getReader();
- IndexSearcher is = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ IndexReader reader = new SlowMultiReaderWrapper(writer.getReader());
+ IndexSearcher is = new IndexSearcher(reader);
writer.close();
SpanTermQuery stq1 = new SpanTermQuery(new Term("content", "a"));
@@ -334,8 +334,8 @@ public class TestPayloadSpans extends Lu
Document doc = new Document();
doc.add(new Field("content", new StringReader("j k a l f k k p a t a k l k t a")));
writer.addDocument(doc);
- IndexReader reader = writer.getReader();
- IndexSearcher is = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ IndexReader reader = new SlowMultiReaderWrapper(writer.getReader());
+ IndexSearcher is = new IndexSearcher(reader);
writer.close();
SpanTermQuery stq1 = new SpanTermQuery(new Term("content", "a"));
@@ -376,9 +376,9 @@ public class TestPayloadSpans extends Lu
doc.add(newField(PayloadHelper.FIELD,"xx rr yy mm pp", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
- IndexReader reader = writer.getReader();
+ IndexReader reader = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
- IndexSearcher searcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(reader));
+ IndexSearcher searcher = new IndexSearcher(reader);
PayloadSpanUtil psu = new PayloadSpanUtil(searcher.getIndexReader());
@@ -440,10 +440,10 @@ public class TestPayloadSpans extends Lu
writer.addDocument(doc);
}
- closeIndexReader = writer.getReader();
+ closeIndexReader = new SlowMultiReaderWrapper(writer.getReader());
writer.close();
- IndexSearcher searcher = new IndexSearcher(SlowMultiReaderWrapper.wrap(closeIndexReader));
+ IndexSearcher searcher = new IndexSearcher(closeIndexReader);
return searcher;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1037294&r1=1037293&r2=1037294&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Sat Nov 20 18:46:55 2010
@@ -196,7 +196,7 @@ public class TestSpans extends LuceneTes
makeSpanTermQuery("t3") },
slop,
ordered);
- Spans spans = snq.getSpans(SlowMultiReaderWrapper.wrap(searcher.getIndexReader()));
+ Spans spans = snq.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
assertTrue("first range", spans.next());
assertEquals("first doc", 11, spans.doc());
@@ -222,7 +222,7 @@ public class TestSpans extends LuceneTes
makeSpanTermQuery("u2") },
0,
false);
- Spans spans = snq.getSpans(SlowMultiReaderWrapper.wrap(searcher.getIndexReader()));
+ Spans spans = snq.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
assertTrue("Does not have next and it should", spans.next());
assertEquals("doc", 4, spans.doc());
assertEquals("start", 1, spans.start());
@@ -258,7 +258,7 @@ public class TestSpans extends LuceneTes
},
1,
false);
- spans = snq.getSpans(SlowMultiReaderWrapper.wrap(searcher.getIndexReader()));
+ spans = snq.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
assertTrue("Does not have next and it should", spans.next());
assertEquals("doc", 4, spans.doc());
assertEquals("start", 0, spans.start());
@@ -316,7 +316,7 @@ public class TestSpans extends LuceneTes
for (int i = 0; i < terms.length; i++) {
sqa[i] = makeSpanTermQuery(terms[i]);
}
- return (new SpanOrQuery(sqa)).getSpans(SlowMultiReaderWrapper.wrap(searcher.getIndexReader()));
+ return (new SpanOrQuery(sqa)).getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
}
private void tstNextSpans(Spans spans, int doc, int start, int end)
@@ -421,7 +421,7 @@ public class TestSpans extends LuceneTes
}
};
- Scorer spanScorer = snq.weight(searcher).scorer(SlowMultiReaderWrapper.wrap(searcher.getIndexReader()), true, false);
+ Scorer spanScorer = snq.weight(searcher).scorer(new SlowMultiReaderWrapper(searcher.getIndexReader()), true, false);
assertTrue("first doc", spanScorer.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals("first doc number", spanScorer.docID(), 11);