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/11/09 21:19:55 UTC
[49/50] [abbrv] lucene-solr:jira/solr-11285-sim: Merge branch
'master' into jira/solr-11285-sim
Merge branch 'master' into jira/solr-11285-sim
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/93a880da
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/93a880da
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/93a880da
Branch: refs/heads/jira/solr-11285-sim
Commit: 93a880da5a470e12a154c81860dedde59175e42d
Parents: ff7717b 15fe53e
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Nov 9 18:08:29 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Nov 9 18:08:29 2017 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 16 ++
lucene/MIGRATE.txt | 146 +------------------
.../org/apache/lucene/index/FieldInfos.java | 12 +-
.../apache/lucene/index/ParallelLeafReader.java | 2 +-
.../org/apache/lucene/search/IndexSearcher.java | 19 +--
.../lucene/search/SloppyPhraseScorer.java | 4 +-
.../search/similarities/BM25Similarity.java | 14 --
.../search/similarities/BooleanSimilarity.java | 10 --
.../search/similarities/MultiSimilarity.java | 10 --
.../lucene/search/similarities/Similarity.java | 17 +--
.../search/similarities/SimilarityBase.java | 10 --
.../search/similarities/TFIDFSimilarity.java | 10 --
.../apache/lucene/search/spans/SpanScorer.java | 2 +-
.../org/apache/lucene/search/spans/Spans.java | 4 +-
.../lucene/index/TestMaxTermFrequency.java | 11 +-
.../lucene/index/TestParallelLeafReader.java | 26 ++++
.../apache/lucene/search/TestConjunctions.java | 13 +-
.../lucene/search/TestDocValuesScoring.java | 11 --
.../lucene/search/TestSimilarityProvider.java | 21 +--
.../search/TestDiversifiedTopDocsCollector.java | 13 +-
.../lucene/queries/payloads/PayloadDecoder.java | 37 +++++
.../queries/payloads/PayloadScoreQuery.java | 41 ++----
.../payloads/TestPayloadExplanations.java | 4 +-
.../queries/payloads/TestPayloadScoreQuery.java | 35 ++---
.../queries/payloads/TestPayloadTermQuery.java | 14 +-
.../xml/builders/BoostingTermBuilder.java | 8 +-
.../similarities/AssertingSimilarity.java | 32 ----
solr/CHANGES.txt | 7 +
.../org/apache/solr/cloud/AddReplicaCmd.java | 2 +-
.../src/java/org/apache/solr/cloud/Assign.java | 13 +-
.../org/apache/solr/cloud/CreateShardCmd.java | 2 +-
.../apache/solr/cloud/rule/ReplicaAssigner.java | 47 +++---
.../java/org/apache/solr/cloud/rule/Rule.java | 5 +-
.../solr/cloud/rule/ServerSnitchContext.java | 67 ++-------
.../solr/handler/admin/CollectionsHandler.java | 3 +-
.../solr/handler/admin/LukeRequestHandler.java | 32 ++--
.../org/apache/solr/schema/IndexSchema.java | 16 +-
.../solr/search/FloatPayloadValueSource.java | 4 +-
.../solr/search/PayloadScoreQParserPlugin.java | 4 +-
.../apache/solr/search/ValueSourceParser.java | 7 +-
.../PayloadScoringSimilarityWrapper.java | 80 ----------
.../similarities/SchemaSimilarityFactory.java | 22 +--
.../org/apache/solr/util/PayloadDecoder.java | 27 ----
.../java/org/apache/solr/util/PayloadUtils.java | 6 +-
.../org/apache/solr/cloud/AddReplicaTest.java | 2 +-
.../solr/cloud/rule/ImplicitSnitchTest.java | 6 +-
.../apache/solr/cloud/rule/RuleEngineTest.java | 33 ++++-
.../src/query-settings-in-solrconfig.adoc | 15 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 4 -
.../solr/common/cloud/rule/ImplicitSnitch.java | 19 ++-
.../solr/common/cloud/rule/SnitchContext.java | 8 +-
.../java/org/apache/solr/common/util/Utils.java | 13 ++
52 files changed, 338 insertions(+), 648 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/93a880da/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/93a880da/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
----------------------------------------------------------------------