You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/10/14 07:04:19 UTC
[shardingsphere] branch master updated: fix metadata overwrite
(#7787)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 17e3993 fix metadata overwrite (#7787)
17e3993 is described below
commit 17e3993febe67450d4324308e68a0ee1119daa6d
Author: kimmking <ki...@163.com>
AuthorDate: Wed Oct 14 15:03:26 2020 +0800
fix metadata overwrite (#7787)
---
.../governance/core/config/listener/SchemaChangedListener.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java
index 6544718..7474e3a 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java
@@ -124,7 +124,7 @@ public final class SchemaChangedListener extends PostGovernanceRepositoryEventLi
} else if (event.getKey().equals(configurationNode.getRulePath(schemaName))) {
return createRuleChangedEvent(schemaName, event);
}
- return createMetaDataChangedEvent(event);
+ return createMetaDataChangedEvent(schemaName, event);
}
private DataSourceChangedEvent createDataSourceChangedEvent(final String schemaName, final DataChangedEvent event) {
@@ -140,8 +140,8 @@ public final class SchemaChangedListener extends PostGovernanceRepositoryEventLi
return new RuleConfigurationsChangedEvent(schemaName, new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(configurations.getRules()));
}
- private GovernanceEvent createMetaDataChangedEvent(final DataChangedEvent event) {
+ private GovernanceEvent createMetaDataChangedEvent(final String schemaName, final DataChangedEvent event) {
RuleSchemaMetaData ruleSchemaMetaData = new RuleSchemaMetaDataYamlSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(), YamlRuleSchemaMetaData.class));
- return new MetaDataChangedEvent(existedSchemaNames, ruleSchemaMetaData);
+ return new MetaDataChangedEvent(Collections.singleton(schemaName), ruleSchemaMetaData);
}
}