svn commit: r1297711 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/CHANGES.txt lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java solr/ solr/core/

[si...@apache.org]

Author: simonw
Date: Tue Mar  6 20:48:53 2012
New Revision: 1297711

URL: http://svn.apache.org/viewvc?rev=1297711&view=rev
Log:
LUCENE-3789: Expose MTQ TermsEnum via RewriteMethod for non package private access

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/CHANGES.txt
    lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java
    lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/core/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1297711&r1=1297710&r2=1297711&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Tue Mar  6 20:48:53 2012
@@ -165,6 +165,9 @@ New Features
 
 * LUCENE-3714: Add top N shortest cost paths search for FST.
   (Robert Muir, Dawid Weiss, Mike McCandless)
+
+* LUCENE-3789: Expose MTQ TermsEnum via RewriteMethod for non package private
+  access (Simon Willnauer)
   
 Bug fixes
 

Modified: lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java?rev=1297711&r1=1297710&r2=1297711&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java Tue Mar  6 20:48:53 2012
@@ -65,6 +65,14 @@ public abstract class MultiTermQuery ext
   /** Abstract class that defines how the query is rewritten. */
   public static abstract class RewriteMethod implements Serializable {
     public abstract Query rewrite(IndexReader reader, MultiTermQuery query) throws IOException;
+    
+    /**
+     * Returns the {@link MultiTermQuery}s {@link FilteredTermEnum}
+     * @see MultiTermQuery#getEnum(IndexReader)
+     */
+    protected FilteredTermEnum getTermsEnum(IndexReader reader, MultiTermQuery query) throws IOException {
+      return query.getEnum(reader); // allow RewriteMethod subclasses to pull a FilteredTermEnum from the MTQ 
+    }
   }
 
   /** A rewrite method that first creates a private Filter,

Modified: lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java?rev=1297711&r1=1297710&r2=1297711&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java (original)
+++ lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java Tue Mar  6 20:48:53 2012
@@ -31,7 +31,7 @@ abstract class TermCollectingRewrite<Q e
   protected abstract void addClause(Q topLevel, Term term, float boost) throws IOException;
   
   protected final void collectTerms(IndexReader reader, MultiTermQuery query, TermCollector collector) throws IOException {
-    final FilteredTermEnum enumerator = query.getEnum(reader);
+    final FilteredTermEnum enumerator = getTermsEnum(reader, query);
     try {
       do {
         final Term t = enumerator.term();