You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2024/03/01 13:24:53 UTC
(solr) 02/02: Merge remote-tracking branch 'origin/main' into jira/solr-13350
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 cc04058c9f774a43365259f420a3ac7dd6c7cf75
Merge: 34c7db09e08 8bfab45afa4
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Mar 1 13:22:21 2024 +0000
Merge remote-tracking branch 'origin/main' into jira/solr-13350
.github/workflows/gradle-precommit.yml | 2 +-
README.md | 23 +-
dev-docs/running-in-docker.adoc | 6 +-
solr/.gitattributes | 1 -
solr/CHANGES.txt | 14 +
solr/bin/init.d/solr | 78 --
solr/bin/install_solr_service.sh | 63 +-
solr/bin/post | 240 ----
solr/bin/postlogs | 37 -
solr/bin/solr | 6 +
solr/bin/solr.cmd | 2 +-
solr/{.gitattributes => bin/systemd/solr.service} | 49 +-
.../src/java/org/apache/solr/cli/PostTool.java | 22 +-
.../java/org/apache/solr/cli/RunExampleTool.java | 26 +-
.../java/org/apache/solr/cli/SimplePostTool.java | 1427 --------------------
.../apache/solr/handler/MoreLikeThisHandler.java | 3 +
.../apache/solr/handler/RequestHandlerBase.java | 10 +-
.../solr/handler/component/ExpandComponent.java | 8 +
.../solr/handler/component/FacetComponent.java | 13 +-
.../solr/handler/component/HighlightComponent.java | 3 +
.../handler/component/HttpShardHandlerFactory.java | 6 +-
.../handler/component/MoreLikeThisComponent.java | 10 +
.../solr/handler/component/QueryComponent.java | 7 +-
.../solr/handler/component/ResponseBuilder.java | 4 +-
.../solr/handler/component/SearchHandler.java | 9 +-
.../handler/component/SpellCheckComponent.java | 21 +-
.../solr/handler/component/SuggestComponent.java | 30 +-
.../org/apache/solr/request/SolrRequestInfo.java | 5 +-
.../apache/solr/response/SolrQueryResponse.java | 43 +-
.../java/org/apache/solr/search/QueryLimits.java | 104 +-
.../solr/search/QueryLimitsExceededException.java | 26 +
.../org/apache/solr/search/SolrIndexSearcher.java | 21 +-
.../org/apache/solr/search/facet/FacetModule.java | 5 +-
.../SearchGroupShardResponseProcessor.java | 6 +-
.../TopGroupsShardResponseProcessor.java | 6 +-
.../apache/solr/spelling/SpellCheckCollator.java | 6 +
.../java/org/apache/solr/util/TestInjection.java | 4 +
.../test/org/apache/solr/TestGroupingSearch.java | 22 +-
.../org/apache/solr/TestSolrCoreProperties.java | 3 +-
.../src/test/org/apache/solr/cli/PostToolTest.java | 62 +-
.../org/apache/solr/cli/SimplePostToolTest.java | 286 ----
.../org/apache/solr/cli/TestSolrCLIRunExample.java | 2 +-
.../cloud/ConcurrentCreateRoutedAliasTest.java | 3 +-
.../solr/cloud/NestedShardedAtomicUpdateTest.java | 6 +
.../org/apache/solr/cloud/SSLMigrationTest.java | 2 +-
.../solr/cloud/TestConfigSetsAPIExclusivity.java | 3 +-
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 3 +-
.../apache/solr/cloud/TestRequestForwarding.java | 3 +-
.../cloud/TestWaitForStateWithJettyShutdowns.java | 5 +-
.../ConcurrentDeleteAndCreateCollectionTest.java | 3 +-
.../org/apache/solr/handler/JsonLoaderTest.java | 6 +
.../solr/handler/PingRequestHandlerTest.java | 3 +-
.../org/apache/solr/handler/V2StandaloneTest.java | 3 +-
.../solr/handler/admin/CoreAdminHandlerTest.java | 10 +-
.../solr/handler/admin/DaemonStreamApiTest.java | 3 +-
.../component/DistributedDebugComponentTest.java | 2 +-
.../solr/handler/component/SearchHandlerTest.java | 7 +-
.../component/TestHttpShardHandlerFactory.java | 2 +-
.../apache/solr/response/TestRawTransformer.java | 3 +-
.../transform/TestChildDocTransformer.java | 6 +
.../TestChildDocTransformerHierarchy.java | 6 +
.../solr/search/CallerSpecificQueryLimit.java | 105 ++
.../org/apache/solr/search/TestQueryLimits.java | 92 ++
.../facet/TestJsonFacetsWithNestedObjects.java | 6 +
.../org/apache/solr/search/join/BJQParserTest.java | 6 +
.../solr/search/join/TestCloudNestedDocsSort.java | 8 +-
.../solr/search/join/TestNestedDocsSort.java | 6 +
.../join/another/BJQFilterAccessibleTest.java | 6 +
.../apache/solr/search/stats/TestDistribIDF.java | 14 +-
.../solr/security/BasicAuthStandaloneTest.java | 4 +-
.../org/apache/solr/update/AddBlockUpdateTest.java | 6 +
.../solr/update/DeleteByIdWithRouterFieldTest.java | 17 +-
.../test/org/apache/solr/update/PeerSyncTest.java | 4 +-
.../test/org/apache/solr/update/RootFieldTest.java | 7 +
.../solr/update/TestNestedUpdateProcessor.java | 6 +
.../solr/update/processor/AtomicUpdatesTest.java | 6 +
.../update/processor/NestedAtomicUpdateTest.java | 6 +
solr/example/README.md | 4 +-
solr/licenses/commons-exec-1.3.jar.sha1 | 1 -
solr/licenses/commons-exec-1.4.0.jar.sha1 | 1 +
solr/licenses/grpc-alts-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-alts-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-api-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-api-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-auth-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-auth-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-context-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-context-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-core-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-core-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-googleapis-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-googleapis-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-grpclb-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-grpclb-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-netty-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-netty-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-netty-shaded-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-netty-shaded-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-protobuf-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-lite-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-protobuf-lite-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-rls-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-rls-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-services-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-services-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-stub-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-stub-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-util-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-util-1.61.1.jar.sha1 | 1 +
solr/licenses/grpc-xds-1.59.0.jar.sha1 | 1 -
solr/licenses/grpc-xds-1.61.1.jar.sha1 | 1 +
solr/licenses/http2-client-10.0.19.jar.sha1 | 1 -
solr/licenses/http2-client-10.0.20.jar.sha1 | 1 +
solr/licenses/http2-common-10.0.19.jar.sha1 | 1 -
solr/licenses/http2-common-10.0.20.jar.sha1 | 1 +
solr/licenses/http2-hpack-10.0.19.jar.sha1 | 1 -
solr/licenses/http2-hpack-10.0.20.jar.sha1 | 1 +
.../http2-http-client-transport-10.0.19.jar.sha1 | 1 -
.../http2-http-client-transport-10.0.20.jar.sha1 | 1 +
solr/licenses/http2-server-10.0.19.jar.sha1 | 1 -
solr/licenses/http2-server-10.0.20.jar.sha1 | 1 +
solr/licenses/jcl-over-slf4j-2.0.10.jar.sha1 | 1 -
solr/licenses/jcl-over-slf4j-2.0.11.jar.sha1 | 1 +
solr/licenses/jcl-over-slf4j-2.0.12.jar.sha1 | 1 +
solr/licenses/jetty-alpn-client-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-alpn-client-10.0.20.jar.sha1 | 1 +
.../jetty-alpn-java-client-10.0.19.jar.sha1 | 1 -
.../jetty-alpn-java-client-10.0.20.jar.sha1 | 1 +
.../jetty-alpn-java-server-10.0.19.jar.sha1 | 1 -
.../jetty-alpn-java-server-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-alpn-server-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-alpn-server-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-client-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-client-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-deploy-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-deploy-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-http-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-http-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-io-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-io-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-jmx-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-jmx-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-rewrite-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-rewrite-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-security-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-security-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-server-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-server-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-servlet-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-servlet-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-servlets-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-servlets-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-start-10.0.19-shaded.jar.sha1 | 1 -
solr/licenses/jetty-start-10.0.20-shaded.jar.sha1 | 1 +
solr/licenses/jetty-util-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-util-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-webapp-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-webapp-10.0.20.jar.sha1 | 1 +
solr/licenses/jetty-xml-10.0.19.jar.sha1 | 1 -
solr/licenses/jetty-xml-10.0.20.jar.sha1 | 1 +
solr/licenses/jose4j-0.9.4.jar.sha1 | 1 -
solr/licenses/jose4j-0.9.5.jar.sha1 | 1 +
solr/licenses/json-path-2.8.0.jar.sha1 | 1 -
solr/licenses/json-path-2.9.0.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-2.0.10.jar.sha1 | 1 -
solr/licenses/jul-to-slf4j-2.0.11.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-2.0.12.jar.sha1 | 1 +
solr/licenses/metrics-annotation-4.2.21.jar.sha1 | 1 -
solr/licenses/metrics-annotation-4.2.25.jar.sha1 | 1 +
solr/licenses/metrics-core-4.2.21.jar.sha1 | 1 -
solr/licenses/metrics-core-4.2.25.jar.sha1 | 1 +
solr/licenses/metrics-graphite-4.2.21.jar.sha1 | 1 -
solr/licenses/metrics-graphite-4.2.25.jar.sha1 | 1 +
solr/licenses/metrics-jetty10-4.2.21.jar.sha1 | 1 -
solr/licenses/metrics-jetty10-4.2.25.jar.sha1 | 1 +
solr/licenses/metrics-jmx-4.2.21.jar.sha1 | 1 -
solr/licenses/metrics-jmx-4.2.25.jar.sha1 | 1 +
solr/licenses/metrics-jvm-4.2.21.jar.sha1 | 1 -
solr/licenses/metrics-jvm-4.2.25.jar.sha1 | 1 +
.../proto-google-common-protos-2.24.0.jar.sha1 | 1 -
.../proto-google-common-protos-2.29.0.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.24.0.jar.sha1 | 1 -
solr/licenses/protobuf-java-3.25.1.jar.sha1 | 1 +
solr/licenses/slf4j-api-2.0.10.jar.sha1 | 1 -
solr/licenses/slf4j-api-2.0.11.jar.sha1 | 1 +
solr/licenses/slf4j-api-2.0.12.jar.sha1 | 1 +
solr/licenses/value-annotations-2.10.0.jar.sha1 | 1 -
solr/licenses/value-annotations-2.10.1.jar.sha1 | 1 +
.../handler/clustering/ClusteringComponent.java | 10 +-
.../hadoop/TestSolrCloudWithDelegationTokens.java | 4 +-
.../TestSolrCloudWithSecureImpersonation.java | 4 +-
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 4 +-
solr/packaging/build.gradle | 4 +-
solr/packaging/test/test_postlogs.bats | 12 -
solr/packaging/test/test_zk.bats | 9 +-
.../pages/configuring-solr-xml.adoc | 2 +-
.../pages/managed-resources.adoc | 2 +-
.../pages/package-manager-internals.adoc | 2 +-
.../configuration-guide/pages/package-manager.adoc | 2 +-
.../configuration-guide/pages/realtime-get.adoc | 2 +-
.../modules/deployment-guide/deployment-nav.adoc | 1 -
.../pages/collection-management.adoc | 2 +-
.../modules/deployment-guide/pages/docker-faq.adoc | 206 +--
.../deployment-guide/pages/docker-networking.adoc | 279 ----
.../deployment-guide/pages/enabling-ssl.adoc | 4 +-
.../deployment-guide/pages/installing-solr.adoc | 2 +-
.../pages/kerberos-authentication-plugin.adoc | 2 +-
.../deployment-guide/pages/replica-management.adoc | 2 +-
.../deployment-guide/pages/shard-management.adoc | 2 +-
.../deployment-guide/pages/solr-in-docker.adoc | 55 +-
.../modules/deployment-guide/pages/solrj.adoc | 63 +-
.../pages/taking-solr-to-production.adoc | 55 +-
.../pages/zookeeper-file-management.adoc | 4 +-
.../pages/zookeeper-utilities.adoc | 2 +-
.../getting-started/pages/about-this-guide.adoc | 2 +-
.../pages/tutorial-five-minutes.adoc | 4 +-
.../getting-started/pages/tutorial-solrcloud.adoc | 6 +-
.../indexing-guide/pages/analysis-screen.adoc | 2 +-
.../indexing-guide/pages/language-analysis.adoc | 16 +-
.../indexing-guide/pages/luke-request-handler.adoc | 2 +-
.../modules/indexing-guide/pages/post-tool.adoc | 3 -
.../modules/indexing-guide/pages/schema-api.adoc | 2 +-
.../query-guide/pages/common-query-parameters.adoc | 24 +-
.../query-guide/pages/dismax-query-parser.adoc | 2 +-
.../query-guide/pages/edismax-query-parser.adoc | 2 +-
.../modules/query-guide/pages/faceting.adoc | 2 +-
.../pages/query-elevation-component.adoc | 4 +-
.../modules/query-guide/pages/result-grouping.adoc | 2 +-
.../modules/query-guide/pages/spell-checking.adoc | 2 +-
.../modules/query-guide/pages/stats-component.adoc | 2 +-
.../query-guide/pages/term-vector-component.adoc | 2 +-
.../modules/query-guide/pages/terms-component.adoc | 2 +-
.../pages/major-changes-in-solr-10.adoc | 11 +-
.../client/solrj/io/stream/CloudSolrStream.java | 16 +-
.../client/solrj/io/stream/BadClusterTest.java | 141 ++
.../org/apache/solr/client/solrj/SolrQuery.java | 23 +
.../solr/client/solrj/impl/CloudSolrClient.java | 48 +-
.../impl/ConcurrentUpdateHttp2SolrClient.java | 38 +
.../solrj/impl/ConcurrentUpdateSolrClient.java | 24 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 15 +
.../solr/client/solrj/impl/HttpSolrClient.java | 51 +-
.../solr/client/solrj/impl/LBHttp2SolrClient.java | 74 +-
.../solr/client/solrj/impl/LBHttpSolrClient.java | 201 +--
.../solr/client/solrj/impl/LBSolrClient.java | 312 +++--
.../solr/client/solrj/request/UpdateRequest.java | 15 +-
.../apache/solr/common/params/CommonParams.java | 6 +
.../apache/solr/common/util/GlobPatternUtil.java | 163 ++-
.../solr/client/solrj/TestLBHttp2SolrClient.java | 47 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 23 +-
.../client/solrj/impl/BasicHttpSolrClientTest.java | 1 -
.../solrj/impl/CloudHttp2SolrClientTest.java | 4 +-
.../solrj/impl/CloudSolrClientCacheTest.java | 2 +-
.../client/solrj/impl/CloudSolrClientTest.java | 4 +-
...oncurrentUpdateHttp2SolrClientBadInputTest.java | 4 +-
.../impl/ConcurrentUpdateHttp2SolrClientTest.java | 1 -
.../ConcurrentUpdateSolrClientBadInputTest.java | 4 +-
.../solrj/impl/ConcurrentUpdateSolrClientTest.java | 5 +-
.../solrj/impl/Http2SolrClientProxyTest.java | 5 +-
.../client/solrj/impl/Http2SolrClientTest.java | 1 -
.../solrj/impl/HttpSolrClientBadInputTest.java | 4 +-
.../solrj/impl/HttpSolrClientConPoolTest.java | 7 +-
.../client/solrj/impl/LBHttp2SolrClientTest.java | 3 +-
.../solrj/impl/LBHttpSolrClientBadInputTest.java | 9 +-
.../solrj/impl/LBHttpSolrClientBuilderTest.java | 10 +-
.../client/solrj/impl/LBHttpSolrClientTest.java | 6 +-
.../solr/client/solrj/impl/LBSolrClientTest.java | 134 +-
.../solrj/impl/TestCloudSolrClientConnections.java | 9 +-
.../apache/solr/BaseDistributedSearchTestCase.java | 1 -
.../java/org/apache/solr/SolrJettyTestBase.java | 11 +-
.../src/java/org/apache/solr/SolrTestCaseHS.java | 7 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 5 -
.../solr/cloud/AbstractFullDistribZkTestBase.java | 3 -
.../apache/solr/cloud/MiniSolrCloudCluster.java | 4 -
.../java/org/apache/solr/embedded/JettyConfig.java | 4 +-
.../org/apache/solr/util/RandomMergePolicy.java | 11 +
.../util/RandomNoReverseMergePolicyFactory.java | 53 +
.../org/apache/solr/util/SolrJettyTestRule.java | 8 +-
.../apache/solr/embedded/TestJettySolrRunner.java | 2 +-
versions.lock | 116 +-
versions.props | 16 +-
281 files changed, 2207 insertions(+), 3486 deletions(-)