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 2016/12/20 10:48:48 UTC

[43/44] lucene-solr:jira/solr-9854: Merge branch 'feature/metrics' into jira/solr-9854

Merge branch 'feature/metrics' into jira/solr-9854


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3562ef76
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3562ef76
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3562ef76

Branch: refs/heads/jira/solr-9854
Commit: 3562ef76293f5b419cdf4497822c615fe65efebf
Parents: ce8ab8c aed34a4
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Dec 20 11:42:41 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Dec 20 11:42:41 2016 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  17 +
 .../lucene70/Lucene70DocValuesConsumer.java     | 163 +++++--
 .../lucene70/Lucene70DocValuesFormat.java       |   5 +-
 .../lucene70/Lucene70DocValuesProducer.java     | 220 +++++++--
 .../org/apache/lucene/index/LeafReader.java     |   2 +-
 .../apache/lucene/index/PrefixCodedTerms.java   |   4 +-
 .../org/apache/lucene/index/SegmentInfos.java   |   7 +-
 .../java/org/apache/lucene/util/LongValues.java |   9 +
 .../apache/lucene/util/packed/DirectWriter.java |   8 +-
 .../lucene70/TestLucene70DocValuesFormat.java   | 152 +++++++
 .../org/apache/lucene/facet/FacetQuery.java     |  52 +++
 .../apache/lucene/facet/MultiFacetQuery.java    |  61 +++
 .../org/apache/lucene/facet/TestFacetQuery.java | 103 +++++
 lucene/ivy-versions.properties                  |   2 -
 .../apache/lucene/search/DocValuesStats.java    | 409 +++++++++++++++++
 .../lucene/search/DocValuesStatsCollector.java  |  64 +++
 .../search/TestDocValuesStatsCollector.java     | 448 +++++++++++++++++++
 .../apache/lucene/document/RangeFieldQuery.java |   1 +
 .../lucene/search/DocValuesNumbersQuery.java    |  26 +-
 .../lucene/search/DocValuesTermsQuery.java      |  49 +-
 .../org/apache/lucene/search/LongHashSet.java   | 156 +++++++
 .../search/BaseRangeFieldQueryTestCase.java     |   2 +-
 .../apache/lucene/search/LongHashSetTests.java  | 100 +++++
 .../lucene/search/TestDocValuesTermsQuery.java  |   1 +
 .../org/apache/lucene/search/QueryUtils.java    |   4 -
 solr/CHANGES.txt                                |  26 +-
 .../plugin/AnalyticsStatisticsCollector.java    |   4 +-
 .../solr/collection1/conf/solrconfig.xml        |   5 -
 solr/contrib/ltr/example/solrconfig.xml         |  11 -
 .../solr/solrcloud/conf/solrconfig.xml          |  11 -
 .../OverseerAutoReplicaFailoverThread.java      |   9 +-
 .../apache/solr/cloud/OverseerStatusCmd.java    |   4 +-
 .../org/apache/solr/core/CoreContainer.java     |  43 +-
 .../java/org/apache/solr/core/SolrConfig.java   |   2 +-
 .../src/java/org/apache/solr/core/SolrCore.java | 127 +++---
 .../apache/solr/handler/RequestHandlerBase.java |  18 +-
 .../solr/handler/admin/MetricsHandler.java      | 164 +++++++
 .../solr/metrics/SolrCoreMetricManager.java     |  20 +-
 .../apache/solr/metrics/SolrMetricManager.java  | 120 +++--
 .../apache/solr/metrics/SolrMetricProducer.java |   3 +-
 .../apache/solr/metrics/SolrMetricReporter.java |   5 +-
 .../solr/metrics/reporters/SolrJmxReporter.java |   6 +-
 .../apache/solr/search/SolrFieldCacheMBean.java |   6 +-
 .../solr/security/PermissionNameProvider.java   |   1 +
 .../apache/solr/servlet/SolrDispatchFilter.java |  33 +-
 .../SolrMetricsServletContextListener.java      |  29 --
 .../apache/solr/servlet/SolrRequestParsers.java |  31 +-
 .../solr/uninverting/UninvertingReader.java     |  25 +-
 .../solr/util/SolrFileCleaningTracker.java      | 147 ++++++
 .../org/apache/solr/util/stats/MetricUtils.java | 144 ++++++
 .../org/apache/solr/util/stats/TimerUtils.java  |  58 ---
 .../solr/collection1/conf/solrconfig_perf.xml   |   1 -
 .../cloud/SegmentTerminateEarlyTestState.java   |  12 +-
 .../solr/cloud/TestMiniSolrCloudCluster.java    |  50 ---
 .../apache/solr/cloud/TestSegmentSorting.java   | 133 ++++++
 .../solr/handler/admin/MetricsHandlerTest.java  |  97 ++++
 .../solr/metrics/SolrCoreMetricManagerTest.java |  42 +-
 .../solr/metrics/SolrMetricManagerTest.java     |  83 ++--
 .../solr/metrics/SolrMetricReporterTest.java    |   4 +-
 .../solr/metrics/SolrMetricTestUtils.java       |   6 +-
 .../metrics/SolrMetricsIntegrationTest.java     |  16 +-
 .../metrics/reporters/MockMetricReporter.java   |   6 +-
 .../metrics/reporters/SolrJmxReporterTest.java  |  26 +-
 .../org/apache/solr/search/TestRealTimeGet.java |   2 +-
 .../solr/search/TestSolrFieldCacheMBean.java    |   3 +-
 .../apache/solr/search/TestStressLucene.java    |   2 +-
 .../apache/solr/search/TestStressRecovery.java  |   2 +-
 .../apache/solr/search/TestStressReorder.java   |   5 +-
 .../solr/search/TestStressUserVersions.java     |   4 +-
 .../apache/solr/search/TestStressVersions.java  |   2 +-
 .../apache/solr/util/stats/MetricUtilsTest.java |  58 +++
 .../apache/solr/util/stats/TimerUtilsTest.java  |  58 ---
 .../example-DIH/solr/db/conf/solrconfig.xml     |  11 -
 .../example-DIH/solr/mail/conf/solrconfig.xml   |  11 -
 .../example-DIH/solr/rss/conf/solrconfig.xml    |  11 -
 .../example-DIH/solr/solr/conf/solrconfig.xml   |  11 -
 .../example-DIH/solr/tika/conf/solrconfig.xml   |  11 -
 solr/example/files/conf/solrconfig.xml          |  11 -
 solr/licenses/metrics-json-3.1.2.jar.sha1       |   1 -
 solr/licenses/metrics-jvm-3.1.2.jar.sha1        |   1 +
 solr/licenses/metrics-jvm-LICENSE-ASL.txt       | 203 +++++++++
 solr/licenses/metrics-jvm-NOTICE.txt            |  12 +
 solr/licenses/metrics-servlets-3.1.2.jar.sha1   |   1 -
 solr/server/ivy.xml                             |   5 -
 .../basic_configs/conf/solrconfig.xml           |  11 -
 .../conf/solrconfig.xml                         |  11 -
 .../conf/solrconfig.xml                         |  11 -
 .../apache/solr/common/params/CommonParams.java |   4 +-
 .../solr/client/solrj/LargeVolumeTestBase.java  |   3 +-
 .../solr/client/solrj/SolrExampleTestBase.java  |   1 -
 .../java/org/apache/solr/SolrJettyTestBase.java |   2 -
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   2 +-
 .../java/org/apache/solr/util/TestHarness.java  |  11 +-
 solr/webapp/web/WEB-INF/web.xml                 |  17 -
 94 files changed, 3341 insertions(+), 750 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3562ef76/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------