This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/SOLR-16858 in repository https://gitbox.apache.org/repos/asf/solr.git
commit c5587492b6509ccb8a6f0f18aa55e28115522e70 Merge: f101b1c9dcd 21d97ed3a0d Author: Chris Hostetter <[email protected]> AuthorDate: Mon Feb 5 16:32:40 2024 -0700 Merge remote-tracking branch 'origin/main' into jira/SOLR-16858 .github/workflows/labeler.yml | 4 +- .github/workflows/tests-via-crave.yml | 6 +- dev-tools/scripts/smokeTestRelease.py | 2 +- solr/CHANGES.txt | 20 +++- .../src/java/org/apache/solr/cli/ExportTool.java | 21 ++-- .../src/java/org/apache/solr/cli/PostTool.java | 22 +++- .../java/org/apache/solr/cli/SimplePostTool.java | 3 - .../core/src/java/org/apache/solr/cli/SolrCLI.java | 2 +- .../solr/cloud/DistributedClusterStateUpdater.java | 4 +- .../solr/cloud/overseer/ClusterStateMutator.java | 12 ++- .../solr/cloud/overseer/CollectionMutator.java | 1 + .../apache/solr/cloud/overseer/ZkStateWriter.java | 6 +- .../org/apache/solr/core/SchemaCodecFactory.java | 10 +- .../src/java/org/apache/solr/core/SolrCore.java | 4 +- .../org/apache/solr/core/backup/BackupManager.java | 6 +- .../apache/solr/handler/admin/ClusterStatus.java | 2 + .../org/apache/solr/handler/admin/ColStatus.java | 1 + .../handler/admin/SegmentsInfoRequestHandler.java | 1 + .../solr/handler/component/QueryComponent.java | 8 +- .../handler/component/QueryElevationComponent.java | 3 +- .../component/ShardFieldSortedHitQueue.java | 5 +- .../handler/component/TermVectorComponent.java | 10 +- .../solr/index/SlowCompositeReaderWrapper.java | 12 ++- .../apache/solr/packagemanager/PackageManager.java | 26 +++-- .../apache/solr/packagemanager/PackageUtils.java | 36 ++++++- .../solr/packagemanager/RepositoryManager.java | 2 +- .../org/apache/solr/schema/DenseVectorField.java | 4 +- .../solr/schema/LatLonPointSpatialField.java | 3 +- .../org/apache/solr/schema/RandomSortField.java | 3 +- .../solr/search/CollapsingQParserPlugin.java | 9 +- .../search/join/ChildFieldValueSourceParser.java | 5 +- .../processor/DistributedUpdateProcessor.java | 3 +- .../solr/collection1/conf/schema_codec.xml | 2 +- .../src/test/org/apache/solr/cli/PostToolTest.java | 32 +++++- .../client/solrj/impl/ConnectionReuseTest.java | 3 +- .../org/apache/solr/cloud/ClusterStateTest.java | 20 +++- .../apache/solr/cloud/CollectionsAPISolrJTest.java | 31 ++++++ .../apache/solr/cloud/LeaderTragicEventTest.java | 11 +- .../OverseerCollectionConfigSetProcessorTest.java | 2 + .../test/org/apache/solr/cloud/RouteFieldTest.java | 20 ++-- .../test/org/apache/solr/cloud/SliceStateTest.java | 4 +- .../apache/solr/cloud/SolrCloudExampleTest.java | 9 +- .../cloud/TestLeaderElectionWithEmptyReplica.java | 3 +- .../org/apache/solr/cloud/TestPullReplica.java | 15 ++- .../apache/solr/cloud/TestRandomFlRTGCloud.java | 2 +- .../solr/cloud/TestRandomRequestDistribution.java | 10 +- .../org/apache/solr/cloud/TestTlogReplica.java | 15 ++- .../solr/cloud/api/collections/ShardSplitTest.java | 3 +- .../SimpleCollectionCreateDeleteTest.java | 7 +- .../cloud/api/collections/TestCollectionAPI.java | 6 +- .../solr/cloud/overseer/ZkStateReaderTest.java | 36 +++++-- .../solr/cloud/overseer/ZkStateWriterTest.java | 103 +++++++----------- .../org/apache/solr/core/TestCodecSupport.java | 2 +- .../apache/solr/handler/ReplicationTestHelper.java | 12 +++ .../handler/TestHealthCheckHandlerLegacyMode.java | 4 +- .../solr/handler/TestReplicationHandler.java | 94 ++++++++-------- .../TestReplicationHandlerDiskOverFlow.java | 8 +- .../solr/handler/TestStressThreadBackup.java | 3 +- .../solr/handler/admin/CoreAdminHandlerTest.java | 15 ++- .../admin/SegmentsInfoRequestHandlerTest.java | 29 ++++- .../DistributedQueryElevationComponentTest.java | 3 +- .../solr/handler/component/SearchHandlerTest.java | 13 ++- .../src/test/org/apache/solr/pkg/TestPackages.java | 25 +++-- .../apache/solr/search/RankQueryTestPlugin.java | 3 +- .../test/org/apache/solr/search/TestDocSet.java | 2 +- .../apache/solr/search/TestSolrQueryParser.java | 11 +- .../org/apache/solr/search/TestTaskManagement.java | 10 +- .../solr/security/BasicAuthIntegrationTest.java | 2 +- .../solr/update/DeleteByIdWithRouterFieldTest.java | 5 +- .../org/apache/solr/util/TestCborDataFormat.java | 8 +- solr/docker/scripts/solr-demo | 10 +- solr/docker/tests/cases/create_core/test.sh | 2 +- solr/docker/tests/cases/create_core_exec/test.sh | 2 +- .../cases/create_core_randomuser_rootgroup/test.sh | 2 +- .../empty-varsolr-dir-ramdomuser-rootgroup/test.sh | 2 +- .../tests/cases/empty-varsolr-dir-solr/test.sh | 2 +- .../tests/cases/empty-varsolr-dir-user/test.sh | 2 +- .../empty-varsolr-vol-ramdomuser-rootgroup/test.sh | 2 +- .../cases/empty-varsolr-vol-solr-nocopy/test.sh | 2 +- .../tests/cases/empty-varsolr-vol-solr/test.sh | 2 +- .../tests/cases/empty-varsolr-vol-user/test.sh | 2 +- solr/docker/tests/cases/gosu/test.sh | 2 +- solr/docker/tests/cases/precreate_core/test.sh | 2 +- .../precreate_core_randomuser_rootgroup/test.sh | 2 +- solr/docker/tests/cases/test_log4j/test.sh | 2 +- solr/docker/tests/cases/user_volume/test.sh | 2 +- solr/example/README.md | 4 +- solr/example/exampledocs/utf8-example.xml | 3 +- .../licenses/lucene-analysis-common-9.8.0.jar.sha1 | 1 - .../licenses/lucene-analysis-common-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-analysis-icu-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1 | 1 + .../lucene-analysis-kuromoji-9.8.0.jar.sha1 | 1 - .../lucene-analysis-kuromoji-9.9.2.jar.sha1 | 1 + .../lucene-analysis-morfologik-9.8.0.jar.sha1 | 1 - .../lucene-analysis-morfologik-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-analysis-nori-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-analysis-nori-9.9.2.jar.sha1 | 1 + .../lucene-analysis-opennlp-9.8.0.jar.sha1 | 1 - .../lucene-analysis-opennlp-9.9.2.jar.sha1 | 1 + .../lucene-analysis-phonetic-9.8.0.jar.sha1 | 1 - .../lucene-analysis-phonetic-9.9.2.jar.sha1 | 1 + .../lucene-analysis-smartcn-9.8.0.jar.sha1 | 1 - .../lucene-analysis-smartcn-9.9.2.jar.sha1 | 1 + .../lucene-analysis-stempel-9.8.0.jar.sha1 | 1 - .../lucene-analysis-stempel-9.9.2.jar.sha1 | 1 + .../licenses/lucene-backward-codecs-9.8.0.jar.sha1 | 1 - .../licenses/lucene-backward-codecs-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-classification-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-classification-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-codecs-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-codecs-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-core-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-core-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-expressions-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-expressions-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-grouping-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-grouping-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-highlighter-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-highlighter-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-join-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-join-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-memory-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-memory-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-misc-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-misc-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-queries-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-queries-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-queryparser-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-queryparser-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-sandbox-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-sandbox-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-spatial-extras-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-spatial-extras-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-spatial3d-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-spatial3d-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-suggest-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-suggest-9.9.2.jar.sha1 | 1 + solr/licenses/lucene-test-framework-9.8.0.jar.sha1 | 1 - solr/licenses/lucene-test-framework-9.9.2.jar.sha1 | 1 + .../hadoop/TestImpersonationWithHadoopAuth.java | 3 +- .../TestSolrCloudWithSecureImpersonation.java | 3 +- .../org/apache/solr/hdfs/cloud/StressHdfsTest.java | 3 +- solr/packaging/test/test_post.bats | 13 ++- .../src/test-files/exampledocs/utf8-example.xml | 3 +- .../solr/configsets/_default/conf/solrconfig.xml | 2 +- .../conf/solrconfig.xml | 2 +- .../pages/collection-management.adoc | 1 + .../deployment-guide/pages/docker-networking.adoc | 2 +- .../deployment-guide/pages/installing-solr.adoc | 4 +- .../getting-started/pages/tutorial-diy.adoc | 14 +-- .../getting-started/pages/tutorial-films.adoc | 10 +- .../pages/tutorial-techproducts.adoc | 7 +- .../indexing-guide/pages/indexing-with-tika.adoc | 14 +-- .../modules/indexing-guide/pages/post-tool.adoc | 14 +-- .../modules/query-guide/pages/spatial-search.adoc | 4 +- .../modules/query-guide/pages/tagger-handler.adoc | 4 +- .../solr/client/solrj/io/SolrClientCache.java | 27 ++++- .../solrj/impl/ZkClientClusterStateProvider.java | 10 +- .../org/apache/solr/common/cloud/SolrZkClient.java | 21 ++++ .../apache/solr/common/cloud/ZkStateReader.java | 10 +- .../apache/solr/common/cloud/SolrZkClientTest.java | 32 ++++++ .../solrj/impl/BaseHttpClusterStateProvider.java | 14 ++- .../solrj/impl/ConcurrentUpdateSolrClient.java | 14 ++- .../solr/client/solrj/impl/LBHttpSolrClient.java | 15 ++- .../client/solrj/request/GenericSolrRequest.java | 32 ++++++ .../org/apache/solr/common/cloud/ClusterState.java | 30 ++++-- .../apache/solr/common/cloud/DocCollection.java | 31 ++++-- .../org/apache/solr/common/util/ExecutorUtil.java | 15 ++- .../java/org/apache/solr/common/util/URLUtil.java | 15 +++ .../solr/client/solrj/SolrExampleTestsBase.java | 2 +- .../solrj/impl/CloudSolrClientCacheTest.java | 4 +- .../solrj/impl/ClusterStateProviderTest.java | 120 +++++++++++++++++++++ .../client/solrj/impl/Http2SolrClientTest.java | 7 +- .../apache/solr/common/cloud/ReplicaCountTest.java | 2 + .../apache/solr/handler/BackupStatusChecker.java | 2 + .../apache/solr/schema/SortableBinaryField.java | 5 +- versions.lock | 54 +++++----- versions.props | 2 +- 179 files changed, 1070 insertions(+), 435 deletions(-)
