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 2015/11/02 20:28:12 UTC
svn commit: r1712123 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
Author: cpoerschke
Date: Mon Nov 2 19:28:11 2015
New Revision: 1712123
URL: http://svn.apache.org/viewvc?rev=1712123&view=rev
Log:
SOLR-8218: DistributedUpdateProcessor (initialCapacity) tweaks (merge in revision 1712087 from trunk)
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/update/processor/DistributedUpdateProcessor.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=1712123&r1=1712122&r2=1712123&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Nov 2 19:28:11 2015
@@ -298,6 +298,9 @@ Other Changes
* SOLR-8221: MiniSolrCloudCluster should create subdirectories for its nodes
(Alan Woodward)
+* SOLR-8218: DistributedUpdateProcessor (initialCapacity) tweaks
+ (Christine Poerschke)
+
================== 5.3.1 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1712123&r1=1712122&r2=1712123&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Mon Nov 2 19:28:11 2015
@@ -527,7 +527,6 @@ public class DistributedUpdateProcessor
int hash = compositeIdRouter.sliceHash(id, doc, null, coll);
for (DocRouter.Range range : ranges) {
if (range.includes(hash)) {
- if (nodes == null) nodes = new ArrayList<>();
DocCollection targetColl = cstate.getCollection(rule.getTargetCollectionName());
Collection<Slice> activeSlices = targetColl.getRouter().getSearchSlicesSingle(id, null, targetColl);
if (activeSlices == null || activeSlices.isEmpty()) {
@@ -535,6 +534,7 @@ public class DistributedUpdateProcessor
"No active slices serving " + id + " found for target collection: " + rule.getTargetCollectionName());
}
Replica targetLeader = cstate.getLeader(rule.getTargetCollectionName(), activeSlices.iterator().next().getName());
+ if (nodes == null) nodes = new ArrayList<>(1);
nodes.add(new StdNode(new ZkCoreNodeProps(targetLeader)));
break;
}
@@ -721,7 +721,7 @@ public class DistributedUpdateProcessor
cmdDistrib.distribAdd(cmd, Collections.singletonList(subShardLeader), params, true);
}
}
- List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getHashableId(), cmd.getSolrInputDocument());
+ final List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getHashableId(), cmd.getSolrInputDocument());
if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) {
ModifiableSolrParams params = new ModifiableSolrParams(filterParams(req.getParams()));
params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());
@@ -756,7 +756,7 @@ public class DistributedUpdateProcessor
// TODO: what to do when no idField?
if (returnVersions && rsp != null && idField != null) {
if (addsResponse == null) {
- addsResponse = new NamedList<String>();
+ addsResponse = new NamedList<String>(1);
rsp.add("adds",addsResponse);
}
if (scratch == null) scratch = new CharsRefBuilder();
@@ -1151,7 +1151,7 @@ public class DistributedUpdateProcessor
cmdDistrib.distribDelete(cmd, subShardLeaders, params, true);
}
- List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getId(), null);
+ final List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, cmd.getId(), null);
if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) {
ModifiableSolrParams params = new ModifiableSolrParams(filterParams(req.getParams()));
params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());
@@ -1183,7 +1183,7 @@ public class DistributedUpdateProcessor
// TODO: what to do when no idField?
if (returnVersions && rsp != null && cmd.getIndexedId() != null && idField != null) {
if (deleteResponse == null) {
- deleteResponse = new NamedList<String>();
+ deleteResponse = new NamedList<String>(1);
rsp.add("deletes",deleteResponse);
}
if (scratch == null) scratch = new CharsRefBuilder();
@@ -1366,7 +1366,7 @@ public class DistributedUpdateProcessor
List<ZkCoreNodeProps> replicaProps = zkController.getZkStateReader()
.getReplicaProps(collection, myShardId, leaderReplica.getName(), null, Replica.State.DOWN);
if (replicaProps != null) {
- List<Node> myReplicas = new ArrayList<>();
+ final List<Node> myReplicas = new ArrayList<>(replicaProps.size());
for (ZkCoreNodeProps replicaProp : replicaProps) {
myReplicas.add(new StdNode(replicaProp, collection, myShardId));
}
@@ -1384,7 +1384,7 @@ public class DistributedUpdateProcessor
if (subShardLeaders != null) {
cmdDistrib.distribDelete(cmd, subShardLeaders, params, true);
}
- List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, null, null);
+ final List<Node> nodesByRoutingRules = getNodesByRoutingRules(zkController.getClusterState(), coll, null, null);
if (nodesByRoutingRules != null && !nodesByRoutingRules.isEmpty()) {
params = new ModifiableSolrParams(filterParams(req.getParams()));
params.set(DISTRIB_UPDATE_PARAM, DistribPhase.FROMLEADER.toString());
@@ -1408,7 +1408,7 @@ public class DistributedUpdateProcessor
if (returnVersions && rsp != null) {
if (deleteByQueryResponse == null) {
- deleteByQueryResponse = new NamedList<String>();
+ deleteByQueryResponse = new NamedList<String>(1);
rsp.add("deleteByQuery",deleteByQueryResponse);
}
deleteByQueryResponse.add(cmd.getQuery(), cmd.getVersion());
@@ -1630,12 +1630,12 @@ public class DistributedUpdateProcessor
private List<Node> getCollectionUrls(SolrQueryRequest req, String collection) {
ClusterState clusterState = req.getCore().getCoreDescriptor()
.getCoreContainer().getZkController().getClusterState();
- List<Node> urls = new ArrayList<>();
Map<String,Slice> slices = clusterState.getSlicesMap(collection);
if (slices == null) {
throw new ZooKeeperException(ErrorCode.BAD_REQUEST,
"Could not find collection in zk: " + clusterState);
}
+ final List<Node> urls = new ArrayList<>(slices.size());
for (Map.Entry<String,Slice> sliceEntry : slices.entrySet()) {
Slice replicas = slices.get(sliceEntry.getKey());
@@ -1648,7 +1648,7 @@ public class DistributedUpdateProcessor
}
}
}
- if (urls.size() == 0) {
+ if (urls.isEmpty()) {
return null;
}
return urls;