Apache Solr open-source search software
SOLR-17884: Don't depend on Apache HttpClient (#3792)
David Smiley5d8a53942ae7
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.javaindex bc41a64136e..4cb6a598432 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java@@ -62,7 +62,7 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.cloud.SolrCloudManager;import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;+import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.impl.SolrClientCloudManager;import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider;@@ -2306,12 +2306,13 @@ public class ZkController implements Closeable {}// short timeouts, we may be in a storm and this is just best effort, and maybe we should be- // the- // leader now+ // the leader now+ // TODO ideally want 8sec connection timeout but can't easily also share the client+ // listenerstry (SolrClient client =- new Builder(leaderBaseUrl)- .withConnectionTimeout(8000, TimeUnit.MILLISECONDS)- .withSocketTimeout(30000, TimeUnit.MILLISECONDS)+ new Http2SolrClient.Builder(leaderBaseUrl)+ .withHttpClient(getCoreContainer().getDefaultHttpSolrClient())+ .withIdleTimeout(30000, TimeUnit.MILLISECONDS).build()) {WaitForState prepCmd = new WaitForState();prepCmd.setCoreName(leaderCoreName);diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.javaindex d5b71d57219..5228f98dae3 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java@@ -28,7 +28,7 @@ import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudSolrClient;-import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;+import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.util.SimpleOrderedMap;@@ -124,7 +124,7 @@ class DatabaseMetaDataImpl implements DatabaseMetaData {for (String node : liveNodes) {try {String nodeURL = Utils.getBaseUrlForNodeName(node, urlScheme);- solrClient = new Builder(nodeURL).build();+ solrClient = new Http2SolrClient.Builder(nodeURL).build();QueryResponse rsp = solrClient.query(sysQuery);return String.valueOf(diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.javaindex 58f59eb8eaf..91f57fe55cc 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java@@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;-import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient.Update;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.util.ClientUtils;import org.apache.solr.common.SolrException;@@ -177,6 +176,9 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {// processedCount is now managed by StallDetection}+ /** Class representing an UpdateRequest and an optional collection. */+ private record Update(UpdateRequest request, String collection) {}+/** Opens a connection and sends everything... */class Runner implements Runnable {@@ -237,16 +239,16 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {InputStreamResponseListener responseListener = null;try (Http2SolrClient.OutStream out =- client.initOutStream(basePath, update.getRequest(), update.getCollection())) {+ client.initOutStream(basePath, update.request(), update.collection())) {Update upd = update;while (upd != null) {- UpdateRequest req = upd.getRequest();- if (!out.belongToThisStream(req, upd.getCollection())) {+ UpdateRequest req = upd.request();+ if (!out.belongToThisStream(req, upd.collection())) {// Request has different params or destination core/collection, return to queuequeue.add(upd);break;}- client.send(out, upd.getRequest(), upd.getCollection());+ client.send(out, upd.request(), upd.collection());out.flush();notifyQueueAndRunnersIfEmptyQueue();