This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 543b190f883 Rename DatabaseMetaDataPersistService (#18804)
543b190f883 is described below
commit 543b190f8835701bb89b95346973af49a2cbab9a
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 3 14:53:04 2022 +0800
Rename DatabaseMetaDataPersistService (#18804)
* Rename DatabaseMetaDataPersistService
* Fix typo
---
.../shardingsphere/mode/manager/ContextManager.java | 18 +++++++++---------
.../mode/metadata/persist/MetaDataPersistService.java | 8 ++++----
...ervice.java => DatabaseMetaDataPersistService.java} | 4 ++--
.../mode/manager/ContextManagerTest.java | 8 ++++----
...st.java => DatabaseMetaDataPersistServiceTest.java} | 18 +++++++++---------
.../manager/cluster/ClusterContextManagerBuilder.java | 4 ++--
.../subscriber/SchemaMetaDataRegistrySubscriber.java | 6 +++---
.../SchemaMetaDataRegistrySubscriberTest.java | 4 ++--
.../standalone/StandaloneContextManagerBuilder.java | 2 +-
9 files changed, 36 insertions(+), 36 deletions(-)
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 25212e4f38a..9f9e427e34a 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
@@ -113,7 +113,7 @@ public final class ContextManager implements AutoCloseable {
DatabaseType protocolType =
DatabaseTypeEngine.getProtocolType(Collections.emptyMap(),
metaDataContexts.getMetaData().getProps());
metaDataContexts.getMetaData().addDatabase(databaseName, protocolType);
metaDataContexts.getOptimizerContext().addDatabase(databaseName,
protocolType);
- metaDataContexts.getPersistService().ifPresent(optional ->
optional.getSchemaMetaDataService().persistDatabase(databaseName));
+ metaDataContexts.getPersistService().ifPresent(optional ->
optional.getDatabaseMetaDataService().persistDatabase(databaseName));
}
/**
@@ -127,7 +127,7 @@ public final class ContextManager implements AutoCloseable {
}
metaDataContexts.getMetaData().dropDatabase(databaseName);
metaDataContexts.getOptimizerContext().dropDatabase(databaseName);
- metaDataContexts.getPersistService().ifPresent(optional ->
optional.getSchemaMetaDataService().deleteDatabase(databaseName));
+ metaDataContexts.getPersistService().ifPresent(optional ->
optional.getDatabaseMetaDataService().deleteDatabase(databaseName));
}
/**
@@ -149,12 +149,12 @@ public final class ContextManager implements
AutoCloseable {
*
* @param databaseName database name
* @param schemaName schema name
- * @param beBoChangedTable to be changed table
+ * @param toBeChangedTable to be changed table
* @param toBeDeletedTableName to be deleted table name
*/
- public void alterSchema(final String databaseName, final String
schemaName, final ShardingSphereTable beBoChangedTable, final String
toBeDeletedTableName) {
+ public void alterSchema(final String databaseName, final String
schemaName, final ShardingSphereTable toBeChangedTable, final String
toBeDeletedTableName) {
if
(metaDataContexts.getMetaData().getDatabases().containsKey(databaseName)) {
- Optional.ofNullable(beBoChangedTable).ifPresent(optional ->
alterTable(databaseName, schemaName, optional));
+ Optional.ofNullable(toBeChangedTable).ifPresent(optional ->
alterTable(databaseName, schemaName, optional));
Optional.ofNullable(toBeDeletedTableName).ifPresent(optional ->
dropTable(databaseName, schemaName, optional));
}
}
@@ -398,7 +398,7 @@ public final class ContextManager implements AutoCloseable {
}
originalSchemas.forEach((key, value) -> {
if (null == actualSchemas.get(key)) {
- metaDataContexts.getPersistService().ifPresent(optional ->
optional.getSchemaMetaDataService().deleteSchema(databaseName, key));
+ metaDataContexts.getPersistService().ifPresent(optional ->
optional.getDatabaseMetaDataService().deleteSchema(databaseName, key));
}
});
}
@@ -407,7 +407,7 @@ public final class ContextManager implements AutoCloseable {
Map<String, ShardingSphereSchema> schemaMap =
GenericSchemaBuilder.build(materials);
if (schemaMap.containsKey(schemaName)) {
metaDataContexts.getMetaData().getDatabases().get(databaseName).getSchemas().put(schemaName,
schemaMap.get(schemaName));
- metaDataContexts.getPersistService().ifPresent(optional ->
optional.getSchemaMetaDataService()
+ metaDataContexts.getPersistService().ifPresent(optional ->
optional.getDatabaseMetaDataService()
.persistMetaData(databaseName, schemaName,
metaDataContexts.getMetaData().getDatabases().get(databaseName).getSchemas().get(schemaName)));
}
}
@@ -416,7 +416,7 @@ public final class ContextManager implements AutoCloseable {
ShardingSphereSchema schema =
GenericSchemaBuilder.build(Collections.singletonList(tableName),
materials).getOrDefault(schemaName, new ShardingSphereSchema());
if (schema.containsTable(tableName)) {
metaDataContexts.getMetaData().getDatabases().get(databaseName).getSchemas().get(schemaName).put(tableName,
schema.get(tableName));
- metaDataContexts.getPersistService().ifPresent(optional ->
optional.getSchemaMetaDataService()
+ metaDataContexts.getPersistService().ifPresent(optional ->
optional.getDatabaseMetaDataService()
.persistMetaData(databaseName, schemaName,
metaDataContexts.getMetaData().getDatabases().get(databaseName).getSchemas().get(schemaName)));
}
}
@@ -580,7 +580,7 @@ public final class ContextManager implements AutoCloseable {
private void persistMetaData(final MetaDataContexts metaDataContexts) {
metaDataContexts.getMetaData().getDatabases().forEach((databaseName,
schemas) -> schemas.getSchemas()
- .forEach((schemaName, tables) ->
metaDataContexts.getPersistService().ifPresent(optional ->
optional.getSchemaMetaDataService().persistMetaData(databaseName, schemaName,
tables))));
+ .forEach((schemaName, tables) ->
metaDataContexts.getPersistService().ifPresent(optional ->
optional.getDatabaseMetaDataService().persistMetaData(databaseName, schemaName,
tables))));
}
@Override
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
index b3b45910346..ce1ed1a22a1 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolD
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import
org.apache.shardingsphere.infra.datasource.props.DataSourcePropertiesCreator;
import
org.apache.shardingsphere.mode.metadata.persist.service.DatabaseVersionPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.SchemaMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.service.impl.DataSourcePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.service.impl.DatabaseRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.service.impl.GlobalRulePersistService;
@@ -52,7 +52,7 @@ public final class MetaDataPersistService {
private final DataSourcePersistService dataSourceService;
- private final SchemaMetaDataPersistService schemaMetaDataService;
+ private final DatabaseMetaDataPersistService databaseMetaDataService;
private final DatabaseRulePersistService databaseRulePersistService;
@@ -65,7 +65,7 @@ public final class MetaDataPersistService {
public MetaDataPersistService(final PersistRepository repository) {
this.repository = repository;
dataSourceService = new DataSourcePersistService(repository);
- schemaMetaDataService = new SchemaMetaDataPersistService(repository);
+ databaseMetaDataService = new
DatabaseMetaDataPersistService(repository);
databaseRulePersistService = new
DatabaseRulePersistService(repository);
globalRuleService = new GlobalRulePersistService(repository);
propsService = new PropertiesPersistService(repository);
@@ -89,7 +89,7 @@ public final class MetaDataPersistService {
Map<String, DataSourceProperties> dataSourcePropertiesMap =
getDataSourcePropertiesMap(entry.getValue().getDataSources());
Collection<RuleConfiguration> ruleConfigurations =
entry.getValue().getRuleConfigurations();
if (dataSourcePropertiesMap.isEmpty() &&
ruleConfigurations.isEmpty()) {
- schemaMetaDataService.persistDatabase(databaseName);
+ databaseMetaDataService.persistDatabase(databaseName);
} else {
dataSourceService.persist(databaseName,
getDataSourcePropertiesMap(entry.getValue().getDataSources()), isOverwrite);
databaseRulePersistService.persist(databaseName,
entry.getValue().getRuleConfigurations(), isOverwrite);
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistService.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
similarity index 98%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistService.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
index f3e636341da..b9cbe43988f 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistService.java
@@ -33,10 +33,10 @@ import java.util.Map.Entry;
import java.util.Optional;
/**
- * Schema meta data registry service.
+ * Database meta data registry service.
*/
@RequiredArgsConstructor
-public final class SchemaMetaDataPersistService {
+public final class DatabaseMetaDataPersistService {
private final PersistRepository repository;
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 48f5cdfa625..9766ea86314 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
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRule
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.SchemaMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.test.mock.MockedDataSource;
import
org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.junit.Before;
@@ -253,12 +253,12 @@ public final class ContextManagerTest {
@Test
public void assertReloadMetaData() {
when(metaDataContexts.getMetaData().getDatabases().get("foo_db").getResource().getDataSources()).thenReturn(Collections.singletonMap("foo_ds",
new MockedDataSource()));
- SchemaMetaDataPersistService schemaMetaDataPersistService =
mock(SchemaMetaDataPersistService.class, RETURNS_DEEP_STUBS);
+ DatabaseMetaDataPersistService databaseMetaDataPersistService =
mock(DatabaseMetaDataPersistService.class, RETURNS_DEEP_STUBS);
MetaDataPersistService metaDataPersistService =
mock(MetaDataPersistService.class);
-
when(metaDataPersistService.getSchemaMetaDataService()).thenReturn(schemaMetaDataPersistService);
+
when(metaDataPersistService.getDatabaseMetaDataService()).thenReturn(databaseMetaDataPersistService);
when(metaDataContexts.getPersistService()).thenReturn(Optional.of(metaDataPersistService));
contextManager.reloadMetaData("foo_db");
- verify(schemaMetaDataPersistService,
times(1)).persistMetaData(eq("foo_db"), eq("foo_db"),
any(ShardingSphereSchema.class));
+ verify(databaseMetaDataPersistService,
times(1)).persistMetaData(eq("foo_db"), eq("foo_db"),
any(ShardingSphereSchema.class));
contextManager.reloadMetaData("foo_db", "foo_schema", "foo_table");
assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabases().get("foo_db").getSchemas().get("foo_db"));
assertTrue(contextManager.getMetaDataContexts().getMetaData().getDatabases().get("foo_db").getResource().getDataSources().containsKey("foo_ds"));
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistServiceTest.java
similarity index 84%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistServiceTest.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistServiceTest.java
index 5999d810ba0..eefbcadc884 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/SchemaMetaDataPersistServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/DatabaseMetaDataPersistServiceTest.java
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class SchemaMetaDataPersistServiceTest {
+public final class DatabaseMetaDataPersistServiceTest {
@Mock
private PersistRepository repository;
@@ -58,30 +58,30 @@ public final class SchemaMetaDataPersistServiceTest {
ShardingSphereTable table = new
TableMetaDataYamlSwapper().swapToObject(YamlEngine.unmarshal(readYAML(),
YamlTableMetaData.class));
ShardingSphereSchema schema = new ShardingSphereSchema();
schema.getTables().put("t_order", table);
- new SchemaMetaDataPersistService(repository).persistMetaData("foo_db",
"foo_schema", schema);
+ new
DatabaseMetaDataPersistService(repository).persistMetaData("foo_db",
"foo_schema", schema);
verify(repository).persist(eq("/metadata/foo_db/schemas/foo_schema/tables/t_order"),
anyString());
}
@Test
public void assertDeleteDatabase() {
- new SchemaMetaDataPersistService(repository).deleteDatabase("foo_db");
+ new
DatabaseMetaDataPersistService(repository).deleteDatabase("foo_db");
verify(repository).delete("/metadata/foo_db");
}
@Test
public void assertPersistDatabase() {
- new SchemaMetaDataPersistService(repository).persistDatabase("foo_db");
+ new
DatabaseMetaDataPersistService(repository).persistDatabase("foo_db");
verify(repository).persist("/metadata/foo_db", "");
}
@Test
public void assertLoad() {
- SchemaMetaDataPersistService schemaMetaDataPersistService = new
SchemaMetaDataPersistService(repository);
+ DatabaseMetaDataPersistService databaseMetaDataPersistService = new
DatabaseMetaDataPersistService(repository);
when(repository.getChildrenKeys("/metadata/foo_db/schemas/foo_schema/tables")).thenReturn(Collections.singletonList("t_order"));
when(repository.get("/metadata/foo_db/schemas/foo_schema/tables/t_order")).thenReturn(readYAML());
- Optional<ShardingSphereSchema> schema =
schemaMetaDataPersistService.load("foo_db", "foo_schema");
+ Optional<ShardingSphereSchema> schema =
databaseMetaDataPersistService.load("foo_db", "foo_schema");
assertTrue(schema.isPresent());
- Optional<ShardingSphereSchema> empty =
schemaMetaDataPersistService.load("test", "test");
+ Optional<ShardingSphereSchema> empty =
databaseMetaDataPersistService.load("test", "test");
assertThat(empty, is(Optional.empty()));
assertThat(schema.get().getAllTableNames(),
is(Collections.singleton("t_order")));
assertThat(schema.get().get("t_order").getIndexes().keySet(),
is(Collections.singleton("primary")));
@@ -92,7 +92,7 @@ public final class SchemaMetaDataPersistServiceTest {
@Test
public void assertLoadAllDatabaseNames() {
when(repository.getChildrenKeys("/metadata")).thenReturn(Collections.singletonList("foo_db"));
- Collection<String> actual = new
SchemaMetaDataPersistService(repository).loadAllDatabaseNames();
+ Collection<String> actual = new
DatabaseMetaDataPersistService(repository).loadAllDatabaseNames();
assertThat(actual.size(), is(1));
assertThat(actual, hasItems("foo_db"));
}
@@ -100,7 +100,7 @@ public final class SchemaMetaDataPersistServiceTest {
@Test
public void assertPersistTableMetaData() {
ShardingSphereTable table = new ShardingSphereTable("FOO_TABLE",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
- new SchemaMetaDataPersistService(repository).persistTable("foo_db",
"foo_schema", table);
+ new DatabaseMetaDataPersistService(repository).persistTable("foo_db",
"foo_schema", table);
verify(repository).persist(eq("/metadata/foo_db/schemas/foo_schema/tables/foo_table"),
anyString());
}
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 33cac7d67e2..c928dc77e7a 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
@@ -84,7 +84,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
final
ContextManagerBuilderParameter parameter, final InstanceContext
instanceContext) throws SQLException {
Collection<String> databaseNames = parameter.getInstanceMetaData()
instanceof JDBCInstanceMetaData
? parameter.getDatabaseConfigs().keySet()
- :
persistService.getSchemaMetaDataService().loadAllDatabaseNames();
+ :
persistService.getDatabaseMetaDataService().loadAllDatabaseNames();
Collection<RuleConfiguration> globalRuleConfigs =
persistService.getGlobalRuleService().load();
ConfigurationProperties props = new
ConfigurationProperties(persistService.getPropsService().load());
Map<String, ShardingSphereDatabase> databases =
ShardingSphereDatabasesFactory.create(buildDatabaseConfigMap(databaseNames,
persistService, parameter), props, instanceContext);
@@ -107,7 +107,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
private void persistMetaData(final MetaDataContexts metaDataContexts) {
metaDataContexts.getMetaData().getDatabases().forEach((databaseName,
schemas) -> schemas.getSchemas()
- .forEach((schemaName, tables) ->
metaDataContexts.getPersistService().ifPresent(optional ->
optional.getSchemaMetaDataService().persistMetaData(databaseName, schemaName,
tables))));
+ .forEach((schemaName, tables) ->
metaDataContexts.getPersistService().ifPresent(optional ->
optional.getDatabaseMetaDataService().persistMetaData(databaseName, schemaName,
tables))));
}
private InstanceContext buildInstanceContext(final RegistryCenter
registryCenter, final InstanceMetaData instanceMetaData, final
ModeConfiguration modeConfig) {
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriber.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySu
[...]
index bc6a9326eb8..45633fa776f 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriber.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriber.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.event.AlterSchem
import
org.apache.shardingsphere.infra.metadata.database.schema.event.DropIndexEvent;
import
org.apache.shardingsphere.infra.metadata.database.schema.event.DropSchemaEvent;
import
org.apache.shardingsphere.infra.metadata.database.schema.event.SchemaAlteredEvent;
-import
org.apache.shardingsphere.mode.metadata.persist.service.SchemaMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
/**
@@ -32,10 +32,10 @@ import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
*/
public final class SchemaMetaDataRegistrySubscriber {
- private final SchemaMetaDataPersistService persistService;
+ private final DatabaseMetaDataPersistService persistService;
public SchemaMetaDataRegistrySubscriber(final ClusterPersistRepository
repository) {
- persistService = new SchemaMetaDataPersistService(repository);
+ persistService = new DatabaseMetaDataPersistService(repository);
ShardingSphereEventBus.getInstance().register(this);
}
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/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriberTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegist
[...]
index 31ce040e1e3..78233ad96e0 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriberTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/subscriber/SchemaMetaDataRegistrySubscriberTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.event.AddSchemaE
import
org.apache.shardingsphere.infra.metadata.database.schema.event.AlterSchemaEvent;
import
org.apache.shardingsphere.infra.metadata.database.schema.event.DropSchemaEvent;
import
org.apache.shardingsphere.infra.metadata.database.schema.event.SchemaAlteredEvent;
-import
org.apache.shardingsphere.mode.metadata.persist.service.SchemaMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.service.DatabaseMetaDataPersistService;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify;
public final class SchemaMetaDataRegistrySubscriberTest {
@Mock
- private SchemaMetaDataPersistService persistService;
+ private DatabaseMetaDataPersistService persistService;
private SchemaMetaDataRegistrySubscriber schemaMetaDataRegistrySubscriber;
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 8d97eda0898..73ef1eb28bb 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -72,7 +72,7 @@ public final class StandaloneContextManagerBuilder implements
ContextManagerBuil
final
ContextManagerBuilderParameter parameter, final InstanceContext
instanceContext) throws SQLException {
Collection<String> databaseNames = parameter.getInstanceMetaData()
instanceof JDBCInstanceMetaData
? parameter.getDatabaseConfigs().keySet()
- :
persistService.getSchemaMetaDataService().loadAllDatabaseNames();
+ :
persistService.getDatabaseMetaDataService().loadAllDatabaseNames();
Map<String, DatabaseConfiguration> databaseConfigMap =
buildDatabaseConfigMap(databaseNames, persistService, parameter);
Collection<RuleConfiguration> globalRuleConfigs =
persistService.getGlobalRuleService().load();
ConfigurationProperties props = new
ConfigurationProperties(persistService.getPropsService().load());
