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 7b5e813b18d21d7aed328449100f7d9e9e7c99cd Merge: dbd2d8a3961 bdf0b2f7fd9 Author: Christine Poerschke <[email protected]> AuthorDate: Tue Feb 13 16:43:22 2024 +0000 Merge remote-tracking branch 'origin/main' into jira/solr-13350 dev-docs/dependency-upgrades.adoc | 4 +- dev-docs/lucene-upgrade.md | 4 + dev-tools/doap/solr.rdf | 14 + help/dependencies.txt | 4 +- solr/CHANGES.txt | 126 ++++++- solr/bin/solr | 2 +- .../src/java/org/apache/solr/cli/PostLogsTool.java | 10 +- .../src/java/org/apache/solr/cli/PostTool.java | 16 +- .../java/org/apache/solr/cli/RunExampleTool.java | 1 - .../apache/solr/handler/MoreLikeThisHandler.java | 4 - .../solr/handler/admin/api/InstallShardData.java | 11 +- .../solr/handler/component/SearchHandler.java | 4 - .../org/apache/solr/request/SolrRequestInfo.java | 34 ++ .../java/org/apache/solr/search/CacheConfig.java | 14 +- .../java/org/apache/solr/search/QueryLimits.java | 95 +++++ .../org/apache/solr/search/SolrIndexSearcher.java | 23 +- .../org/apache/solr/search/SolrQueryTimeLimit.java | 66 ++++ .../apache/solr/search/SolrQueryTimeoutImpl.java | 107 ------ .../org/apache/solr/search/neural/KnnQParser.java | 146 ++++++- .../test/org/apache/solr/TestTolerantSearch.java | 4 +- .../org/apache/solr/cli/TestSolrCLIRunExample.java | 2 +- .../apache/solr/cloud/AliasIntegrationTest.java | 3 +- .../DistribDocExpirationUpdateProcessorTest.java | 2 +- .../solr/cloud/DistributedVersionInfoTest.java | 8 +- .../solr/cloud/FullSolrCloudDistribCmdsTest.java | 17 +- .../solr/cloud/HttpPartitionOnCommitTest.java | 2 +- .../org/apache/solr/cloud/HttpPartitionTest.java | 3 +- .../solr/cloud/LeaderVoteWaitTimeoutTest.java | 3 +- .../org/apache/solr/cloud/MigrateRouteKeyTest.java | 2 +- .../solr/cloud/NestedShardedAtomicUpdateTest.java | 2 +- .../apache/solr/cloud/ReplicationFactorTest.java | 3 +- .../test/org/apache/solr/cloud/SplitShardTest.java | 3 +- .../apache/solr/cloud/TestCloudConsistency.java | 3 +- .../apache/solr/cloud/TestCloudDeleteByQuery.java | 11 +- .../TestCloudPhrasesIdentificationComponent.java | 2 +- .../solr/cloud/TestCloudPseudoReturnFields.java | 2 +- .../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 + .../org/apache/solr/cloud/TestPullReplica.java | 13 +- .../solr/cloud/TestPullReplicaErrorHandling.java | 15 +- .../apache/solr/cloud/TestPullReplicaWithAuth.java | 4 +- .../cloud/TestStressCloudBlindAtomicUpdates.java | 2 +- .../org/apache/solr/cloud/TestTlogReplica.java | 8 +- .../cloud/TestTolerantUpdateProcessorCloud.java | 11 +- .../TestTolerantUpdateProcessorRandomCloud.java | 2 +- .../solr/cloud/api/collections/ShardSplitTest.java | 16 +- .../test/org/apache/solr/core/CacheConfigTest.java | 168 +++++++++ .../apache/solr/core/TestSolrConfigHandler.java | 54 +++ .../solr/core/snapshots/TestSolrCoreSnapshots.java | 10 +- .../org/apache/solr/handler/TestHttpRequestId.java | 3 +- .../solr/handler/TestReplicationHandler.java | 4 +- .../solr/handler/TestStressIncrementalBackup.java | 2 +- .../solr/handler/TestStressThreadBackup.java | 2 +- .../component/DistributedDebugComponentTest.java | 4 +- .../apache/solr/request/TestSolrRequestInfo.java | 53 +++ .../org/apache/solr/search/QueryEqualityTest.java | 90 ++++- .../search/facet/TestCloudJSONFacetJoinDomain.java | 2 +- .../solr/search/facet/TestCloudJSONFacetSKG.java | 2 +- .../search/facet/TestCloudJSONFacetSKGEquiv.java | 2 +- .../apache/solr/search/neural/KnnQParserTest.java | 419 ++++++++++++++++++++- .../solr/update/DeleteByIdWithRouterFieldTest.java | 4 +- .../solr/update/TestInPlaceUpdatesDistrib.java | 4 +- solr/docker/scripts/solr-demo | 6 +- 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/packaging/test/test_extraction.bats | 4 +- solr/packaging/test/test_modules.bats | 6 +- solr/packaging/test/test_post.bats | 14 +- solr/packaging/test/test_ssl.bats | 4 +- .../pages/basic-authentication-plugin.adoc | 4 +- .../modules/indexing-guide/pages/post-tool.adoc | 127 ++++--- .../query-guide/pages/dense-vector-search.adoc | 114 ++++-- .../pages/major-changes-in-solr-9.adoc | 10 +- .../solr/client/solrj/impl/LBHttpSolrClient.java | 18 +- .../client/solrj/SolrExampleBinaryHttp2Test.java | 3 +- .../solr/client/solrj/SolrExampleBinaryTest.java | 3 +- .../solr/client/solrj/SolrExampleCborTest.java | 3 +- .../solr/client/solrj/SolrExampleXMLTest.java | 11 +- .../client/solrj/SolrSchemalessExampleTest.java | 7 +- .../apache/solr/client/solrj/TestBatchUpdate.java | 11 +- .../solr/client/solrj/TestLBHttp2SolrClient.java | 11 +- .../solr/client/solrj/TestLBHttpSolrClient.java | 13 +- .../solr/client/solrj/TestSolrJErrorHandling.java | 9 +- .../solrj/embedded/SolrExampleXMLHttp2Test.java | 3 +- .../client/solrj/impl/BasicHttpSolrClientTest.java | 141 ++++--- .../solrj/impl/CloudHttp2SolrClientTest.java | 23 +- .../client/solrj/impl/CloudSolrClientTest.java | 22 +- .../client/solrj/impl/Http2SolrClientTest.java | 122 ++++-- .../solrj/impl/HttpSolrClientBadInputTest.java | 2 +- .../solrj/impl/HttpSolrClientConPoolTest.java | 18 +- .../solrj/response/NoOpResponseParserTest.java | 3 +- .../java/org/apache/solr/SolrJettyTestBase.java | 4 +- .../src/java/org/apache/solr/SolrTestCaseHS.java | 6 +- .../src/java/org/apache/solr/SolrTestCaseJ4.java | 12 + .../cloud/AbstractBasicDistributedZk2TestBase.java | 4 +- .../cloud/AbstractBasicDistributedZkTestBase.java | 54 +-- .../solr/cloud/AbstractFullDistribZkTestBase.java | 32 +- .../solr/cloud/AbstractRecoveryZkTestBase.java | 3 +- .../solr/cloud/AbstractSyncSliceTestBase.java | 7 +- .../cloud/AbstractUnloadDistributedZkTestBase.java | 15 +- .../AbstractCloudBackupRestoreTestCase.java | 3 +- .../org/apache/solr/util/SolrJettyTestRule.java | 6 +- solr/webapp/web/js/angular/controllers/cloud.js | 22 +- 115 files changed, 1979 insertions(+), 584 deletions(-)
