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 2014/04/02 18:31:48 UTC
svn commit: r1584083 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/update/ core/src/test/org/apache/solr/update/
solrj/src/java/org/apache/solr/client/solrj/request/
Author: shalin
Date: Wed Apr 2 16:31:47 2014
New Revision: 1584083
URL: http://svn.apache.org/r1584083
Log:
SOLR-5943: SolrCmdDistributor does not distribute the openSearcher parameter
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1584083&r1=1584082&r2=1584083&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Apr 2 16:31:47 2014
@@ -183,6 +183,9 @@ Bug Fixes
* SOLR-5915: Attempts to specify the parserImpl for
solr.PreAnalyzedField fieldtype failed. (Mike McCandless)
+* SOLR-5943: SolrCmdDistributor does not distribute the openSearcher parameter.
+ (ludovic Boutros via shalin)
+
Optimizations
----------------------
* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1584083&r1=1584082&r2=1584083&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Wed Apr 2 16:31:47 2014
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -206,7 +205,7 @@ public class SolrCmdDistributor {
void addCommit(UpdateRequest ureq, CommitUpdateCommand cmd) {
if (cmd == null) return;
ureq.setAction(cmd.optimize ? AbstractUpdateRequest.ACTION.OPTIMIZE
- : AbstractUpdateRequest.ACTION.COMMIT, false, cmd.waitSearcher, cmd.maxOptimizeSegments, cmd.softCommit, cmd.expungeDeletes);
+ : AbstractUpdateRequest.ACTION.COMMIT, false, cmd.waitSearcher, cmd.maxOptimizeSegments, cmd.softCommit, cmd.expungeDeletes, cmd.openSearcher);
}
private void submit(Req req) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java?rev=1584083&r1=1584082&r2=1584083&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java Wed Apr 2 16:31:47 2014
@@ -25,11 +25,13 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.request.LukeRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
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.ConfigSolr;
import org.apache.solr.core.CoreContainer;
@@ -321,6 +323,8 @@ public class SolrCmdDistributorTest exte
testOneRetry();
testRetryNodeAgainstBadAddress();
testRetryNodeWontRetrySocketError();
+
+ testDistribOpenSearcher();
}
private void testMaxRetries() throws IOException {
@@ -511,4 +515,23 @@ public class SolrCmdDistributorTest exte
updateShardHandler.close();
super.tearDown();
}
+
+ private void testDistribOpenSearcher() {
+ SolrCmdDistributor cmdDistrib = new SolrCmdDistributor(updateShardHandler);
+ UpdateRequest updateRequest = new UpdateRequest();
+
+ CommitUpdateCommand ccmd = new CommitUpdateCommand(null, false);
+
+ //test default value (should be true)
+ cmdDistrib.addCommit(updateRequest, ccmd);
+ boolean openSearcher = updateRequest.getParams().getBool(UpdateParams.OPEN_SEARCHER,false);
+ assertTrue(openSearcher);
+
+ //test openSearcher = false
+ ccmd.openSearcher = false;
+
+ cmdDistrib.addCommit(updateRequest, ccmd);
+ openSearcher = updateRequest.getParams().getBool(UpdateParams.OPEN_SEARCHER,true);
+ assertFalse(openSearcher);
+ }
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java?rev=1584083&r1=1584082&r2=1584083&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java Wed Apr 2 16:31:47 2014
@@ -83,6 +83,12 @@ public abstract class AbstractUpdateRequ
return setAction(action, waitFlush, waitSearcher,maxSegments,false,expungeDeletes);
}
+ public AbstractUpdateRequest setAction(ACTION action, boolean waitFlush, boolean waitSearcher, int maxSegments, boolean softCommit, boolean expungeDeletes, boolean openSearcher) {
+ setAction(action, waitFlush, waitSearcher, maxSegments, softCommit, expungeDeletes);
+ params.set(UpdateParams.OPEN_SEARCHER, String.valueOf(openSearcher));
+ return this;
+ }
+
/**
* @since Solr 1.4
*/