You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by to...@apache.org on 2023/05/01 16:11:34 UTC
[shardingsphere] branch master updated: Rename ProcessRegistry (#25426)
This is an automated email from the ASF dual-hosted git repository.
totalo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ea2250ed1bb Rename ProcessRegistry (#25426)
ea2250ed1bb is described below
commit ea2250ed1bb1c42655aa66259d60432783e7bfd5
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue May 2 00:11:27 2023 +0800
Rename ProcessRegistry (#25426)
---
.../infra/executor/sql/process/ExecuteIDContext.java | 16 ++++++++--------
...{ShowProcessListManager.java => ProcessRegistry.java} | 8 ++++----
.../infra/executor/sql/process/ProcessReporter.java | 10 +++++-----
.../infra/executor/sql/process/ProcessReporterTest.java | 14 +++++++-------
.../sql/process/DriverProcessReporterCleaner.java | 4 ++--
.../process/subscriber/ProcessRegistrySubscriber.java | 6 +++---
.../subscriber/ProcessListChangedSubscriber.java | 10 +++++-----
.../subscriber/ProcessListChangedSubscriberTest.java | 8 ++++----
.../subscriber/ProcessStandaloneSubscriber.java | 6 +++---
.../subscriber/ProcessStandaloneSubscriberTest.java | 10 +++++-----
10 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteIDContext.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteIDContext.java
index ce9abbbc229..e1f5bfbf18e 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteIDContext.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteIDContext.java
@@ -22,7 +22,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Execute id context.
+ * Execute ID context.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ExecuteIDContext {
@@ -30,34 +30,34 @@ public final class ExecuteIDContext {
private static final TransmittableThreadLocal<String> EXECUTE_ID = new TransmittableThreadLocal<>();
/**
- * Judge whether execute id is empty or not.
+ * Judge whether execute ID is empty or not.
*
- * @return whether execute id is empty or not
+ * @return whether execute ID is empty or not
*/
public static boolean isEmpty() {
return null == EXECUTE_ID.get();
}
/**
- * Get execute id.
+ * Get execute ID.
*
- * @return execute id
+ * @return execute ID
*/
public static String get() {
return EXECUTE_ID.get();
}
/**
- * Set execute id.
+ * Set execute ID.
*
- * @param executeId execute id
+ * @param executeId execute ID
*/
public static void set(final String executeId) {
EXECUTE_ID.set(executeId);
}
/**
- * Remove execute id.
+ * Remove execute ID.
*/
public static void remove() {
EXECUTE_ID.remove();
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ShowProcessListManager.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessRegistry.java
similarity index 91%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ShowProcessListManager.java
rename to infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessRegistry.java
index bd774274b83..fc9a56ea638 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ShowProcessListManager.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessRegistry.java
@@ -27,12 +27,12 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Show process list manager.
+ * Process registry.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShowProcessListManager {
+public final class ProcessRegistry {
- private static final ShowProcessListManager INSTANCE = new ShowProcessListManager();
+ private static final ProcessRegistry INSTANCE = new ProcessRegistry();
private final Map<String, ProcessContext> processContexts = new ConcurrentHashMap<>();
@@ -44,7 +44,7 @@ public final class ShowProcessListManager {
*
* @return show process list manager
*/
- public static ShowProcessListManager getInstance() {
+ public static ProcessRegistry getInstance() {
return INSTANCE;
}
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporter.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporter.java
index c8c7953e127..bbb5e2510f9 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporter.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporter.java
@@ -41,7 +41,7 @@ public final class ProcessReporter {
public String reportConnect(final Grantee grantee, final String databaseName) {
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext = new ExecutionGroupContext<>(Collections.emptyList(), new ExecutionGroupReportContext(databaseName, grantee));
ProcessContext processContext = new ProcessContext(executionGroupContext);
- ShowProcessListManager.getInstance().putProcessContext(processContext.getId(), processContext);
+ ProcessRegistry.getInstance().putProcessContext(processContext.getId(), processContext);
return executionGroupContext.getReportContext().getProcessID();
}
@@ -53,7 +53,7 @@ public final class ProcessReporter {
*/
public void reportExecute(final QueryContext queryContext, final ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext) {
ProcessContext processContext = new ProcessContext(queryContext.getSql(), executionGroupContext);
- ShowProcessListManager.getInstance().putProcessContext(processContext.getId(), processContext);
+ ProcessRegistry.getInstance().putProcessContext(processContext.getId(), processContext);
}
/**
@@ -62,7 +62,7 @@ public final class ProcessReporter {
* @param processID process ID
*/
public void reportComplete(final String processID) {
- ShowProcessListManager.getInstance().getProcessContext(processID).completeExecutionUnit();
+ ProcessRegistry.getInstance().getProcessContext(processID).completeExecutionUnit();
}
/**
@@ -71,7 +71,7 @@ public final class ProcessReporter {
* @param processID process ID
*/
public void reset(final String processID) {
- ProcessContext context = ShowProcessListManager.getInstance().getProcessContext(processID);
+ ProcessContext context = ProcessRegistry.getInstance().getProcessContext(processID);
if (null == context) {
return;
}
@@ -86,6 +86,6 @@ public final class ProcessReporter {
* @param processID process ID
*/
public void remove(final String processID) {
- ShowProcessListManager.getInstance().removeProcessContext(processID);
+ ProcessRegistry.getInstance().removeProcessContext(processID);
}
}
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterTest.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterTest.java
index 2e805e3aae5..6a53ce5185a 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterTest.java
+++ b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessReporterTest.java
@@ -37,22 +37,22 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
-@StaticMockSettings(ShowProcessListManager.class)
+@StaticMockSettings(ProcessRegistry.class)
class ProcessReporterTest {
@Mock
- private ShowProcessListManager showProcessListManager;
+ private ProcessRegistry processRegistry;
@BeforeEach
void setUp() {
- when(ShowProcessListManager.getInstance()).thenReturn(showProcessListManager);
+ when(ProcessRegistry.getInstance()).thenReturn(processRegistry);
}
@Test
void assertReportExecute() {
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext = mockExecutionGroupContext();
new ProcessReporter().reportExecute(new QueryContext(null, null, null), executionGroupContext);
- verify(showProcessListManager).putProcessContext(eq(executionGroupContext.getReportContext().getProcessID()), any());
+ verify(processRegistry).putProcessContext(eq(executionGroupContext.getReportContext().getProcessID()), any());
}
@SuppressWarnings("unchecked")
@@ -66,14 +66,14 @@ class ProcessReporterTest {
@Test
void assertReportUnit() {
- when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ProcessContext.class));
+ when(processRegistry.getProcessContext("foo_id")).thenReturn(mock(ProcessContext.class));
new ProcessReporter().reportComplete("foo_id");
- verify(showProcessListManager).getProcessContext("foo_id");
+ verify(processRegistry).getProcessContext("foo_id");
}
@Test
void assertReportClean() {
- when(showProcessListManager.getProcessContext("foo_id")).thenReturn(mock(ProcessContext.class));
+ when(processRegistry.getProcessContext("foo_id")).thenReturn(mock(ProcessContext.class));
new ProcessReporter().reset("foo_id");
}
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverProcessReporterCleaner.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverProcessReporterCleaner.java
index 6c925e1c94a..a8098d66827 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverProcessReporterCleaner.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/sql/process/DriverProcessReporterCleaner.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.driver.executor.sql.process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessReporterCleaner;
-import org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessContext;
/**
@@ -28,6 +28,6 @@ public final class DriverProcessReporterCleaner implements ProcessReporterCleane
@Override
public void reset(final ProcessContext context) {
- ShowProcessListManager.getInstance().removeProcessContext(context.getId());
+ ProcessRegistry.getInstance().removeProcessContext(context.getId());
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
index 5fca4885035..9aaea20e152 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.process.subscriber;
import com.google.common.eventbus.Subscribe;
-import org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListLock;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
@@ -118,7 +118,7 @@ public final class ProcessRegistrySubscriber {
private boolean waitAllNodeDataReady(final String processId, final Collection<String> paths) {
ShowProcessListLock lock = new ShowProcessListLock();
- ShowProcessListManager.getInstance().getLocks().put(processId, lock);
+ ProcessRegistry.getInstance().getLocks().put(processId, lock);
lock.lock();
try {
while (!isReady(paths)) {
@@ -129,7 +129,7 @@ public final class ProcessRegistrySubscriber {
return true;
} finally {
lock.unlock();
- ShowProcessListManager.getInstance().getLocks().remove(processId);
+ ProcessRegistry.getInstance().getLocks().remove(processId);
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
index 8f68c4f2cce..04ca8a67ce0 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessContext;
-import org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListLock;
import org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListContextsSwapper;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
@@ -64,7 +64,7 @@ public final class ProcessListChangedSubscriber {
if (!event.getInstanceId().equals(contextManager.getInstanceContext().getInstance().getMetaData().getId())) {
return;
}
- Collection<ProcessContext> processContexts = ShowProcessListManager.getInstance().getAllProcessContexts();
+ Collection<ProcessContext> processContexts = ProcessRegistry.getInstance().getAllProcessContexts();
if (!processContexts.isEmpty()) {
registryCenter.getRepository().persist(
ProcessNode.getProcessListInstancePath(event.getProcessId(), event.getInstanceId()), YamlEngine.marshal(swapper.swapToYamlConfiguration(processContexts)));
@@ -83,7 +83,7 @@ public final class ProcessListChangedSubscriber {
if (!event.getInstanceId().equals(contextManager.getInstanceContext().getInstance().getMetaData().getId())) {
return;
}
- ProcessContext processContext = ShowProcessListManager.getInstance().getProcessContext(event.getProcessId());
+ ProcessContext processContext = ProcessRegistry.getInstance().getProcessContext(event.getProcessId());
if (null != processContext) {
for (Statement each : processContext.getProcessStatements()) {
each.cancel();
@@ -99,7 +99,7 @@ public final class ProcessListChangedSubscriber {
*/
@Subscribe
public synchronized void completeUnitShowProcessList(final ShowProcessListUnitCompleteEvent event) {
- ShowProcessListLock lock = ShowProcessListManager.getInstance().getLocks().get(event.getProcessId());
+ ShowProcessListLock lock = ProcessRegistry.getInstance().getLocks().get(event.getProcessId());
if (null != lock) {
lock.doNotify();
}
@@ -112,7 +112,7 @@ public final class ProcessListChangedSubscriber {
*/
@Subscribe
public synchronized void completeUnitKillProcessId(final KillProcessIdUnitCompleteEvent event) {
- ShowProcessListLock lock = ShowProcessListManager.getInstance().getLocks().get(event.getProcessId());
+ ShowProcessListLock lock = ProcessRegistry.getInstance().getLocks().get(event.getProcessId());
if (null != lock) {
lock.doNotify();
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
index 47598c1bda0..56f32148f90 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriberTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessContext;
-import org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListLock;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
@@ -102,7 +102,7 @@ class ProcessListChangedSubscriberTest {
void assertCompleteUnitShowProcessList() {
String processId = "foo_process_id";
ShowProcessListLock lock = new ShowProcessListLock();
- ShowProcessListManager.getInstance().getLocks().put(processId, lock);
+ ProcessRegistry.getInstance().getLocks().put(processId, lock);
long startTime = System.currentTimeMillis();
ExecutorService executorService = Executors.newFixedThreadPool(1);
executorService.submit(() -> {
@@ -116,13 +116,13 @@ class ProcessListChangedSubscriberTest {
long currentTime = System.currentTimeMillis();
assertTrue(currentTime >= startTime + 50L);
assertTrue(currentTime <= startTime + 5000L);
- ShowProcessListManager.getInstance().getLocks().remove(processId);
+ ProcessRegistry.getInstance().getLocks().remove(processId);
}
@Test
void assertTriggerShowProcessList() throws ReflectiveOperationException {
String instanceId = contextManager.getInstanceContext().getInstance().getMetaData().getId();
- ShowProcessListManager.getInstance().putProcessContext("foo_execution_id", mock(ProcessContext.class));
+ ProcessRegistry.getInstance().putProcessContext("foo_execution_id", mock(ProcessContext.class));
String processId = "foo_process_id";
subscriber.triggerShowProcessList(new ShowProcessListTriggerEvent(instanceId, processId));
ClusterPersistRepository repository = ((RegistryCenter) Plugins.getMemberAccessor().get(ProcessListChangedSubscriber.class.getDeclaredField("registryCenter"), subscriber)).getRepository();
diff --git a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
index 08fea4376c5..f49a58490fa 100644
--- a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
+++ b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.standalone.subscriber;
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessContext;
-import org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessListContexts;
import org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListContextsSwapper;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
@@ -54,7 +54,7 @@ public final class ProcessStandaloneSubscriber {
*/
@Subscribe
public void loadShowProcessListData(final ShowProcessListRequestEvent event) {
- YamlProcessListContexts yamlContexts = swapper.swapToYamlConfiguration(ShowProcessListManager.getInstance().getAllProcessContexts());
+ YamlProcessListContexts yamlContexts = swapper.swapToYamlConfiguration(ProcessRegistry.getInstance().getAllProcessContexts());
eventBusContext.post(new ShowProcessListResponseEvent(yamlContexts.getContexts().isEmpty() ? Collections.emptyList() : Collections.singleton(YamlEngine.marshal(yamlContexts))));
}
@@ -66,7 +66,7 @@ public final class ProcessStandaloneSubscriber {
*/
@Subscribe
public void killProcess(final KillProcessRequestEvent event) throws SQLException {
- ProcessContext processContext = ShowProcessListManager.getInstance().getProcessContext(event.getId());
+ ProcessContext processContext = ProcessRegistry.getInstance().getProcessContext(event.getId());
if (null == processContext) {
return;
}
diff --git a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriberTest.java b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriberTest.java
index 8a9c85be626..d5502b2c38f 100644
--- a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriberTest.java
+++ b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriberTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.manager.standalone.subscriber;
-import org.apache.shardingsphere.infra.executor.sql.process.ShowProcessListManager;
+import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.mode.event.process.ShowProcessListRequestEvent;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
@@ -30,14 +30,14 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
-@StaticMockSettings(ShowProcessListManager.class)
+@StaticMockSettings(ProcessRegistry.class)
class ProcessStandaloneSubscriberTest {
@Test
void assertLoadShowProcessListData() {
- ShowProcessListManager showProcessListManager = mock(ShowProcessListManager.class);
- when(ShowProcessListManager.getInstance()).thenReturn(showProcessListManager);
+ ProcessRegistry processRegistry = mock(ProcessRegistry.class);
+ when(ProcessRegistry.getInstance()).thenReturn(processRegistry);
new ProcessStandaloneSubscriber(new EventBusContext()).loadShowProcessListData(mock(ShowProcessListRequestEvent.class));
- verify(showProcessListManager).getAllProcessContexts();
+ verify(processRegistry).getAllProcessContexts();
}
}