You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2017/12/01 01:53:58 UTC
[2/2] lucene-solr:branch_7x: Merge branch 'branch_7x' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x
Merge branch 'branch_7x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8b230d21
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8b230d21
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8b230d21
Branch: refs/heads/branch_7x
Commit: 8b230d21c663b2849a296394d6b02a8a9ab0b3e0
Parents: 608e094 53c185a
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Nov 30 20:53:46 2017 -0500
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Nov 30 20:53:46 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 | 6 +
.../lucene/search/DisjunctionMaxQuery.java | 6 +
.../org/apache/lucene/search/IndexSearcher.java | 3 +-
.../org/apache/lucene/search/LRUQueryCache.java | 25 +--
.../org/apache/lucene/search/SortRescorer.java | 2 +-
.../apache/lucene/search/TermInSetQuery.java | 4 +-
.../apache/lucene/search/TopFieldCollector.java | 162 +++++++++++++-
.../apache/lucene/index/TestIndexSorting.java | 10 +-
.../apache/lucene/index/TestIndexWriter.java | 129 +++++++++++
.../org/apache/lucene/search/TestBoolean2.java | 8 +-
.../TestEarlyTerminatingSortingCollector.java | 4 +-
.../lucene/search/TestElevationComparator.java | 2 +-
.../apache/lucene/search/TestLRUQueryCache.java | 15 +-
.../apache/lucene/search/TestTopDocsMerge.java | 4 +-
.../lucene/search/TestTopFieldCollector.java | 14 +-
.../TestTopFieldCollectorEarlyTermination.java | 213 +++++++++++++++++++
.../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 +-
.../analyzing/AnalyzingInfixSuggester.java | 10 +-
.../apache/lucene/index/RandomIndexWriter.java | 11 +
solr/CHANGES.txt | 5 +
.../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 +-
.../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 +-
.../test/org/apache/solr/search/TestSort.java | 2 +-
.../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 ++++
53 files changed, 1358 insertions(+), 214 deletions(-)
----------------------------------------------------------------------