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 2010/05/12 15:45:45 UTC

svn commit: r943493 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/search/PhraseQuery.java test/org/apache/lucene/search/TestPhraseQuery.java

Author: rmuir
Date: Wed May 12 13:45:44 2010
New Revision: 943493

URL: http://svn.apache.org/viewvc?rev=943493&view=rev
Log:
LUCENE-2410: add a PhraseQuery->TermQuery rewrite when there is only one term

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhraseQuery.java?rev=943493&r1=943492&r2=943493&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhraseQuery.java Wed May 12 13:45:44 2010
@@ -110,6 +110,16 @@ public class PhraseQuery extends Query {
       return result;
   }
 
+  @Override
+  public Query rewrite(IndexReader reader) throws IOException {
+    if (terms.size() == 1) {
+      TermQuery tq = new TermQuery(terms.get(0));
+      tq.setBoost(getBoost());
+      return tq;
+    } else
+      return super.rewrite(reader);
+  }
+
   private class PhraseWeight extends Weight {
     private final Similarity similarity;
     private float value;

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=943493&r1=943492&r2=943493&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java Wed May 12 13:45:44 2010
@@ -565,4 +565,11 @@ public class TestPhraseQuery extends Luc
     q2.toString();
   }
   
+  /* test that a single term is rewritten to a term query */
+  public void testRewrite() throws IOException {
+    PhraseQuery pq = new PhraseQuery();
+    pq.add(new Term("foo", "bar"));
+    Query rewritten = pq.rewrite(searcher.getIndexReader());
+    assertTrue(rewritten instanceof TermQuery);
+  }
 }