You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/08/29 14:06:03 UTC
svn commit: r1378512 - in /lucene/dev/trunk/solr:
core/src/java/org/apache/solr/cloud/Overseer.java
solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
Author: siren
Date: Wed Aug 29 12:06:03 2012
New Revision: 1378512
URL: http://svn.apache.org/viewvc?rev=1378512&view=rev
Log:
reuse existing code, baseUrl and coreName can no longer be null
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1378512&r1=1378511&r2=1378512&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java Wed Aug 29 12:06:03 2012
@@ -166,17 +166,12 @@ public class Overseer {
} else if (DELETECORE.equals(operation)) {
clusterState = removeCore(clusterState, message);
} else if (ZkStateReader.LEADER_PROP.equals(operation)) {
- StringBuilder sb = new StringBuilder();
String baseUrl = message.get(ZkStateReader.BASE_URL_PROP);
String coreName = message.get(ZkStateReader.CORE_NAME_PROP);
- sb.append(baseUrl);
- if (!baseUrl.endsWith("/")) sb.append("/");
- sb.append(coreName == null ? "" : coreName);
- if (!(sb.substring(sb.length() - 1).equals("/"))) sb
- .append("/");
+ final String leaderUrl = ZkCoreNodeProps.getCoreUrl(baseUrl, coreName);
clusterState = setShardLeader(clusterState,
message.get(ZkStateReader.COLLECTION_PROP),
- message.get(ZkStateReader.SHARD_ID_PROP), sb.toString());
+ message.get(ZkStateReader.SHARD_ID_PROP), leaderUrl);
} else {
throw new RuntimeException("unknown operation:" + operation
+ " contents:" + message.getProperties());
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java?rev=1378512&r1=1378511&r2=1378512&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java Wed Aug 29 12:06:03 2012
@@ -24,7 +24,6 @@ public class ZkCoreNodeProps {
this.nodeProps = nodeProps;
}
- // may return null
public String getCoreUrl() {
return getCoreUrl(nodeProps.get(ZkStateReader.BASE_URL_PROP), nodeProps.get(ZkStateReader.CORE_NAME_PROP));
}
@@ -51,13 +50,10 @@ public class ZkCoreNodeProps {
public static String getCoreUrl(String baseUrl, String coreName) {
StringBuilder sb = new StringBuilder();
- if (baseUrl == null) return null;
- if (coreName == null) return null;
sb.append(baseUrl);
if (!baseUrl.endsWith("/")) sb.append("/");
- sb.append(coreName == null ? "" : coreName);
+ sb.append(coreName);
if (!(sb.substring(sb.length() - 1).equals("/"))) sb.append("/");
-
return sb.toString();
}