You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/09/06 06:09:46 UTC

[2/2] lucene-solr:master: 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/ecbb588f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ecbb588f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ecbb588f

Branch: refs/heads/master
Commit: ecbb588f978152ba5871d1463ec1d692103794e8
Parents: 6ca9aeb 9ac5c1c
Author: Noble Paul <no...@apache.org>
Authored: Tue Sep 6 11:39:32 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Sep 6 11:39:32 2016 +0530

----------------------------------------------------------------------
 .../org/apache/lucene/index/LogMergePolicy.java |   6 +-
 solr/CHANGES.txt                                |  32 +-
 .../java/org/apache/solr/cloud/BackupCmd.java   |   6 +-
 .../org/apache/solr/cloud/DeleteNodeCmd.java    |  15 +-
 .../org/apache/solr/cloud/DeleteReplicaCmd.java | 144 +++++-
 .../org/apache/solr/cloud/DeleteShardCmd.java   |  92 +++-
 .../org/apache/solr/cloud/ReplaceNodeCmd.java   |   5 +-
 .../java/org/apache/solr/cloud/RestoreCmd.java  |   6 +-
 .../org/apache/solr/cloud/SplitShardCmd.java    |  24 +-
 .../apache/solr/cloud/rule/ImplicitSnitch.java  |  10 +-
 .../org/apache/solr/core/CoreContainer.java     |   4 +-
 .../apache/solr/core/backup/BackupManager.java  |  34 +-
 .../backup/repository/BackupRepository.java     |  14 +-
 .../backup/repository/HdfsBackupRepository.java |  29 +-
 .../repository/LocalFileSystemRepository.java   |  36 +-
 .../apache/solr/handler/ReplicationHandler.java |  12 +-
 .../org/apache/solr/handler/RestoreCore.java    |   6 +-
 .../org/apache/solr/handler/SnapShooter.java    |  11 +-
 .../solr/handler/admin/CollectionsHandler.java  |  14 +-
 .../solr/handler/admin/CoreAdminOperation.java  |   7 +-
 .../solr/handler/component/FacetComponent.java  |  31 +-
 .../org/apache/solr/request/SimpleFacets.java   |  71 ++-
 .../java/org/apache/solr/search/DocSetUtil.java |  33 ++
 .../apache/solr/search/SolrIndexSearcher.java   |   5 +
 .../apache/solr/search/facet/FacetField.java    |  70 ++-
 .../solr/search/facet/FacetFieldProcessor.java  | 150 ++++++-
 .../facet/FacetFieldProcessorByArray.java       | 144 +-----
 .../facet/FacetFieldProcessorByHashDV.java      | 442 +++++++++++++++++++
 .../facet/FacetFieldProcessorByHashNumeric.java | 439 ------------------
 .../org/apache/solr/search/facet/SlotAcc.java   |  15 +-
 .../processor/DistributedUpdateProcessor.java   |  22 +-
 .../org/apache/solr/TestRandomFaceting.java     | 261 +++++++++--
 .../apache/solr/cloud/DeleteReplicaTest.java    | 139 +++++-
 .../cloud/TestLocalFSCloudBackupRestore.java    |  10 +-
 .../TestSolrCloudWithSecureImpersonation.java   |  25 +-
 .../org/apache/solr/cloud/rule/RulesTest.java   |   7 +-
 .../DistributedFacetExistsSmallTest.java        | 236 ++++++++++
 .../apache/solr/request/SimpleFacetsTest.java   | 286 +++++++++++-
 .../solr/search/facet/TestJsonFacets.java       |  53 ++-
 .../solrj/request/CollectionAdminRequest.java   |  12 +-
 .../common/params/CollectionAdminParams.java    |   9 +-
 .../apache/solr/common/params/FacetParams.java  |   8 +
 .../solr/common/util/JsonRecordReader.java      |  27 +-
 43 files changed, 2145 insertions(+), 857 deletions(-)
----------------------------------------------------------------------