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 2017/12/04 17:49:21 UTC

[37/50] lucene-solr:jira/solr-11458-2: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


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

Branch: refs/heads/jira/solr-11458-2
Commit: 9c0ca9b46505b21ac7e3165d8f9f3c0ce3fe63ec
Parents: 249dac1 01d1277
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Nov 30 20:52:02 2017 -0500
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Nov 30 20:52:02 2017 -0500

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  17 ++
 .../lucene/benchmark/byTask/tasks/ReadTask.java |   9 +-
 .../apache/lucene/index/DocumentsWriter.java    |  15 +
 .../index/DocumentsWriterFlushControl.java      |  88 +++++-
 .../org/apache/lucene/index/FlushPolicy.java    |  25 +-
 .../org/apache/lucene/index/IndexWriter.java    |  25 ++
 .../org/apache/lucene/search/BooleanWeight.java |  19 +-
 .../lucene/search/DisjunctionMaxQuery.java      |  11 +-
 .../lucene/search/DisjunctionMaxScorer.java     |   4 +-
 .../EarlyTerminatingSortingCollector.java       | 129 ---------
 .../org/apache/lucene/search/IndexSearcher.java |   3 +-
 .../org/apache/lucene/search/LRUQueryCache.java |  76 +++--
 .../org/apache/lucene/search/SortRescorer.java  |   2 +-
 .../apache/lucene/search/TermInSetQuery.java    |   4 +-
 .../apache/lucene/search/TopFieldCollector.java |  86 +++++-
 .../apache/lucene/index/TestIndexSorting.java   |  10 +-
 .../apache/lucene/index/TestIndexWriter.java    | 129 +++++++++
 .../org/apache/lucene/search/TestBoolean2.java  |   8 +-
 .../search/TestBooleanMinShouldMatch.java       |   2 +-
 .../TestEarlyTerminatingSortingCollector.java   | 246 ----------------
 .../lucene/search/TestElevationComparator.java  |   2 +-
 .../apache/lucene/search/TestLRUQueryCache.java | 101 ++++---
 .../lucene/search/TestMinShouldMatch2.java      |   4 +-
 .../apache/lucene/search/TestTopDocsMerge.java  |   4 +-
 .../lucene/search/TestTopFieldCollector.java    |  14 +-
 .../TestTopFieldCollectorEarlyTermination.java  | 213 ++++++++++++++
 .../TestUsageTrackingFilterCachingPolicy.java   |   2 +-
 .../lucene/expressions/TestDemoExpressions.java |  11 +-
 .../org/apache/lucene/facet/DrillSideways.java  |   4 +-
 .../apache/lucene/facet/FacetsCollector.java    |   3 +-
 .../search/grouping/BlockGroupingCollector.java |   2 +-
 .../search/grouping/TopGroupsCollector.java     |   2 +-
 .../lucene/search/join/GlobalOrdinalsQuery.java |   5 +-
 .../lucene/queries/TestCustomScoreQuery.java    |  24 +-
 .../analyzing/AnalyzingInfixSuggester.java      |  10 +-
 .../apache/lucene/index/RandomIndexWriter.java  |  11 +
 .../org/apache/lucene/search/CheckHits.java     |  45 ++-
 .../org/apache/lucene/util/LuceneTestCase.java  |   2 +-
 solr/CHANGES.txt                                |  11 +
 solr/contrib/ltr/build.xml                      |   5 +
 solr/contrib/ltr/ivy.xml                        |   5 +-
 .../solr/ltr/model/DefaultWrapperModel.java     | 105 +++++++
 .../org/apache/solr/ltr/model/WrapperModel.java | 169 +++++++++++
 .../solr/ltr/store/rest/ManagedModelStore.java  |  35 ++-
 .../solr/collection1/conf/solrconfig-ltr.xml    |   3 +
 .../solr/ltr/model/TestDefaultWrapperModel.java | 145 ++++++++++
 .../apache/solr/ltr/model/TestWrapperModel.java | 290 +++++++++++++++++++
 .../store/rest/TestModelManagerPersistence.java |  76 +++++
 .../org/apache/solr/cloud/ActionThrottle.java   |  11 +
 .../cloud/autoscaling/AutoScalingHandler.java   |  14 +
 .../cloud/autoscaling/ScheduledTriggers.java    | 144 ++++++---
 .../org/apache/solr/handler/StreamHandler.java  |   1 +
 .../solr/handler/component/ExpandComponent.java |   4 +-
 .../solr/metrics/SolrCoreContainerReporter.java |  47 +++
 .../apache/solr/metrics/SolrCoreReporter.java   |  47 +++
 .../apache/solr/metrics/SolrMetricManager.java  |  10 +-
 .../reporters/solr/SolrClusterReporter.java     |  12 +-
 .../reporters/solr/SolrShardReporter.java       |  12 +-
 .../EarlyTerminatingSortingCollector.java       | 132 +++++++++
 .../java/org/apache/solr/search/Grouping.java   |   2 +-
 .../org/apache/solr/search/ReRankCollector.java |   2 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   2 +-
 .../distributed/command/QueryCommand.java       |   2 +-
 .../apache/solr/cloud/ActionThrottleTest.java   |  37 ++-
 .../autoscaling/AutoScalingHandlerTest.java     | 112 ++++++-
 .../autoscaling/TriggerIntegrationTest.java     | 186 +++++++++++-
 .../solr/handler/admin/TestCoreAdminApis.java   |   2 +-
 .../reporters/solr/SolrCloudReportersTest.java  |   8 +
 .../test/org/apache/solr/search/TestSort.java   |   2 +-
 solr/solr-ref-guide/src/learning-to-rank.adoc   |  49 ++++
 .../src/meta-docs/asciidoc-syntax.adoc          |  46 ++-
 .../src/solrcloud-autoscaling-api.adoc          |  39 +++
 .../cloud/autoscaling/AutoScalingConfig.java    |  39 ++-
 .../io/eval/GeometricDistributionEvaluator.java |  44 +++
 .../io/eval/PoissonDistributionEvaluator.java   |   2 +-
 .../client/solrj/request/CoreApiMapping.java    |   2 +-
 .../solr/common/params/AutoScalingParams.java   |   7 +
 .../resources/apispec/autoscaling.Commands.json |   5 +
 .../solrj/io/stream/StreamExpressionTest.java   |  39 +++
 79 files changed, 2555 insertions(+), 717 deletions(-)
----------------------------------------------------------------------