You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/03 10:52:05 UTC
[17/18] lucene-solr:jira/solr-11702: Merge branch 'master' into
jira/solr-11702
Merge branch 'master' into jira/solr-11702
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/764c1f27
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/764c1f27
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/764c1f27
Branch: refs/heads/jira/solr-11702
Commit: 764c1f27a6c0decf921c3f6844991740fae1f0d2
Parents: 19d2af7 692e524
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Jan 2 10:20:37 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Jan 2 10:20:37 2018 +0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 13 ++
.../apache/lucene/search/ConjunctionScorer.java | 17 +-
.../apache/lucene/search/ExactPhraseScorer.java | 23 ++-
.../lucene/search/IndexOrDocValuesQuery.java | 2 +-
.../lucene/search/MaxScoreSumPropagator.java | 157 +++++++++++++++
.../apache/lucene/search/MultiPhraseQuery.java | 14 +-
.../org/apache/lucene/search/PhraseQuery.java | 14 +-
.../apache/lucene/search/ReqOptSumScorer.java | 8 +-
.../org/apache/lucene/search/WANDScorer.java | 20 +-
.../lucene/search/similarities/Axiomatic.java | 34 +++-
.../search/similarities/AxiomaticF1EXP.java | 2 +-
.../search/similarities/AxiomaticF1LOG.java | 2 +-
.../search/similarities/AxiomaticF3EXP.java | 2 +-
.../search/similarities/AxiomaticF3LOG.java | 2 +-
.../search/similarities/DistributionSPL.java | 26 ++-
.../lucene/search/similarities/LambdaDF.java | 7 +-
.../lucene/search/similarities/LambdaTTF.java | 7 +-
.../search/TestMaxScoreSumPropagator.java | 198 +++++++++++++++++++
.../apache/lucene/search/TestPhraseQuery.java | 47 +++++
.../search/similarities/TestAxiomaticF1EXP.java | 4 -
.../search/similarities/TestAxiomaticF1LOG.java | 4 -
.../search/similarities/TestAxiomaticF3EXP.java | 7 +-
.../search/similarities/TestAxiomaticF3LOG.java | 7 +-
.../similarities/TestDistributionSPL.java | 4 -
.../search/similarities/TestSimilarity2.java | 7 +
.../lucene/search/grouping/TestGrouping.java | 3 +
.../FastVectorHighlighterTest.java | 8 +-
.../search/similarities/RandomSimilarity.java | 11 +-
solr/CHANGES.txt | 7 +
.../org/apache/solr/handler/StreamHandler.java | 2 +
.../java/org/apache/solr/query/FilterQuery.java | 5 +
.../org/apache/solr/cloud/TestCryptoKeys.java | 33 +---
.../org/apache/solr/core/TestCustomStream.java | 23 +--
.../apache/solr/core/TestDynamicLoading.java | 29 +--
.../org/apache/solr/core/TestLazyCores.java | 7 -
.../apache/solr/handler/TestConfigReload.java | 25 +--
.../handler/TestSolrConfigHandlerCloud.java | 28 +--
.../TestSolrConfigHandlerConcurrent.java | 22 +--
.../solr/schema/TestBulkSchemaConcurrent.java | 32 +--
.../apache/solr/schema/TestCloudSchemaless.java | 43 ++--
.../apache/solr/search/TestSolrQueryParser.java | 20 ++
.../processor/TestNamedUpdateProcessors.java | 51 ++---
solr/solr-ref-guide/src/documents-screen.adoc | 2 +-
solr/solr-ref-guide/src/index-replication.adoc | 6 +-
solr/solr-ref-guide/src/indexupgrader-tool.adoc | 2 +-
.../src/uploading-data-with-index-handlers.adoc | 6 +-
.../solrj/io/eval/MannWhitneyUEvaluator.java | 62 ++++++
.../client/solrj/io/eval/SumSqEvaluator.java | 56 ++++++
.../solrj/io/stream/TimeSeriesStream.java | 12 +-
.../solrj/io/stream/StreamExpressionTest.java | 80 +++++++-
.../cloud/AbstractFullDistribZkTestBase.java | 33 ++++
.../web/js/angular/controllers/collections.js | 1 -
.../web/js/angular/controllers/core-overview.js | 12 --
solr/webapp/web/js/angular/controllers/cores.js | 15 --
.../web/js/angular/controllers/dataimport.js | 1 -
solr/webapp/web/js/angular/services.js | 7 +-
solr/webapp/web/partials/core_overview.html | 4 -
solr/webapp/web/partials/cores.html | 5 -
58 files changed, 919 insertions(+), 362 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/764c1f27/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
----------------------------------------------------------------------