You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/10/10 08:11:30 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14914

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-14914
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit aa69d710fce6fae12b3d7326f6f936c93ec96eda
Merge: 072246e 7a13e81
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Sat Oct 10 10:11:09 2020 +0200

    Merge branch 'master' into jira/solr-14914

 .../org/apache/lucene/search/ConjunctionDISI.java  |  36 ++
 .../src/java/org/apache/lucene/search/Weight.java  |  58 +++-
 .../lucene/search/comparators/DocComparator.java   |   8 +-
 .../search/comparators/NumericComparator.java      |   8 +-
 .../apache/lucene/search/TestConjunctionDISI.java  |  19 +-
 solr/CHANGES.txt                                   |   8 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |  21 +-
 .../apache/solr/handler/ReplicationHandler.java    |   9 +-
 .../apache/solr/handler/RequestHandlerBase.java    |   4 +-
 .../apache/solr/handler/admin/MetricsHandler.java  |  24 +-
 .../solr/handler/component/SuggestComponent.java   |   4 +-
 .../java/org/apache/solr/metrics/MetricsMap.java   |  69 +++-
 .../solr/metrics/reporters/solr/SolrReporter.java  |   2 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |  11 +-
 .../java/org/apache/solr/search/CaffeineCache.java |   2 +-
 .../org/apache/solr/search/SolrFieldCacheBean.java |   4 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   4 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |   4 +-
 .../org/apache/solr/store/blockcache/Metrics.java  |   2 +-
 .../solr/store/hdfs/HdfsLocalityReporter.java      |   2 +-
 .../org/apache/solr/util/stats/MetricUtils.java    | 380 +++++++++++++++------
 .../test/org/apache/solr/core/MockInfoBean.java    |   2 +-
 .../solr/handler/admin/MetricsHandlerTest.java     |  63 ++--
 .../apache/solr/util/stats/MetricUtilsTest.java    |  75 ++--
 .../solr/configsets/_default/conf/solrconfig.xml   | 154 ++-------
 .../conf/solrconfig.xml                            | 166 ++-------
 solr/solr-ref-guide/src/analytics.adoc             |   2 +-
 .../src/common-query-parameters.adoc               |   8 +-
 solr/solr-ref-guide/src/faceting.adoc              |   2 +
 solr/solr-ref-guide/src/highlighting.adoc          |   2 +-
 solr/solr-ref-guide/src/index-replication.adoc     |   2 +-
 ...andlers-and-searchcomponents-in-solrconfig.adoc | 286 ++++++++++++----
 .../src/rule-based-authorization-plugin.adoc       |   4 +-
 solr/solr-ref-guide/src/the-terms-component.adoc   |   2 +-
 .../src/uploading-data-with-index-handlers.adoc    |   5 +
 .../java/org/apache/solr/common/MapWriterMap.java  |   5 +
 .../org/apache/solr/common/NavigableObject.java    |   6 +
 .../org/apache/solr/common/util/NamedList.java     |   5 +
 .../java/org/apache/solr/common/util/Utils.java    |  58 +++-
 39 files changed, 931 insertions(+), 595 deletions(-)