Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename MetaDataContexts.persistService #17789

Merged
merged 9 commits into from
May 18, 2022
Merged

Rename MetaDataContexts.persistService #17789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cdaf048
Refactor ContextManager
terrymanu May 18, 2022
859930d
Move ContextManager.executorEngine
terrymanu May 18, 2022
29c504e
Fix test case
terrymanu May 18, 2022
9e7d61b
Fix test case
terrymanu May 18, 2022
e5148cb
Fix test case
terrymanu May 18, 2022
c1e2516
Fix test case
terrymanu May 18, 2022
410152e
Rename MetaDataContexts.persistService
terrymanu May 18, 2022
39538ee
Rename useless codes
terrymanu May 18, 2022
11c8917
Resolve conflict
terrymanu May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public ConnectionManager(final String databaseName, final ContextManager context

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();
}
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private ContextManager mockContextManager() throws SQLException {
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")));
Expand Down
7 changes: 3 additions & 4 deletions ...re/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/PipelineAPIFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
};

Expand Down
34 changes: 17 additions & 17 deletions ...sphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private MetaDataContexts createMetaDataContext(final String databaseName) throws
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));
}

/**
Expand Down Expand Up @@ -199,9 +199,9 @@ public void alterSchema(final String databaseName, final String schemaName, fina
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));
}
}));
}
Expand Down Expand Up @@ -255,7 +255,7 @@ public void deleteDatabase(final String databaseName) {
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));
}
}

Expand Down Expand Up @@ -284,7 +284,7 @@ public void dropSchema(final String databaseName, final String schemaName) {
*/
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));
}

/**
Expand All @@ -296,7 +296,7 @@ public void addResource(final String databaseName, final Map<String, DataSourceP
*/
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));
}

/**
Expand All @@ -307,7 +307,7 @@ public void alterResource(final String databaseName, final Map<String, DataSourc
*/
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));
}

/**
Expand Down Expand Up @@ -401,7 +401,7 @@ public void reloadMetaData(final String databaseName, final String schemaName) {
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);
Expand Down Expand Up @@ -450,7 +450,7 @@ private void loadTableMetaData(final String databaseName, final String schemaNam
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)));
}
}
Expand Down Expand Up @@ -493,18 +493,18 @@ private boolean isModifiedDataSource(final Map<String, DataSource> originalDataS
}

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);
}

Expand Down Expand Up @@ -532,11 +532,11 @@ private MetaDataContexts buildChangedMetaDataContextWithAddedDataSource(final Sh
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;
}
Expand All @@ -551,7 +551,7 @@ private MetaDataContexts buildChangedMetaDataContext(final ShardingSphereMetaDat
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;
}
Expand All @@ -565,7 +565,7 @@ private MetaDataContexts buildChangedMetaDataContextWithChangedDataSource(final
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;
}
Expand All @@ -578,7 +578,7 @@ private MetaDataContexts buildChangedMetaDataContextWithChangedDataSourceAndRule
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;
}
Expand Down
14 changes: 7 additions & 7 deletions ...ere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
@Getter
public final class MetaDataContexts implements AutoCloseable {

private final MetaDataPersistService metaDataPersistService;
private final MetaDataPersistService persistService;

private final Map<String, ShardingSphereMetaData> metaDataMap;

Expand All @@ -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()));
}

Expand All @@ -61,8 +61,8 @@ public MetaDataContexts(final MetaDataPersistService metaDataPersistService) {
*
* @return persist service
*/
public Optional<MetaDataPersistService> getMetaDataPersistService() {
return Optional.ofNullable(metaDataPersistService);
public Optional<MetaDataPersistService> getPersistService() {
return Optional.ofNullable(persistService);
}

/**
Expand All @@ -86,8 +86,8 @@ public ShardingSphereMetaData getMetaData(final String databaseName) {

@Override
public void close() throws Exception {
if (null != metaDataPersistService) {
metaDataPersistService.getRepository().close();
if (null != persistService) {
persistService.getRepository().close();
}
}
}
26 changes: 2 additions & 24 deletions ...va/org/apache/shardingsphere/mode/metadata/persist/service/ComputeNodePersistService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Optional;

/**
Expand Down Expand Up @@ -96,6 +95,7 @@ public void persistInstanceXaRecoveryId(final String instanceId, final String xa
* @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);
Expand All @@ -107,6 +107,7 @@ public Collection<String> loadInstanceLabels(final String instanceId) {
* @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);
Expand Down Expand Up @@ -138,29 +139,6 @@ public Optional<String> loadXaRecoveryId(final String instanceId) {
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.
*
Expand Down
4 changes: 2 additions & 2 deletions ...re-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public void assertAlterRuleConfiguration() {
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));
Expand Down Expand Up @@ -260,7 +260,7 @@ public void assertReloadMetaData() {
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");
Expand Down
Loading