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/05/11 04:26:48 UTC
[solr] branch jira/solr16507_refactor updated (7cd15cbfb56 -> ec3e58620be)
This is an automated email from the ASF dual-hosted git repository.
noble pushed a change to branch jira/solr16507_refactor
in repository https://gitbox.apache.org/repos/asf/solr.git
from 7cd15cbfb56 javadocs
add a1a33bd0c24 Remove duplicate code analytics tests (#1490)
add 94d41851542 SOLR-16754: Change the bin/solr -info logic to work like other tools. (#1579)
add c54baa79276 Ref Guide: Clearer instructions for placing security.json. (#1589)
add 1d8781d6174 SOLR-7609: Validate the version is present on follower replicas when adding documents (#1504)
add 58bccab7d59 Remove deprecated constructor in MetricsMap (#1567)
add b42a0a73a84 Remove deprecated methods and fields in Tuple class (#1566)
add 0bb5129a7d8 SOLR-16712: Simplify DocCollection ctor for PRS enabled collection (#1477)
add 1a2ab763ec8 SOLR-16393: Tweak v2 "create alias" API to be more REST-ful (#1590)
add 015f8a22449 SOLR-16737 Http2SolrClient needs to inherit all properties when initialized with another http2 client (#1587)
add 2d9defd2ebe SOLR-16719: Let AffinityPlacementFactory have a spread_domain label (#1577)
add 17437d1e5bd Ref-guide tutorial-aws.adoc link fix (#1591)
add a557776ba19 SOLR-15083: prometheus-exporter incorrect metric namings (#1588)
add c19aa95f04c SOLR-16394: Tweak v2 restore-coll to be more REST-ful (#1592)
add bf9ca1044b2 SOLR-16777: Fix for Schema Designer blindly trusting potentially malicious configsets
add 44cb2b4436e SOLR-13605: HttpSolrClient.Builder.withHttpClient() is useless for the purpose of setting client scoped so/connect timeouts (#1565)
add c8edffc49a7 SOLR-13880: Add test that creates/reloads/deletes collections (#1105)
add 538145f5567 SOLR-16773: UI: Cloud>Nodes screen fix display of cores with non-standard shard names (#1593)
add 684d693bfd6 DOAP changes for release 9.2.1
add c2d5a323635 Sync CHANGES for 9.2.1
add 68dd1fe413f some docs and a test (#1602)
add a59c7878bde SOLR-12226: Basic zk test framework in BATS (#1601)
add bd1dabdf062 Allow SolrBot to run every day to test new version
add e89ab86e611 SOLR-16774: Docker version requirement documented (#1595)
add 4ff4a311d59 SOLR-16764: Be clearer that bin/solr export uses JSONL, not JSON format. Fix up how files are named and output and add tests. (#1614)
add c1b603bf62e Solrbot - return to run on sundays only
add 4ef8df9c603 SOLR-16718: Move placement test utils to test-framework (#1596)
add 0bb6f61b52d SOLR-16784 Badapple CollectionReloadTest (#1621)
add 0788fb488b7 SOLR-16771: Fixed behavior and handling of 'unset' logging levels in /admin/info/logging API and related Admin UI
add 1c50f16abee SOLR-16783: Ignore NoNodeException when deleting clusterstate.json on startup (#1624)
add f29b7cd1efd SOLR-16697: Align install-shard docs
add d9ddba3ac51 SOLR-16789: Admin UI Dashboard shows "unauthenticated" warning on authenticated servers (#1628)
add 810783d812e MINOR: Fix typos in `org.apache.solr.core` package (#1629)
add ad4875d9bb2 SOLR-16782: Export tool should export in JSON that matches Solr Import Format (#1623)
add a3bba065fd6 Add test with ssl and basic auth (#1635)
add 9df80630805 SOLR-16760: bin/solr package support the -h and -help commands like other tools (#1600)
add a93a25b94fb SOLR-16392: Tweak v2 deletereplica to be more REST-ful (#1594)
add ffedc5bb680 SOLR-14853: enableRemoteStreaming and enableStreamBody are now global (#1615)
add 3d8a2bd9cb5 SOLR-16766: Remove -usage as option, and ensure both -help and -h work (#1637)
add 3c8c9fc5218 SOLR-16691 :Use Jackson for JSON serialization (2) (#1633)
add 87627ce0c36 SOLR-16784: This is failing often. Let's fix it and re-enable it
add ec3e58620be Merge branch 'main' into jira/solr16507_refactor merging with main
No new revisions were added by this update.
Summary of changes:
dev-tools/doap/solr.rdf | 7 +
solr/CHANGES.txt | 100 ++++-
solr/bin/solr | 338 ++++++++++-------
solr/bin/solr.cmd | 14 +-
.../java/org/apache/solr/api/JerseyResource.java | 8 +
.../src/java/org/apache/solr/cli/ExportTool.java | 152 +++++++-
.../src/java/org/apache/solr/cli/PackageTool.java | 355 +++++++++---------
.../core/src/java/org/apache/solr/cli/SolrCLI.java | 2 +-
.../src/java/org/apache/solr/cli/StatusTool.java | 2 +
.../solr/cloud/DistributedClusterStateUpdater.java | 3 +-
.../java/org/apache/solr/cloud/ZkController.java | 10 +-
.../solr/cloud/api/collections/RoutedAlias.java | 6 +-
.../cloud/api/collections/TimeRoutedAlias.java | 4 +-
.../solr/cloud/overseer/ClusterStateMutator.java | 2 +-
.../solr/cloud/overseer/CollectionMutator.java | 2 +-
.../apache/solr/cloud/overseer/ZkStateWriter.java | 13 +-
.../placement/plugins/AffinityPlacementConfig.java | 36 ++
.../plugins/AffinityPlacementFactory.java | 329 +++++++++++++---
.../apache/solr/core/CachingDirectoryFactory.java | 4 +-
.../src/java/org/apache/solr/core/CloseHook.java | 4 +-
.../java/org/apache/solr/core/ConfigOverlay.java | 2 +-
.../src/java/org/apache/solr/core/ConfigSet.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 36 +-
.../java/org/apache/solr/core/CoreDescriptor.java | 2 +-
.../src/java/org/apache/solr/core/CoreSorter.java | 4 +-
.../org/apache/solr/core/DirectoryFactory.java | 10 +-
.../solr/core/IndexDeletionPolicyWrapper.java | 52 +--
.../src/java/org/apache/solr/core/NodeConfig.java | 4 +-
.../src/java/org/apache/solr/core/PluginBag.java | 2 +-
.../src/java/org/apache/solr/core/PluginInfo.java | 2 +-
.../src/java/org/apache/solr/core/SolrConfig.java | 35 +-
.../src/java/org/apache/solr/core/SolrCore.java | 50 +--
.../org/apache/solr/core/SolrDeletionPolicy.java | 4 +-
.../org/apache/solr/core/SolrResourceLoader.java | 6 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 8 +-
.../org/apache/solr/core/TracerConfigurator.java | 2 +-
.../apache/solr/core/TransientSolrCoreCache.java | 2 +-
.../java/org/apache/solr/core/XmlConfigFile.java | 2 +-
.../core/backup/repository/BackupRepository.java | 6 +-
.../backup/repository/BackupRepositoryFactory.java | 2 +-
.../apache/solr/handler/DumpRequestHandler.java | 2 +-
.../solr/handler/admin/CollectionsHandler.java | 287 +-------------
.../solr/handler/admin/api/AdminAPIBase.java | 42 +++
.../solr/handler/admin/api/CreateAliasAPI.java | 416 +++++++++++++++++++--
.../handler/admin/api/CreateCollectionAPI.java | 16 +-
.../admin/api/CreateCollectionBackupAPI.java | 6 +-
.../solr/handler/admin/api/DeleteReplicaAPI.java | 281 ++++++++++++--
.../solr/handler/admin/api/DeleteShardAPI.java | 118 ++++--
.../handler/admin/api/RestoreCollectionAPI.java | 239 ++++++++++--
.../designer/SchemaDesignerConfigSetHelper.java | 2 +-
.../apache/solr/handler/export/ExportWriter.java | 5 +-
.../apache/solr/logging/log4j2/Log4j2Watcher.java | 81 ++--
.../java/org/apache/solr/metrics/MetricsMap.java | 11 -
.../solr/response/BinaryQueryResponseWriter.java | 14 +-
...eResponseWriter.java => JacksonJsonWriter.java} | 79 +++-
.../solr/response/QueryResponseWriterUtil.java | 45 ++-
.../response/transform/GeoTransformerFactory.java | 4 +-
.../apache/solr/servlet/DirectSolrConnection.java | 11 +-
.../apache/solr/servlet/SolrRequestParsers.java | 9 +-
.../processor/DistributedUpdateProcessor.java | 41 +-
.../processor/DistributedZkUpdateProcessor.java | 28 +-
.../org/apache/solr/util/stats/MetricUtils.java | 173 +--------
.../org/apache/solr/util/tracing/TraceUtils.java | 2 +-
.../conf/solrconfig-analytics-query.xml | 2 +-
.../conf/solrconfig-collapseqparser.xml | 2 +-
.../conf/solrconfig-components-name.xml | 2 +-
.../conf/solrconfig-delaying-component.xml | 2 +-
.../conf/solrconfig-doctransformers.xml | 2 +-
.../solr/collection1/conf/solrconfig-elevate.xml | 2 +-
.../solr/collection1/conf/solrconfig-follower.xml | 2 +-
.../solr/collection1/conf/solrconfig-follower1.xml | 2 +-
.../solr/collection1/conf/solrconfig-hash.xml | 2 +-
.../conf/solrconfig-leader-throttled.xml | 2 +-
.../solr/collection1/conf/solrconfig-leader.xml | 2 +-
.../conf/solrconfig-leader1-keepOneBackup.xml | 2 +-
.../solr/collection1/conf/solrconfig-leader1.xml | 2 +-
.../solr/collection1/conf/solrconfig-leader2.xml | 2 +-
.../solr/collection1/conf/solrconfig-leader3.xml | 2 +-
.../collection1/conf/solrconfig-managed-schema.xml | 3 +-
.../solr/collection1/conf/solrconfig-minhash.xml | 2 +-
.../solr/collection1/conf/solrconfig-nocache.xml | 2 +-
.../collection1/conf/solrconfig-plugcollector.xml | 2 +-
.../solr/collection1/conf/solrconfig-repeater.xml | 2 +-
.../conf/solrconfig-replication-legacy.xml | 2 +-
.../collection1/conf/solrconfig-schemaless.xml | 2 +-
.../solr/collection1/conf/solrconfig-sql.xml | 2 +-
.../solr/collection1/conf/solrconfig-tlog.xml | 2 +-
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../solr/collection1/conf/solrconfig_perf.xml | 3 +-
.../src/test-files/solr/crazy-path-to-config.xml | 2 +-
.../test/org/apache/solr/cli/TestExportTool.java | 60 ++-
.../apache/solr/cloud/AliasIntegrationTest.java | 2 +-
.../org/apache/solr/cloud/ClusterStateTest.java | 6 +-
.../apache/solr/cloud/CreateRoutedAliasTest.java | 74 ++--
.../OverseerCollectionConfigSetProcessorTest.java | 2 +-
.../org/apache/solr/cloud/ZkControllerTest.java | 65 ++++
.../api/collections/CollectionReloadTest.java | 119 +++++-
.../solr/cloud/api/collections/ShardSplitTest.java | 46 ++-
.../solr/cloud/overseer/ZkStateReaderTest.java | 44 +--
.../solr/cloud/overseer/ZkStateWriterTest.java | 14 +-
.../plugins/AffinityPlacementFactoryTest.java | 280 +++++++++++++-
.../solr/handler/admin/LoggingHandlerTest.java | 186 ++++++---
.../solr/handler/admin/TestApiFramework.java | 7 -
.../solr/handler/admin/TestCollectionAPIs.java | 25 --
.../handler/admin/V2CollectionsAPIMappingTest.java | 165 --------
.../solr/handler/admin/api/CreateAliasAPITest.java | 348 +++++++++++++++++
.../handler/admin/api/DeleteReplicaAPITest.java | 135 +++++++
.../solr/handler/admin/api/DeleteShardAPITest.java | 93 +++++
.../admin/api/RestoreCollectionAPITest.java | 202 ++++++++++
.../handler/admin/api/V2ShardsAPIMappingTest.java | 58 ---
.../apache/solr/request/TestRemoteStreaming.java | 6 +-
.../org/apache/solr/request/TestStreamBody.java | 26 +-
.../solr/response/TestRawResponseWriter.java | 7 +-
.../test/org/apache/solr/search/TestRecovery.java | 2 +-
.../org/apache/solr/search/TestSmileRequest.java | 1 +
.../apache/solr/search/json/TestJsonRequest.java | 1 +
.../org/apache/solr/servlet/CacheHeaderTest.java | 6 +-
.../solr/servlet/DirectSolrConnectionTest.java | 1 +
.../apache/solr/servlet/SolrRequestParserTest.java | 2 +
.../apache/solr/util/stats/MetricUtilsTest.java | 6 -
.../org/apache/solr/analytics/NoFacetTest.java | 80 +---
.../solr/analytics/OverallAnalyticsTest.java | 82 +---
.../solr/analytics/SolrAnalyticsTestCase.java | 81 ++++
.../solr/analytics/facet/PivotFacetTest.java | 83 +---
.../solr/analytics/facet/QueryFacetTest.java | 83 +---
.../solr/analytics/facet/RangeFacetTest.java | 83 +---
.../solr/analytics/facet/ValueFacetTest.java | 83 +---
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../conf/solrconfig-languageidentifier.xml | 2 +-
.../solr/collection1/conf/solrconfig-ltr.xml | 2 +-
.../collection1/conf/solrconfig-ltr_Th10_10.xml | 2 +-
.../solr/collection1/conf/solrconfig-multiseg.xml | 2 +-
solr/packaging/test/test_export.bats | 38 +-
.../test/{test_create.bats => test_packages.bats} | 24 +-
solr/packaging/test/test_ssl.bats | 39 +-
.../test/{test_create.bats => test_status.bats} | 20 +-
solr/packaging/test/test_zk.bats | 77 ++++
.../conf/grafana-solr-dashboard.json | 6 +-
.../conf/solr-exporter-config.xml | 6 +-
.../solr/configsets/_default/conf/solrconfig.xml | 10 +-
.../conf/solrconfig.xml | 13 +-
.../configuration-guide/pages/config-api.adoc | 2 -
.../pages/requestdispatcher.adoc | 62 +--
.../deployment-guide/pages/alias-management.adoc | 104 +++---
.../authentication-and-authorization-plugins.adoc | 4 +-
.../pages/collection-management.adoc | 39 +-
.../deployment-guide/pages/metrics-reporting.adoc | 2 +-
.../pages/performance-statistics-reference.adoc | 2 +-
.../deployment-guide/pages/replica-management.adoc | 47 ++-
.../deployment-guide/pages/shard-management.adoc | 29 +-
.../pages/solr-control-script-reference.adoc | 171 ++++++---
.../getting-started/pages/tutorial-aws.adoc | 8 +-
.../indexing-guide/pages/content-streams.adoc | 46 +--
.../pages/major-changes-in-solr-9.adoc | 13 +-
.../org/apache/solr/client/solrj/io/Tuple.java | 34 +-
.../solrj/solr/configsets/ml/conf/solrconfig.xml | 2 +-
.../solr/configsets/streaming/conf/solrconfig.xml | 2 +-
.../client/solrj/cloud/DistribStateManager.java | 15 +-
.../solrj/impl/ZkClientClusterStateProvider.java | 2 +-
.../solr/common/cloud/PerReplicaStatesFetcher.java | 7 +-
.../apache/solr/common/cloud/ZkStateReader.java | 4 +-
.../solrj/impl/BaseHttpClusterStateProvider.java | 12 +-
.../client/solrj/impl/CloudHttp2SolrClient.java | 2 +-
.../client/solrj/impl/CloudLegacySolrClient.java | 21 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 16 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 106 ++++--
.../solr/client/solrj/impl/HttpSolrClient.java | 40 +-
.../solr/client/solrj/impl/LBHttpSolrClient.java | 22 +-
.../solr/client/solrj/impl/SolrClientBuilder.java | 36 +-
.../solrj/request/beans/CreateAliasPayload.java | 63 ----
.../request/beans/RestoreCollectionPayload.java | 45 ---
.../org/apache/solr/common/cloud/ClusterState.java | 2 +-
.../apache/solr/common/cloud/DocCollection.java | 134 ++++---
.../apache/solr/common/cloud/PerReplicaStates.java | 4 +
.../java/org/apache/solr/common/cloud/Replica.java | 19 +-
.../java/org/apache/solr/common/cloud/Slice.java | 11 +-
.../solr/collection1/conf/solrconfig-follower1.xml | 2 +-
.../solrj/solr/collection1/conf/solrconfig-sql.xml | 2 +-
.../solrj/solr/collection1/conf/solrconfig.xml | 2 +-
.../solrj/solr/configsets/ml/conf/solrconfig.xml | 2 +-
.../solr/configsets/shared/conf/solrconfig.xml | 2 +-
.../solr/configsets/streaming/conf/solrconfig.xml | 2 +-
.../solrj/solr/multicore/core0/conf/solrconfig.xml | 2 +-
.../solrj/solr/multicore/core1/conf/solrconfig.xml | 2 +-
.../client/solrj/impl/Http2SolrClientTest.java | 35 ++
.../solrj/impl/HttpSolrClientBuilderTest.java | 17 +
.../solrj/impl/LBHttpSolrClientBuilderTest.java | 19 +
.../src/java/org/apache/solr/JSONTestUtil.java | 1 +
.../src/java/org/apache/solr/SolrTestCase.java | 10 +
.../cluster/placement/AttributeFetcherForTest.java | 0
.../apache/solr/cluster/placement/Builders.java | 0
.../placement/ClusterAbstractionsForTest.java | 0
.../solr/cluster/placement}/package-info.java | 4 +-
.../java/org/apache/solr/util/RestTestHarness.java | 6 +-
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../solr/cluster/placement/BuildersTest.java | 0
solr/webapp/web/js/angular/controllers/cloud.js | 11 +-
solr/webapp/web/js/angular/controllers/index.js | 4 +
198 files changed, 4777 insertions(+), 2875 deletions(-)
copy solr/core/src/java/org/apache/solr/response/{SmileResponseWriter.java => JacksonJsonWriter.java} (69%)
delete mode 100644 solr/core/src/test/org/apache/solr/handler/admin/V2CollectionsAPIMappingTest.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/api/CreateAliasAPITest.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaAPITest.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/api/DeleteShardAPITest.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java
copy solr/packaging/test/{test_create.bats => test_packages.bats} (66%)
copy solr/packaging/test/{test_create.bats => test_status.bats} (68%)
create mode 100644 solr/packaging/test/test_zk.bats
delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateAliasPayload.java
delete mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/RestoreCollectionPayload.java
rename solr/{core/src/test => test-framework/src/java}/org/apache/solr/cluster/placement/AttributeFetcherForTest.java (100%)
rename solr/{core/src/test => test-framework/src/java}/org/apache/solr/cluster/placement/Builders.java (100%)
rename solr/{core/src/test => test-framework/src/java}/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java (100%)
copy solr/{benchmark/src/java/org/apache/solr/bench/search => test-framework/src/java/org/apache/solr/cluster/placement}/package-info.java (89%)
rename solr/{core => test-framework}/src/test/org/apache/solr/cluster/placement/BuildersTest.java (100%)