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 2020/09/03 10:31:01 UTC
[lucene-solr] branch jira/solr-14749 updated: SOLR-14749: Move
ClusterSingleton to a common package.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr-14749 by this push:
new 83648f3 SOLR-14749: Move ClusterSingleton to a common package.
83648f3 is described below
commit 83648f3c449a29f8af60341d22ac209d792e675c
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Sep 3 12:30:33 2020 +0200
SOLR-14749: Move ClusterSingleton to a common package.
---
.../org/apache/solr/{cluster/events => cloud}/ClusterSingleton.java | 2 +-
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 1 -
.../apache/solr/cluster/events/impl/AutoAddReplicasEventListener.java | 2 +-
.../org/apache/solr/cluster/events/impl/ClusterEventProducerImpl.java | 2 +-
.../java/org/apache/solr/cluster/scheduler/impl/SolrSchedulerImpl.java | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cluster/events/ClusterSingleton.java b/solr/core/src/java/org/apache/solr/cloud/ClusterSingleton.java
similarity index 98%
rename from solr/core/src/java/org/apache/solr/cluster/events/ClusterSingleton.java
rename to solr/core/src/java/org/apache/solr/cloud/ClusterSingleton.java
index f52cdb8..3aa7ec1 100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/ClusterSingleton.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ClusterSingleton.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.solr.cluster.events;
+package org.apache.solr.cloud;
/**
* Intended for {@link org.apache.solr.core.CoreContainer} plugins that should be
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 39085f4..f35e29f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -47,7 +47,6 @@ import org.apache.solr.cloud.overseer.ReplicaMutator;
import org.apache.solr.cloud.overseer.SliceMutator;
import org.apache.solr.cloud.overseer.ZkStateWriter;
import org.apache.solr.cloud.overseer.ZkWriteCommand;
-import org.apache.solr.cluster.events.ClusterSingleton;
import org.apache.solr.common.AlreadyClosedException;
import org.apache.solr.common.SolrCloseable;
import org.apache.solr.common.SolrException;
diff --git a/solr/core/src/java/org/apache/solr/cluster/events/impl/AutoAddReplicasEventListener.java b/solr/core/src/java/org/apache/solr/cluster/events/impl/AutoAddReplicasEventListener.java
index ea15f28..a10b846 100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/impl/AutoAddReplicasEventListener.java
+++ b/solr/core/src/java/org/apache/solr/cluster/events/impl/AutoAddReplicasEventListener.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.solr.client.solrj.io.SolrClientCache;
import org.apache.solr.cluster.events.ClusterEvent;
import org.apache.solr.cluster.events.ClusterEventListener;
-import org.apache.solr.cluster.events.ClusterSingleton;
+import org.apache.solr.cloud.ClusterSingleton;
import org.apache.solr.core.CoreContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/core/src/java/org/apache/solr/cluster/events/impl/ClusterEventProducerImpl.java b/solr/core/src/java/org/apache/solr/cluster/events/impl/ClusterEventProducerImpl.java
index 53389d4..9fc218c 100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/impl/ClusterEventProducerImpl.java
+++ b/solr/core/src/java/org/apache/solr/cluster/events/impl/ClusterEventProducerImpl.java
@@ -29,7 +29,7 @@ import org.apache.solr.cloud.ZkController;
import org.apache.solr.cluster.events.ClusterEvent;
import org.apache.solr.cluster.events.ClusterEventListener;
import org.apache.solr.cluster.events.ClusterEventProducer;
-import org.apache.solr.cluster.events.ClusterSingleton;
+import org.apache.solr.cloud.ClusterSingleton;
import org.apache.solr.cluster.events.NodeDownEvent;
import org.apache.solr.cluster.events.NodeUpEvent;
import org.apache.solr.common.cloud.LiveNodesListener;
diff --git a/solr/core/src/java/org/apache/solr/cluster/scheduler/impl/SolrSchedulerImpl.java b/solr/core/src/java/org/apache/solr/cluster/scheduler/impl/SolrSchedulerImpl.java
index ee87da8..058d0fc 100644
--- a/solr/core/src/java/org/apache/solr/cluster/scheduler/impl/SolrSchedulerImpl.java
+++ b/solr/core/src/java/org/apache/solr/cluster/scheduler/impl/SolrSchedulerImpl.java
@@ -25,7 +25,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.solr.cluster.events.ClusterSingleton;
+import org.apache.solr.cloud.ClusterSingleton;
import org.apache.solr.cluster.scheduler.Schedule;
import org.apache.solr.cluster.scheduler.Schedulable;
import org.apache.solr.cluster.scheduler.SolrScheduler;