You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/04/25 13:59:43 UTC

[16/17] lucene-solr:jira/solr-8668: Merge branch 'master' into jira/solr-8668

Merge branch 'master' into jira/solr-8668


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

Branch: refs/heads/jira/solr-8668
Commit: 7a2a47f534040d28864cd4fe914de380eac62e24
Parents: 796d5d1 680f4d7
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Apr 25 14:38:18 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Apr 25 14:38:18 2017 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   3 +
 .../org/apache/lucene/store/FSDirectory.java    |   2 +-
 .../apache/lucene/index/TestIndexSorting.java   |  82 ++++++++++
 .../org/apache/lucene/store/TestDirectory.java  |  17 ++-
 solr/CHANGES.txt                                |  23 +++
 .../org/apache/solr/cloud/CloudDescriptor.java  |  20 +++
 .../org/apache/solr/core/CoreContainer.java     |  40 ++++-
 .../apache/solr/core/CorePropertiesLocator.java |  18 +--
 .../java/org/apache/solr/core/CoresLocator.java |  10 --
 .../org/apache/solr/handler/StreamHandler.java  |   7 +-
 .../handler/admin/MetricsCollectorHandler.java  |  13 +-
 .../solr/handler/admin/MetricsHandler.java      |   2 +-
 .../handler/component/SpatialHeatmapFacets.java |  41 ++---
 .../reporters/solr/SolrClusterReporter.java     |   1 +
 .../metrics/reporters/solr/SolrReporter.java    |  21 ++-
 .../reporters/solr/SolrShardReporter.java       |   1 +
 .../solr/search/facet/FacetFieldMerger.java     |  14 +-
 .../solr/search/facet/FacetFieldProcessor.java  |  36 +++--
 .../join/BlockJoinFacetComponentSupport.java    |  12 +-
 .../search/join/ScoreJoinQParserPlugin.java     |  11 +-
 .../apache/solr/cloud/SolrCloudExampleTest.java |  81 +++++++++-
 .../org/apache/solr/core/TestCoreContainer.java |   5 -
 .../solr/handler/admin/MetricsHandlerTest.java  |  24 +--
 .../solr/handler/admin/StatsReloadRaceTest.java |  10 +-
 .../reporters/solr/SolrCloudReportersTest.java  |   8 +-
 .../org/apache/solr/schema/DocValuesTest.java   |  72 ---------
 .../solr/schema/TestHalfAndHalfDocValues.java   | 136 +++++++++++++++++
 .../solr/search/facet/TestJsonFacets.java       |   8 +-
 .../search/join/BlockJoinFacetDistribTest.java  |  10 +-
 .../search/join/TestScoreJoinQPNoScore.java     |   7 +-
 .../solr/client/solrj/io/stream/CellStream.java | 152 +++++++++++++++++++
 .../solr/client/solrj/io/stream/GetStream.java  | 117 ++++++++++++++
 .../solr/client/solrj/io/stream/LetStream.java  | 152 +++++++++++++++++++
 .../solr/client/solrj/io/stream/ListStream.java | 145 ++++++++++++++++++
 .../client/solrj/io/stream/StreamContext.java   |   7 +
 .../solrj/io/stream/StreamExpressionTest.java   | 141 +++++++++++++++++
 .../apache/solr/util/ReadOnlyCoresLocator.java  |   6 -
 .../java/org/apache/solr/util/TestHarness.java  |   4 -
 38 files changed, 1245 insertions(+), 214 deletions(-)
----------------------------------------------------------------------