Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed some unused variables from DistributedUpdateProcessor

This commit is contained in:
Tomas Fernandez Lobbe 2019-01-25 18:17:32 -08:00
parent 1d13d3df03
commit 0add3bb0ac
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
View File

@ -31,9 +31,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletionService;
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
@ -63,7 +60,6 @@ import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.RoutingRule; import org.apache.solr.common.cloud.RoutingRule;
import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.Slice.State; import org.apache.solr.common.cloud.Slice.State;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkCoreNodeProps; import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.cloud.ZooKeeperException; import org.apache.solr.common.cloud.ZooKeeperException;
@ -561,7 +557,6 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
ZkStateReader.COLLECTION_PROP, collection, ZkStateReader.COLLECTION_PROP, collection,
ZkStateReader.SHARD_ID_PROP, myShardId, ZkStateReader.SHARD_ID_PROP, myShardId,
"routeKey", routeKey + "!"); "routeKey", routeKey + "!");
SolrZkClient zkClient = zkController.getZkClient();
zkController.getOverseer().offerStateUpdate(Utils.toJSON(map)); zkController.getOverseer().offerStateUpdate(Utils.toJSON(map));
} catch (KeeperException e) { } catch (KeeperException e) {
log.warn("Exception while removing routing rule for route key: " + routeKey, e); log.warn("Exception while removing routing rule for route key: " + routeKey, e);
@ -1097,7 +1092,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
versionOnUpdate = 0; versionOnUpdate = 0;
} }
boolean updated = getUpdatedDocument(cmd, versionOnUpdate); getUpdatedDocument(cmd, versionOnUpdate);
// leaders can also be in buffering state during "migrate" API call, see SOLR-5308 // leaders can also be in buffering state during "migrate" API call, see SOLR-5308
if (forwardedFromCollection && ulog.getState() != UpdateLog.State.ACTIVE if (forwardedFromCollection && ulog.getState() != UpdateLog.State.ACTIVE
@ -1955,8 +1950,6 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
&& node.getNodeProps().getCoreName().equals(req.getCore().getName())); && node.getNodeProps().getCoreName().equals(req.getCore().getName()));
} }
CompletionService<Exception> completionService = new ExecutorCompletionService<>(req.getCore().getCoreContainer().getUpdateShardHandler().getUpdateExecutor());
Set<Future<Exception>> pending = new HashSet<>();
if (!zkEnabled || (!isLeader && req.getParams().get(COMMIT_END_POINT, "").equals("replicas"))) { if (!zkEnabled || (!isLeader && req.getParams().get(COMMIT_END_POINT, "").equals("replicas"))) {
if (replicaType == Replica.Type.TLOG) { if (replicaType == Replica.Type.TLOG) {