You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ep...@apache.org on 2020/10/15 18:16:21 UTC
[lucene-solr] branch pr1985 updated (b799b5c -> 6b4ef13)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a change to branch pr1985
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from b799b5c track fix
add fa3e1ad SOLR-14869: ChildDocTransformer should have omitted deleted child documents. Closes #1970
add a7a6757 SOLR-14654: ref guide error
add b43c389 Include missing commands in package tool help section (#1975)
add ab5671d LUCENE-9574 Add DropIfFlaggedFilterFactory (#1979)
add 9805b12 LUCENE-9579 Update to JUnit 4.13.1 (#1981)
add 2a3da99 SOLR-14914: Add option to disable metrics collection.
add 321b4fa SOLR-14930: Deprecate rulebased replica placement strategy (remove in 9.0) (#1980)
add 737cf98 SOLR-14924: Some ReplicationHandler metrics are reported using incorrect types.
add 0bd2f31 SOLR-14930: fix precommit
add 6b4ef13 merging master
No new revisions were added by this update.
Summary of changes:
lucene/CHANGES.txt | 7 +
.../miscellaneous/DropIfFlaggedFilter.java} | 33 +-
.../miscellaneous/DropIfFlaggedFilterFactory.java | 71 ++++
.../org.apache.lucene.analysis.TokenFilterFactory | 1 +
.../miscellaneous/TestDropIfFlaggedFilter.java | 73 ++++
...ry.java => TestDropIfFlaggedFilterFactory.java} | 30 +-
lucene/licenses/junit-4.12.jar.sha1 | 1 -
lucene/licenses/junit-4.13.1.jar.sha1 | 1 +
solr/CHANGES.txt | 9 +-
.../prometheus/PrometheusExporterTestBase.java | 1 +
.../src/java/org/apache/solr/cloud/Overseer.java | 1 -
.../apache/solr/cloud/api/collections/Assign.java | 72 +---
.../OverseerCollectionMessageHandler.java | 3 -
.../solr/cloud/api/collections/SplitShardCmd.java | 9 +-
.../org/apache/solr/cloud/rule/ImplicitSnitch.java | 65 ---
.../apache/solr/cloud/rule/ReplicaAssigner.java | 452 ---------------------
.../src/java/org/apache/solr/cloud/rule/Rule.java | 395 ------------------
.../solr/cloud/rule/ServerSnitchContext.java | 59 ---
.../org/apache/solr/cloud/rule/package-info.java | 23 --
.../java/org/apache/solr/core/CoreContainer.java | 12 +-
.../java/org/apache/solr/core/MetricsConfig.java | 71 +++-
.../java/org/apache/solr/core/SolrXmlConfig.java | 13 +-
.../apache/solr/handler/ReplicationHandler.java | 63 +--
.../solr/handler/admin/CollectionsHandler.java | 50 ---
.../apache/solr/handler/admin/MetricsHandler.java | 18 +-
.../solr/handler/admin/MetricsHistoryHandler.java | 15 +-
.../org/apache/solr/metrics/MetricSuppliers.java | 267 ++++++++++--
.../org/apache/solr/metrics/SolrMetricManager.java | 14 +-
.../response/transform/ChildDocTransformer.java | 11 +-
.../src/java/org/apache/solr/util/PackageTool.java | 12 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 1 +
.../src/test-files/solr/solr-metricsconfig.xml | 2 +-
solr/core/src/test-files/solr/solr.xml | 2 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 1 +
.../solr/cloud/MetricsHistoryIntegrationTest.java | 1 +
.../MetricsHistoryWithAuthIntegrationTest.java | 2 +-
.../org/apache/solr/cloud/ReplaceNodeTest.java | 39 ++
.../test/org/apache/solr/cloud/SplitShardTest.java | 1 +
.../apache/solr/cloud/TestBaseStatsCacheCloud.java | 1 +
.../org/apache/solr/cloud/TestCloudRecovery.java | 1 +
.../org/apache/solr/cloud/TestTlogReplica.java | 1 +
.../apache/solr/cloud/rule/ImplicitSnitchTest.java | 244 -----------
.../org/apache/solr/cloud/rule/RuleEngineTest.java | 323 ---------------
.../test/org/apache/solr/cloud/rule/RulesTest.java | 328 ---------------
.../solr/handler/admin/AdminHandlersProxyTest.java | 1 +
.../handler/admin/MetricsHistoryHandlerTest.java | 1 +
.../solr/handler/admin/TestCollectionAPIs.java | 4 -
.../org/apache/solr/metrics/MetricsConfigTest.java | 12 +
.../solr/metrics/MetricsDisabledCloudTest.java | 72 ++++
.../TestChildDocTransformerHierarchy.java | 47 +++
.../solr/search/stats/TestDefaultStatsCache.java | 1 +
solr/dev-docs/overseer/overseer.adoc | 7 +-
solr/licenses/junit-4.12.jar.sha1 | 1 -
solr/licenses/junit-4.13.1.jar.sha1 | 1 +
solr/server/solr/solr.xml | 2 +
solr/solr-ref-guide/src/collection-management.adoc | 6 -
solr/solr-ref-guide/src/configuration-apis.adoc | 4 +-
solr/solr-ref-guide/src/metrics-history.adoc | 3 +
solr/solr-ref-guide/src/metrics-reporting.adoc | 15 +
.../src/rule-based-replica-placement.adoc | 177 --------
solr/solr-ref-guide/src/solrcloud.adoc | 5 +-
solr/solr-ref-guide/src/v2-api.adoc | 10 -
.../solrj/impl/SolrClientNodeStateProvider.java | 50 +--
.../solrj/request/CollectionAdminRequest.java | 7 -
.../apache/solr/common/cloud/DocCollection.java | 6 -
.../resources/apispec/collections.Commands.json | 16 -
.../collections.collection.Commands.modify.json | 16 -
.../solrj/impl/CloudHttp2SolrClientRetryTest.java | 1 +
.../solrj/impl/CloudHttp2SolrClientTest.java | 1 +
.../solrj/impl/CloudSolrClientRetryTest.java | 1 +
.../client/solrj/impl/CloudSolrClientTest.java | 1 +
.../apache/solr/cloud/MiniSolrCloudCluster.java | 3 +-
.../apache/solr/cloud/SolrCloudAuthTestCase.java | 12 +
versions.lock | 2 +-
versions.props | 2 +-
75 files changed, 857 insertions(+), 2429 deletions(-)
copy lucene/analysis/{kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java => common/src/java/org/apache/lucene/analysis/miscellaneous/DropIfFlaggedFilter.java} (54%)
create mode 100644 lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DropIfFlaggedFilterFactory.java
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilter.java
copy lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/{TestTypeAsSynonymFilterFactory.java => TestDropIfFlaggedFilterFactory.java} (55%)
delete mode 100644 lucene/licenses/junit-4.12.jar.sha1
create mode 100644 lucene/licenses/junit-4.13.1.jar.sha1
delete mode 100644 solr/core/src/java/org/apache/solr/cloud/rule/ImplicitSnitch.java
delete mode 100644 solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
delete mode 100644 solr/core/src/java/org/apache/solr/cloud/rule/Rule.java
delete mode 100644 solr/core/src/java/org/apache/solr/cloud/rule/ServerSnitchContext.java
delete mode 100644 solr/core/src/java/org/apache/solr/cloud/rule/package-info.java
delete mode 100644 solr/core/src/test/org/apache/solr/cloud/rule/ImplicitSnitchTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java
delete mode 100644 solr/core/src/test/org/apache/solr/cloud/rule/RulesTest.java
create mode 100644 solr/core/src/test/org/apache/solr/metrics/MetricsDisabledCloudTest.java
delete mode 100644 solr/licenses/junit-4.12.jar.sha1
create mode 100644 solr/licenses/junit-4.13.1.jar.sha1
delete mode 100644 solr/solr-ref-guide/src/rule-based-replica-placement.adoc