You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/06/28 19:20:17 UTC
svn commit: r1688027 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/ solr/solrj/
solr/solrj/src/java/org/apache/solr/common/params/
solr/solrj/src/test/org/apache/solr/client/solrj/impl/
solr/solrj/src/test/...
Author: andyetitmoves
Date: Sun Jun 28 17:20:17 2015
New Revision: 1688027
URL: http://svn.apache.org/r1688027
Log:
SOLR-7485: Replace shards.info occurrences with ShardParams.SHARDS_INFO
Added:
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
- copied unchanged from r1688025, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.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/test/org/apache/solr/TestTolerantSearch.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.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=1688027&r1=1688026&r2=1688027&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sun Jun 28 17:20:17 2015
@@ -196,6 +196,9 @@ Other Changes
* SOLR-7711: Correct initial capacity for the list that holds the default components for the SearchHandler
(Christine Poerschke via Varun Thacker)
+* SOLR-7485: Replace shards.info occurrences with ShardParams.SHARDS_INFO
+ (Christine Poerschke via Ramkumar Aiyengar)
+
================== 5.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestTolerantSearch.java?rev=1688027&r1=1688026&r2=1688027&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestTolerantSearch.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestTolerantSearch.java Sun Jun 28 17:20:17 2015
@@ -141,7 +141,7 @@ public class TestTolerantSearch extends
query.set(ShardParams.SHARDS_TOLERANT, "true");
QueryResponse response = collection1.query(query);
assertTrue(response.getResponseHeader().getBooleanArg("partialResults"));
- NamedList<Object> shardsInfo = ((NamedList<Object>)response.getResponse().get("shards.info"));
+ NamedList<Object> shardsInfo = ((NamedList<Object>)response.getResponse().get(ShardParams.SHARDS_INFO));
boolean foundError = false;
for (int i = 0; i < shardsInfo.size(); i++) {
if (shardsInfo.getName(i).contains("collection2")) {
@@ -189,7 +189,7 @@ public class TestTolerantSearch extends
query.set(ShardParams.SHARDS_TOLERANT, "true");
QueryResponse response = collection1.query(query);
assertTrue(response.getResponseHeader().getBooleanArg("partialResults"));
- NamedList<Object> shardsInfo = ((NamedList<Object>)response.getResponse().get("shards.info"));
+ NamedList<Object> shardsInfo = ((NamedList<Object>)response.getResponse().get(ShardParams.SHARDS_INFO));
boolean foundError = false;
for (int i = 0; i < shardsInfo.size(); i++) {
if (shardsInfo.getName(i).contains("collection2")) {
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java?rev=1688027&r1=1688026&r2=1688027&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java Sun Jun 28 17:20:17 2015
@@ -19,6 +19,10 @@ package org.apache.solr.common.params;
/**
* Parameters used for distributed search.
+ *
+ * When adding a new parameter here, please also add the corresponding
+ * one-line test case in the ShardParamsTest class.
+ *
*/
public interface ShardParams {
/** the shards to use (distributed configuration) */
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java?rev=1688027&r1=1688026&r2=1688027&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java Sun Jun 28 17:20:17 2015
@@ -423,7 +423,7 @@ public class CloudSolrClientTest extends
ModifiableSolrParams qParams = new ModifiableSolrParams();
qParams.add("preferLocalShards", Boolean.toString(preferLocalShards));
- qParams.add("shards.info", "true");
+ qParams.add(ShardParams.SHARDS_INFO, "true");
qRequest.add(qParams);
// CloudSolrClient sends the request to some node.
@@ -432,8 +432,8 @@ public class CloudSolrClientTest extends
// local shards only
QueryResponse qResponse = cloudClient.query (qRequest);
- Object shardsInfo = qResponse.getResponse().get("shards.info");
- assertNotNull("Unable to obtain shards.info", shardsInfo);
+ Object shardsInfo = qResponse.getResponse().get(ShardParams.SHARDS_INFO);
+ assertNotNull("Unable to obtain "+ShardParams.SHARDS_INFO, shardsInfo);
// Iterate over shards-info and check what cores responded
SimpleOrderedMap<?> shardsInfoMap = (SimpleOrderedMap<?>)shardsInfo;
@@ -441,9 +441,9 @@ public class CloudSolrClientTest extends
List<String> shardAddresses = new ArrayList<String>();
while (itr.hasNext()) {
Map.Entry<String, ?> e = itr.next();
- assertTrue("Did not find map-type value in shards.info", e.getValue() instanceof Map);
+ assertTrue("Did not find map-type value in "+ShardParams.SHARDS_INFO, e.getValue() instanceof Map);
String shardAddress = (String)((Map)e.getValue()).get("shardAddress");
- assertNotNull("shards.info did not return 'shardAddress' parameter", shardAddress);
+ assertNotNull(ShardParams.SHARDS_INFO+" did not return 'shardAddress' parameter", shardAddress);
shardAddresses.add(shardAddress);
}
log.info("Shards giving the response: " + Arrays.toString(shardAddresses.toArray()));