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/10/27 20:09:25 UTC

[21/50] [abbrv] 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/a916877f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a916877f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a916877f

Branch: refs/heads/jira/solr-8593
Commit: a916877f3877e416f26a4b5f9c8914ccca649766
Parents: 34ad857 c15c8af
Author: Noble Paul <no...@apache.org>
Authored: Wed Oct 26 02:04:41 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Oct 26 02:04:41 2016 +0530

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   7 +
 .../LegacySortedNumericDocValuesWrapper.java    |   1 +
 .../DefaultSortedSetDocValuesReaderState.java   |   3 +-
 .../SortedSetDocValuesFacetCounts.java          | 124 ++++++++++++---
 .../facet/taxonomy/FastTaxonomyFacetCounts.java |  49 ++++++
 .../lucene/facet/taxonomy/TaxonomyFacets.java   |   4 +-
 .../sortedset/TestSortedSetDocValuesFacets.java |  25 +--
 .../facet/taxonomy/TestTaxonomyFacetCounts.java |  84 ++++------
 .../highlight/WeightedSpanTermExtractor.java    |  13 +-
 .../search/highlight/HighlighterTest.java       |  17 ++
 solr/CHANGES.txt                                |  27 +++-
 solr/bin/solr                                   |  13 +-
 solr/bin/solr.cmd                               |   8 +-
 solr/bin/solr.in.sh                             |   4 +-
 .../backup/repository/HdfsBackupRepository.java |   9 ++
 .../apache/solr/handler/OldBackupDirectory.java |   2 +-
 .../org/apache/solr/request/IntervalFacets.java |  12 +-
 .../apache/solr/search/facet/FacetField.java    |   1 +
 .../solr/search/facet/FacetFieldMerger.java     |   8 +-
 .../solr/search/facet/FacetFieldProcessor.java  |  22 ++-
 .../apache/solr/search/facet/FacetRequest.java  |   1 +
 .../TemplateUpdateProcessorFactory.java         |  10 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  |   8 +-
 .../apache/solr/cloud/TestCloudRecovery.java    | 154 +++++++++++++++++++
 .../TestLeaderRecoverFromLogOnStartup.java      |  77 ----------
 .../solr/handler/TestHdfsBackupRestoreCore.java |  11 ++
 .../solr/request/TestIntervalFaceting.java      |   7 +-
 .../solr/search/facet/TestJsonFacets.java       |  37 +++++
 .../org/apache/solr/util/UtilsToolTest.java     |   6 +-
 29 files changed, 536 insertions(+), 208 deletions(-)
----------------------------------------------------------------------