You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/11/28 17:26:56 UTC

[27/42] lucene-solr:jira/solr-8593: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/jira/solr-8593
Commit: 950ff500325219ea7b45a4795d215d9deea3e66b
Parents: 142461b 4314c51
Author: Noble Paul <no...@apache.org>
Authored: Fri Nov 25 08:18:09 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Fri Nov 25 08:18:09 2016 +0530

----------------------------------------------------------------------
 .../KNearestNeighborClassifier.java             |   8 +-
 .../KNearestNeighborDocumentClassifier.java     |   6 +-
 solr/CHANGES.txt                                |  13 +
 .../UIMAUpdateRequestProcessorTest.java         |  25 -
 .../handler/component/HighlightComponent.java   | 108 +++-
 .../solr/highlight/DefaultSolrHighlighter.java  |  15 +-
 .../solr/highlight/PostingsSolrHighlighter.java |   9 +-
 .../solr/highlight/UnifiedSolrHighlighter.java  | 365 +++++++++++++
 .../ClassificationUpdateProcessor.java          |  59 ++-
 .../ClassificationUpdateProcessorFactory.java   | 199 +++-----
 .../ClassificationUpdateProcessorParams.java    | 112 ++++
 .../conf/schema-unifiedhighlight.xml            |  64 +++
 .../conf/solrconfig-classification.xml          |  15 +
 .../highlight/FastVectorHighlighterTest.java    |   9 +-
 .../apache/solr/highlight/HighlighterTest.java  |  26 +-
 .../highlight/TestPostingsSolrHighlighter.java  |   2 +-
 .../highlight/TestUnifiedSolrHighlighter.java   | 229 +++++++++
 ...lassificationUpdateProcessorFactoryTest.java | 208 ++------
 ...ificationUpdateProcessorIntegrationTest.java | 192 +++++++
 .../ClassificationUpdateProcessorTest.java      | 506 +++++++++++++++++++
 .../SignatureUpdateProcessorFactoryTest.java    |  28 +-
 .../TestPartialUpdateDeduplication.java         |   2 -
 .../solr/common/params/HighlightParams.java     | 118 +++--
 .../java/org/apache/solr/SolrTestCaseJ4.java    |  22 +
 24 files changed, 1889 insertions(+), 451 deletions(-)
----------------------------------------------------------------------