From ef7ab192f6508f22d620367e050ecd1ab33758bb Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Tue, 18 Apr 2017 18:55:31 +0930 Subject: [PATCH] SOLR-10278: moved everything to common package --- .../apache/solr/cloud/OverseerCollectionMessageHandler.java | 4 ++-- .../apache/solr/client/solrj/impl/ClientDataProvider.java | 4 ++-- .../src/java/org/apache/solr/cloud/autoscaling/Clause.java | 6 +++--- .../src/java/org/apache/solr/cloud/autoscaling/Operand.java | 6 ++++-- .../src/java/org/apache/solr/cloud/autoscaling/Row.java | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java index 06509fc3e4d..162eb4e44c5 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java @@ -45,10 +45,10 @@ import org.apache.solr.client.solrj.impl.ZkClientClusterStateProvider; import org.apache.solr.client.solrj.request.AbstractUpdateRequest; import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.client.solrj.response.UpdateResponse; +import org.apache.solr.cloud.autoscaling.PolicyHelper; import org.apache.solr.cloud.overseer.OverseerAction; import org.apache.solr.cloud.rule.ReplicaAssigner; import org.apache.solr.cloud.rule.ReplicaAssigner.Position; -import org.apache.solr.common.params.CommonParams; import org.apache.solr.cloud.rule.Rule; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; @@ -63,6 +63,7 @@ import org.apache.solr.common.cloud.ZkCoreNodeProps; import org.apache.solr.common.cloud.ZkNodeProps; import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.params.CollectionParams.CollectionAction; +import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.CoreAdminParams; import org.apache.solr.common.params.CoreAdminParams.CoreAdminAction; import org.apache.solr.common.params.ModifiableSolrParams; @@ -76,7 +77,6 @@ import org.apache.solr.handler.component.ShardHandler; import org.apache.solr.handler.component.ShardHandlerFactory; import org.apache.solr.handler.component.ShardRequest; import org.apache.solr.handler.component.ShardResponse; -import org.apache.solr.autoscaling.PolicyHelper; import org.apache.solr.util.DefaultSolrThreadFactory; import org.apache.solr.util.RTimer; import org.apache.solr.util.TimeOut; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ClientDataProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ClientDataProvider.java index e2b2913b98a..bae32d7f9ad 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ClientDataProvider.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ClientDataProvider.java @@ -32,6 +32,8 @@ import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.request.GenericSolrRequest; import org.apache.solr.client.solrj.response.SimpleSolrResponse; +import org.apache.solr.cloud.autoscaling.ClusterDataProvider; +import org.apache.solr.cloud.autoscaling.Policy.ReplicaInfo; import org.apache.solr.common.SolrException; import org.apache.solr.common.cloud.ClusterState; import org.apache.solr.common.cloud.DocCollection; @@ -45,8 +47,6 @@ import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.StrUtils; import org.apache.solr.common.util.Utils; -import org.apache.solr.autoscaling.ClusterDataProvider; -import org.apache.solr.autoscaling.Policy.ReplicaInfo; import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java index a1f0af1714b..3a4c6ff605e 100644 --- a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java +++ b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java @@ -34,9 +34,9 @@ import static java.util.Collections.singletonMap; import static org.apache.solr.common.params.CoreAdminParams.COLLECTION; import static org.apache.solr.common.params.CoreAdminParams.REPLICA; import static org.apache.solr.common.params.CoreAdminParams.SHARD; -import static org.apache.solr.autoscaling.Clause.TestStatus.FAIL; -import static org.apache.solr.autoscaling.Clause.TestStatus.NOT_APPLICABLE; -import static org.apache.solr.autoscaling.Clause.TestStatus.PASS; +import static org.apache.solr.cloud.autoscaling.Clause.TestStatus.FAIL; +import static org.apache.solr.cloud.autoscaling.Clause.TestStatus.NOT_APPLICABLE; +import static org.apache.solr.cloud.autoscaling.Clause.TestStatus.PASS; import static org.apache.solr.cloud.autoscaling.Operand.EQUAL; import static org.apache.solr.cloud.autoscaling.Operand.GREATER_THAN; import static org.apache.solr.cloud.autoscaling.Operand.LESS_THAN; diff --git a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Operand.java b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Operand.java index 81bdcf48c6f..13c258941b1 100644 --- a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Operand.java +++ b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Operand.java @@ -19,9 +19,11 @@ package org.apache.solr.cloud.autoscaling; import java.util.Objects; -import org.apache.solr.autoscaling.Clause.TestStatus; +import org.apache.solr.cloud.autoscaling.Clause.TestStatus; -import static org.apache.solr.autoscaling.Clause.TestStatus.*; +import static org.apache.solr.cloud.autoscaling.Clause.TestStatus.FAIL; +import static org.apache.solr.cloud.autoscaling.Clause.TestStatus.NOT_APPLICABLE; +import static org.apache.solr.cloud.autoscaling.Clause.TestStatus.PASS; import static org.apache.solr.cloud.autoscaling.Policy.ANY; diff --git a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Row.java b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Row.java index c62ccdb94ff..0fd14438e99 100644 --- a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Row.java +++ b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Row.java @@ -29,7 +29,7 @@ import org.apache.solr.common.IteratorWriter; import org.apache.solr.common.MapWriter; import org.apache.solr.common.util.Pair; import org.apache.solr.common.util.Utils; -import org.apache.solr.autoscaling.Policy.ReplicaInfo; +import org.apache.solr.cloud.autoscaling.Policy.ReplicaInfo; import static org.apache.solr.common.params.CoreAdminParams.NODE;