This is an automated email from the ASF dual-hosted git repository. cpoerschke pushed a commit to branch jira/solr-13350 in repository https://gitbox.apache.org/repos/asf/solr.git
commit d14329d340c20a18b01c3120bc0127f62c2da394 Merge: 07f01620a97 59744b0625d Author: Christine Poerschke <[email protected]> AuthorDate: Tue Apr 23 18:13:37 2024 +0100 Merge remote-tracking branch 'origin/main' into jira/solr-13350 .asf.yaml | 1 + solr/CHANGES.txt | 42 ++++- .../src/java/org/apache/solr/cli/PostLogsTool.java | 2 +- .../apache/solr/core/CachingDirectoryFactory.java | 119 +++++++----- .../apache/solr/core/CancellableQueryTracker.java | 6 +- .../solr/handler/component/HttpShardHandler.java | 79 ++++---- .../component/QueryCancellationComponent.java | 4 +- .../solr/response/QueryResponseWriterUtil.java | 20 +- .../apache/solr/search/CancellableCollector.java | 4 +- .../test/org/apache/solr/cli/TestExportTool.java | 74 ++++++++ .../solr/core/CachingDirectoryFactoryTest.java | 94 ++++++++++ .../org/apache/solr/handler/TestHttpRequestId.java | 34 ++-- .../apache/solr/update/MockingHttp2SolrClient.java | 143 --------------- solr/licenses/commons-cli-1.6.0.jar.sha1 | 1 - solr/licenses/commons-cli-1.7.0.jar.sha1 | 1 + .../org/apache/solr/client/solrj/SolrClient.java | 2 +- .../client/solrj/impl/CloudHttp2SolrClient.java | 105 ++++++----- .../solrj/impl/Http2ClusterStateProvider.java | 4 + .../solr/client/solrj/impl/Http2SolrClient.java | 174 +++++++++++------- .../solr/client/solrj/impl/HttpJdkSolrClient.java | 65 ++----- .../solr/client/solrj/impl/HttpSolrClientBase.java | 43 +++-- .../solr/client/solrj/impl/LBHttp2SolrClient.java | 204 +++++++++++---------- .../solr/client/solrj/impl/LBSolrClient.java | 4 +- .../solr/client/solrj/util/AsyncListener.java | 34 ---- .../apache/solr/client/solrj/util/Cancellable.java | 31 ---- .../org/apache/solr/common/util/ExecutorUtil.java | 20 +- .../impl/CloudHttp2SolrClientBuilderTest.java | 68 ++++++- .../solr/client/solrj/impl/DebugAsyncListener.java | 84 --------- .../client/solrj/impl/HttpJdkSolrClientTest.java | 56 +----- .../client/solrj/impl/HttpSolrClientTestBase.java | 73 ++++---- .../client/solrj/impl/LBHttp2SolrClientTest.java | 182 ++++++++++++++++++ .../solr/client/solrj/impl/LBSolrClientTest.java | 6 +- versions.lock | 2 +- versions.props | 2 +- 34 files changed, 997 insertions(+), 786 deletions(-)
