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 2018/04/16 17:20:42 UTC
[02/46] lucene-solr:jira/solr-11833: 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/5bd7b03e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5bd7b03e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5bd7b03e
Branch: refs/heads/jira/solr-11833
Commit: 5bd7b03e7191d4966590e96bcf9cdcbc4813a5cc
Parents: 0c71503 376f6c4
Author: Karl Wright <Da...@gmail.com>
Authored: Wed Apr 11 17:54:30 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Wed Apr 11 17:54:30 2018 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 9 +
.../org/apache/lucene/index/IndexWriter.java | 20 +
.../org/apache/lucene/index/LogMergePolicy.java | 4 +-
.../org/apache/lucene/index/MergePolicy.java | 27 +-
.../apache/lucene/index/MergePolicyWrapper.java | 7 +
.../org/apache/lucene/index/NoMergePolicy.java | 7 +
.../apache/lucene/index/ReadersAndUpdates.java | 91 ++-
.../index/SoftDeletesRetentionMergePolicy.java | 29 +-
.../apache/lucene/index/TieredMergePolicy.java | 2 +-
.../org/apache/lucene/search/BooleanWeight.java | 35 +
.../lucene/search/ConstantScoreQuery.java | 5 +
.../search/DisjunctionMatchesIterator.java | 171 +++++
.../lucene/search/DisjunctionMaxQuery.java | 12 +
.../lucene/search/DocValuesRewriteMethod.java | 20 +-
.../org/apache/lucene/search/FilterWeight.java | 4 +
.../lucene/search/IndexOrDocValuesQuery.java | 6 +
.../org/apache/lucene/search/LRUQueryCache.java | 5 +
.../java/org/apache/lucene/search/Matches.java | 146 +++++
.../apache/lucene/search/MatchesIterator.java | 79 +++
.../MultiTermQueryConstantScoreWrapper.java | 14 +-
.../org/apache/lucene/search/SynonymQuery.java | 13 +-
.../apache/lucene/search/TermInSetQuery.java | 9 +
.../lucene/search/TermMatchesIterator.java | 77 +++
.../org/apache/lucene/search/TermQuery.java | 21 +-
.../java/org/apache/lucene/search/Weight.java | 29 +
.../java/org/apache/lucene/util/IOSupplier.java | 37 ++
.../TestSoftDeletesRetentionMergePolicy.java | 56 ++
.../lucene/search/TestMatchesIterator.java | 440 +++++++++++++
.../search/join/ToParentBlockJoinQuery.java | 23 +
.../queries/function/FunctionScoreQuery.java | 6 +
.../org/apache/lucene/search/CoveringQuery.java | 22 +
.../apache/lucene/search/AssertingMatches.java | 43 ++
.../lucene/search/AssertingMatchesIterator.java | 77 +++
.../apache/lucene/search/AssertingWeight.java | 8 +
.../org/apache/lucene/search/CheckHits.java | 55 +-
.../org/apache/lucene/search/QueryUtils.java | 2 +
solr/CHANGES.txt | 2 +
.../autoscaling/AutoAddReplicasPlanAction.java | 4 +-
.../solr/cloud/autoscaling/AutoScaling.java | 3 +
.../cloud/autoscaling/ComputePlanAction.java | 21 +-
.../cloud/autoscaling/IndexSizeTrigger.java | 408 ++++++++++++
.../solr/cloud/autoscaling/MetricTrigger.java | 6 +-
.../cloud/autoscaling/SearchRateTrigger.java | 5 +-
.../solr/cloud/autoscaling/TriggerEvent.java | 16 +-
.../org/apache/solr/cloud/CloudTestUtils.java | 20 +-
.../cloud/autoscaling/IndexSizeTriggerTest.java | 647 +++++++++++++++++++
.../cloud/autoscaling/NodeAddedTriggerTest.java | 2 +-
.../ScheduledMaintenanceTriggerTest.java | 2 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 103 ++-
.../sim/SimClusterStateProvider.java | 248 ++++++-
.../autoscaling/sim/SimNodeStateProvider.java | 4 +-
.../autoscaling/sim/SimSolrCloudTestCase.java | 60 +-
.../cloud/autoscaling/sim/TestLargeCluster.java | 16 +-
.../autoscaling/sim/TestTriggerIntegration.java | 2 +-
.../src/solrcloud-autoscaling-triggers.adoc | 77 +++
.../client/solrj/cloud/autoscaling/Policy.java | 3 +
.../solrj/cloud/autoscaling/ReplicaInfo.java | 4 +
.../cloud/autoscaling/SplitShardSuggester.java | 43 ++
.../cloud/autoscaling/TriggerEventType.java | 3 +-
.../cloud/autoscaling/UnsupportedSuggester.java | 59 ++
.../solr/common/params/CollectionParams.java | 4 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 2 +-
62 files changed, 3194 insertions(+), 181 deletions(-)
----------------------------------------------------------------------