Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-22 18:27:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2858: fix qp module

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene2858@1237314 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-01-29 15:25:35 +00:00
parent 1906da16d0
commit 6d4484cb4a
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
View File

@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.xml.builders;
* limitations under the License. * limitations under the License.
*/ */
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.NumericRangeFilter; import org.apache.lucene.search.NumericRangeFilter;

2
modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java
View File

@ -20,7 +20,7 @@ package org.apache.lucene.queryparser.surround.query;
import java.io.IOException; import java.io.IOException;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Collector; import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Scorer;

5
modules/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
View File

@ -24,6 +24,7 @@ import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.document.NumericField; import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.TextField; import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
@ -180,8 +181,8 @@ public class TestParser extends LuceneTestCase {
} }
public void testDuplicateFilterQueryXML() throws ParserException, IOException { public void testDuplicateFilterQueryXML() throws ParserException, IOException {
Assume.assumeTrue(searcher.getIndexReader().getSequentialSubReaders() == null || AtomicReaderContext leaves[] = searcher.getTopReaderContext().leaves();
searcher.getIndexReader().getSequentialSubReaders().length == 1); Assume.assumeTrue(leaves == null || leaves.length == 1);
Query q = parse("DuplicateFilterQuery.xml"); Query q = parse("DuplicateFilterQuery.xml");
int h = searcher.search(q, null, 1000).totalHits; int h = searcher.search(q, null, 1000).totalHits;
assertEquals("DuplicateFilterQuery should produce 1 result ", 1, h); assertEquals("DuplicateFilterQuery should produce 1 result ", 1, h);

7
modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
View File

@ -17,10 +17,11 @@ package org.apache.lucene.queryparser.xml.builders;
* limitations under the License. * limitations under the License.
*/ */
import org.apache.lucene.index.AtomicIndexReader;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.NumericRangeFilter; import org.apache.lucene.search.NumericRangeFilter;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
@ -63,7 +64,7 @@ public class TestNumericRangeFilterBuilder extends LuceneTestCase {
IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null)); IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null));
writer.commit(); writer.commit();
try { try {
IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(ramDir)); AtomicIndexReader reader = new SlowCompositeReaderWrapper(IndexReader.open(ramDir));
try { try {
assertNull(filter.getDocIdSet((AtomicReaderContext) reader.getTopReaderContext(), reader.getLiveDocs())); assertNull(filter.getDocIdSet((AtomicReaderContext) reader.getTopReaderContext(), reader.getLiveDocs()));
} }