You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/01/20 13:58:58 UTC
svn commit: r1725711 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/handler/
solr/core/src/java/org/apache/solr/search/ solr/solrj/
solr/solrj/src/java/org/apache/solr/common/params/
solr/solrj/src/test/org/...
Author: cpoerschke
Date: Wed Jan 20 12:58:58 2016
New Revision: 1725711
URL: http://svn.apache.org/viewvc?rev=1725711&view=rev
Log:
SOLR-8565: add & use CommonParams.(ROWS|START)_DEFAULT constants, add CommonParamsTest (merge in revision 1725708 from trunk)
Added:
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/params/CommonParamsTest.java
- copied unchanged from r1725708, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/params/CommonParamsTest.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QParser.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1725711&r1=1725710&r2=1725711&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Jan 20 12:58:58 2016
@@ -338,6 +338,8 @@ Other Changes
* SOLR-8566: various initialCapacity tweaks (Fix Versions: trunk 5.5)
(Christine Poerschke)
+* SOLR-8565: add & use CommonParams.(ROWS|START)_DEFAULT constants (Christine Poerschke)
+
================== 5.4.1 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java?rev=1725711&r1=1725710&r2=1725711&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java Wed Jan 20 12:58:58 2016
@@ -166,8 +166,8 @@ public class MoreLikeThisHandler extends
}
}
- int start = params.getInt(CommonParams.START, 0);
- int rows = params.getInt(CommonParams.ROWS, 10);
+ int start = params.getInt(CommonParams.START, CommonParams.START_DEFAULT);
+ int rows = params.getInt(CommonParams.ROWS, CommonParams.ROWS_DEFAULT);
// Find documents MoreLikeThis - either with a reader or a query
// --------------------------------------------------------------------------------
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QParser.java?rev=1725711&r1=1725710&r2=1725711&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QParser.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QParser.java Wed Jan 20 12:58:58 2016
@@ -241,8 +241,8 @@ public abstract class QParser {
}
}
- int start = startS != null ? Integer.parseInt(startS) : 0;
- int rows = rowsS != null ? Integer.parseInt(rowsS) : 10;
+ int start = startS != null ? Integer.parseInt(startS) : CommonParams.START_DEFAULT;
+ int rows = rowsS != null ? Integer.parseInt(rowsS) : CommonParams.ROWS_DEFAULT;
SortSpec sort = SortSpecParsing.parseSortSpec(sortStr, req);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java?rev=1725711&r1=1725710&r2=1725711&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java Wed Jan 20 12:58:58 2016
@@ -90,8 +90,8 @@ public class ReRankQParserPlugin extends
double reRankWeight = localParams.getDouble("reRankWeight",2.0d);
- int start = params.getInt(CommonParams.START,0);
- int rows = params.getInt(CommonParams.ROWS,10);
+ int start = params.getInt(CommonParams.START,CommonParams.START_DEFAULT);
+ int rows = params.getInt(CommonParams.ROWS,CommonParams.ROWS_DEFAULT);
int length = start+rows;
return new ReRankQuery(reRankQuery, reRankDocs, reRankWeight, length);
}
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java?rev=1725711&r1=1725710&r2=1725711&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java Wed Jan 20 12:58:58 2016
@@ -62,9 +62,11 @@ public interface CommonParams {
/** zero based offset of matching documents to retrieve */
public static final String START ="start";
+ public static final int START_DEFAULT = 0;
/** number of documents to return starting at "start" */
public static final String ROWS ="rows";
+ public static final int ROWS_DEFAULT = 10;
// SOLR-4228 start
/** handler value for SolrPing */
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java?rev=1725711&r1=1725710&r2=1725711&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java Wed Jan 20 12:58:58 2016
@@ -63,7 +63,7 @@ public interface TermsParams {
public static final String TERMS_LOWER_INCLUSIVE = TERMS_PREFIX + "lower.incl";
/**
- * Optional. The number of results to return. If not specified, looks for {@link org.apache.solr.common.params.CommonParams#ROWS}. If that's not specified, uses 10.
+ * Optional. The number of results to return. If not specified, looks for {@link org.apache.solr.common.params.CommonParams#ROWS}. If that's not specified, uses {@link org.apache.solr.common.params.CommonParams#ROWS_DEFAULT}.
*/
public static final String TERMS_LIMIT = TERMS_PREFIX + "limit";