Skip to content

Shardingsphere
Shardingsphere

apache / Shardingsphere

通知 56
Star 3
Fork 0
Shardingsphere
Shardingsphere

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 87af778b 编写于 作者: H Haoran Meng 提交者： GitHub
浏览文件
操作

Refactor registry center structure (#8135) 

* Refactor registry center structure

* Refactor registry center structure
上级 dd6a182d
展开全部 隐藏空白更改
内联 并排
Showing with 119 addition and 124 deletion
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
浏览文件 @ 87af778b
......@@ -132,14 +132,14 @@ public final class ConfigCenter {
*/
@Subscribe
public synchronized void renew(final SchemaNamePersistEvent event) {
String schemaNames = repository.get(node.getSchemasPath());
String schemaNames = repository.get(node.getMetadataNodePath());
Collection<String> schemas = Strings.isNullOrEmpty(schemaNames) ? new LinkedHashSet<>() : new LinkedHashSet<>(Splitter.on(",").splitToList(schemaNames));
if (event.isDrop()) {
schemas.remove(event.getSchemaName());
} else if (!schemas.contains(event.getSchemaName())) {
schemas.add(event.getSchemaName());
}
repository.persist(node.getSchemasPath(), Joiner.on(",").join(schemas));
repository.persist(node.getMetadataNodePath(), Joiner.on(",").join(schemas));
}
/**
......@@ -244,9 +244,9 @@ public final class ConfigCenter {
}
private void persistSchemaName(final String schemaName) {
String schemaNames = repository.get(node.getSchemasPath());
String schemaNames = repository.get(node.getMetadataNodePath());
if (Strings.isNullOrEmpty(schemaNames)) {
repository.persist(node.getSchemasPath(), schemaName);
repository.persist(node.getMetadataNodePath(), schemaName);
return;
}
List<String> schemaNameList = Splitter.on(",").splitToList(schemaNames);
......@@ -255,7 +255,7 @@ public final class ConfigCenter {
}
List<String> newArrayList = new ArrayList<>(schemaNameList);
newArrayList.add(schemaName);
repository.persist(node.getSchemasPath(), Joiner.on(",").join(newArrayList));
repository.persist(node.getMetadataNodePath(), Joiner.on(",").join(newArrayList));
}
/**
......@@ -310,7 +310,7 @@ public final class ConfigCenter {
* @return all schema names
*/
public Collection<String> getAllSchemaNames() {
String schemaNames = repository.get(node.getSchemasPath());
String schemaNames = repository.get(node.getMetadataNodePath());
return Strings.isNullOrEmpty(schemaNames) ? new LinkedList<>() : node.splitSchemaName(schemaNames);
}
......@@ -341,7 +341,7 @@ public final class ConfigCenter {
* @param schema ShardingSphere schema
*/
public void persistSchema(final String schemaName, final ShardingSphereSchema schema) {
repository.persist(node.getTablePath(schemaName), YamlEngine.marshal(new SchemaYamlSwapper().swapToYamlConfiguration(schema)));
repository.persist(node.getSchemaPath(schemaName), YamlEngine.marshal(new SchemaYamlSwapper().swapToYamlConfiguration(schema)));
}
/**
......@@ -351,7 +351,7 @@ public final class ConfigCenter {
* @return ShardingSphere schema
*/
public Optional<ShardingSphereSchema> loadSchema(final String schemaName) {
String path = repository.get(node.getTablePath(schemaName));
String path = repository.get(node.getSchemaPath(schemaName));
if (Strings.isNullOrEmpty(path)) {
return Optional.empty();
}
......
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenterNode.java
浏览文件 @ 87af778b
......@@ -34,13 +34,13 @@ import java.util.regex.Pattern;
@RequiredArgsConstructor
public final class ConfigCenterNode {
private static final String SCHEMAS_NODE = "schemas";
private static final String METADATA_NODE = "metadata";
private static final String DATA_SOURCE_NODE = "datasource";
private static final String RULE_NODE = "rule";
private static final String TABLE_NODE = "table";
private static final String SCHEMA_NODE = "schema";
private static final String AUTHENTICATION_NODE = "authentication";
......@@ -51,12 +51,12 @@ public final class ConfigCenterNode {
private static final String PATH_SEPARATOR = "/";
/**
* Get schemas path.
* Get metadata node path.
*
* @return schemas path
* @return metadata node path
*/
public String getSchemasPath() {
return Joiner.on(PATH_SEPARATOR).join("", SCHEMAS_NODE);
public String getMetadataNodePath() {
return Joiner.on(PATH_SEPARATOR).join("", METADATA_NODE);
}
/**
......@@ -66,7 +66,7 @@ public final class ConfigCenterNode {
* @return schema name path
*/
public String getSchemaNamePath(final String schemaName) {
return Joiner.on(PATH_SEPARATOR).join("", SCHEMAS_NODE, schemaName);
return Joiner.on(PATH_SEPARATOR).join("", METADATA_NODE, schemaName);
}
/**
......@@ -90,13 +90,13 @@ public final class ConfigCenterNode {
}
/**
* Get table path.
* Get schema path.
*
* @param schemaName schema name
* @return table path
* @return schema path
*/
public String getTablePath(final String schemaName) {
return getFullPath(schemaName, TABLE_NODE);
public String getSchemaPath(final String schemaName) {
return getFullPath(schemaName, SCHEMA_NODE);
}
/**
......@@ -118,7 +118,7 @@ public final class ConfigCenterNode {
}
private String getFullPath(final String schemaName, final String node) {
return Joiner.on(PATH_SEPARATOR).join("", SCHEMAS_NODE, schemaName, node);
return Joiner.on(PATH_SEPARATOR).join("", METADATA_NODE, schemaName, node);
}
private String getFullPath(final String node) {
......@@ -132,7 +132,7 @@ public final class ConfigCenterNode {
* @return schema name
*/
public String getSchemaName(final String configurationNodeFullPath) {
Pattern pattern = Pattern.compile(getSchemasPath() + "/(\\w+)" + "(/datasource|/rule)?", Pattern.CASE_INSENSITIVE);
Pattern pattern = Pattern.compile(getMetadataNodePath() + "/(\\w+)" + "(/datasource|/rule)?", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(configurationNodeFullPath);
return matcher.find() ? matcher.group(1) : "";
}
......@@ -154,12 +154,12 @@ public final class ConfigCenterNode {
* @return config paths list.
*/
public Collection<String> getAllSchemaConfigPaths(final Collection<String> schemaNames) {
Collection<String> result = new ArrayList<>(Collections.singletonList(getSchemasPath()));
Collection<String> result = new ArrayList<>(Collections.singletonList(getMetadataNodePath()));
for (String schemaName : schemaNames) {
result.add(getSchemaNamePath(schemaName));
result.add(getRulePath(schemaName));
result.add(getDataSourcePath(schemaName));
result.add(getTablePath(schemaName));
result.add(getSchemaPath(schemaName));
}
return result;
}
......
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java
浏览文件 @ 87af778b
......@@ -67,7 +67,7 @@ public final class SchemaChangedListener extends PostGovernanceRepositoryEventLi
@Override
protected Optional<GovernanceEvent> createGovernanceEvent(final DataChangedEvent event) {
// TODO Consider removing the following one.
if (configurationNode.getSchemasPath().equals(event.getKey())) {
if (configurationNode.getMetadataNodePath().equals(event.getKey())) {
return createSchemaNamesUpdatedEvent(event.getValue());
}
String schemaName = configurationNode.getSchemaName(event.getKey());
......@@ -105,7 +105,7 @@ public final class SchemaChangedListener extends PostGovernanceRepositoryEventLi
private boolean isValidNodeChangedEvent(final String schemaName, final String nodeFullPath) {
return !existedSchemaNames.contains(schemaName) || configurationNode.getDataSourcePath(schemaName).equals(nodeFullPath)
|| configurationNode.getRulePath(schemaName).equals(nodeFullPath)
|| configurationNode.getTablePath(schemaName).equals(nodeFullPath);
|| configurationNode.getSchemaPath(schemaName).equals(nodeFullPath);
}
private GovernanceEvent createAddedEvent(final String schemaName) {
......
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterNodeTest.java
浏览文件 @ 87af778b
......@@ -31,19 +31,14 @@ public final class ConfigCenterNodeTest {
private final ConfigCenterNode configurationNode = new ConfigCenterNode();
@Test
public void assertGetSchemaPath() {
assertThat(configurationNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/schemas/logic_db/rule"));
}
@Test
public void assertGetDataSourcePath() {
assertThat(configurationNode.getDataSourcePath(DefaultSchema.LOGIC_NAME), is("/schemas/logic_db/datasource"));
assertThat(configurationNode.getDataSourcePath(DefaultSchema.LOGIC_NAME), is("/metadata/logic_db/datasource"));
}
@Test
public void assertGetRulePath() {
assertThat(configurationNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/schemas/logic_db/rule"));
assertThat(configurationNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/metadata/logic_db/rule"));
}
@Test
......@@ -58,27 +53,27 @@ public final class ConfigCenterNodeTest {
@Test
public void assertGetSchemaName() {
assertThat(configurationNode.getSchemaName("/schemas/logic_db/rule"), is(DefaultSchema.LOGIC_NAME));
assertThat(configurationNode.getSchemaName("/metadata/logic_db/rule"), is(DefaultSchema.LOGIC_NAME));
}
@Test
public void assertGetAllSchemaConfigPaths() {
Collection<String> actual = configurationNode.getAllSchemaConfigPaths(Collections.singletonList(DefaultSchema.LOGIC_NAME));
assertThat(actual.size(), is(5));
assertThat(actual, hasItems("/schemas"));
assertThat(actual, hasItems("/schemas/logic_db"));
assertThat(actual, hasItems("/schemas/logic_db/rule"));
assertThat(actual, hasItems("/schemas/logic_db/datasource"));
assertThat(actual, hasItems("/schemas/logic_db/table"));
assertThat(actual, hasItems("/metadata"));
assertThat(actual, hasItems("/metadata/logic_db"));
assertThat(actual, hasItems("/metadata/logic_db/rule"));
assertThat(actual, hasItems("/metadata/logic_db/datasource"));
assertThat(actual, hasItems("/metadata/logic_db/schema"));
}
@Test
public void assertGetSchemaNamePath() {
assertThat(configurationNode.getSchemaNamePath("sharding_db"), is("/schemas/sharding_db"));
assertThat(configurationNode.getSchemaNamePath("sharding_db"), is("/metadata/sharding_db"));
}
@Test
public void assertGetTablePath() {
assertThat(configurationNode.getTablePath("sharding_db"), is("/schemas/sharding_db/table"));
assertThat(configurationNode.getSchemaPath("sharding_db"), is("/metadata/sharding_db/schema"));
}
}
shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java
浏览文件 @ 87af778b
......@@ -78,14 +78,14 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateIgnoredEvent() {
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/schemas/encrypt_db", "test", Type.UPDATED)).isPresent());
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/schemas/encrypt_db/rule", "test", Type.IGNORED)).isPresent());
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/metadata/encrypt_db", "test", Type.UPDATED)).isPresent());
assertFalse(schemaChangedListener.createGovernanceEvent(new DataChangedEvent("/metadata/encrypt_db/rule", "test", Type.IGNORED)).isPresent());
}
@Test
public void assertCreateDataSourceChangedEventForExistedSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/datasource", dataSource, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/sharding_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(DataSourceChangedEvent.class));
......@@ -95,7 +95,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateRuleConfigurationsChangedEventForExistedSchema() {
String shardingRule = readYAML(SHARDING_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/rule", shardingRule, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/sharding_db/rule", shardingRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((RuleConfigurationsChangedEvent) actual.get()).getSchemaName(), is("sharding_db"));
......@@ -107,7 +107,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateReplicaQueryRuleChangedEventForExistedSchema() {
String rule = readYAML(REPLICA_QUERY_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/replica_query_db/rule", rule, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/replica_query_db/rule", rule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
RuleConfigurationsChangedEvent event = (RuleConfigurationsChangedEvent) actual.get();
......@@ -120,7 +120,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateEncryptRuleChangedEventForExistedSchema() {
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/encrypt_db/rule", encryptRule, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/encrypt_db/rule", encryptRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
RuleConfigurationsChangedEvent event = (RuleConfigurationsChangedEvent) actual.get();
......@@ -135,7 +135,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateIgnoredGovernanceEventForNewSchema() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", "rule", Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/rule", "rule", Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(MetaDataAddedEvent.class));
......@@ -144,7 +144,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -153,7 +153,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateReplicaQuerySchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -162,7 +162,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateEncryptSchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/datasource", dataSource, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -171,7 +171,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaDeletedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, Type.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/datasource", dataSource, Type.DELETED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataDeletedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -180,7 +180,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithSchemaDeletedEvent() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db", dataSource, Type.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db", dataSource, Type.DELETED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(MetaDataDeletedEvent.class));
......@@ -189,7 +189,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithSchemaDeletedEventWithDataSourceNode() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/datasource", dataSource, Type.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/datasource", dataSource, Type.DELETED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(MetaDataDeletedEvent.class));
......@@ -198,7 +198,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithEncryptRuleConfigurationForNewSchema() {
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", encryptRule, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/rule", encryptRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -207,7 +207,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithShardingRuleConfigurationForNewSchema() {
String shardingRule = readYAML(SHARDING_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", shardingRule, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/rule", shardingRule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -216,7 +216,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateAddedEventWithReplicaQueryRuleConfigurationForNewSchema() {
String rule = readYAML(REPLICA_QUERY_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", rule, Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/logic_db/rule", rule, Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("logic_db"));
......@@ -224,7 +224,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForAdd() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db,encrypt_db,shadow_db", Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata", "sharding_db,replica_query_db,encrypt_db,shadow_db", Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("shadow_db"));
......@@ -232,7 +232,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForDelete() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db", Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata", "sharding_db,replica_query_db", Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataDeletedEvent) actual.get()).getSchemaName(), is("encrypt_db"));
......@@ -240,13 +240,13 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForIgnore() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,replica_query_db,encrypt_db", Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata", "sharding_db,replica_query_db,encrypt_db", Type.UPDATED);
assertFalse(schemaChangedListener.createGovernanceEvent(dataChangedEvent).isPresent());
}
@Test
public void assertCreateSchemaNameAddEvent() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/shadow_db", "", Type.ADDED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/shadow_db", "", Type.ADDED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((MetaDataAddedEvent) actual.get()).getSchemaName(), is("shadow_db"));
......@@ -254,7 +254,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaChangedEvent() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/sharding_db/table", readYAML(META_DATA_FILE), Type.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/metadata/sharding_db/schema", readYAML(META_DATA_FILE), Type.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertTrue(((SchemaChangedEvent) actual.get()).getSchema().getAllTableNames().contains("t_order"));
......
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryEncryptTest.java
浏览文件 @ 87af778b
......@@ -67,8 +67,8 @@ public class GovernanceSpringBootRegistryEncryptTest {
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
TestGovernanceRepository repository = new TestGovernanceRepository();
repository.persist("/schemas/logic_db/datasource", dataSource);
repository.persist("/schemas/logic_db/rule", encryptRule);
repository.persist("/metadata/logic_db/datasource", dataSource);
repository.persist("/metadata/logic_db/rule", encryptRule);
repository.persist("/props", ConfigurationPropertyKey.SQL_SHOW.getKey() + ": 'true'\n");
repository.persist("/states/datanodes", "");
}
......
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryReplicaQueryTest.java
浏览文件 @ 87af778b
......@@ -61,8 +61,8 @@ public class GovernanceSpringBootRegistryReplicaQueryTest {
public static void init() {
EmbedTestingServer.start();
TestGovernanceRepository repository = new TestGovernanceRepository();
repository.persist("/schemas/logic_db/datasource", readYAML(DATA_SOURCE_FILE));
repository.persist("/schemas/logic_db/rule", readYAML(RULE_FILE));
repository.persist("/metadata/logic_db/datasource", readYAML(DATA_SOURCE_FILE));
repository.persist("/metadata/logic_db/rule", readYAML(RULE_FILE));
repository.persist("/props", "{}\n");
repository.persist("/states/datanodes", "");
}
......
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryShardingTest.java
浏览文件 @ 87af778b
......@@ -67,8 +67,8 @@ public class GovernanceSpringBootRegistryShardingTest {
String shardingDatabases = readYAML(SHARDING_DATABASES_FILE);
String shardingRule = readYAML(SHARDING_RULE_FILE);
TestGovernanceRepository repository = new TestGovernanceRepository();
repository.persist("/schemas/logic_db/datasource", shardingDatabases);
repository.persist("/schemas/logic_db/rule", shardingRule);
repository.persist("/metadata/logic_db/datasource", shardingDatabases);
repository.persist("/metadata/logic_db/rule", shardingRule);
repository.persist("/props", ConfigurationPropertyKey.EXECUTOR_SIZE.getKey() + ": '100'\n" + ConfigurationPropertyKey.SQL_SHOW.getKey() + ": 'true'\n");
repository.persist("/states/datanodes", "");
}
......
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
浏览文件 @ 87af778b
......@@ -84,7 +84,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
ConfigCenterNode node = new ConfigCenterNode();
configurationRepository.persist(node.getAuthenticationPath(), readYAML(AUTHENTICATION_YAML));
configurationRepository.persist(node.getPropsPath(), readYAML(PROPS_YAML));
configurationRepository.persist(node.getSchemasPath(), "db");
configurationRepository.persist(node.getMetadataNodePath(), "db");
configurationRepository.persist(node.getDataSourcePath("db"), readYAML(DATA_SOURCE_YAML));
configurationRepository.persist(node.getRulePath("db"), readYAML(SHARDING_RULE_YAML));
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或