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 2019/12/18 16:38:51 UTC
[lucene-solr] 13/36: Merge branch 'master' into jira/solr-13579
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-13579
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 386ee2d24dcb782b90f55265dfd166ef3fc3976e
Merge: 3d735b6 15b08f9
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Jul 18 15:06:02 2019 +0200
Merge branch 'master' into jira/solr-13579
.github/PULL_REQUEST_TEMPLATE.md | 14 +-
lucene/CHANGES.txt | 42 +-
.../java/org/apache/lucene/index/FieldInfos.java | 10 +-
.../java/org/apache/lucene/index/IndexWriter.java | 16 -
.../org/apache/lucene/search/BooleanQuery.java | 28 +
.../java/org/apache/lucene/search/PhraseQuery.java | 7 +
.../org/apache/lucene/search/TestPhraseQuery.java | 11 +
.../lucene/document/FloatPointNearestNeighbor.java | 31 +-
.../lucene/document/BaseLatLonShapeTestCase.java | 2 +-
solr/CHANGES.txt | 29 +
.../org/apache/solr/cloud/OverseerTaskQueue.java | 59 +-
.../solr/cloud/api/collections/AliasCmd.java | 29 +-
.../cloud/api/collections/CategoryRoutedAlias.java | 142 ++--
.../solr/cloud/api/collections/CreateAliasCmd.java | 3 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 18 +-
.../api/collections/DimensionalRoutedAlias.java | 365 +++++++++++
.../MaintainCategoryRoutedAliasCmd.java | 183 ------
.../api/collections/MaintainRoutedAliasCmd.java | 182 ++++++
.../collections/MaintainTimeRoutedAliasCmd.java | 257 --------
.../OverseerCollectionMessageHandler.java | 37 +-
.../solr/cloud/api/collections/RoutedAlias.java | 392 +++++++++--
.../cloud/api/collections/TimeRoutedAlias.java | 468 ++++++-------
.../java/org/apache/solr/core/CoreContainer.java | 7 +
.../solr/handler/admin/BaseHandlerApiSupport.java | 29 +
.../solr/handler/admin/CollectionsHandler.java | 27 +-
.../java/org/apache/solr/request/SimpleFacets.java | 4 +-
.../processor/AtomicUpdateDocumentMerger.java | 5 -
.../processor/RoutedAliasUpdateProcessor.java | 6 +-
.../collection1/conf/schema-inplace-updates.xml | 1 +
.../apache/solr/cloud/AliasIntegrationTest.java | 30 +-
.../apache/solr/cloud/CreateRoutedAliasTest.java | 5 +-
.../apache/solr/core/TestDynamicLoadingUrl.java | 154 ++---
.../{ => component}/ResponseBuilderTest.java | 3 +-
.../org/apache/solr/request/SimpleFacetsTest.java | 33 +
.../solr/update/TestInPlaceUpdatesDistrib.java | 41 +-
.../solr/update/TestInPlaceUpdatesStandalone.java | 97 ++-
.../CategoryRoutedAliasUpdateProcessorTest.java | 6 +
.../DimensionalRoutedAliasUpdateProcessorTest.java | 726 +++++++++++++++++++++
.../processor/RoutedAliasUpdateProcessorTest.java | 68 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 175 +++--
solr/solr-ref-guide/src/aliases.adoc | 126 +++-
solr/solr-ref-guide/src/collection-aliasing.adoc | 209 +++++-
.../apache/solr/client/solrj/RoutedAliasTypes.java | 47 ++
.../solrj/request/CollectionAdminRequest.java | 174 ++++-
.../solr/common/cloud/ConnectionManager.java | 41 +-
.../common/cloud/ZkClientConnectionStrategy.java | 36 +-
.../solr/common/params/CollectionParams.java | 3 +-
.../resources/apispec/collections.Commands.json | 8 +
solr/webapp/build.xml | 4 +-
solr/webapp/web/index.html | 4 +-
50 files changed, 3160 insertions(+), 1234 deletions(-)