This is an automated email from the ASF dual-hosted git repository. ab pushed a commit to branch jira/solr-15232 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 32e362fc59d014ff34dc096fbb349bd57352668f Merge: 2cdfc69 06fad78 Author: Andrzej Bialecki <[email protected]> AuthorDate: Tue Apr 6 14:44:53 2021 +0200 Merge branch 'main' into jira/solr-15232 README.md | 2 +- build.gradle | 4 +- gradle/hacks/{gradle.gradle => wipe-temp.gradle} | 10 +- .../inaccessible-test-sources.gradle | 37 -- gradle/validation/ecj-lint.gradle | 2 +- gradle/validation/error-prone.gradle | 34 +- solr/CHANGES.txt | 30 +- .../solr/handler/clustering/EngineContext.java | 3 +- .../apache/solr/cloud/CloudConfigSetService.java | 146 ----- .../src/java/org/apache/solr/cloud/CloudUtil.java | 3 +- .../solr/cloud/DistributedClusterStateUpdater.java | 2 +- .../src/java/org/apache/solr/cloud/Overseer.java | 2 +- .../OverseerCollectionConfigSetProcessor.java | 2 +- .../cloud/OverseerConfigSetMessageHandler.java | 55 +- .../org/apache/solr/cloud/RecoveryStrategy.java | 5 +- .../java/org/apache/solr/cloud/SolrZkServer.java | 29 +- .../core/src/java/org/apache/solr/cloud/ZkCLI.java | 14 +- .../org/apache/solr/cloud/ZkConfigSetService.java | 324 +++++++++++ .../java/org/apache/solr/cloud/ZkController.java | 100 +--- .../apache/solr/cloud/ZkSolrResourceLoader.java | 3 +- .../solr/cloud/api/collections/BackupCmd.java | 2 +- .../solr/cloud/api/collections/CollApiCmds.java | 2 +- .../api/collections/CollectionHandlingUtils.java | 6 +- .../cloud/api/collections/CreateCollectionCmd.java | 53 +- .../cloud/api/collections/DeleteCollectionCmd.java | 2 +- .../OverseerCollectionMessageHandler.java | 10 +- .../solr/cloud/api/collections/RestoreCmd.java | 12 +- .../apache/solr/cloud/overseer/NodeMutator.java | 18 +- .../org/apache/solr/core/ConfigSetService.java | 318 ++++++++--- .../java/org/apache/solr/core/CoreContainer.java | 7 +- .../org/apache/solr/core/DirectoryFactory.java | 2 +- .../solr/core/FileSystemConfigSetService.java | 148 +++++ .../org/apache/solr/core/MMapDirectoryFactory.java | 9 +- .../apache/solr/core/NIOFSDirectoryFactory.java | 12 +- .../solr/core/NRTCachingDirectoryFactory.java | 11 +- .../src/java/org/apache/solr/core/SolrConfig.java | 3 +- .../org/apache/solr/core/SolrResourceLoader.java | 31 +- .../apache/solr/core/StandardDirectoryFactory.java | 7 +- .../src/java/org/apache/solr/core/ZkContainer.java | 7 +- .../org/apache/solr/core/backup/BackupManager.java | 63 +-- .../backup/repository/BackupRepositoryFactory.java | 12 +- .../solr/core/snapshots/SolrSnapshotsTool.java | 56 +- .../apache/solr/filestore/DistribPackageStore.java | 47 +- .../org/apache/solr/filestore/PackageStoreAPI.java | 22 +- .../java/org/apache/solr/handler/CatStream.java | 11 +- .../java/org/apache/solr/handler/IndexFetcher.java | 54 +- .../apache/solr/handler/PingRequestHandler.java | 26 +- .../apache/solr/handler/ReplicationHandler.java | 11 +- .../solr/handler/admin/ConfigSetsHandler.java | 126 ++--- .../solr/handler/component/QueryComponent.java | 10 +- .../handler/component/QueryElevationComponent.java | 300 +++++----- .../solr/handler/component/SearchHandler.java | 14 + .../apache/solr/packagemanager/PackageUtils.java | 7 +- .../java/org/apache/solr/schema/IndexSchema.java | 6 +- .../org/apache/solr/schema/IndexSchemaFactory.java | 38 +- .../org/apache/solr/schema/ManagedIndexSchema.java | 3 +- .../java/org/apache/solr/schema/SchemaManager.java | 3 +- .../apache/solr/schema/ZkIndexSchemaReader.java | 3 +- .../java/org/apache/solr/search/CursorMark.java | 17 +- .../StoredFieldsShardResponseProcessor.java | 4 + .../ConfigurableInternodeAuthHadoopPlugin.java | 67 ++- .../org/apache/solr/security/HadoopAuthPlugin.java | 13 +- .../org/apache/solr/security/KerberosPlugin.java | 22 +- .../processor/SignatureUpdateProcessorFactory.java | 17 +- .../src/java/org/apache/solr/util/SolrCLI.java | 15 +- .../conf/solrconfig-analytics-query.xml | 32 -- .../conf/solrconfig-collapseqparser.xml | 32 -- .../conf/solrconfig-dedup-overwrites.xml | 81 +++ .../collection1/conf/solrconfig-deeppaging.xml | 15 + .../solr/collection1/conf/solrconfig-elevate.xml | 13 - .../solr/collection1/conf/solrconfig-minhash.xml | 32 -- .../collection1/conf/solrconfig-plugcollector.xml | 32 -- .../solr/collection1/conf/solrconfig-tlog.xml | 24 - .../solr/collection1/conf/solrconfig.xml | 32 -- .../solr/configsets/dedup/conf/schema.xml | 31 ++ .../dedup/conf/solrconfig.xml} | 48 +- .../security/hadoop_kerberos_authz_config.json | 15 +- .../apache/solr/AnalysisAfterCoreReloadTest.java | 23 +- .../src/test/org/apache/solr/CursorPagingTest.java | 180 +++++- .../solr/TestCursorMarkWithoutUniqueKey.java | 5 +- .../org/apache/solr/TestDistributedGrouping.java | 3 + ...java => TestLuceneIndexBackCompat.java.ignored} | 0 .../client/solrj/impl/Krb5HttpClientUtils.java | 66 +++ .../apache/solr/cloud/DistribCursorPagingTest.java | 220 ++++++-- .../solr/cloud/MoveReplicaHDFSFailoverTest.java | 4 +- .../org/apache/solr/cloud/NodeMutatorTest.java | 2 +- .../OverseerCollectionConfigSetProcessorTest.java | 1 + .../test/org/apache/solr/cloud/OverseerTest.java | 2 +- .../org/apache/solr/cloud/TestConfigSetsAPI.java | 40 +- .../solr/cloud/TestConfigSetsAPIZkFailure.java | 11 +- .../src/test/org/apache/solr/cloud/ZkCLITest.java | 12 +- .../org/apache/solr/cloud/ZkControllerTest.java | 3 +- .../HdfsCloudIncrementalBackupTest.java | 2 + .../LocalFSCloudIncrementalBackupTest.java | 2 + .../SimpleCollectionCreateDeleteTest.java | 29 +- .../cloud/api/collections/TestCollectionAPI.java | 4 +- .../collections/TestHdfsCloudBackupRestore.java | 10 +- .../collections/TestLocalFSCloudBackupRestore.java | 6 +- .../solr/cloud/hdfs/HDFSCollectionsAPITest.java | 4 +- .../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java | 4 +- .../apache/solr/core/AlternateDirectoryTest.java | 5 +- .../org/apache/solr/core/TestCoreContainer.java | 60 ++ .../HdfsBackupRepositoryIntegrationTest.java | 2 + .../core/snapshots/TestSolrCloudSnapshots.java | 2 + .../solr/core/snapshots/TestSolrCoreSnapshots.java | 2 + .../org/apache/solr/handler/TestConfigReload.java | 4 +- .../solr/handler/TestIncrementalCoreBackup.java | 2 + .../solr/handler/TestReplicationHandlerBackup.java | 2 + .../solr/handler/TestSnapshotCoreBackup.java | 2 + .../solr/handler/TestStressThreadBackup.java | 2 +- .../solr/handler/component/BadComponentTest.java | 6 + .../DistributedQueryElevationComponentTest.java | 15 - .../component/QueryElevationComponentTest.java | 126 ++++- .../test/org/apache/solr/schema/EnumFieldTest.java | 5 +- .../org/apache/solr/search/CursorMarkTest.java | 20 +- .../search/join/CrossCollectionJoinQueryTest.java | 5 +- .../apache/solr/security/hadoop/KerberosUtils.java | 3 +- .../TestRuleBasedAuthorizationWithKerberos.java | 51 +- .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java | 7 +- .../SignatureUpdateProcessorFactoryTest.java | 43 +- .../update/processor/TestCloudDeduplication.java | 146 +++++ .../processor/TestPartialUpdateDeduplication.java | 2 +- .../solr/configsets/_default/conf/solrconfig.xml | 1 - .../conf/solrconfig.xml | 1 - solr/solr-ref-guide/src/audit-logging.adoc | 2 +- .../src/basic-authentication-plugin.adoc | 10 + solr/solr-ref-guide/src/de-duplication.adoc | 39 +- solr/solr-ref-guide/src/format-of-solr-xml.adoc | 2 +- .../src/hadoop-authentication-plugin.adoc | 10 + .../src/major-changes-in-solr-9.adoc | 5 + solr/solr-ref-guide/src/morelikethis.adoc | 608 +++++++++++++++++++-- solr/solr-ref-guide/src/other-parsers.adoc | 49 +- .../src/solr-control-script-reference.adoc | 2 +- .../src/the-query-elevation-component.adoc | 6 +- .../client/solrj/impl/CloudHttp2SolrClient.java | 34 +- .../client/solrj/impl/Krb5HttpClientBuilder.java | 13 +- .../solrj/impl/ZkClientClusterStateProvider.java | 26 - .../java/org/apache/solr/client/solrj/io/Lang.java | 9 +- .../solr/client/solrj/io/stream/FacetStream.java | 4 +- .../solr/client/solrj/io/stream/StatsStream.java | 2 + .../client/solrj/io/stream/TimeSeriesStream.java | 2 + .../io/stream/metrics/CountDistinctMetric.java | 77 +++ .../org/apache/solr/common/cloud/SolrZkClient.java | 4 +- .../apache/solr/common/cloud/ZkConfigManager.java | 230 -------- .../solr/common/cloud/ZkMaintenanceUtils.java | 20 +- .../apache/solr/common/cloud/ZkStateReader.java | 8 - .../ref_guide_examples/ZkConfigFilesTest.java | 23 +- .../impl/CloudHttp2SolrClientBuilderTest.java | 54 +- .../client/solrj/impl/CloudSolrClientTest.java | 43 -- .../solrj/impl/TestCloudSolrClientConnections.java | 8 +- .../org/apache/solr/client/solrj/io/TestLang.java | 2 +- .../solrj/io/stream/StreamExpressionTest.java | 45 +- .../cloud/PerReplicaStatesIntegrationTest.java | 158 ++++++ ...figManager.java => TestZkConfigSetService.java} | 50 +- .../src/java/org/apache/solr/SolrTestCase.java | 12 + .../apache/solr/cloud/MiniSolrCloudCluster.java | 9 +- .../org/apache/solr/cloud/SolrCloudTestCase.java | 3 +- .../apache/solr/core/MockFSDirectoryFactory.java | 6 +- 158 files changed, 3506 insertions(+), 2037 deletions(-)
