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 2015/04/13 06:09:16 UTC
svn commit: r1673094 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/spans/
lucene/core/src/test/org/apache/lucene/search/spans/
Author: rmuir
Date: Mon Apr 13 04:09:16 2015
New Revision: 1673094
URL: http://svn.apache.org/r1673094
Log:
add a few more spans tests and fix bug in positions check
Added:
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNearQuery.java
- copied unchanged from r1673093, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNearQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNotQuery.java
- copied unchanged from r1673093, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNotQuery.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java?rev=1673094&r1=1673093&r2=1673094&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java Mon Apr 13 04:09:16 2015
@@ -26,10 +26,10 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermContext;
+import org.apache.lucene.index.Terms;
import org.apache.lucene.search.ComplexExplanation;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.search.Weight;
@@ -46,8 +46,7 @@ public class SpanWeight extends Weight {
protected final SpanQuery query;
protected Similarity.SimWeight stats;
- public SpanWeight(SpanQuery query, IndexSearcher searcher)
- throws IOException {
+ public SpanWeight(SpanQuery query, IndexSearcher searcher) throws IOException {
super(query);
this.similarity = searcher.getSimilarity();
this.query = query;
@@ -89,6 +88,10 @@ public class SpanWeight extends Weight {
if (stats == null) {
return null;
}
+ Terms terms = context.reader().terms(query.getField());
+ if (terms != null && terms.hasPositions() == false) {
+ throw new IllegalStateException("field \"" + query.getField() + "\" was indexed without position data; cannot run SpanQuery (query=" + query + ")");
+ }
Spans spans = query.getSpans(context, acceptDocs, termContexts);
return (spans == null) ? null : new SpanScorer(spans, this, similarity.simScorer(stats, context));
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java?rev=1673094&r1=1673093&r2=1673094&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java Mon Apr 13 04:09:16 2015
@@ -41,4 +41,15 @@ public class TestSpanOrQuery extends Luc
SpanOrQuery b = new SpanOrQuery();
assertTrue("empty should equal", a.equals(b));
}
+
+ public void testDifferentField() throws Exception {
+ SpanTermQuery q1 = new SpanTermQuery(new Term("field1", "foo"));
+ SpanTermQuery q2 = new SpanTermQuery(new Term("field2", "bar"));
+ try {
+ new SpanOrQuery(q1, q2);
+ fail("didn't get expected exception");
+ } catch (IllegalArgumentException expected) {
+ assertTrue(expected.getMessage().contains("must have same field"));
+ }
+ }
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java?rev=1673094&r1=1673093&r2=1673094&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java Mon Apr 13 04:09:16 2015
@@ -42,8 +42,22 @@ public class TestSpanSearchEquivalence e
assertSameSet(new TermQuery(t1), spanQuery(new SpanTermQuery(t1)));
}
+ /** SpanOrQuery(A) = SpanTermQuery(A) */
+ public void testSpanOrVersusTerm() throws Exception {
+ Term t1 = randomTerm();
+ SpanQuery term = spanQuery(new SpanTermQuery(t1));
+ assertSameSet(spanQuery(new SpanOrQuery(term)), term);
+ }
+
+ /** SpanOrQuery(A, A) = SpanTermQuery(A) */
+ public void testSpanOrDoubleVersusTerm() throws Exception {
+ Term t1 = randomTerm();
+ SpanQuery term = spanQuery(new SpanTermQuery(t1));
+ assertSameSet(spanQuery(new SpanOrQuery(term, term)), term);
+ }
+
/** SpanOrQuery(A, B) = (A B) */
- public void testSpanOrVersusBoolean() throws Exception {
+ public void testSpanOrVersusBooleanTerm() throws Exception {
Term t1 = randomTerm();
Term t2 = randomTerm();
BooleanQuery q1 = new BooleanQuery();
@@ -53,6 +67,27 @@ public class TestSpanSearchEquivalence e
assertSameSet(q1, q2);
}
+ /** SpanOrQuery(SpanNearQuery[A B], SpanNearQuery[C D]) = (SpanNearQuery[A B], SpanNearQuery[C D]) */
+ public void testSpanOrVersusBooleanNear() throws Exception {
+ Term t1 = randomTerm();
+ Term t2 = randomTerm();
+ Term t3 = randomTerm();
+ Term t4 = randomTerm();
+ SpanQuery near1 = spanQuery(new SpanNearQuery(new SpanQuery[] {
+ spanQuery(new SpanTermQuery(t1)),
+ spanQuery(new SpanTermQuery(t2))
+ }, 10, random().nextBoolean()));
+ SpanQuery near2 = spanQuery(new SpanNearQuery(new SpanQuery[] {
+ spanQuery(new SpanTermQuery(t3)),
+ spanQuery(new SpanTermQuery(t4))
+ }, 10, random().nextBoolean()));
+ BooleanQuery q1 = new BooleanQuery();
+ q1.add(near1, Occur.SHOULD);
+ q1.add(near2, Occur.SHOULD);
+ SpanQuery q2 = spanQuery(new SpanOrQuery(near1, near2));
+ assertSameSet(q1, q2);
+ }
+
/** SpanNotQuery(A, B) â SpanTermQuery(A) */
public void testSpanNotVersusSpanTerm() throws Exception {
Term t1 = randomTerm();
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java?rev=1673094&r1=1673093&r2=1673094&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java Mon Apr 13 04:09:16 2015
@@ -17,8 +17,17 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
+import java.io.IOException;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
/** Basic tests for SpanTermQuery */
@@ -31,4 +40,26 @@ public class TestSpanTermQuery extends L
QueryUtils.check(q2);
QueryUtils.checkUnequal(q1, q2);
}
+
+ public void testNoPositions() throws IOException {
+ Directory dir = newDirectory();
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
+ Document doc = new Document();
+ doc.add(new StringField("foo", "bar", Field.Store.NO));
+ iw.addDocument(doc);
+
+ IndexReader ir = iw.getReader();
+ iw.close();
+
+ IndexSearcher is = new IndexSearcher(ir);
+ SpanTermQuery query = new SpanTermQuery(new Term("foo", "bar"));
+ try {
+ is.search(query, 5);
+ fail("didn't get expected exception");
+ } catch (IllegalStateException expected) {
+ assertTrue(expected.getMessage().contains("was indexed without position data"));
+ }
+ ir.close();
+ dir.close();
+ }
}