Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-1327: Fix TermSpans#skipTo() to behave as specified in javadocs 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@756669 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Busch 2009-03-20 17:31:43 +00:00
parent c443dcc662
commit a7697e8cef
3 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -94,6 +94,9 @@ Bug fixes
6. LUCENE-1186: Add Analyzer.close() to free internal ThreadLocal
resources. (Christian Kohlschütter via Mike McCandless)
7. LUCENE-1327: Fix TermSpans#skipTo() to behave as specified in javadocs
of Terms#skipTo(). (Michael Busch)
New features
1. LUCENE-1411: Added expert API to open an IndexWriter on a prior

5
src/java/org/apache/lucene/search/spans/TermSpans.java
View File

@ -59,11 +59,6 @@ public class TermSpans implements PayloadSpans {
}
public boolean skipTo(int target) throws IOException {
// are we already at the correct position?
if (doc >= target) {
return true;
}
if (!positions.skipTo(target)) {
doc = Integer.MAX_VALUE;
return false;

54
src/test/org/apache/lucene/search/spans/TestBasics.java
View File

@ -17,19 +17,24 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException;
import org.apache.lucene.util.English;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.CheckHits;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.search.*;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
/**
* Tests basic search capabilities.
@ -339,7 +344,46 @@ public class TestBasics extends LuceneTestCase {
706, 707, 726, 727, 736, 737, 746, 747,
756, 757, 766, 767, 776, 777, 786, 787, 796, 797});
}
public void testSpansSkipTo() throws Exception {
SpanTermQuery t1 = new SpanTermQuery(new Term("field", "seventy"));
SpanTermQuery t2 = new SpanTermQuery(new Term("field", "seventy"));
Spans s1 = t1.getSpans(searcher.getIndexReader());
Spans s2 = t2.getSpans(searcher.getIndexReader());
assertTrue(s1.next());
assertTrue(s2.next());
boolean hasMore = true;
do {
hasMore = skipToAccoringToJavaDocs(s1, s1.doc());
assertEquals(hasMore, s2.skipTo(s2.doc()));
assertEquals(s1.doc(), s2.doc());
} while (hasMore);
}
/** Skips to the first match beyond the current, whose document number is
* greater than or equal to <i>target</i>. <p>Returns true iff there is such
* a match. <p>Behaves as if written: <pre>
* boolean skipTo(int target) {
* do {
* if (!next())
* return false;
* } while (target > doc());
* return true;
* }
* </pre>
*/
private boolean skipToAccoringToJavaDocs(Spans s, int target)
throws Exception {
do {
if (!s.next())
return false;
} while (target > s.doc());
return true;
}
private void checkHits(Query query, int[] results) throws IOException {
CheckHits.checkHits(query, "field", searcher, results);