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/01/02 10:18:40 UTC

[19/19] lucene-solr:jira/solr-9854: Merge branch 'master' into jira/solr-9854

Merge branch 'master' into jira/solr-9854


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

Branch: refs/heads/jira/solr-9854
Commit: 4ca11b3ed20b0860bfafe99d5b1594184f9e3001
Parents: 2531fc8 fb2800b
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Jan 2 10:47:16 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Jan 2 10:47:16 2017 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   3 +
 .../lucene/analysis/custom/CustomAnalyzer.java  |   2 +-
 .../analysis/custom/TestCustomAnalyzer.java     |  21 ++
 .../apache/lucene/analysis/custom/mapping1.txt  |   1 +
 .../apache/lucene/analysis/custom/mapping2.txt  |   1 +
 .../lucene/search/TestDoubleValuesSource.java   |   9 +
 .../apache/lucene/search/TestLRUQueryCache.java |   2 +
 .../lucene/search/TestLongValuesSource.java     |   9 +
 .../analyzing/AnalyzingInfixSuggester.java      | 137 +++++++-----
 .../org/apache/lucene/util/RamUsageTester.java  |   2 +-
 solr/CHANGES.txt                                |  12 +
 solr/bin/solr                                   |  26 ++-
 solr/bin/solr.cmd                               |  21 +-
 .../handler/dataimport/SolrEntityProcessor.java | 192 ++++++++++------
 .../dataimport/MockSolrEntityProcessor.java     |  18 +-
 .../TestSolrEntityProcessorEndToEnd.java        |  27 ++-
 .../dataimport/TestSolrEntityProcessorUnit.java |  70 ++++++
 .../org/apache/solr/handler/StreamHandler.java  |   3 +-
 .../apache/solr/parser/SolrQueryParserBase.java |  14 ++
 .../src/java/org/apache/solr/util/SolrCLI.java  |  65 +++++-
 .../TestReversedWildcardFilterFactory.java      |  12 +
 .../solr/cloud/DocValuesNotIndexedTest.java     |  10 -
 .../reporters/SolrGangliaReporterTest.java      |   3 +-
 .../reporters/SolrGraphiteReporterTest.java     |   3 +-
 .../client/solrj/io/stream/CloudSolrStream.java |   4 +
 .../solr/client/solrj/io/stream/NullStream.java | 155 +++++++++++++
 .../client/solrj/io/stream/SchedulerStream.java | 161 +++++++++++++
 .../solrj/io/stream/StreamExpressionTest.java   | 224 +++++++++++++++++++
 28 files changed, 1056 insertions(+), 151 deletions(-)
----------------------------------------------------------------------