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 2013/10/19 05:24:09 UTC
svn commit: r1533684 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/update/
solrj/src/java/org/apache/solr/client/solrj/impl/
Author: markrmiller
Date: Sat Oct 19 03:24:08 2013
New Revision: 1533684
URL: http://svn.apache.org/r1533684
Log:
SOLR-5223: SolrCloud should use the JavaBin binary format for communication by default.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrServers.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1533684&r1=1533683&r2=1533684&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Oct 19 03:24:08 2013
@@ -114,6 +114,9 @@ Optimizations
* SOLR-5232: SolrCloud should distribute updates via streaming rather than buffering.
(Mark Miller)
+
+* SOLR-5223: SolrCloud should use the JavaBin binary format for communication by default.
+ (Mark Miller)
Security
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrServers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrServers.java?rev=1533684&r1=1533683&r2=1533684&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrServers.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/StreamingSolrServers.java Sat Oct 19 03:24:08 2013
@@ -83,7 +83,8 @@ public class StreamingSolrServers {
errors.add(error);
}
};
-
+ server.setParser(new BinaryResponseParser());
+ server.setRequestWriter(new BinaryRequestWriter());
server.setPollQueueTime(0);
solrServers.put(url, server);
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1533684&r1=1533683&r2=1533684&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java Sat Oct 19 03:24:08 2013
@@ -44,6 +44,7 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
import org.apache.solr.client.solrj.request.IsUpdateRequest;
+import org.apache.solr.client.solrj.request.RequestWriter;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrException;
@@ -122,6 +123,8 @@ public class CloudSolrServer extends Sol
this.zkHost = zkHost;
this.myClient = HttpClientUtil.createClient(null);
this.lbServer = new LBHttpSolrServer(myClient);
+ this.lbServer.setRequestWriter(new BinaryRequestWriter());
+ this.lbServer.setParser(new BinaryResponseParser());
this.updatesToLeaders = true;
shutdownLBHttpSolrServer = true;
}
@@ -131,6 +134,8 @@ public class CloudSolrServer extends Sol
this.zkHost = zkHost;
this.myClient = HttpClientUtil.createClient(null);
this.lbServer = new LBHttpSolrServer(myClient);
+ this.lbServer.setRequestWriter(new BinaryRequestWriter());
+ this.lbServer.setParser(new BinaryResponseParser());
this.updatesToLeaders = updatesToLeaders;
shutdownLBHttpSolrServer = true;
}
@@ -175,6 +180,14 @@ public class CloudSolrServer extends Sol
public void setParser(ResponseParser processor) {
lbServer.setParser(processor);
}
+
+ public RequestWriter getRequestWriter() {
+ return lbServer.getRequestWriter();
+ }
+
+ public void setRequestWriter(RequestWriter requestWriter) {
+ lbServer.setRequestWriter(requestWriter);
+ }
public ZkStateReader getZkStateReader() {
return zkStateReader;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1533684&r1=1533683&r2=1533684&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java Sat Oct 19 03:24:08 2013
@@ -606,6 +606,10 @@ public class LBHttpSolrServer extends So
this.requestWriter = requestWriter;
}
+ public RequestWriter getRequestWriter() {
+ return requestWriter;
+ }
+
@Override
protected void finalize() throws Throwable {
try {