You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/05/18 14:55:04 UTC
[shardingsphere] branch master updated: Rename MetaDataContexts.persistService (#17789)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 9b4c0137d52 Rename MetaDataContexts.persistService (#17789)
9b4c0137d52 is described below
commit 9b4c0137d52b6d17b7f046e30749fddb808d48b8
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed May 18 22:54:56 2022 +0800
Rename MetaDataContexts.persistService (#17789)
* Refactor ContextManager
* Move ContextManager.executorEngine
* Fix test case
* Fix test case
* Fix test case
* Fix test case
* Rename MetaDataContexts.persistService
* Rename useless codes
---
.../jdbc/core/connection/ConnectionManager.java | 2 +-
.../core/connection/ConnectionManagerTest.java | 2 +-
.../data/pipeline/core/api/PipelineAPIFactory.java | 7 ++---
.../mode/manager/ContextManager.java | 34 +++++++++++-----------
.../mode/metadata/MetaDataContexts.java | 14 ++++-----
.../persist/service/ComputeNodePersistService.java | 26 ++---------------
.../mode/manager/ContextManagerTest.java | 4 +--
.../service/ComputeNodePersistServiceTest.java | 7 -----
.../cluster/ClusterContextManagerBuilder.java | 4 +--
.../ClusterContextManagerCoordinatorTest.java | 4 +--
.../StandaloneContextManagerBuilderTextTest.java | 4 +--
...ShowReadwriteSplittingReadResourcesHandler.java | 2 +-
.../ral/common/updatable/AlterInstanceHandler.java | 2 +-
.../updatable/AlterSQLParserRuleHandler.java | 2 +-
.../common/updatable/AlterTrafficRuleHandler.java | 2 +-
.../updatable/AlterTransactionRuleHandler.java | 2 +-
.../common/updatable/CreateTrafficRuleHandler.java | 2 +-
.../common/updatable/DropTrafficRuleHandler.java | 2 +-
.../ImportDatabaseConfigurationHandler.java | 2 +-
.../ral/common/updatable/LabelInstanceHandler.java | 2 +-
.../common/updatable/SetInstanceStatusHandler.java | 4 +--
.../SetReadwriteSplittingStatusHandler.java | 4 +--
.../ral/common/updatable/SetVariableHandler.java | 2 +-
.../common/updatable/UnlabelInstanceHandler.java | 2 +-
.../rdl/rule/RuleDefinitionBackendHandler.java | 4 +--
.../common/updatable/AlterInstanceHandlerTest.java | 4 +--
26 files changed, 58 insertions(+), 88 deletions(-)
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
index 8ea67961f72..37412811a6b 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
@@ -84,7 +84,7 @@ public final class ConnectionManager implements ExecutorJDBCConnectionManager, A
private Map<String, DataSource> getTrafficDataSourceMap(final String schema, final ContextManager contextManager) {
Optional<TrafficRule> trafficRule = contextManager.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TrafficRule.class);
- Optional<MetaDataPersistService> metaDataPersistService = contextManager.getMetaDataContexts().getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = contextManager.getMetaDataContexts().getPersistService();
if (!trafficRule.isPresent() || trafficRule.get().getStrategyRules().isEmpty() || !metaDataPersistService.isPresent()) {
return Collections.emptyMap();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
index d4d06ed96c5..fa1fd9ef9b9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
@@ -89,7 +89,7 @@ public final class ConnectionManagerTest {
TrafficRule trafficRule = mockTrafficRule();
MetaDataPersistService metaDataPersistService = mockMetaDataPersistService();
when(result.getDataSourceMap(DefaultDatabase.LOGIC_NAME)).thenReturn(dataSourceMap);
- when(result.getMetaDataContexts().getMetaDataPersistService()).thenReturn(Optional.of(metaDataPersistService));
+ when(result.getMetaDataContexts().getPersistService()).thenReturn(Optional.of(metaDataPersistService));
when(result.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TransactionRule.class)).thenReturn(Optional.empty());
when(result.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TrafficRule.class)).thenReturn(Optional.of(trafficRule));
when(result.getInstanceContext().getComputeNodeInstanceIds(InstanceType.PROXY, Arrays.asList("OLTP", "OLAP"))).thenReturn(Collections.singletonList(new InstanceId("127.0.0.1@3307")));
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java
index 595fc6209d1..4e1da7e835d 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java
@@ -49,12 +49,11 @@ public final class PipelineAPIFactory {
@Override
protected GovernanceRepositoryAPI initialize() {
- Optional<MetaDataPersistService> persistServiceOptional = PipelineContext.getContextManager().getMetaDataContexts().getMetaDataPersistService();
- if (!persistServiceOptional.isPresent()) {
+ Optional<MetaDataPersistService> persistService = PipelineContext.getContextManager().getMetaDataContexts().getPersistService();
+ if (!persistService.isPresent()) {
throw new RuntimeException("persistService is not present");
}
- ClusterPersistRepository repository = (ClusterPersistRepository) persistServiceOptional.get().getRepository();
- return new GovernanceRepositoryAPIImpl(repository);
+ return new GovernanceRepositoryAPIImpl((ClusterPersistRepository) persistService.get().getRepository());
}
};
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 579c134f924..d61c1b4cbc6 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -145,7 +145,7 @@ public final class ContextManager implements AutoCloseable {
MetaDataContextsBuilder builder = new MetaDataContextsBuilder(
Collections.singletonMap(databaseName, new DataSourceProvidedDatabaseConfiguration(new HashMap<>(), new LinkedList<>())),
metaDataContexts.getGlobalRuleMetaData().getConfigurations(), metaDataContexts.getProps());
- return builder.build(metaDataContexts.getMetaDataPersistService().orElse(null));
+ return builder.build(metaDataContexts.getPersistService().orElse(null));
}
/**
@@ -199,9 +199,9 @@ public final class ContextManager implements AutoCloseable {
private void persistMetaData(final MetaDataContexts metaDataContexts) {
metaDataContexts.getMetaDataMap().forEach((databaseName, schemas) -> schemas.getDatabase().getSchemas().forEach((schemaName, tables) -> {
if (tables.getTables().isEmpty()) {
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistSchema(databaseName, schemaName));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistSchema(databaseName, schemaName));
} else {
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, tables));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, tables));
}
}));
}
@@ -255,7 +255,7 @@ public final class ContextManager implements AutoCloseable {
ShardingSphereMetaData removeMetaData = metaDataContexts.getMetaDataMap().remove(databaseName);
closeDataSources(removeMetaData);
removeAndCloseTransactionEngine(databaseName);
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().deleteDatabase(databaseName));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().deleteDatabase(databaseName));
}
}
@@ -284,7 +284,7 @@ public final class ContextManager implements AutoCloseable {
*/
public void addResource(final String databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap) throws SQLException {
refreshMetaDataContext(databaseName, dataSourcePropsMap);
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getDataSourceService().append(databaseName, dataSourcePropsMap));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getDataSourceService().append(databaseName, dataSourcePropsMap));
}
/**
@@ -296,7 +296,7 @@ public final class ContextManager implements AutoCloseable {
*/
public void alterResource(final String databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap) throws SQLException {
refreshMetaDataContext(databaseName, dataSourcePropsMap);
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getDataSourceService().append(databaseName, dataSourcePropsMap));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getDataSourceService().append(databaseName, dataSourcePropsMap));
}
/**
@@ -307,7 +307,7 @@ public final class ContextManager implements AutoCloseable {
*/
public void dropResource(final String databaseName, final Collection<String> toBeDroppedResourceNames) {
toBeDroppedResourceNames.forEach(metaDataContexts.getMetaData(databaseName).getResource().getDataSources()::remove);
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getDataSourceService().drop(databaseName, toBeDroppedResourceNames));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getDataSourceService().drop(databaseName, toBeDroppedResourceNames));
}
/**
@@ -401,7 +401,7 @@ public final class ContextManager implements AutoCloseable {
Map<String, ShardingSphereSchema> schemas = loadActualSchema(databaseName, schemaName);
alterSchemas(databaseName, schemas);
for (ShardingSphereSchema each : schemas.values()) {
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, each));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, each));
}
} catch (final SQLException ex) {
log.error("Reload database:{} meta data of schema:{} failed", databaseName, schemaName, ex);
@@ -450,7 +450,7 @@ public final class ContextManager implements AutoCloseable {
SchemaMetaData schemaMetaData = TableMetaDataBuilder.load(Collections.singletonList(tableName), materials).getOrDefault(schemaName, new SchemaMetaData("", Collections.emptyMap()));
if (schemaMetaData.getTables().containsKey(tableName)) {
metaDataContexts.getMetaData(databaseName).getSchemaByName(schemaName).put(tableName, schemaMetaData.getTables().get(tableName));
- metaDataContexts.getMetaDataPersistService()
+ metaDataContexts.getPersistService()
.ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, metaDataContexts.getMetaData(databaseName).getSchemaByName(schemaName)));
}
}
@@ -493,18 +493,18 @@ public final class ContextManager implements AutoCloseable {
}
private MetaDataContexts rebuildMetaDataContexts(final Map<String, ShardingSphereMetaData> schemaMetaData) {
- return new MetaDataContexts(metaDataContexts.getMetaDataPersistService().orElse(null),
+ return new MetaDataContexts(metaDataContexts.getPersistService().orElse(null),
schemaMetaData, metaDataContexts.getGlobalRuleMetaData(),
metaDataContexts.getOptimizerContext(), metaDataContexts.getProps());
}
private MetaDataContexts rebuildMetaDataContexts(final ShardingSphereRuleMetaData globalRuleMetaData) {
- return new MetaDataContexts(metaDataContexts.getMetaDataPersistService().orElse(null),
+ return new MetaDataContexts(metaDataContexts.getPersistService().orElse(null),
metaDataContexts.getMetaDataMap(), globalRuleMetaData, metaDataContexts.getOptimizerContext(), metaDataContexts.getProps());
}
private MetaDataContexts rebuildMetaDataContexts(final ConfigurationProperties props) {
- return new MetaDataContexts(metaDataContexts.getMetaDataPersistService().orElse(null),
+ return new MetaDataContexts(metaDataContexts.getPersistService().orElse(null),
metaDataContexts.getMetaDataMap(), metaDataContexts.getGlobalRuleMetaData(), metaDataContexts.getOptimizerContext(), props);
}
@@ -532,11 +532,11 @@ public final class ContextManager implements AutoCloseable {
Map<String, DataSource> dataSourceMap = new HashMap<>(originalMetaData.getResource().getDataSources());
dataSourceMap.putAll(DataSourcePoolCreator.create(addedDataSourceProps));
DatabaseConfiguration databaseConfig = new DataSourceProvidedDatabaseConfiguration(dataSourceMap, originalMetaData.getRuleMetaData().getConfigurations());
- Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getPersistService();
metaDataPersistService.ifPresent(optional -> persistTransactionConfiguration(databaseConfig, optional));
MetaDataContextsBuilder builder = new MetaDataContextsBuilder(
Collections.singletonMap(originalMetaData.getDatabase().getName(), databaseConfig), metaDataContexts.getGlobalRuleMetaData().getConfigurations(), metaDataContexts.getProps());
- MetaDataContexts result = builder.build(metaDataContexts.getMetaDataPersistService().orElse(null));
+ MetaDataContexts result = builder.build(metaDataContexts.getPersistService().orElse(null));
persistMetaData(result);
return result;
}
@@ -551,7 +551,7 @@ public final class ContextManager implements AutoCloseable {
MetaDataContextsBuilder builder = new MetaDataContextsBuilder(
Collections.singletonMap(originalMetaData.getDatabase().getName(), new DataSourceProvidedDatabaseConfiguration(originalMetaData.getResource().getDataSources(), ruleConfigs)),
metaDataContexts.getGlobalRuleMetaData().getConfigurations(), metaDataContexts.getProps());
- MetaDataContexts result = builder.build(metaDataContexts.getMetaDataPersistService().orElse(null));
+ MetaDataContexts result = builder.build(metaDataContexts.getPersistService().orElse(null));
persistMetaData(result);
return result;
}
@@ -565,7 +565,7 @@ public final class ContextManager implements AutoCloseable {
originalMetaData.getRuleMetaData().getConfigurations());
MetaDataContextsBuilder builder = new MetaDataContextsBuilder(Collections.singletonMap(originalMetaData.getDatabase().getName(), databaseConfig),
metaDataContexts.getGlobalRuleMetaData().getConfigurations(), metaDataContexts.getProps());
- MetaDataContexts result = builder.build(metaDataContexts.getMetaDataPersistService().orElse(null));
+ MetaDataContexts result = builder.build(metaDataContexts.getPersistService().orElse(null));
persistMetaData(result);
return result;
}
@@ -578,7 +578,7 @@ public final class ContextManager implements AutoCloseable {
getAddedDataSources(originalMetaData, newDataSourceProps), changedDataSources, deletedDataSources), ruleConfigs);
MetaDataContextsBuilder builder = new MetaDataContextsBuilder(
Collections.singletonMap(originalMetaData.getDatabase().getName(), databaseConfig), metaDataContexts.getGlobalRuleMetaData().getConfigurations(), metaDataContexts.getProps());
- MetaDataContexts result = builder.build(metaDataContexts.getMetaDataPersistService().orElse(null));
+ MetaDataContexts result = builder.build(metaDataContexts.getPersistService().orElse(null));
persistMetaData(result);
return result;
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
index ab4631a213c..ab52c135ee5 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
@@ -41,7 +41,7 @@ import java.util.Properties;
@Getter
public final class MetaDataContexts implements AutoCloseable {
- private final MetaDataPersistService metaDataPersistService;
+ private final MetaDataPersistService persistService;
private final Map<String, ShardingSphereMetaData> metaDataMap;
@@ -51,8 +51,8 @@ public final class MetaDataContexts implements AutoCloseable {
private final ConfigurationProperties props;
- public MetaDataContexts(final MetaDataPersistService metaDataPersistService) {
- this(metaDataPersistService, new LinkedHashMap<>(), new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList()),
+ public MetaDataContexts(final MetaDataPersistService persistService) {
+ this(persistService, new LinkedHashMap<>(), new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList()),
OptimizerContextFactory.create(new HashMap<>(), new ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList())), new ConfigurationProperties(new Properties()));
}
@@ -61,8 +61,8 @@ public final class MetaDataContexts implements AutoCloseable {
*
* @return persist service
*/
- public Optional<MetaDataPersistService> getMetaDataPersistService() {
- return Optional.ofNullable(metaDataPersistService);
+ public Optional<MetaDataPersistService> getPersistService() {
+ return Optional.ofNullable(persistService);
}
/**
@@ -86,8 +86,8 @@ public final class MetaDataContexts implements AutoCloseable {
@Override
public void close() throws Exception {
- if (null != metaDataPersistService) {
- metaDataPersistService.getRepository().close();
+ if (null != persistService) {
+ persistService.getRepository().close();
}
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistService.java
index eff0b5fcbdf..2a7383c44bc 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistService.java
@@ -30,7 +30,6 @@ import org.apache.shardingsphere.mode.persist.PersistRepository;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.List;
import java.util.Optional;
/**
@@ -96,6 +95,7 @@ public final class ComputeNodePersistService {
* @param instanceId instance id
* @return labels
*/
+ @SuppressWarnings("unchecked")
public Collection<String> loadInstanceLabels(final String instanceId) {
String yamlContent = repository.get(ComputeNode.getInstanceLabelsNodePath(instanceId));
return Strings.isNullOrEmpty(yamlContent) ? new ArrayList<>() : YamlEngine.unmarshal(yamlContent, Collection.class);
@@ -107,6 +107,7 @@ public final class ComputeNodePersistService {
* @param instanceId instance id
* @return status
*/
+ @SuppressWarnings("unchecked")
public Collection<String> loadInstanceStatus(final String instanceId) {
String yamlContent = repository.get(ComputeNode.getInstanceStatusNodePath(instanceId));
return Strings.isNullOrEmpty(yamlContent) ? new ArrayList<>() : YamlEngine.unmarshal(yamlContent, Collection.class);
@@ -138,29 +139,6 @@ public final class ComputeNodePersistService {
return Optional.ofNullable(repository.get(ComputeNode.getInstanceXaRecoveryIdNodePath(instanceId)));
}
- /**
- * Load compute node instances by instance type and labels.
- *
- * @param instanceType instance type
- * @param labels collection of contained label
- * @return compute node instances
- */
- public Collection<ComputeNodeInstance> loadComputeNodeInstances(final InstanceType instanceType, final Collection<String> labels) {
- Collection<String> onlineComputeNodes = repository.getChildrenKeys(ComputeNode.getOnlineNodePath(instanceType));
- List<ComputeNodeInstance> result = new ArrayList<>(onlineComputeNodes.size());
- onlineComputeNodes.forEach(each -> {
- Collection<String> actualLabels = loadInstanceLabels(each);
- if (actualLabels.stream().anyMatch(labels::contains)) {
- ComputeNodeInstance instance = new ComputeNodeInstance(new InstanceDefinition(instanceType, each));
- instance.setLabels(actualLabels);
- instance.switchState(loadInstanceStatus(each));
- loadInstanceWorkerId(each).ifPresent(instance::setWorkerId);
- result.add(instance);
- }
- });
- return result;
- }
-
/**
* Load all compute node instances.
*
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 9a5e167fed0..bbf0f1217d8 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -207,7 +207,7 @@ public final class ContextManagerTest {
ShardingSphereResource resource = mock(ShardingSphereResource.class);
when(metaDataContexts.getMetaDataMap()).thenReturn(Collections.singletonMap("foo_db",
new ShardingSphereMetaData(new MySQLDatabaseType(), resource, mock(ShardingSphereRuleMetaData.class), new ShardingSphereDatabase("foo_db", Collections.emptyMap()))));
- when(metaDataContexts.getMetaDataPersistService()).thenReturn(Optional.of(mock(MetaDataPersistService.class, RETURNS_DEEP_STUBS)));
+ when(metaDataContexts.getPersistService()).thenReturn(Optional.of(mock(MetaDataPersistService.class, RETURNS_DEEP_STUBS)));
RuleConfiguration ruleConfig = mock(RuleConfiguration.class);
contextManager.alterRuleConfiguration("foo_db", Collections.singleton(ruleConfig));
assertTrue(contextManager.getMetaDataContexts().getMetaDataMap().get("foo_db").getRuleMetaData().getConfigurations().contains(ruleConfig));
@@ -260,7 +260,7 @@ public final class ContextManagerTest {
SchemaMetaDataPersistService schemaMetaDataPersistService = mock(SchemaMetaDataPersistService.class, RETURNS_DEEP_STUBS);
MetaDataPersistService metaDataPersistService = mock(MetaDataPersistService.class);
when(metaDataPersistService.getSchemaMetaDataService()).thenReturn(schemaMetaDataPersistService);
- when(metaDataContexts.getMetaDataPersistService()).thenReturn(Optional.of(metaDataPersistService));
+ when(metaDataContexts.getPersistService()).thenReturn(Optional.of(metaDataPersistService));
contextManager.reloadMetaData("foo_db", "foo_schema");
verify(schemaMetaDataPersistService, times(1)).persistTables(eq("foo_db"), eq("foo_schema"), any(ShardingSphereSchema.class));
contextManager.reloadMetaData("foo_db", "foo_schema", "foo_table");
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistServiceTest.java b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistServiceTest.java
index 832efedeb29..d83ecb188b7 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistServiceTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistServiceTest.java
@@ -102,13 +102,6 @@ public final class ComputeNodePersistServiceTest {
verify(repository).get(ComputeNode.getInstanceXaRecoveryIdNodePath(instanceId));
}
- @Test
- public void assertLoadComputeNodeInstances() {
- InstanceDefinition instanceDefinition = new InstanceDefinition(InstanceType.PROXY, 3307);
- new ComputeNodePersistService(repository).loadComputeNodeInstances(instanceDefinition.getInstanceType(), Collections.singletonList("test"));
- verify(repository).getChildrenKeys(ComputeNode.getOnlineNodePath(instanceDefinition.getInstanceType()));
- }
-
@Test
public void assertLoadAllComputeNodeInstances() {
when(repository.getChildrenKeys("/nodes/compute_nodes/online/proxy")).thenReturn(Collections.singletonList("127.0.0.1@3307"));
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 3be5c0709a1..5eb0e95d48e 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -145,9 +145,9 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
private void persistMetaData(final MetaDataContexts metaDataContexts) {
metaDataContexts.getMetaDataMap().forEach((databaseName, schemas) -> schemas.getDatabase().getSchemas().forEach((schemaName, tables) -> {
if (tables.getTables().isEmpty()) {
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistSchema(databaseName, schemaName));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistSchema(databaseName, schemaName));
} else {
- metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, tables));
+ metaDataContexts.getPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, tables));
}
}));
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
index ed5c197efa2..e33ca583892 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
@@ -138,8 +138,8 @@ public final class ClusterContextManagerCoordinatorTest {
ModeConfiguration modeConfig = new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("FIXTURE", "", "", new Properties()), false);
contextManager = new ClusterContextManagerBuilder().build(ContextManagerBuilderParameter.builder().modeConfig(modeConfig).databaseConfigs(Collections.emptyMap())
.globalRuleConfigs(Collections.emptyList()).props(new Properties()).instanceDefinition(new InstanceDefinition(InstanceType.PROXY, 3307)).build());
- assertTrue(contextManager.getMetaDataContexts().getMetaDataPersistService().isPresent());
- contextManager.renewMetaDataContexts(new MetaDataContexts(contextManager.getMetaDataContexts().getMetaDataPersistService().get(), createMetaDataMap(), globalRuleMetaData,
+ assertTrue(contextManager.getMetaDataContexts().getPersistService().isPresent());
+ contextManager.renewMetaDataContexts(new MetaDataContexts(contextManager.getMetaDataContexts().getPersistService().get(), createMetaDataMap(), globalRuleMetaData,
createOptimizerContext(), new ConfigurationProperties(new Properties())));
contextManager.renewTransactionContexts(mock(TransactionContexts.class, RETURNS_DEEP_STUBS));
coordinator = new ClusterContextManagerCoordinator(metaDataPersistService, contextManager, new RegistryCenter(mock(ClusterPersistRepository.class)));
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
index 8fde499dae1..8c155ef1647 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
@@ -48,8 +48,8 @@ public final class StandaloneContextManagerBuilderTextTest {
.globalRuleConfigs(Collections.singleton(mock(RuleConfiguration.class))).props(new Properties())
.instanceDefinition(new InstanceDefinition(InstanceType.PROXY, 3307)).build());
assertNotNull(actual.getMetaDataContexts().getMetaDataMap().get("foo_schema"));
- assertTrue(actual.getMetaDataContexts().getMetaDataPersistService().isPresent());
- PersistRepository repository = actual.getMetaDataContexts().getMetaDataPersistService().get().getRepository();
+ assertTrue(actual.getMetaDataContexts().getPersistService().isPresent());
+ PersistRepository repository = actual.getMetaDataContexts().getPersistService().get().getRepository();
assertNotNull(repository.get(GlobalNode.getGlobalRuleNode()));
assertNotNull(repository.get(DatabaseMetaDataNode.getMetaDataDataSourcePath("foo_schema", "0")));
assertNotNull(repository.get(DatabaseMetaDataNode.getRulePath("foo_schema", "0")));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowReadwriteSplittingReadResourcesHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowReadwriteSplittingReadResourcesHandler.java
index 0115119bbe9..26636de1914 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowReadwriteSplittingReadResourcesHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowReadwriteSplittingReadResourcesHandler.java
@@ -78,7 +78,7 @@ public final class ShowReadwriteSplittingReadResourcesHandler extends QueryableR
MetaDataContexts metaDataContexts = contextManager.getMetaDataContexts();
ShardingSphereMetaData metaData = metaDataContexts.getMetaData(databaseName);
Collection<String> allReadResources = getAllReadResources(metaData);
- Map<String, StorageNodeDataSource> persistentReadResources = getPersistentReadResources(databaseName, metaDataContexts.getMetaDataPersistService().orElse(null));
+ Map<String, StorageNodeDataSource> persistentReadResources = getPersistentReadResources(databaseName, metaDataContexts.getPersistService().orElse(null));
return buildRows(allReadResources, persistentReadResources);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandler.java
index 7ed2ea26593..0bd8e33016e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandler.java
@@ -45,7 +45,7 @@ public final class AlterInstanceHandler extends UpdatableRALBackendHandler<Alter
}
private void setXaRecoveryId(final ContextManager contextManager, final AlterInstanceStatement sqlStatement) {
- Optional<MetaDataPersistService> persistService = contextManager.getMetaDataContexts().getMetaDataPersistService();
+ Optional<MetaDataPersistService> persistService = contextManager.getMetaDataContexts().getPersistService();
if (!persistService.isPresent()) {
throw new UnsupportedOperationException(String.format("No persistence configuration found, unable to set '%s'", sqlStatement.getKey()));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
index f674cbe2770..4b69509a6b5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
@@ -66,7 +66,7 @@ public final class AlterSQLParserRuleHandler extends UpdatableRALBackendHandler<
}
private void persistNewRuleConfigurations(final Collection<RuleConfiguration> globalRuleConfigs) {
- Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService();
if (metaDataPersistService.isPresent() && null != metaDataPersistService.get().getGlobalRuleService()) {
metaDataPersistService.get().getGlobalRuleService().persist(globalRuleConfigs, true);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java
index d1e3775e626..475669fabf5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTrafficRuleHandler.java
@@ -86,7 +86,7 @@ public final class AlterTrafficRuleHandler extends UpdatableRALBackendHandler<Al
currentConfig.getLoadBalancers().putAll(toBeAlteredConfig.getLoadBalancers());
getUnusedLoadBalancer(currentConfig).forEach(each -> currentConfig.getLoadBalancers().remove(each));
MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
- Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getPersistService();
metaDataPersistService.ifPresent(optional -> optional.getGlobalRuleService().persist(metaDataContexts.getGlobalRuleMetaData().getConfigurations(), true));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java
index 9fa2f12d104..573014f0498 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterTransactionRuleHandler.java
@@ -50,7 +50,7 @@ public final class AlterTransactionRuleHandler extends UpdatableRALBackendHandle
globalRules.add(new TransactionRule(toBeAlteredRuleConfig));
globalRuleConfigs.add(toBeAlteredRuleConfig);
ProxyContext.getInstance().getContextManager().renewAllTransactionContext();
- Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getPersistService();
if (metaDataPersistService.isPresent() && null != metaDataPersistService.get().getGlobalRuleService()) {
metaDataPersistService.get().getGlobalRuleService().persist(globalRuleConfigs, true);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java
index 62132bb78a6..cd0f2cce1cb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/CreateTrafficRuleHandler.java
@@ -83,7 +83,7 @@ public final class CreateTrafficRuleHandler extends UpdatableRALBackendHandler<C
} else {
setUpCurrentRuleConfiguration(toBeCreatedRuleConfig, currentRuleConfig);
}
- Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getPersistService();
metaDataPersistService.ifPresent(optional -> optional.getGlobalRuleService().persist(globalRuleConfigs, true));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java
index 63ca636beca..a33d92aad8d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/DropTrafficRuleHandler.java
@@ -72,7 +72,7 @@ public final class DropTrafficRuleHandler extends UpdatableRALBackendHandler<Dro
private void updateToRepository(final TrafficRuleConfiguration config) {
MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
- Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getPersistService();
getUnusedLoadBalancer(config).forEach(each -> config.getLoadBalancers().remove(each));
metaDataPersistService.ifPresent(optional -> optional.getGlobalRuleService().persist(metaDataContexts.getGlobalRuleMetaData().getConfigurations(), true));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
index 2e332acf7d6..a4a6cd4c7f2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
@@ -139,7 +139,7 @@ public final class ImportDatabaseConfigurationHandler extends UpdatableRALBacken
shardingSphereMetaData.getRuleMetaData().getConfigurations().clear();
shardingSphereMetaData.getRuleMetaData().getConfigurations().addAll(toBeUpdatedRuleConfigs);
ProxyContext.getInstance().getContextManager().renewMetaDataContexts(metaDataContexts);
- Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getPersistService();
metaDataPersistService.ifPresent(optional -> optional.getDatabaseRulePersistService().persist(databaseName, toBeUpdatedRuleConfigs));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/LabelInstanceHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/LabelInstanceHandler.java
index 0935cafbea9..99515e11619 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/LabelInstanceHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/LabelInstanceHandler.java
@@ -38,7 +38,7 @@ public final class LabelInstanceHandler extends UpdatableRALBackendHandler<Label
@Override
public void update(final ContextManager contextManager, final LabelInstanceStatement sqlStatement) {
- MetaDataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService().orElse(null);
+ MetaDataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService().orElse(null);
if (null == persistService || null == persistService.getRepository() || persistService.getRepository() instanceof StandalonePersistRepository) {
throw new UnsupportedOperationException("Labels can only be added in cluster mode");
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetInstanceStatusHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetInstanceStatusHandler.java
index 5bedd5560da..b7efae33e86 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetInstanceStatusHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetInstanceStatusHandler.java
@@ -69,7 +69,7 @@ public final class SetInstanceStatusHandler extends UpdatableRALBackendHandler<S
}
private void checkExistDisabled(final InstanceId operationInstanceId) {
- Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService();
if (metaDataPersistService.isPresent()) {
metaDataPersistService.get().getComputeNodePersistService().loadAllComputeNodeInstances().forEach(each -> {
if (StateType.CIRCUIT_BREAK == each.getState().getCurrentState() && isIdenticalInstance(each.getInstanceDefinition(), operationInstanceId)) {
@@ -80,7 +80,7 @@ public final class SetInstanceStatusHandler extends UpdatableRALBackendHandler<S
}
private void checkExist(final InstanceId operationInstanceId) {
- Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService();
metaDataPersistService.ifPresent(optional -> {
Collection<ComputeNodeInstance> computeNodeInstances = optional.getComputeNodePersistService().loadAllComputeNodeInstances();
if (computeNodeInstances.stream().noneMatch(each -> isIdenticalInstance(each.getInstanceDefinition(), operationInstanceId))) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetReadwriteSplittingStatusHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetReadwriteSplittingStatusHandler.java
index c1b0a307c3d..bf9f70adf15 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetReadwriteSplittingStatusHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetReadwriteSplittingStatusHandler.java
@@ -98,7 +98,7 @@ public final class SetReadwriteSplittingStatusHandler extends UpdatableRALBacken
if (!"Cluster".equals(contextManager.getInstanceContext().getModeConfiguration().getType())) {
throw new UnsupportedOperationException("Mode must be `Cluster`.");
}
- if (!contextManager.getMetaDataContexts().getMetaDataPersistService().isPresent()) {
+ if (!contextManager.getMetaDataContexts().getPersistService().isPresent()) {
throw new UnsupportedOperationException("Persistence must be configured");
}
}
@@ -120,7 +120,7 @@ public final class SetReadwriteSplittingStatusHandler extends UpdatableRALBacken
}
private Map<String, String> getDisabledResources(final ContextManager contextManager, final String databaseName) {
- Optional<MetaDataPersistService> persistService = contextManager.getMetaDataContexts().getMetaDataPersistService();
+ Optional<MetaDataPersistService> persistService = contextManager.getMetaDataContexts().getPersistService();
Map<String, String> result = new HashMap<>();
persistService.ifPresent(optional -> {
Map<String, String> disableNodes = getDisabledStorageNodes(databaseName, optional).stream()
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableHandler.java
index a48f9cd3c38..50666c186a8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableHandler.java
@@ -75,7 +75,7 @@ public final class SetVariableHandler extends UpdatableRALBackendHandler<SetVari
private void handleConfigurationProperty(final ConfigurationPropertyKey propertyKey, final String value) {
ContextManager contextManager = ProxyContext.getInstance().getContextManager();
MetaDataContexts metaDataContexts = contextManager.getMetaDataContexts();
- Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = metaDataContexts.getPersistService();
Properties props = new Properties(metaDataContexts.getProps().getProps());
props.put(propertyKey.getKey(), getValue(propertyKey, value));
contextManager.alterProperties(props);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/UnlabelInstanceHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/UnlabelInstanceHandler.java
index b9d69ecec19..5a96f33678a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/UnlabelInstanceHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/UnlabelInstanceHandler.java
@@ -39,7 +39,7 @@ public final class UnlabelInstanceHandler extends UpdatableRALBackendHandler<Unl
@Override
protected void update(final ContextManager contextManager, final UnlabelInstanceStatement sqlStatement) throws DistSQLException {
- MetaDataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService().orElse(null);
+ MetaDataPersistService persistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService().orElse(null);
if (null == persistService || null == persistService.getRepository() || persistService.getRepository() instanceof StandalonePersistRepository) {
throw new UnsupportedOperationException("Labels can only be removed in cluster mode");
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index 809a9a2969b..8810d20c68f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -142,7 +142,7 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
private void prepareScaling(final ShardingSphereMetaData shardingSphereMetaData, final T sqlStatement, final RuleDefinitionAlterUpdater updater, final RuleConfiguration currentRuleConfig,
final RuleDefinitionAlterPreprocessor preprocessor) {
- Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService();
+ Optional<MetaDataPersistService> metaDataPersistService = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService();
if (metaDataPersistService.isPresent()) {
Optional<String> newVersion = metaDataPersistService.get().getDatabaseVersionPersistService().createNewVersion(shardingSphereMetaData.getDatabase().getName());
if (!newVersion.isPresent()) {
@@ -163,7 +163,7 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
}
private void persistRuleConfigurationChange(final ShardingSphereMetaData shardingSphereMetaData) {
- ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService().ifPresent(optional -> optional.getDatabaseRulePersistService().persist(
+ ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService().ifPresent(optional -> optional.getDatabaseRulePersistService().persist(
shardingSphereMetaData.getDatabase().getName(), shardingSphereMetaData.getRuleMetaData().getConfigurations()));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandlerTest.java
index 55e49f57fc5..a292c702ecc 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterInstanceHandlerTest.java
@@ -44,7 +44,7 @@ public final class AlterInstanceHandlerTest {
@Test(expected = UnsupportedOperationException.class)
public void assertCheckWithNoPersistenceConfigurationFound() throws SQLException {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getMetaDataContexts().getMetaDataPersistService()).thenReturn(Optional.empty());
+ when(contextManager.getMetaDataContexts().getPersistService()).thenReturn(Optional.empty());
ProxyContext.init(contextManager);
String instanceId = "instance_id";
String key = "xa_recovery_nodes";
@@ -56,7 +56,7 @@ public final class AlterInstanceHandlerTest {
public void assertCheckWithNotExistInstanceId() throws SQLException {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
MetaDataPersistService metaDataPersistService = new MetaDataPersistService(mock(PersistRepository.class));
- when(contextManager.getMetaDataContexts().getMetaDataPersistService()).thenReturn(Optional.of(metaDataPersistService));
+ when(contextManager.getMetaDataContexts().getPersistService()).thenReturn(Optional.of(metaDataPersistService));
ProxyContext.init(contextManager);
String instanceId = "instance_id";
String key = "xa_recovery_nodes";