This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 9ae4b225d2d Refactor ModePersistServiceFacade (#34998)
9ae4b225d2d is described below
commit 9ae4b225d2dfd68313ed8e050b51e00851ea7ad9
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Mar 15 13:47:46 2025 +0800
Refactor ModePersistServiceFacade (#34998)
---
.../update/CreateBroadcastTableRuleExecutorTest.java | 6 +++---
.../handler/update/DropBroadcastTableRuleExecutorTest.java | 2 +-
.../handler/update/AlterEncryptRuleExecutorTest.java | 4 ++--
.../handler/update/CreateEncryptRuleExecutorTest.java | 2 +-
.../handler/update/DropEncryptRuleExecutorTest.java | 6 +++---
.../distsql/handler/update/AlterMaskRuleExecutorTest.java | 2 +-
.../distsql/handler/update/CreateMaskRuleExecutorTest.java | 4 ++--
.../distsql/handler/update/DropMaskRuleExecutorTest.java | 4 ++--
.../engine/database/type/AlterDatabaseRuleOperator.java | 2 +-
.../engine/database/type/CreateDatabaseRuleOperator.java | 2 +-
.../engine/database/type/DropDatabaseRuleOperator.java | 2 +-
.../engine/global/GlobalRuleDefinitionExecuteEngine.java | 2 +-
.../executor/rdl/resource/AlterStorageUnitExecutor.java | 2 +-
.../executor/rdl/resource/RegisterStorageUnitExecutor.java | 2 +-
.../rdl/resource/UnregisterStorageUnitExecutor.java | 2 +-
.../rdl/resource/UnregisterStorageUnitExecutorTest.java | 2 +-
.../driver/executor/engine/DriverExecuteExecutor.java | 2 +-
.../pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java | 2 +-
.../jdbc/DriverJDBCPushDownExecuteUpdateExecutor.java | 2 +-
.../handler/update/LoadSingleTableExecutorTest.java | 4 ++--
.../SetDefaultSingleTableStorageUnitExecutorTest.java | 4 ++--
.../mode/persist/mode/ModePersistServiceFacade.java | 6 +++---
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 4 ++--
.../global/node/compute/type/ComputeNodeOnlineHandler.java | 4 ++--
.../persist/facade/ClusterPersistServiceFacade.java | 14 +++++++-------
.../node/compute/type/ComputeNodeOnlineHandlerTest.java | 2 +-
.../persist/facade/StandalonePersistServiceFacade.java | 12 ++++++------
.../proxy/backend/connector/StandardDatabaseConnector.java | 4 ++--
.../handler/database/CreateDatabaseBackendHandler.java | 2 +-
.../handler/database/DropDatabaseBackendHandler.java | 2 +-
.../queryable/computenode/ShowComputeNodesExecutor.java | 2 +-
.../updatable/computenode/SetComputeNodeStateExecutor.java | 2 +-
.../ral/updatable/label/LabelComputeNodeExecutor.java | 2 +-
.../ral/updatable/label/UnlabelComputeNodeExecutor.java | 4 ++--
.../ral/updatable/variable/SetDistVariableExecutor.java | 2 +-
.../proxy/backend/util/MetaDataImportExecutor.java | 4 ++--
.../util/YamlDatabaseConfigurationImportExecutor.java | 6 +++---
.../handler/distsql/DistSQLBackendHandlerFactoryTest.java | 2 +-
.../computenode/ShowComputeNodesExecutorTest.java | 2 +-
.../mysql/handler/admin/executor/KillProcessExecutor.java | 2 +-
.../handler/admin/executor/ShowProcessListExecutor.java | 2 +-
.../admin/executor/ShowProcessListExecutorTest.java | 2 +-
.../engine/update/GlobalRuleDefinitionExecutorTest.java | 2 +-
43 files changed, 72 insertions(+), 72 deletions(-)
diff --git
a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java
b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java
index a2d8a9ed1ca..c2cdb801635 100644
---
a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java
+++
b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutorTest.java
@@ -71,7 +71,7 @@ class CreateBroadcastTableRuleExecutorTest {
when(rule.getTables()).thenReturn(Collections.singleton("foo_tbl"));
ContextManager contextManager = mockContextManager(database, rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).alterRuleConfiguration(any(),
ArgumentMatchers.<BroadcastRuleConfiguration>argThat(x ->
x.getTables().equals(new HashSet<>(Arrays.asList("foo_tbl", "bar_tbl")))));
}
@@ -84,7 +84,7 @@ class CreateBroadcastTableRuleExecutorTest {
when(rule.getTables()).thenReturn(Collections.singleton("foo_tbl"));
ContextManager contextManager = mockContextManager(database, rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).alterRuleConfiguration(any(),
ArgumentMatchers.<BroadcastRuleConfiguration>argThat(x ->
x.getTables().equals(new HashSet<>(Arrays.asList("foo_tbl", "bar_tbl")))));
}
@@ -95,7 +95,7 @@ class CreateBroadcastTableRuleExecutorTest {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
ContextManager contextManager = mockContextManager(database, null);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).alterRuleConfiguration(any(),
ArgumentMatchers.<BroadcastRuleConfiguration>argThat(x ->
x.getTables().equals(new HashSet<>(Arrays.asList("foo_tbl", "bar_tbl")))));
}
diff --git
a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java
b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java
index 1bebd2623bd..ca266375759 100644
---
a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java
+++
b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutorTest.java
@@ -57,7 +57,7 @@ class DropBroadcastTableRuleExecutorTest {
when(rule.getConfiguration().getTables()).thenReturn(Collections.singleton("foo_tbl"));
ContextManager contextManager = mockContextManager(database, rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).removeRuleConfiguration(database,
"broadcast");
}
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
index 2a908bc6456..e668bfaa4cc 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutorTest.java
@@ -88,7 +88,7 @@ class AlterEncryptRuleExecutorTest {
when(rule.getAllTableNames()).thenReturn(Collections.singleton("t_encrypt"));
when(rule.getConfiguration()).thenReturn(createCurrentRuleConfiguration());
ContextManager contextManager = mockContextManager(rule);
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
new
DistSQLUpdateExecuteEngine(createSQLStatementWithAssistQueryAndLikeColumns(),
"foo_db", contextManager).executeUpdate();
metaDataManagerPersistService.removeRuleConfigurationItem(any(),
ArgumentMatchers.argThat(this::assertToBeDroppedRuleConfiguration));
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertToBeAlteredRuleConfiguration));
@@ -101,7 +101,7 @@ class AlterEncryptRuleExecutorTest {
when(rule.getConfiguration()).thenReturn(createCurrentRuleConfiguration());
ContextManager contextManager = mockContextManager(rule);
new
DistSQLUpdateExecuteEngine(createSQLStatementWithoutAssistQueryAndLikeColumns(),
"foo_db", contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.removeRuleConfigurationItem(any(),
ArgumentMatchers.argThat(this::assertToBeDroppedRuleConfiguration));
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertToBeAlteredRuleConfiguration));
}
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
index 3c782f8a7ef..d89b0590a44 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
@@ -103,7 +103,7 @@ class CreateEncryptRuleExecutorTest {
CreateEncryptRuleStatement sqlStatement =
createAESEncryptRuleSQLStatement(true);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertIfNotExistsRuleConfiguration));
}
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
index 5eef55417ad..7c73f389c29 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutorTest.java
@@ -68,7 +68,7 @@ class DropEncryptRuleExecutorTest {
when(rule.getConfiguration()).thenReturn(ruleConfig);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(createSQLStatement("T_ENCRYPT"),
"foo_db", contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration));
}
@@ -86,7 +86,7 @@ class DropEncryptRuleExecutorTest {
when(rule.getAllTableNames().contains(anyString())).thenReturn(true);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(createSQLStatement("T_ENCRYPT"),
"foo_db", contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutEncryptors));
}
@@ -104,7 +104,7 @@ class DropEncryptRuleExecutorTest {
when(rule.getAllTableNames().contains(anyString())).thenReturn(true);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(statement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutEncryptors));
}
diff --git
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
index 762fe171a32..a61d0dc211f 100644
---
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
+++
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
@@ -67,7 +67,7 @@ class AlterMaskRuleExecutorTest {
when(rule.getConfiguration()).thenReturn(currentRuleConfig);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.removeRuleConfigurationItem(any(),
ArgumentMatchers.argThat(this::assertToBeDroppedRuleConfiguration));
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertToBeAlteredRuleConfiguration));
}
diff --git
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
index 403ef08fcce..a7198215172 100644
---
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
+++
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
@@ -65,7 +65,7 @@ class CreateMaskRuleExecutorTest {
when(rule.getConfiguration()).thenReturn(currentRuleConfig);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration));
}
@@ -77,7 +77,7 @@ class CreateMaskRuleExecutorTest {
when(rule.getConfiguration()).thenReturn(currentRuleConfig);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfiguration));
}
diff --git
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
index d2a293ad900..03aeeca0a9f 100644
---
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
+++
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutorTest.java
@@ -60,7 +60,7 @@ class DropMaskRuleExecutorTest {
when(rule.getConfiguration()).thenReturn(ruleConfig);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(createSQLStatement(false, "T_MASK"),
"foo_db", contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutIfExists));
}
@@ -78,7 +78,7 @@ class DropMaskRuleExecutorTest {
when(rule.getConfiguration()).thenReturn(ruleConfig);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(createSQLStatement(true, "T_USER"),
"foo_db", contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithoutIfExists));
metaDataManagerPersistService.alterRuleConfiguration(any(),
ArgumentMatchers.argThat(this::assertRuleConfigurationWithIfExists));
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
index ddb25e58936..6429096f91d 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
@@ -48,7 +48,7 @@ public final class AlterDatabaseRuleOperator implements
DatabaseRuleOperator {
@SuppressWarnings("unchecked")
public void operate(final DatabaseRuleDefinitionStatement sqlStatement,
final ShardingSphereDatabase database, final RuleConfiguration
currentRuleConfig) throws SQLException {
RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement);
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(database,
decorateRuleConfiguration(database, toBeAlteredRuleConfig));
RuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(toBeAlteredRuleConfig);
metaDataManagerPersistService.removeRuleConfigurationItem(database,
toBeDroppedRuleConfig);
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
index 5cc266ed3c1..77bd59ef422 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
@@ -48,7 +48,7 @@ public final class CreateDatabaseRuleOperator implements
DatabaseRuleOperator {
@SuppressWarnings("unchecked")
public void operate(final DatabaseRuleDefinitionStatement sqlStatement,
final ShardingSphereDatabase database, final RuleConfiguration
currentRuleConfig) throws SQLException {
RuleConfiguration toBeCreatedRuleConfig =
executor.buildToBeCreatedRuleConfiguration(sqlStatement);
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
metaDataManagerPersistService.alterRuleConfiguration(database,
decorateRuleConfiguration(database, toBeCreatedRuleConfig));
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
index 9473fb7b27c..31f2ef74dfd 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
@@ -60,7 +60,7 @@ public final class DropDatabaseRuleOperator implements
DatabaseRuleOperator {
}
// TODO refactor to new metadata refresh way
}
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
RuleConfiguration toBeDroppedRuleConfig =
executor.buildToBeDroppedRuleConfiguration(sqlStatement);
metaDataManagerPersistService.removeRuleConfigurationItem(database,
toBeDroppedRuleConfig);
RuleConfiguration toBeAlteredRuleConfig =
executor.buildToBeAlteredRuleConfiguration(sqlStatement);
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
index dd31876081a..32e06f3a641 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
@@ -48,7 +48,7 @@ public final class GlobalRuleDefinitionExecuteEngine {
ShardingSphereRule rule =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(executor.getRuleClass());
executor.setRule(rule);
executor.checkBeforeUpdate(sqlStatement);
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService()
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService()
.alterGlobalRuleConfiguration(executor.buildToBeAlteredRuleConfiguration(sqlStatement));
}
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
index b4c3f605ffe..03ed6d8f80b 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
@@ -66,7 +66,7 @@ public final class AlterStorageUnitExecutor implements
DistSQLUpdateExecutor<Alt
Map<String, DataSourcePoolProperties> propsMap =
DataSourceSegmentsConverter.convert(database.getProtocolType(),
sqlStatement.getStorageUnits());
validateHandler.validate(propsMap,
getExpectedPrivileges(sqlStatement));
try {
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().alterStorageUnits(database,
propsMap);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().alterStorageUnits(database,
propsMap);
} catch (final ShardingSphereExternalException ex) {
throw new StorageUnitsOperateException("alter", propsMap.keySet(),
ex);
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutor.java
index a10cb97969b..a02cdd20017 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutor.java
@@ -67,7 +67,7 @@ public final class RegisterStorageUnitExecutor implements
DistSQLUpdateExecutor<
}
validateHandler.validate(propsMap,
getExpectedPrivileges(sqlStatement));
try {
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().registerStorageUnits(database.getName(),
propsMap);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().registerStorageUnits(database.getName(),
propsMap);
} catch (final ShardingSphereExternalException ex) {
throw new StorageUnitsOperateException("register",
propsMap.keySet(), ex);
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
index 25345843492..44489099482 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
@@ -56,7 +56,7 @@ public final class UnregisterStorageUnitExecutor implements
DistSQLUpdateExecuto
}
checkInUsed(sqlStatement);
try {
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().unregisterStorageUnits(database,
sqlStatement.getStorageUnitNames());
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().unregisterStorageUnits(database,
sqlStatement.getStorageUnitNames());
} catch (final ShardingSphereServerException ex) {
throw new StorageUnitsOperateException("unregister",
sqlStatement.getStorageUnitNames(), ex);
}
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutorTest.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutorTest.java
index 812cbde58ac..6e88e1da336 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutorTest.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutorTest.java
@@ -85,7 +85,7 @@ class UnregisterStorageUnitExecutorTest {
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
-
when(result.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService()).thenReturn(metaDataManagerPersistService);
+
when(result.getPersistServiceFacade().getModeFacade().getMetaDataManagerService()).thenReturn(metaDataManagerPersistService);
when(result.getDatabase("foo_db")).thenReturn(database);
return result;
}
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
index db7019f4644..11aa2b768aa 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
@@ -102,7 +102,7 @@ public final class DriverExecuteExecutor {
return null != resultSet;
}
FederationMetaDataRefreshEngine federationMetaDataRefreshEngine = new
FederationMetaDataRefreshEngine(
-
connection.getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService(),
database);
+
connection.getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerService(),
database);
if (sqlFederationEngine.enabled() &&
federationMetaDataRefreshEngine.isNeedRefresh(queryContext.getSqlStatementContext()))
{
federationMetaDataRefreshEngine.refresh(queryContext.getSqlStatementContext());
return true;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java
index 20b0970e744..704bca84517 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteExecutor.java
@@ -107,7 +107,7 @@ public final class DriverJDBCPushDownExecuteExecutor {
if
(isNeedImplicitCommit(executionContext.getSqlStatementContext())) {
connection.commit();
}
- new
PushDownMetaDataRefreshEngine(connection.getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService(),
database, metaData.getProps())
+ new
PushDownMetaDataRefreshEngine(connection.getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerService(),
database, metaData.getProps())
.refresh(executionContext.getSqlStatementContext(),
executionContext.getRouteContext().getRouteUnits());
return null != results && !results.isEmpty() && null !=
results.get(0) && results.get(0);
} finally {
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteUpdateExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteUpdateExecutor.java
index 15978f09330..e1dcbfd4ad7 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteUpdateExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/pushdown/jdbc/DriverJDBCPushDownExecuteUpdateExecutor.java
@@ -109,7 +109,7 @@ public final class DriverJDBCPushDownExecuteUpdateExecutor {
.newInstance(database,
executionContext.getSqlStatementContext().getSqlStatement(), updateCallback);
List<Integer> updateCounts =
jdbcExecutor.execute(executionGroupContext, callback);
PushDownMetaDataRefreshEngine pushDownMetaDataRefreshEngine =
- new
PushDownMetaDataRefreshEngine(connection.getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService(),
database, props);
+ new
PushDownMetaDataRefreshEngine(connection.getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerService(),
database, props);
if
(pushDownMetaDataRefreshEngine.isNeedRefresh(executionContext.getSqlStatementContext()))
{
if
(isNeedImplicitCommit(executionContext.getSqlStatementContext())) {
connection.commit();
diff --git
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java
index d6f31cf6e4d..aadf8c9d6da 100644
---
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java
+++
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java
@@ -145,7 +145,7 @@ class LoadSingleTableExecutorTest {
when(rule.getConfiguration()).thenReturn(currentConfig);
ContextManager contextManager = mockContextManager(rule);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).alterRuleConfiguration(any(),
any());
}
@@ -164,7 +164,7 @@ class LoadSingleTableExecutorTest {
when(rule.getConfiguration()).thenReturn(currentConfig);
ContextManager contextManager = mockContextManager(null);
new DistSQLUpdateExecuteEngine(sqlStatement, "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).alterRuleConfiguration(any(),
any());
}
}
diff --git
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutorTest.java
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutorTest.java
index 7e4adfaf642..6cbf7820bc6 100644
---
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutorTest.java
+++
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutorTest.java
@@ -63,7 +63,7 @@ class SetDefaultSingleTableStorageUnitExecutorTest {
when(rule.getConfiguration()).thenReturn(new
SingleRuleConfiguration(Collections.emptyList(), "foo_ds"));
ContextManager contextManager = mockContextManager(database, rule);
new DistSQLUpdateExecuteEngine(new
SetDefaultSingleTableStorageUnitStatement(null), "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).removeRuleConfigurationItem(any(),
ArgumentMatchers.<SingleRuleConfiguration>argThat(x ->
x.getDefaultDataSource().equals(Optional.of("foo_ds"))));
verify(metaDataManagerPersistService).alterRuleConfiguration(any(),
ArgumentMatchers.<SingleRuleConfiguration>argThat(x ->
!x.getDefaultDataSource().isPresent()));
}
@@ -79,7 +79,7 @@ class SetDefaultSingleTableStorageUnitExecutorTest {
when(rule.getAttributes().findAttribute(DataSourceMapperRuleAttribute.class)).thenReturn(Optional.empty());
ContextManager contextManager = mockContextManager(database, rule);
new DistSQLUpdateExecuteEngine(new
SetDefaultSingleTableStorageUnitStatement("bar_ds"), "foo_db",
contextManager).executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).removeRuleConfigurationItem(database,
null);
verify(metaDataManagerPersistService).alterRuleConfiguration(any(),
ArgumentMatchers.<SingleRuleConfiguration>argThat(x ->
x.getDefaultDataSource().equals(Optional.of("bar_ds"))));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/mode/ModePersistServiceFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/mode/ModePersistServiceFacade.java
index 197a4c8f897..e9a64c9d98d 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/mode/ModePersistServiceFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/mode/ModePersistServiceFacade.java
@@ -31,21 +31,21 @@ public interface ModePersistServiceFacade extends
AutoCloseable {
*
* @return meta data manager persist service
*/
- MetaDataManagerPersistService getMetaDataManagerPersistService();
+ MetaDataManagerPersistService getMetaDataManagerService();
/**
* Get compute node persist service.
*
* @return compute node persist service
*/
- ComputeNodePersistService getComputeNodePersistService();
+ ComputeNodePersistService getComputeNodeService();
/**
* Get process persist service.
*
* @return process persist service
*/
- ProcessPersistService getProcessPersistService();
+ ProcessPersistService getProcessService();
@Override
void close();
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 8a7f4c97d33..fce8a3405a1 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -77,9 +77,9 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
private void registerOnline(final ComputeNodeInstanceContext
computeNodeInstanceContext, final ContextManagerBuilderParameter param, final
ContextManager contextManager) {
ClusterPersistServiceFacade clusterPersistServiceFacade =
(ClusterPersistServiceFacade)
contextManager.getPersistServiceFacade().getModeFacade();
-
clusterPersistServiceFacade.getComputeNodePersistService().registerOnline(computeNodeInstanceContext.getInstance());
+
clusterPersistServiceFacade.getComputeNodeService().registerOnline(computeNodeInstanceContext.getInstance());
contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().getAllClusterInstances()
-
.addAll(clusterPersistServiceFacade.getComputeNodePersistService().loadAllInstances());
+
.addAll(clusterPersistServiceFacade.getComputeNodeService().loadAllInstances());
new DataChangedEventListenerRegistry(contextManager,
getDatabaseNames(param,
contextManager.getPersistServiceFacade().getMetaDataFacade())).register();
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandler.java
index 65528e23e0a..376cc2dc666 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandler.java
@@ -63,10 +63,10 @@ public final class ComputeNodeOnlineHandler implements
ComputeNodeChangedHandler
String instanceId = NodePathSearcher.get(event.getKey(),
OnlineNodePath.createInstanceIdSearchCriteria());
ComputeNodeData computeNodeData = new
YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(),
YamlComputeNodeData.class));
InstanceMetaData instanceMetaData =
InstanceMetaDataFactory.create(instanceId, instanceType, computeNodeData);
+ ClusterPersistServiceFacade clusterPersistServiceFacade =
(ClusterPersistServiceFacade)
contextManager.getPersistServiceFacade().getModeFacade();
switch (event.getType()) {
case ADDED:
- ClusterPersistServiceFacade clusterPersistServiceFacade =
(ClusterPersistServiceFacade)
contextManager.getPersistServiceFacade().getModeFacade();
-
clusterInstanceRegistry.add(clusterPersistServiceFacade.getComputeNodePersistService().loadInstance(instanceMetaData));
+
clusterInstanceRegistry.add(clusterPersistServiceFacade.getComputeNodeService().loadInstance(instanceMetaData));
break;
case DELETED:
clusterInstanceRegistry.delete(new
ComputeNodeInstance(instanceMetaData));
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/facade/ClusterPersistServiceFacade.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/facade/ClusterPersistServiceFacade.java
index b9e1eef224d..a1f4b44e7f0 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/facade/ClusterPersistServiceFacade.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/facade/ClusterPersistServiceFacade.java
@@ -33,24 +33,24 @@ import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
@Getter
public final class ClusterPersistServiceFacade implements
ModePersistServiceFacade {
- private final ClusterMetaDataManagerPersistService
metaDataManagerPersistService;
+ private final ClusterMetaDataManagerPersistService metaDataManagerService;
- private final ClusterComputeNodePersistService computeNodePersistService;
+ private final ClusterComputeNodePersistService computeNodeService;
- private final ClusterProcessPersistService processPersistService;
+ private final ClusterProcessPersistService processService;
@Getter(AccessLevel.NONE)
private final ComputeNodeInstance computeNodeInstance;
public ClusterPersistServiceFacade(final MetaDataContextManager
metaDataContextManager, final ClusterPersistRepository repository) {
- metaDataManagerPersistService = new
ClusterMetaDataManagerPersistService(metaDataContextManager, repository);
- computeNodePersistService = new
ClusterComputeNodePersistService(repository);
- processPersistService = new ClusterProcessPersistService(repository);
+ metaDataManagerService = new
ClusterMetaDataManagerPersistService(metaDataContextManager, repository);
+ computeNodeService = new ClusterComputeNodePersistService(repository);
+ processService = new ClusterProcessPersistService(repository);
computeNodeInstance =
metaDataContextManager.getComputeNodeInstanceContext().getInstance();
}
@Override
public void close() {
- computeNodePersistService.offline(computeNodeInstance);
+ computeNodeService.offline(computeNodeInstance);
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandlerTest.java
index 4a7cd15e98a..777e00b3938 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/compute/type/ComputeNodeOnlineHandlerTest.java
@@ -63,7 +63,7 @@ class ComputeNodeOnlineHandlerTest {
void assertHandleWithInstanceOnlineEvent() {
ComputeNodeInstance computeNodeInstance =
mock(ComputeNodeInstance.class);
ClusterPersistServiceFacade clusterPersistServiceFacade =
mock(ClusterPersistServiceFacade.class, RETURNS_DEEP_STUBS);
-
when(clusterPersistServiceFacade.getComputeNodePersistService().loadInstance(any())).thenReturn(computeNodeInstance);
+
when(clusterPersistServiceFacade.getComputeNodeService().loadInstance(any())).thenReturn(computeNodeInstance);
when(contextManager.getPersistServiceFacade().getModeFacade()).thenReturn(clusterPersistServiceFacade);
handler.handle(contextManager, new
DataChangedEvent("/nodes/compute_nodes/online/proxy/foo_instance_id",
"{attribute: 127.0.0.1@3307,version: 1}", Type.ADDED));
verify(contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry()).add(computeNodeInstance);
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/facade/StandalonePersistServiceFacade.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/facade/StandalonePersistServiceFacade.java
index 4475b7aeafa..e0f9a7b3514 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/facade/StandalonePersistServiceFacade.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/facade/StandalonePersistServiceFacade.java
@@ -30,16 +30,16 @@ import
org.apache.shardingsphere.mode.persist.mode.ModePersistServiceFacade;
@Getter
public final class StandalonePersistServiceFacade implements
ModePersistServiceFacade {
- private final StandaloneMetaDataManagerPersistService
metaDataManagerPersistService;
+ private final StandaloneMetaDataManagerPersistService
metaDataManagerService;
- private final StandaloneComputeNodePersistService
computeNodePersistService;
+ private final StandaloneComputeNodePersistService computeNodeService;
- private final StandaloneProcessPersistService processPersistService;
+ private final StandaloneProcessPersistService processService;
public StandalonePersistServiceFacade(final MetaDataContextManager
metaDataContextManager) {
- metaDataManagerPersistService = new
StandaloneMetaDataManagerPersistService(metaDataContextManager);
- computeNodePersistService = new
StandaloneComputeNodePersistService(metaDataContextManager.getComputeNodeInstanceContext().getInstance());
- processPersistService = new StandaloneProcessPersistService();
+ metaDataManagerService = new
StandaloneMetaDataManagerPersistService(metaDataContextManager);
+ computeNodeService = new
StandaloneComputeNodePersistService(metaDataContextManager.getComputeNodeInstanceContext().getInstance());
+ processService = new StandaloneProcessPersistService();
}
@Override
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
index 0aba5731589..1129f65ea94 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
@@ -137,8 +137,8 @@ public final class StandardDatabaseConnector implements
DatabaseConnector {
}
proxySQLExecutor = new ProxySQLExecutor(driverType,
databaseConnectionManager, this, queryContext);
pushDownMetaDataRefreshEngine = new PushDownMetaDataRefreshEngine(
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService(),
database, contextManager.getMetaDataContexts().getMetaData().getProps());
- federationMetaDataRefreshEngine = new
FederationMetaDataRefreshEngine(contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService(),
database);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService(),
database, contextManager.getMetaDataContexts().getMetaData().getProps());
+ federationMetaDataRefreshEngine = new
FederationMetaDataRefreshEngine(contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService(),
database);
}
private void checkBackendReady(final SQLStatementContext
sqlStatementContext) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandler.java
index 153d87cf92a..bee9a3773b4 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandler.java
@@ -38,7 +38,7 @@ public final class CreateDatabaseBackendHandler implements
ProxyBackendHandler {
@Override
public ResponseHeader execute() throws SQLException {
check(sqlStatement);
-
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().createDatabase(sqlStatement.getDatabaseName());
+
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerService().createDatabase(sqlStatement.getDatabaseName());
return new UpdateResponseHeader(sqlStatement);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
index 39174df313c..6fcd786156b 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
@@ -56,7 +56,7 @@ public final class DropDatabaseBackendHandler implements
ProxyBackendHandler {
}
if
(ProxyContext.getInstance().databaseExists(sqlStatement.getDatabaseName())) {
ShardingSphereDatabase database =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(sqlStatement.getDatabaseName());
-
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().dropDatabase(database);
+
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getMetaDataManagerService().dropDatabase(database);
}
return new UpdateResponseHeader(sqlStatement);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java
index 6039e2c9bb7..6c9c8ee1e68 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutor.java
@@ -42,7 +42,7 @@ public final class ShowComputeNodesExecutor implements
DistSQLQueryExecutor<Show
@Override
public Collection<LocalDataQueryResultRow> getRows(final
ShowComputeNodesStatement sqlStatement, final ContextManager contextManager) {
String modeType =
contextManager.getComputeNodeInstanceContext().getModeConfiguration().getType();
- Collection<ComputeNodeInstance> instances =
contextManager.getPersistServiceFacade().getModeFacade().getComputeNodePersistService().loadAllInstances();
+ Collection<ComputeNodeInstance> instances =
contextManager.getPersistServiceFacade().getModeFacade().getComputeNodeService().loadAllInstances();
return instances.stream().map(each -> buildRow(each,
modeType)).collect(Collectors.toList());
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutor.java
index 581bcfa81a1..e6f2c3f003d 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutor.java
@@ -41,7 +41,7 @@ public final class SetComputeNodeStateExecutor implements
DistSQLUpdateExecutor<
}
if
(contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster())
{
ClusterPersistServiceFacade clusterPersistServiceFacade =
(ClusterPersistServiceFacade)
contextManager.getPersistServiceFacade().getModeFacade();
-
clusterPersistServiceFacade.getComputeNodePersistService().updateState(sqlStatement.getInstanceId(),
+
clusterPersistServiceFacade.getComputeNodeService().updateState(sqlStatement.getInstanceId(),
"DISABLE".equals(sqlStatement.getState()) ?
InstanceState.CIRCUIT_BREAK : InstanceState.OK);
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutor.java
index 29ac0a4eb48..7504c9f0487 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/LabelComputeNodeExecutor.java
@@ -49,7 +49,7 @@ public final class LabelComputeNodeExecutor implements
DistSQLUpdateExecutor<Lab
labels.addAll(computeNodeInstance.get().getLabels());
}
ClusterPersistServiceFacade clusterPersistServiceFacade =
(ClusterPersistServiceFacade)
contextManager.getPersistServiceFacade().getModeFacade();
-
clusterPersistServiceFacade.getComputeNodePersistService().persistLabels(instanceId,
new LinkedList<>(labels));
+
clusterPersistServiceFacade.getComputeNodeService().persistLabels(instanceId,
new LinkedList<>(labels));
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutor.java
index 3fbbbff5448..29df92dceb0 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/label/UnlabelComputeNodeExecutor.java
@@ -47,10 +47,10 @@ public final class UnlabelComputeNodeExecutor implements
DistSQLUpdateExecutor<U
ClusterPersistServiceFacade clusterPersistServiceFacade =
(ClusterPersistServiceFacade)
contextManager.getPersistServiceFacade().getModeFacade();
Collection<String> labels = new
LinkedHashSet<>(computeNodeInstance.get().getLabels());
if (sqlStatement.getLabels().isEmpty()) {
-
clusterPersistServiceFacade.getComputeNodePersistService().persistLabels(instanceId,
Collections.emptyList());
+
clusterPersistServiceFacade.getComputeNodeService().persistLabels(instanceId,
Collections.emptyList());
} else {
labels.removeAll(sqlStatement.getLabels());
-
clusterPersistServiceFacade.getComputeNodePersistService().persistLabels(instanceId,
new ArrayList<>(labels));
+
clusterPersistServiceFacade.getComputeNodeService().persistLabels(instanceId,
new ArrayList<>(labels));
}
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutor.java
index 0c94256f396..edefde1e6f8 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutor.java
@@ -71,7 +71,7 @@ public final class SetDistVariableExecutor implements
DistSQLUpdateExecutor<SetD
props.putAll(metaDataContexts.getMetaData().getProps().getProps());
props.putAll(metaDataContexts.getMetaData().getTemporaryProps().getProps());
props.put(propertyKey.getKey(), getValue(propertyKey, value));
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().alterProperties(props);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().alterProperties(props);
refreshRootLogger(props);
syncSQLShowToLoggingRule(propertyKey, metaDataContexts, value,
contextManager);
syncSQLSimpleToLoggingRule(propertyKey, metaDataContexts, value,
contextManager);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
index c86a8da8ea9..aa686482397 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
@@ -71,12 +71,12 @@ public final class MetaDataImportExecutor {
private void importGlobalRules(final YamlProxyServerConfiguration
yamlServerConfig) {
Collection<RuleConfiguration> rules =
ruleConfigSwapperEngine.swapToRuleConfigurations(yamlServerConfig.getRules());
for (RuleConfiguration each : rules) {
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().alterGlobalRuleConfiguration(each);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().alterGlobalRuleConfiguration(each);
}
}
private void importProps(final YamlProxyServerConfiguration
yamlServerConfig) {
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().alterProperties(yamlServerConfig.getProps());
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().alterProperties(yamlServerConfig.getProps());
}
private Map<String, YamlProxyDatabaseConfiguration>
getYamlProxyDatabaseConfigurations(final ExportedMetaData exportedMetaData) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
index f93ebfd12d9..0b248137e89 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
@@ -98,7 +98,7 @@ public final class YamlDatabaseConfigurationImportExecutor {
}
private void addDatabase(final String databaseName) {
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().createDatabase(databaseName);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().createDatabase(databaseName);
DatabaseType protocolType =
DatabaseTypeEngine.getProtocolType(Collections.emptyMap(),
contextManager.getMetaDataContexts().getMetaData().getProps());
contextManager.getMetaDataContexts().getMetaData().addDatabase(databaseName,
protocolType, contextManager.getMetaDataContexts().getMetaData().getProps());
}
@@ -110,7 +110,7 @@ public final class YamlDatabaseConfigurationImportExecutor {
propsMap.put(entry.getKey(),
DataSourcePoolPropertiesCreator.create(dataSourceConfig));
}
validateHandler.validate(propsMap);
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().registerStorageUnits(databaseName,
propsMap);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().registerStorageUnits(databaseName,
propsMap);
Map<String, StorageUnit> storageUnits =
contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData().getStorageUnits();
Map<String, StorageNode> toBeAddedStorageNode =
StorageUnitNodeMapCreator.create(propsMap);
for (Entry<String, DataSourcePoolProperties> entry :
propsMap.entrySet()) {
@@ -154,6 +154,6 @@ public final class YamlDatabaseConfigurationImportExecutor {
}
private void dropDatabase(final ShardingSphereDatabase database) {
-
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService().dropDatabase(database);
+
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService().dropDatabase(database);
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
index 4e7dc55fed3..083072990cf 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
@@ -101,7 +101,7 @@ class DistSQLBackendHandlerFactoryTest {
MetaDataContexts metaDataContexts = mockMetaDataContexts(database);
when(result.getDatabase("foo_db")).thenReturn(database);
when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
-
when(result.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService()).thenReturn(mock(MetaDataManagerPersistService.class));
+
when(result.getPersistServiceFacade().getModeFacade().getMetaDataManagerService()).thenReturn(mock(MetaDataManagerPersistService.class));
when(result.getComputeNodeInstanceContext().getModeConfiguration().getType()).thenReturn("Cluster");
return result;
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
index a8ac4e3eb74..e7e11360442 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
@@ -108,7 +108,7 @@ class ShowComputeNodesExecutorTest {
when(computeNodeInstance.getWorkerId()).thenReturn(1);
when(result.getClusterInstanceRegistry().getAllClusterInstances()).thenReturn(Collections.singleton(computeNodeInstance));
ClusterPersistServiceFacade clusterPersistServiceFacade =
mock(ClusterPersistServiceFacade.class, RETURNS_DEEP_STUBS);
-
when(clusterPersistServiceFacade.getComputeNodePersistService().loadAllInstances()).thenReturn(Collections.singleton(computeNodeInstance));
+
when(clusterPersistServiceFacade.getComputeNodeService().loadAllInstances()).thenReturn(Collections.singleton(computeNodeInstance));
when(contextManager.getPersistServiceFacade().getModeFacade()).thenReturn(clusterPersistServiceFacade);
return result;
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
index b89dfdb38d2..8d4038c4803 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/KillProcessExecutor.java
@@ -47,6 +47,6 @@ public final class KillProcessExecutor implements
DatabaseAdminExecutor {
ShardingSpherePreconditions.checkState(QUERY_SCOPE.equalsIgnoreCase(killStatement.getScope()),
() -> new UnsupportedSQLOperationException("Only `KILL QUERY
<processId>` SQL syntax is supported"));
String processId = killStatement.getProcessId();
-
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getProcessPersistService().killProcess(processId);
+
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getProcessService().killProcess(processId);
}
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
index 6de6eb16b94..745ff3c3105 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutor.java
@@ -61,7 +61,7 @@ public final class ShowProcessListExecutor implements
DatabaseAdminQueryExecutor
}
private QueryResult getQueryResult() {
- Collection<Process> processes =
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getProcessPersistService().getProcessList();
+ Collection<Process> processes =
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getModeFacade().getProcessService().getProcessList();
if (processes.isEmpty()) {
return new RawMemoryQueryResult(queryResultMetaData,
Collections.emptyList());
}
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
index 691724b7913..16a5285fbc6 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcessListExecutorTest.java
@@ -49,7 +49,7 @@ class ShowProcessListExecutorTest {
void assertExecute() throws SQLException {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
-
when(contextManager.getPersistServiceFacade().getModeFacade().getProcessPersistService().getProcessList()).thenReturn(mockProcessList());
+
when(contextManager.getPersistServiceFacade().getModeFacade().getProcessService().getProcessList()).thenReturn(mockProcessList());
ShowProcessListExecutor showProcessListExecutor = new
ShowProcessListExecutor(false);
showProcessListExecutor.execute(new
ConnectionSession(mock(MySQLDatabaseType.class), new DefaultAttributeMap()));
assertThat(showProcessListExecutor.getQueryResultMetaData().getColumnCount(),
is(8));
diff --git
a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/GlobalRuleDefinitionExecutorTest.java
b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/GlobalRuleDefinitionExecutorTest.java
index 20f52ff0b65..0a3ec7ef78a 100644
---
a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/GlobalRuleDefinitionExecutorTest.java
+++
b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/GlobalRuleDefinitionExecutorTest.java
@@ -52,7 +52,7 @@ public abstract class GlobalRuleDefinitionExecutorTest {
return;
}
engine.executeUpdate();
- MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerPersistService();
+ MetaDataManagerPersistService metaDataManagerPersistService =
contextManager.getPersistServiceFacade().getModeFacade().getMetaDataManagerService();
verify(metaDataManagerPersistService).alterGlobalRuleConfiguration(deepEq(matchedRuleConfig));
}
