You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/10/09 12:35:07 UTC
svn commit: r1530556 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/Overseer.java
Author: shalin
Date: Wed Oct 9 10:35:07 2013
New Revision: 1530556
URL: http://svn.apache.org/r1530556
Log:
SOLR-5321: Remove unnecessary code in Overseer.updateState method which tries to use router name from message where none is ever sent
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1530556&r1=1530555&r2=1530556&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Oct 9 10:35:07 2013
@@ -115,6 +115,9 @@ Other Changes
* SOLR-5319: Remove unused and incorrect router name from Collection ZK nodes.
(Jessica Cheng via shalin)
+* SOLR-5321: Remove unnecessary code in Overseer.updateState method which tries to
+ use router name from message where none is ever sent. (shalin)
+
================== 4.5.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1530556&r1=1530555&r2=1530556&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java Wed Oct 9 10:35:07 2013
@@ -308,18 +308,12 @@ public class Overseer {
Integer numShards = message.getInt(ZkStateReader.NUM_SHARDS_PROP, null);
log.info("Update state numShards={} message={}", numShards, message);
- String router = message.getStr(OverseerCollectionProcessor.ROUTER,DocRouter.DEFAULT_NAME);
List<String> shardNames = new ArrayList<String>();
//collection does not yet exist, create placeholders if num shards is specified
boolean collectionExists = state.getCollections().contains(collection);
if (!collectionExists && numShards!=null) {
- if(ImplicitDocRouter.NAME.equals(router)){
- getShardNames(shardNames, message.getStr("shards",null));
- numShards = shardNames.size();
- }else {
- getShardNames(numShards, shardNames);
- }
+ getShardNames(numShards, shardNames);
state = createCollection(state, collection, shardNames, message);
}