You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2023/03/06 06:18:27 UTC
[solr] 04/06: Merge branch 'apache:main' into SOLR-16653-shardsplit
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch jira/solr16653_3
in repository https://gitbox.apache.org/repos/asf/solr.git
commit b44b145379de8c56a23410c920df9faa266cb5ee
Merge: 08034f3c8fc 1222e9b72e8
Author: Noble Paul <no...@users.noreply.github.com>
AuthorDate: Mon Mar 6 13:32:06 2023 +1100
Merge branch 'apache:main' into SOLR-16653-shardsplit
.github/renovate.json | 13 +-
.gitignore | 9 +-
gradle/documentation/render-javadoc.gradle | 1 +
gradle/ide/eclipse.gradle | 2 +
gradle/validation/rat-sources.gradle | 3 +
gradle/validation/validate-source-patterns.gradle | 1 +
solr/CHANGES.txt | 24 +-
.../apache/solr/bench/lifecycle/SolrStartup.java | 120 ++++++++++
.../apache/solr/bench/lifecycle}/package-info.java | 4 +-
.../src/resources/configs/minimal/conf/schema.xml | 21 ++
.../resources/configs/minimal/conf/solrconfig.xml | 47 ++++
solr/benchmark/src/resources/solr.xml | 50 ++++
...istributedCollectionConfigSetCommandRunner.java | 12 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 146 ++++--------
.../java/org/apache/solr/core/CoreContainer.java | 13 +-
.../solr/handler/admin/CollectionsHandler.java | 194 ++--------------
.../solr/handler/admin/RebalanceLeaders.java | 90 +-------
.../solr/handler/admin/ZookeeperReadAPI.java | 251 ++++++++++++++-------
.../solr/handler/component/SearchHandler.java | 20 +-
.../apache/solr/jersey/ExperimentalResponse.java} | 15 +-
.../org/apache/solr/jersey/JerseyApplications.java | 1 +
.../org/apache/solr/jersey/MessageBodyWriters.java | 15 ++
.../apache/solr/response/RawResponseWriter.java | 25 +-
.../apache/solr/security/AuthorizationUtils.java | 6 +-
.../test/org/apache/solr/cloud/SplitShardTest.java | 210 ++++-------------
.../solr/cloud/api/collections/ShardSplitTest.java | 13 +-
.../solr/handler/admin/TestCollectionAPIs.java | 15 +-
.../solr/handler/admin/ZookeeperReadAPITest.java | 112 +++++++--
.../solr/metrics/SolrMetricsIntegrationTest.java | 4 +-
solr/licenses/api-common-2.2.2.jar.sha1 | 1 -
solr/licenses/api-common-2.6.1.jar.sha1 | 1 +
solr/licenses/argparse4j-0.8.1.jar.sha1 | 1 -
solr/licenses/argparse4j-0.9.0.jar.sha1 | 1 +
solr/licenses/auto-value-1.10.1.jar.sha1 | 1 +
...-LICENSE-ASL.txt => auto-value-LICENSE-ASL.txt} | 1 +
solr/licenses/auto-value-NOTICE.txt | 0
solr/licenses/avatica-core-1.22.0.jar.sha1 | 1 -
solr/licenses/avatica-core-1.23.0.jar.sha1 | 1 +
solr/licenses/avatica-metrics-1.22.0.jar.sha1 | 1 -
solr/licenses/avatica-metrics-1.23.0.jar.sha1 | 1 +
.../biz.aQute.bnd.annotation-6.3.1.jar.sha1 | 1 -
.../biz.aQute.bnd.annotation-6.4.0.jar.sha1 | 1 +
solr/licenses/calcite-core-1.32.0.jar.sha1 | 1 -
solr/licenses/calcite-core-1.33.0.jar.sha1 | 1 +
solr/licenses/calcite-linq4j-1.32.0.jar.sha1 | 1 -
solr/licenses/calcite-linq4j-1.33.0.jar.sha1 | 1 +
solr/licenses/commons-compress-1.21.jar.sha1 | 1 -
solr/licenses/commons-compress-1.22.jar.sha1 | 1 +
solr/licenses/dd-plist-1.23.jar.sha1 | 1 -
solr/licenses/dd-plist-1.24.jar.sha1 | 1 +
solr/licenses/disruptor-3.4.2.jar.sha1 | 1 -
solr/licenses/disruptor-3.4.4.jar.sha1 | 1 +
...c-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 | 1 -
...c-google-cloud-storage-v2-2.19.0-alpha.jar.sha1 | 1 +
solr/licenses/gax-2.20.1.jar.sha1 | 1 -
solr/licenses/gax-2.23.1.jar.sha1 | 1 +
solr/licenses/gax-grpc-2.20.1.jar.sha1 | 1 -
solr/licenses/gax-grpc-2.23.1.jar.sha1 | 1 +
solr/licenses/gax-httpjson-0.105.1.jar.sha1 | 1 -
solr/licenses/gax-httpjson-0.108.1.jar.sha1 | 1 +
solr/licenses/google-api-client-2.1.1.jar.sha1 | 1 -
solr/licenses/google-api-client-2.2.0.jar.sha1 | 1 +
...google-auth-library-credentials-1.13.0.jar.sha1 | 1 -
...google-auth-library-credentials-1.16.0.jar.sha1 | 1 +
...google-auth-library-oauth2-http-1.13.0.jar.sha1 | 1 -
...google-auth-library-oauth2-http-1.16.0.jar.sha1 | 1 +
solr/licenses/google-cloud-core-2.11.0.jar.sha1 | 1 +
solr/licenses/google-cloud-core-2.9.0.jar.sha1 | 1 -
.../google-cloud-core-grpc-2.11.0.jar.sha1 | 1 +
.../licenses/google-cloud-core-grpc-2.9.0.jar.sha1 | 1 -
.../google-cloud-core-http-2.11.0.jar.sha1 | 1 +
.../licenses/google-cloud-core-http-2.9.0.jar.sha1 | 1 -
solr/licenses/google-cloud-nio-0.126.0.jar.sha1 | 1 -
solr/licenses/google-cloud-nio-0.126.6.jar.sha1 | 1 +
solr/licenses/google-cloud-storage-2.16.0.jar.sha1 | 1 -
solr/licenses/google-cloud-storage-2.19.0.jar.sha1 | 1 +
solr/licenses/grpc-alts-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-alts-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-api-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-api-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-auth-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-auth-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-context-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-context-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-core-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-core-1.53.0.jar.sha1 | 1 +
...c-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 | 1 -
...c-google-cloud-storage-v2-2.19.0-alpha.jar.sha1 | 1 +
solr/licenses/grpc-google-iam-v1-1.6.22.jar.sha1 | 1 -
solr/licenses/grpc-googleapis-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-googleapis-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-grpclb-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-grpclb-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-netty-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-netty-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-netty-shaded-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-netty-shaded-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-protobuf-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-lite-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-protobuf-lite-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-services-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-services-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-stub-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-stub-1.53.0.jar.sha1 | 1 +
solr/licenses/grpc-xds-1.51.0.jar.sha1 | 1 -
solr/licenses/grpc-xds-1.53.0.jar.sha1 | 1 +
solr/licenses/gson-2.10.1.jar.sha1 | 1 +
solr/licenses/gson-2.10.jar.sha1 | 1 -
solr/licenses/jackcess-4.0.1.jar.sha1 | 1 -
solr/licenses/jackcess-4.0.2.jar.sha1 | 1 +
solr/licenses/jcl-over-slf4j-2.0.5.jar.sha1 | 1 -
solr/licenses/jcl-over-slf4j-2.0.6.jar.sha1 | 1 +
solr/licenses/jctools-core-3.3.0.jar.sha1 | 1 -
solr/licenses/jctools-core-4.0.1.jar.sha1 | 1 +
solr/licenses/jmh-core-1.32.jar.sha1 | 1 -
solr/licenses/jmh-core-1.36.jar.sha1 | 1 +
solr/licenses/jna-5.11.0.jar.sha1 | 1 -
solr/licenses/jna-5.12.1.jar.sha1 | 1 +
solr/licenses/jopt-simple-4.6.jar.sha1 | 1 -
solr/licenses/jopt-simple-5.0.4.jar.sha1 | 1 +
solr/licenses/jose4j-0.7.9.jar.sha1 | 1 -
solr/licenses/jose4j-0.9.3.jar.sha1 | 1 +
solr/licenses/jul-to-slf4j-2.0.5.jar.sha1 | 1 -
solr/licenses/jul-to-slf4j-2.0.6.jar.sha1 | 1 +
solr/licenses/junrar-7.5.2.jar.sha1 | 1 -
solr/licenses/junrar-7.5.3.jar.sha1 | 1 +
solr/licenses/log4j-1.2-api-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-api-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-core-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.20.0.jar.sha1 | 1 +
.../log4j-layout-template-json-2.19.0.jar.sha1 | 1 -
.../log4j-layout-template-json-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-slf4j2-impl-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j2-impl-2.20.0.jar.sha1 | 1 +
solr/licenses/log4j-web-2.19.0.jar.sha1 | 1 -
solr/licenses/log4j-web-2.20.0.jar.sha1 | 1 +
solr/licenses/metrics-annotation-4.2.17.jar.sha1 | 1 +
...-ASL.txt => metrics-annotation-LICENSE-ASL.txt} | 3 +-
solr/licenses/metrics-annotation-NOTICE.txt | 11 +
solr/licenses/metrics-core-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-core-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-graphite-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-graphite-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-jetty10-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-jetty10-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-jmx-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-jmx-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-jvm-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-jvm-4.2.17.jar.sha1 | 1 +
solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1 | 1 -
solr/licenses/netty-tcnative-NOTICE.txt | 51 -----
.../netty-tcnative-classes-2.0.48.Final.jar.sha1 | 1 -
solr/licenses/proj4j-1.1.5.jar.sha1 | 1 -
solr/licenses/proj4j-1.2.2.jar.sha1 | 1 +
...o-google-cloud-storage-v2-2.16.0-alpha.jar.sha1 | 1 -
...o-google-cloud-storage-v2-2.19.0-alpha.jar.sha1 | 1 +
.../proto-google-common-protos-2.11.0.jar.sha1 | 1 -
.../proto-google-common-protos-2.14.1.jar.sha1 | 1 +
solr/licenses/proto-google-iam-v1-1.6.22.jar.sha1 | 1 -
solr/licenses/proto-google-iam-v1-1.9.1.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.21.10.jar.sha1 | 1 -
solr/licenses/protobuf-java-3.21.12.jar.sha1 | 1 +
solr/licenses/protobuf-java-util-3.21.10.jar.sha1 | 1 -
solr/licenses/protobuf-java-util-3.21.12.jar.sha1 | 1 +
solr/licenses/re2j-1.6.jar.sha1 | 1 -
solr/licenses/re2j-1.7.jar.sha1 | 1 +
solr/licenses/semver4j-2.2.0.jar.sha1 | 1 -
solr/licenses/semver4j-4.2.1.jar.sha1 | 1 +
solr/licenses/simpleclient-0.16.0.jar.sha1 | 1 +
solr/licenses/simpleclient-0.2.0.jar.sha1 | 1 -
solr/licenses/simpleclient_common-0.16.0.jar.sha1 | 1 +
solr/licenses/simpleclient_common-0.2.0.jar.sha1 | 1 -
.../simpleclient_httpserver-0.16.0.jar.sha1 | 1 +
.../simpleclient_httpserver-0.2.0.jar.sha1 | 1 -
solr/licenses/slf4j-api-2.0.5.jar.sha1 | 1 -
solr/licenses/slf4j-api-2.0.6.jar.sha1 | 1 +
solr/licenses/snappy-java-1.1.8.2.jar.sha1 | 1 -
solr/licenses/snappy-java-1.1.9.1.jar.sha1 | 1 +
solr/licenses/threetenbp-1.6.4.jar.sha1 | 1 -
solr/licenses/threetenbp-1.6.5.jar.sha1 | 1 +
solr/licenses/tika-core-1.28.4.jar.sha1 | 1 -
solr/licenses/tika-core-1.28.5.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.28.4.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.28.5.jar.sha1 | 1 +
solr/licenses/value-annotations-2.9.2.jar.sha1 | 1 -
solr/licenses/value-annotations-2.9.3.jar.sha1 | 1 +
solr/licenses/zookeeper-3.8.0-tests.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.0.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.1-tests.jar.sha1 | 1 +
solr/licenses/zookeeper-3.8.1.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.8.0.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.8.1.jar.sha1 | 1 +
solr/modules/analysis-extras/build.gradle | 1 +
...sTest.java => HadoopSSLConfigurationsTest.java} | 2 +-
.../apache/solr/security/jwt/api/package-info.java | 19 --
solr/modules/langid/build.gradle | 1 +
.../opentelemetry/OtelTracerConfiguratorTest.java | 2 +-
solr/prometheus-exporter/build.gradle | 12 +-
.../exporter/SolrExporterIntegrationTest.java | 4 +-
.../deployment-guide/pages/shard-management.adoc | 12 -
.../solrj/request/CollectionAdminRequest.java | 11 +-
.../solr/common/params/CommonAdminParams.java | 6 -
.../apache/solr/client/solrj/SolrExampleTests.java | 74 ++++++
.../apache/solr/cloud/MiniSolrCloudCluster.java | 33 +--
versions.lock | 223 +++++++++---------
versions.props | 48 ++--
209 files changed, 1088 insertions(+), 1024 deletions(-)