svn commit: r882619 - in /lucene/solr/trunk/src/java/org/apache/solr: schema/TrieDateField.java schema/TrieField.java search/QueryParsing.java search/SolrQueryWrapper.java

[ma...@apache.org]

Author: markrmiller
Date: Fri Nov 20 15:55:00 2009
New Revision: 882619

URL: http://svn.apache.org/viewvc?rev=882619&view=rev
Log:
Remove QueryWrapper

Removed:
    lucene/solr/trunk/src/java/org/apache/solr/search/SolrQueryWrapper.java
Modified:
    lucene/solr/trunk/src/java/org/apache/solr/schema/TrieDateField.java
    lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java
    lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/TrieDateField.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/TrieDateField.java?rev=882619&r1=882618&r2=882619&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/TrieDateField.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/TrieDateField.java Fri Nov 20 15:55:00 2009
@@ -24,7 +24,6 @@
 import org.apache.solr.analysis.TrieTokenizerFactory;
 import org.apache.solr.search.function.*;
 import org.apache.solr.search.QParser;
-import org.apache.solr.search.SolrQueryWrapper;
 import org.apache.solr.request.XMLWriter;
 import org.apache.solr.request.TextResponseWriter;
 import org.apache.lucene.document.Fieldable;
@@ -205,9 +204,6 @@
               max == null ? null : max.getTime(),
               minInclusive, maxInclusive);
 
-    // NumericRangeQuery extends MultiTermQuery but returns null for getTerm() which currently breaks
-    // the span based highlighter in Lucene 2.9.0.  Wrapping the query prevents the highlighter
-    // from calling getTerm()
-    return new SolrQueryWrapper(query);
+    return query;
   }
 }

Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java?rev=882619&r1=882618&r2=882619&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java Fri Nov 20 15:55:00 2009
@@ -22,19 +22,16 @@
 import org.apache.lucene.util.NumericUtils;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.NumericTokenStream;
-import org.apache.lucene.index.IndexReader;
 import org.apache.solr.analysis.*;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.request.TextResponseWriter;
 import org.apache.solr.request.XMLWriter;
 import org.apache.solr.search.QParser;
-import org.apache.solr.search.SolrQueryWrapper;
 import org.apache.solr.search.function.*;
 
 import java.io.IOException;
 import java.util.Map;
 import java.util.Date;
-import java.util.Set;
 
 /**
  * Provides field types to support for Lucene's Trie Range Queries.
@@ -265,10 +262,7 @@
         throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field");
     }
 
-    // NumericRangeQuery extends MultiTermQuery but returns null for getTerm() which currently breaks
-    // the span based highlighter in Lucene 2.9.0.  Wrapping the query prevents the highlighter
-    // from calling getTerm()
-    return new SolrQueryWrapper(query);
+    return query;
   }
 
 

Modified: lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java?rev=882619&r1=882618&r2=882619&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java Fri Nov 20 15:55:00 2009
@@ -29,7 +29,6 @@
 import org.apache.solr.schema.FieldType;
 import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.schema.SchemaField;
-import org.apache.solr.search.SolrQueryWrapper;
 import org.apache.solr.search.function.FunctionQuery;
 
 import java.io.IOException;
@@ -441,9 +440,6 @@
     } else if (query instanceof ConstantScoreQuery) {
       out.append(query.toString());
       writeBoost=false;
-    } else if (query instanceof SolrQueryWrapper) {
-      toString(((SolrQueryWrapper)query).getWrappedQuery(), schema, out, flags);
-      return;
     } else {
       out.append(query.getClass().getSimpleName()
               + '(' + query.toString() + ')' );