You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/11/25 23:17:37 UTC
svn commit: r1206361 -
/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
Author: markrmiller
Date: Fri Nov 25 22:17:37 2011
New Revision: 1206361
URL: http://svn.apache.org/viewvc?rev=1206361&view=rev
Log:
remove nocommit about hard coding the update chain and pass on the update chain that is passed in
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1206361&r1=1206360&r2=1206361&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Fri Nov 25 22:17:37 2011
@@ -42,6 +42,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
@@ -160,14 +161,7 @@ public class SolrCmdDistributor {
if (ureq.getParams() == null) {
ureq.setParams(new ModifiableSolrParams());
}
- String seenLeader = req.getParams().get(
- DistributedUpdateProcessor.SEEN_LEADER);
- if (seenLeader != null) {
- ureq.getParams().add(DistributedUpdateProcessor.SEEN_LEADER, seenLeader);
- }
-
- // nocommit: we add the right update chain - we should add the current one?
- ureq.getParams().add("update.chain", "distrib-update-chain");
+ passOnParams(ureq);
addCommit(ureq, cmd);
submit(ureq, shardStr);
@@ -180,6 +174,18 @@ public class SolrCmdDistributor {
checkResponses(true);
}
}
+
+ private void passOnParams(UpdateRequestExt ureq) {
+ String seenLeader = req.getParams().get(
+ DistributedUpdateProcessor.SEEN_LEADER);
+ if (seenLeader != null) {
+ ureq.getParams().add(DistributedUpdateProcessor.SEEN_LEADER, seenLeader);
+ }
+ String updateChain = req.getParams().get(UpdateParams.UPDATE_CHAIN);
+ if (updateChain != null) {
+ ureq.getParams().add(UpdateParams.UPDATE_CHAIN, updateChain);
+ }
+ }
private void doDelete(DeleteUpdateCommand cmd, String shardStr) throws IOException {
@@ -209,12 +215,8 @@ public class SolrCmdDistributor {
if (ureq.getParams() == null) {
ureq.setParams(new ModifiableSolrParams());
}
- String seenLeader = req.getParams().get(DistributedUpdateProcessor.SEEN_LEADER);
- if (seenLeader != null) {
- ureq.getParams().add(DistributedUpdateProcessor.SEEN_LEADER, seenLeader);
- }
- // nocommit: we add the right update chain - we should add the current one?
- ureq.getParams().add("update.chain", "distrib-update-chain");
+
+ passOnParams(ureq);
addCommit(ureq, ccmd);
for (AddUpdateCommand cmd : alist) {
@@ -236,14 +238,9 @@ public class SolrCmdDistributor {
ureq.setParams(new ModifiableSolrParams());
}
- String seenLeader = req.getParams().get(DistributedUpdateProcessor.SEEN_LEADER);
- if (seenLeader != null) {
- ureq.getParams().add(DistributedUpdateProcessor.SEEN_LEADER, seenLeader);
- }
-
- // nocommit: we add the right update chain - we should add the current one?
- ureq.getParams().add("update.chain", "distrib-update-chain");
+ passOnParams(ureq);
addCommit(ureq, ccmd);
+
for (DeleteUpdateCommand cmd : dlist) {
if (cmd.id != null) {
ureq.deleteById(cmd.id);