You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2024/01/30 21:00:35 UTC
(solr) 02/05: Merge branch 'main' into jira/SOLR-16858
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 68ec852ca80a38d08fc22e4a7253e309f2388aa9
Merge: cf26b6c1f45 0830423afd7
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Mon Jan 29 14:39:07 2024 -0700
Merge branch 'main' into jira/SOLR-16858
.asf.yaml | 3 +-
.github/workflows/stale.yml | 38 +++
dev-docs/apis.adoc | 13 +-
dev-docs/v2-api-conventions.adoc | 76 ++++++
dev-tools/doap/solr.rdf | 7 +
gradle/node.gradle | 23 +-
help/localSettings.txt | 16 ++
solr/CHANGES.txt | 128 ++++++++--
solr/api/build.gradle | 7 +-
.../client/api/endpoint/AddReplicaPropertyApi.java | 6 +-
.../client/api/endpoint/AliasPropertyApis.java | 10 +-
.../client/api/endpoint/BalanceReplicasApi.java | 4 +-
.../client/api/endpoint/BalanceShardUniqueApi.java | 6 +-
.../client/api/endpoint/CollectionPropertyApi.java | 8 +-
.../solr/client/api/endpoint/CoreSnapshotApi.java | 12 +-
.../client/api/endpoint/CreateCollectionApi.java | 4 +-
.../api/endpoint/CreateCollectionBackupApi.java | 6 +-
.../api/endpoint/CreateCollectionSnapshotApi.java | 6 +-
.../client/api/endpoint/CreateCoreBackupApi.java | 6 +-
.../solr/client/api/endpoint/CreateReplicaApi.java | 6 +-
.../solr/client/api/endpoint/CreateShardApi.java | 6 +-
.../solr/client/api/endpoint/DeleteAliasApi.java | 8 +-
.../client/api/endpoint/DeleteCollectionApi.java | 8 +-
.../api/endpoint/DeleteCollectionBackupApi.java | 10 +-
.../api/endpoint/DeleteCollectionSnapshotApi.java | 10 +-
.../solr/client/api/endpoint/DeleteNodeApi.java | 6 +-
.../solr/client/api/endpoint/DeleteReplicaApi.java | 10 +-
.../api/endpoint/DeleteReplicaPropertyApi.java | 6 +-
.../solr/client/api/endpoint/DeleteShardApi.java | 8 +-
.../solr/client/api/endpoint/ForceLeaderApi.java | 6 +-
.../api/endpoint/GetNodeCommandStatusApi.java | 50 ++++
.../solr/client/api/endpoint/GetPublicKeyApi.java | 4 +-
.../solr/client/api/endpoint/GetSchemaApi.java | 12 +-
.../client/api/endpoint/InstallCoreDataApi.java | 6 +-
.../client/api/endpoint/InstallShardDataApi.java | 6 +-
.../solr/client/api/endpoint/ListAliasesApi.java | 6 +-
.../api/endpoint/ListCollectionBackupsApi.java | 8 +-
.../client/api/endpoint/ListCollectionsApi.java | 4 +-
.../client/api/endpoint/ListConfigsetsApi.java | 4 +-
.../solr/client/api/endpoint/MergeIndexesApi.java | 6 +-
.../client/api/endpoint/MigrateReplicasApi.java | 4 +-
.../client/api/endpoint/ReloadCollectionApi.java | 6 +-
.../solr/client/api/endpoint/ReloadCoreApi.java | 6 +-
.../client/api/endpoint/RenameCollectionApi.java | 6 +-
.../solr/client/api/endpoint/RenameCoreApi.java | 6 +-
.../solr/client/api/endpoint/ReplaceNodeApi.java | 6 +-
.../solr/client/api/endpoint/RestoreCoreApi.java | 6 +-
.../apache/solr/client/api/endpoint/SelectApi.java | 12 +-
.../solr/client/api/endpoint/SwapCoresApi.java | 6 +-
.../solr/client/api/endpoint/SyncShardApi.java | 6 +-
.../solr/client/api/endpoint/UnloadCoreApi.java | 6 +-
...Type.java => GetNodeCommandStatusResponse.java} | 18 +-
.../api/model/{StoreType.java => IndexType.java} | 4 +-
.../org/apache/solr/client/api/util/Constants.java | 8 +-
.../solr/client/api/util/StoreApiParameters.java | 12 +-
solr/bin/solr | 6 +-
solr/core/build.gradle | 14 +-
.../org/apache/solr/api/ClusterPluginsSource.java | 83 ++++++
.../apache/solr/api/ContainerPluginsRegistry.java | 14 +-
.../java/org/apache/solr/api/JerseyResource.java | 4 +-
.../solr/api/NodeConfigClusterPluginsSource.java | 106 ++++++++
.../apache/solr/api/ZkClusterPluginsSource.java | 114 +++++++++
.../org/apache/solr/cloud/RecoveryStrategy.java | 2 +-
.../api/collections/CollectionHandlingUtils.java | 2 +-
.../cloud/api/collections/InstallShardDataCmd.java | 2 +-
.../api/collections/ReindexCollectionCmd.java | 2 +-
.../impl/PlacementPluginFactoryLoader.java | 42 +---
.../java/org/apache/solr/core/CoreContainer.java | 21 +-
.../src/java/org/apache/solr/core/NodeConfig.java | 44 ++--
.../org/apache/solr/core/SchemaCodecFactory.java | 4 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 68 ++++-
.../org/apache/solr/core/TracerConfigurator.java | 4 +-
.../apache/solr/handler/RequestHandlerBase.java | 23 ++
.../org/apache/solr/handler/SolrConfigHandler.java | 11 +-
.../solr/handler/admin/ContainerPluginsApi.java | 115 ++-------
.../solr/handler/admin/CoreAdminHandler.java | 6 +-
.../solr/handler/admin/CoreAdminOperation.java | 40 +--
.../solr/handler/admin/ZookeeperReadAPI.java | 14 +-
.../solr/handler/admin/api/AddReplicaProperty.java | 2 +-
.../solr/handler/admin/api/AliasProperty.java | 2 +-
.../solr/handler/admin/api/BalanceReplicas.java | 2 +-
.../solr/handler/admin/api/BalanceShardUnique.java | 2 +-
.../solr/handler/admin/api/CoreReplicationAPI.java | 12 +-
.../solr/handler/admin/api/CoreSnapshot.java | 2 +-
.../solr/handler/admin/api/CreateAliasAPI.java | 10 +-
.../solr/handler/admin/api/CreateCollection.java | 2 +-
.../handler/admin/api/CreateCollectionBackup.java | 2 +-
.../admin/api/CreateCollectionSnapshot.java | 2 +-
.../solr/handler/admin/api/CreateCoreBackup.java | 2 +-
.../solr/handler/admin/api/CreateReplica.java | 2 +-
.../apache/solr/handler/admin/api/CreateShard.java | 2 +-
.../apache/solr/handler/admin/api/DeleteAlias.java | 2 +-
.../solr/handler/admin/api/DeleteCollection.java | 2 +-
.../handler/admin/api/DeleteCollectionBackup.java | 2 +-
.../admin/api/DeleteCollectionSnapshot.java | 2 +-
.../apache/solr/handler/admin/api/DeleteNode.java | 2 +-
.../solr/handler/admin/api/DeleteReplica.java | 2 +-
.../handler/admin/api/DeleteReplicaProperty.java | 2 +-
.../apache/solr/handler/admin/api/DeleteShard.java | 2 +-
.../apache/solr/handler/admin/api/ForceLeader.java | 2 +-
.../handler/admin/api/GetNodeCommandStatus.java | 75 ++++++
.../apache/solr/handler/admin/api/GetSchema.java | 2 +-
.../solr/handler/admin/api/GetSchemaFieldAPI.java | 12 +-
.../solr/handler/admin/api/InstallShardData.java | 2 +-
.../apache/solr/handler/admin/api/ListAliases.java | 2 +-
.../handler/admin/api/ListCollectionBackups.java | 2 +-
.../admin/api/ListCollectionSnapshotsAPI.java | 10 +-
.../solr/handler/admin/api/ListCollections.java | 2 +-
.../solr/handler/admin/api/MergeIndexes.java | 2 +-
.../solr/handler/admin/api/MigrateReplicas.java | 2 +-
.../solr/handler/admin/api/NodeLoggingAPI.java | 12 +-
.../handler/admin/api/ReloadCollectionAPI.java | 2 +-
.../apache/solr/handler/admin/api/ReloadCore.java | 2 +-
.../solr/handler/admin/api/RenameCollection.java | 2 +-
.../apache/solr/handler/admin/api/RenameCore.java | 2 +-
.../apache/solr/handler/admin/api/ReplaceNode.java | 2 +-
.../admin/api/RequestCoreCommandStatusAPI.java | 62 -----
.../handler/admin/api/RestoreCollectionAPI.java | 10 +-
.../apache/solr/handler/admin/api/RestoreCore.java | 2 +-
.../solr/handler/admin/api/SnapshotBackupAPI.java | 10 +-
.../apache/solr/handler/admin/api/SwapCores.java | 2 +-
.../apache/solr/handler/admin/api/SyncShard.java | 2 +-
.../apache/solr/handler/admin/api/UnloadCore.java | 2 +-
.../solr/handler/admin/api/V2NodeLoggingAPI.java | 10 +-
.../handler/component/IterativeMergeStrategy.java | 2 +-
.../solr/handler/component/SearchHandler.java | 33 +++
.../solr/handler/configsets/ListConfigSets.java | 6 +-
.../solr/jersey/APIConfigProviderBinder.java | 2 +-
.../solr/jersey/CatchAllExceptionMapper.java | 14 +-
.../org/apache/solr/jersey/InjectionFactories.java | 4 +-
.../solr/jersey/MediaTypeOverridingFilter.java | 15 +-
.../org/apache/solr/jersey/MessageBodyReaders.java | 19 +-
.../org/apache/solr/jersey/MessageBodyWriters.java | 16 +-
.../solr/jersey/NotFoundExceptionMapper.java | 12 +-
.../solr/jersey/PostRequestDecorationFilter.java | 8 +-
.../solr/jersey/PostRequestLoggingFilter.java | 16 +-
.../org/apache/solr/jersey/RequestContextKeys.java | 4 +-
.../apache/solr/jersey/RequestMetricHandling.java | 12 +-
.../org/apache/solr/jersey/SolrJacksonMapper.java | 4 +-
.../apache/solr/jersey/SolrRequestAuthorizer.java | 12 +-
.../jersey/container/ContainerRequestUtils.java | 4 +-
.../container/JettyBridgeResponseWriter.java | 2 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 2 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 8 +-
.../org/apache/solr/security/GetPublicKey.java | 2 +-
.../org/apache/solr/update/PeerSyncWithLeader.java | 2 +-
.../apache/solr/update/StreamingSolrClients.java | 2 +-
.../src/java/org/apache/solr/update/UpdateLog.java | 9 +-
.../src/java/org/apache/solr/util/ModuleUtils.java | 2 +-
.../org/apache/solr/util/StartupLoggingUtils.java | 2 +-
.../src/java/org/apache/solr/util/ThreadStats.java | 94 +++++++
.../circuitbreaker/CircuitBreakerRegistry.java | 2 +-
.../collection1/conf/schema_postingsformat.xml | 6 +-
solr/core/src/test-files/solr/solr-50-all.xml | 3 +
.../test/org/apache/solr/TestCpuTimeSearch.java | 124 +++++++++
.../org/apache/solr/api/JerseyResourceTest.java | 2 +-
.../api/NodeConfigClusterPluginsSourceTest.java | 219 ++++++++++++++++
.../impl/NodeConfigPlacementPluginTest.java | 63 +++++
.../impl/PlacementPluginIntegrationTest.java | 19 --
.../src/test/org/apache/solr/core/TestSolrXml.java | 126 +++++++++-
.../apache/solr/handler/TestContainerPlugin.java | 46 ++++
.../admin/api/GetNodeCommandStatusTest.java | 94 +++++++
.../solr/handler/admin/api/NodeLoggingAPITest.java | 69 ++---
.../handler/admin/api/SnapshotBackupAPITest.java | 97 +++-----
.../handler/admin/api/V2CoreAPIMappingTest.java | 13 -
.../handler/configsets/ListConfigSetsAPITest.java | 77 +-----
.../solr/jersey/PostRequestLoggingFilterTest.java | 6 +-
.../org/apache/solr/schema/TestSchemaField.java | 30 ++-
.../licenses/aopalliance-repackaged-2.6.1.jar.sha1 | 1 -
.../licenses/aopalliance-repackaged-3.0.5.jar.sha1 | 1 +
solr/licenses/bcutil-jdk18on-NOTICE.txt | 2 -
solr/licenses/grizzly-framework-2.4.4.jar.sha1 | 1 -
solr/licenses/grizzly-framework-LICENSE-EPL.txt | 277 ---------------------
solr/licenses/grizzly-http-2.4.4.jar.sha1 | 1 -
solr/licenses/grizzly-http-LICENSE-EPL.txt | 277 ---------------------
solr/licenses/grizzly-http-server-2.4.4.jar.sha1 | 1 -
solr/licenses/grizzly-http-servlet-2.4.4.jar.sha1 | 1 -
solr/licenses/hk2-api-2.6.1.jar.sha1 | 1 -
solr/licenses/hk2-api-3.0.5.jar.sha1 | 1 +
solr/licenses/hk2-locator-2.6.1.jar.sha1 | 1 -
solr/licenses/hk2-locator-3.0.5.jar.sha1 | 1 +
solr/licenses/hk2-utils-2.6.1.jar.sha1 | 1 -
solr/licenses/hk2-utils-3.0.5.jar.sha1 | 1 +
...ule-jakarta-xmlbind-annotations-2.16.1.jar.sha1 | 1 +
...jackson-module-jaxb-annotations-2.16.1.jar.sha1 | 1 -
.../licenses/jakarta.annotation-api-1.3.5.jar.sha1 | 1 -
.../licenses/jakarta.annotation-api-2.1.1.jar.sha1 | 1 +
solr/licenses/jakarta.inject-api-2.0.1.jar.sha1 | 1 +
.../licenses/jakarta.validation-api-2.0.2.jar.sha1 | 1 -
.../licenses/jakarta.validation-api-3.0.2.jar.sha1 | 1 +
solr/licenses/jakarta.ws.rs-api-2.1.6.jar.sha1 | 1 -
solr/licenses/jakarta.ws.rs-api-3.1.0.jar.sha1 | 1 +
solr/licenses/javassist-3.29.0-GA.jar.sha1 | 1 -
solr/licenses/javassist-3.29.2-GA.jar.sha1 | 1 +
solr/licenses/jersey-client-2.39.1.jar.sha1 | 1 -
solr/licenses/jersey-client-3.1.5.jar.sha1 | 1 +
solr/licenses/jersey-common-2.39.1.jar.sha1 | 1 -
solr/licenses/jersey-common-3.1.5.jar.sha1 | 1 +
.../jersey-container-grizzly2-http-2.39.1.jar.sha1 | 1 -
...rsey-container-grizzly2-servlet-2.39.1.jar.sha1 | 1 -
.../jersey-container-servlet-2.39.1.jar.sha1 | 1 -
.../jersey-container-servlet-core-2.39.1.jar.sha1 | 1 -
.../jersey-entity-filtering-2.39.1.jar.sha1 | 1 -
.../jersey-entity-filtering-3.1.5.jar.sha1 | 1 +
solr/licenses/jersey-hk2-2.39.1.jar.sha1 | 1 -
solr/licenses/jersey-hk2-3.1.5.jar.sha1 | 1 +
solr/licenses/jersey-media-jaxb-2.39.1.jar.sha1 | 1 -
.../jersey-media-json-jackson-2.39.1.jar.sha1 | 1 -
.../jersey-media-json-jackson-3.1.5.jar.sha1 | 1 +
solr/licenses/jersey-server-2.39.1.jar.sha1 | 1 -
solr/licenses/jersey-server-3.1.5.jar.sha1 | 1 +
.../jersey-test-framework-core-2.39.1.jar.sha1 | 1 -
...est-framework-provider-grizzly2-2.39.1.jar.sha1 | 1 -
solr/licenses/junit-jupiter-5.9.1.jar.sha1 | 1 -
solr/licenses/junit-jupiter-api-5.9.1.jar.sha1 | 1 -
solr/licenses/junit-jupiter-engine-5.9.1.jar.sha1 | 1 -
solr/licenses/junit-jupiter-params-5.9.1.jar.sha1 | 1 -
.../licenses/junit-platform-commons-1.9.1.jar.sha1 | 1 -
solr/licenses/junit-platform-engine-1.9.1.jar.sha1 | 1 -
solr/licenses/opentest4j-1.2.0.jar.sha1 | 1 -
solr/licenses/opentest4j-LICENSE-ASL.txt | 201 ---------------
solr/licenses/opentest4j-NOTICE.txt | 13 -
solr/licenses/swagger-annotations-2.2.17.jar.sha1 | 1 -
.../swagger-annotations-jakarta-2.2.17.jar.sha1 | 1 +
.../extraction/ExtractingRequestHandlerTest.java | 3 +-
.../solr/security/hadoop/HadoopAuthPlugin.java | 3 +-
.../solr/security/hadoop/KerberosPlugin.java | 33 +--
.../hadoop/HadoopSSLCredentialProvider.java | 5 +-
.../client/solrj/impl/Krb5HttpClientUtils.java | 3 +-
.../solr/security/hadoop/HadoopTestUtil.java | 3 +-
.../solr/security/hadoop/ImpersonationUtil.java | 3 +-
.../solr/security/hadoop/KerberosTestServices.java | 3 +-
.../hadoop/TestImpersonationWithHadoopAuth.java | 3 +-
.../TestSolrCloudWithSecureImpersonation.java | 6 +-
.../configuration/HadoopSSLConfigurationsTest.java | 5 +-
.../org/apache/solr/hdfs/HdfsDirectoryFactory.java | 9 +-
.../org/apache/solr/hdfs/index/CheckHdfsIndex.java | 3 +-
.../org/apache/hadoop/fs/RawLocalFileSystem.java | 5 +-
.../test/org/apache/hadoop/util/PlatformName.java | 11 +-
.../apache/solr/hdfs/HdfsDirectoryFactoryTest.java | 3 +-
.../org/apache/solr/hdfs/cloud/HdfsTestUtil.java | 16 +-
.../apache/solr/security/jwt/JWTIssuerConfig.java | 3 +-
.../solr/security/jwt/JWTAuthPluginTest.java | 3 +-
.../algorithms/TeamDraftInterleaving.java | 3 +-
.../solr/opentelemetry/OtelTracerConfigurator.java | 17 +-
.../CustomTestOtelTracerConfigurator.java | 3 +-
.../opentelemetry/OtelTracerConfiguratorTest.java | 3 +-
.../apache/solr/s3/S3BackupRepositoryConfig.java | 15 +-
.../configuration-guide/pages/cluster-plugins.adoc | 4 +-
.../pages/configuring-solr-xml.adoc | 19 ++
.../configuration-guide/pages/coreadmin-api.adoc | 29 ++-
.../getting-started/pages/solr-glossary.adoc | 3 +-
.../query-guide/pages/result-clustering.adoc | 2 +-
.../org/apache/solr/client/solrj/SolrRequest.java | 12 +-
.../client/solrj/impl/CloudLegacySolrClient.java | 12 +-
.../impl/ConcurrentUpdateHttp2SolrClient.java | 12 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 4 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 12 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 4 +-
.../solr/client/solrj/impl/LBHttp2SolrClient.java | 10 +-
.../solr/client/solrj/impl/LBHttpSolrClient.java | 4 +-
.../solr/client/solrj/impl/LBSolrClient.java | 2 +-
.../solr/client/solrj/impl/SolrClientBuilder.java | 8 +-
.../solrj/request/AbstractUpdateRequest.java | 2 +-
...st.java => CollectionRequiringSolrRequest.java} | 8 +-
.../client/solrj/request/DirectXmlRequest.java | 2 +-
.../solrj/request/DocumentAnalysisRequest.java | 3 +-
.../client/solrj/request/FieldAnalysisRequest.java | 2 +-
.../solr/client/solrj/request/LukeRequest.java | 2 +-
.../solr/client/solrj/request/QueryRequest.java | 2 +-
.../apache/solr/client/solrj/request/SolrPing.java | 2 +-
.../request/schema/AbstractSchemaRequest.java | 4 +-
.../apache/solr/client/solrj/util/ClientUtils.java | 4 +-
.../java/org/apache/solr/common/util/EnvUtils.java | 58 ++---
.../apache/solr/common/util/PropertiesUtil.java | 2 +-
.../ConcurrentUpdateSolrClientBuilderTest.java | 2 +-
.../solrj/impl/HttpSolrClientBuilderTest.java | 2 +-
.../solrj/impl/LBHttpSolrClientBuilderTest.java | 2 +-
.../solrj/response/TestSuggesterResponse.java | 2 +-
.../solr/client/solrj/util/ClientUtilsTest.java | 8 +-
.../org/apache/solr/common/util/EnvUtilsTest.java | 53 ++--
.../src/java/org/apache/solr/SolrTestCase.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
.../java/org/apache/solr/cloud/ConfigRequest.java | 4 +-
.../api/collections/AbstractInstallShardTest.java | 45 +++-
versions.lock | 69 ++---
versions.props | 8 +-
287 files changed, 2495 insertions(+), 1938 deletions(-)