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/03/15 08:37:21 UTC
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-11127-2
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-11127-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 95d34856423577496085109ea0f640bb9917da4b
Merge: 5ad99eb d8f2a02
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Mar 13 22:29:30 2019 +0100
Merge branch 'master' into jira/solr-11127-2
solr/CHANGES.txt | 6 +-
.../solr/cloud/api/collections/AliasCmd.java | 108 +++++
.../cloud/api/collections/CategoryRoutedAlias.java | 265 +++++++++++
.../solr/cloud/api/collections/CreateAliasCmd.java | 76 ++-
.../MaintainCategoryRoutedAliasCmd.java | 183 ++++++++
...iasCmd.java => MaintainTimeRoutedAliasCmd.java} | 87 +---
.../OverseerCollectionMessageHandler.java | 44 +-
.../solr/cloud/api/collections/RoutedAlias.java | 145 ++++++
.../cloud/api/collections/TimeRoutedAlias.java | 393 ++++++++++++++--
.../java/org/apache/solr/core/CoreContainer.java | 121 +++--
.../solr/handler/admin/CollectionsHandler.java | 57 ++-
.../DistributedUpdateProcessorFactory.java | 2 +-
.../processor/RoutedAliasUpdateProcessor.java | 252 ++++++++++
.../processor/TimeRoutedAliasUpdateProcessor.java | 507 ---------------------
.../apache/solr/cloud/CreateRoutedAliasTest.java | 2 +-
.../CategoryRoutedAliasUpdateProcessorTest.java | 476 +++++++++++++++++++
.../processor/RoutedAliasUpdateProcessorTest.java | 308 +++++++++++++
.../TimeRoutedAliasUpdateProcessorTest.java | 332 ++------------
solr/solr-ref-guide/src/aliases.adoc | 267 +++++++++++
solr/solr-ref-guide/src/collections-api.adoc | 60 ++-
solr/solr-ref-guide/src/distributed-requests.adoc | 1 +
solr/solr-ref-guide/src/how-solrcloud-works.adoc | 4 +-
solr/solr-ref-guide/src/time-routed-aliases.adoc | 119 -----
.../solrj/io/stream/expr/InjectionDefense.java | 1 -
.../solrj/request/CollectionAdminRequest.java | 74 ++-
.../solr/common/params/CollectionParams.java | 3 +-
.../resources/apispec/collections.Commands.json | 8 +
27 files changed, 2711 insertions(+), 1190 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 0772def,70bcd1a..e933ac3
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@@ -52,7 -53,7 +53,8 @@@ import org.apache.solr.cloud.OverseerTa
import org.apache.solr.cloud.ZkController.NotInClusterStateException;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.cloud.ZkShardTerms;
+import org.apache.solr.cloud.api.collections.ReindexCollectionCmd;
+ import org.apache.solr.cloud.api.collections.RoutedAlias;
import org.apache.solr.cloud.overseer.SliceMutator;
import org.apache.solr.cloud.rule.ReplicaAssigner;
import org.apache.solr.cloud.rule.Rule;