Author: yonik Date: Thu Sep 17 18:40:28 2009 New Revision: 816328 URL: http://svn.apache.org/viewvc?rev=816328&view=rev Log: SOLR-1432: deprecate existing getValues(), remove accidentally committed changes
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java lucene/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java Modified: lucene/solr/trunk/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java?rev=816328&r1=816327&r2=816328&view=diff ============================================================================== --- lucene/solr/trunk/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (original) +++ lucene/solr/trunk/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java Thu Sep 17 18:40:28 2009 @@ -68,12 +68,3 @@ } } - -class FunctionConstantScoreQuery extends ConstantScoreQuery { - public FunctionConstantScoreQuery(Filter filter) { - super(filter); - } - - - -} \ No newline at end of file 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=816328&r1=816327&r2=816328&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 Thu Sep 17 18:40:28 2009 @@ -435,7 +435,7 @@ } else if (query instanceof FuzzyQuery) { out.append(query.toString()); writeBoost=false; - } else if (query instanceof SolrConstantScoreQuery) { + } else if (query instanceof ConstantScoreQuery) { out.append(query.toString()); writeBoost=false; } else { Modified: lucene/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java?rev=816328&r1=816327&r2=816328&view=diff ============================================================================== --- lucene/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java (original) +++ lucene/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java Thu Sep 17 18:40:28 2009 @@ -35,6 +35,7 @@ */ public abstract class ValueSource implements Serializable { + @Deprecated public DocValues getValues(IndexReader reader) throws IOException { return getValues(null, reader); }