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 9500ee6 Revert DataSourceChangedEvent (#10623)
9500ee6 is described below
commit 9500ee6d2208941480f007e6885da387047fd361
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jun 2 18:12:47 2021 +0800
Revert DataSourceChangedEvent (#10623)
---
.../metadata/GovernanceMetaDataContexts.java | 14 ++++----
.../metadata/GovernanceMetaDataContextsTest.java | 12 +++----
.../event/datasource/DataSourceChangedEvent.java | 37 ++++++++++++++++++++++
.../metadata/watcher/MetaDataChangedWatcher.java | 8 ++---
.../GovernanceShardingSphereDataSourceTest.java | 8 ++---
.../rdl/impl/AddResourceBackendHandler.java | 6 ++--
6 files changed, 61 insertions(+), 24 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index be88a95..cd886d9 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -23,18 +23,18 @@ import
org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration
import
org.apache.shardingsphere.governance.context.authority.listener.event.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.GovernanceFacade;
import
org.apache.shardingsphere.governance.core.lock.ShardingSphereDistributeLock;
-import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
-import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceChangeCompletedEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceChangedEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.props.PropertiesChangedEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationsChangedEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.schema.SchemaChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.MetaDataChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaAddedEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaDeletedEvent;
-import
org.apache.shardingsphere.governance.core.registry.config.event.props.PropertiesChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.state.event.PrimaryStateChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationsChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.config.event.schema.SchemaChangedEvent;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
@@ -273,7 +273,7 @@ public final class GovernanceMetaDataContexts implements
MetaDataContexts {
* @throws SQLException SQL exception
*/
@Subscribe
- public synchronized void renew(final DataSourceAlteredEvent event) throws
SQLException {
+ public synchronized void renew(final DataSourceChangedEvent event) throws
SQLException {
String schemaName = event.getSchemaName();
Map<String, ShardingSphereMetaData> newMetaDataMap = new
HashMap<>(metaDataContexts.getMetaDataMap());
newMetaDataMap.remove(schemaName);
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
index 2014625..cc16b6e 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
@@ -21,15 +21,15 @@ import
org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration
import
org.apache.shardingsphere.governance.context.authority.listener.event.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.GovernanceFacade;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
-import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
-import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
-import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaAddedEvent;
-import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaDeletedEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.props.PropertiesChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationsChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.schema.SchemaChangedEvent;
+import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaAddedEvent;
+import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaDeletedEvent;
+import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
@@ -186,7 +186,7 @@ public final class GovernanceMetaDataContextsTest {
@Test
public void assertDataSourceChanged() throws SQLException {
- DataSourceAlteredEvent event = new DataSourceAlteredEvent("schema",
getChangedDataSourceConfigurations());
+ DataSourceChangedEvent event = new DataSourceChangedEvent("schema",
getChangedDataSourceConfigurations());
governanceMetaDataContexts.renew(event);
assertTrue(governanceMetaDataContexts.getMetaData("schema").getResource().getDataSources().containsKey("ds_2"));
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/event/datasource/DataSourceChangedEvent.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/event/datasource/DataSourceChangedEvent.java
new file mode 100644
index 0000000..e45b040
--- /dev/null
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/event/datasource/DataSourceChangedEvent.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package
org.apache.shardingsphere.governance.core.registry.config.event.datasource;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.governance.core.registry.GovernanceEvent;
+import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
+
+import java.util.Map;
+
+/**
+ * Data source changed event.
+ */
+@RequiredArgsConstructor
+@Getter
+public final class DataSourceChangedEvent implements GovernanceEvent {
+
+ private final String schemaName;
+
+ private final Map<String, DataSourceConfiguration>
dataSourceConfigurations;
+}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
index 7cd2034..5b74bd1 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -21,7 +21,7 @@ import com.google.common.base.Strings;
import org.apache.shardingsphere.governance.core.registry.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.GovernanceWatcher;
import org.apache.shardingsphere.governance.core.registry.cache.node.CacheNode;
-import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationCachedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationsChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.schema.SchemaChangedEvent;
@@ -93,7 +93,7 @@ public final class MetaDataChangedWatcher implements
GovernanceWatcher<Governanc
return Optional.empty();
}
if (isDataSourceChangedEvent(schemaName, event.getKey())) {
- return Optional.of(createDataSourceAlteredEvent(schemaName,
event));
+ return Optional.of(createDataSourceChangedEvent(schemaName,
event));
}
if (isRuleChangedEvent(schemaName, event.getKey())) {
return Optional.of(createRuleChangedEvent(schemaName, event));
@@ -112,12 +112,12 @@ public final class MetaDataChangedWatcher implements
GovernanceWatcher<Governanc
}
@SuppressWarnings("unchecked")
- private DataSourceAlteredEvent createDataSourceAlteredEvent(final String
schemaName, final DataChangedEvent event) {
+ private DataSourceChangedEvent createDataSourceChangedEvent(final String
schemaName, final DataChangedEvent event) {
Map<String, Map<String, Object>> yamlDataSources =
YamlEngine.unmarshal(event.getValue(), Map.class);
Map<String, DataSourceConfiguration> dataSourceConfigs =
yamlDataSources.isEmpty() ? new HashMap<>()
: yamlDataSources.entrySet().stream().collect(Collectors.toMap(
Entry::getKey, entry -> new
YamlDataSourceConfigurationSwapper().swapToDataSourceConfiguration(entry.getValue()),
(oldValue, currentValue) -> oldValue, LinkedHashMap::new));
- return new DataSourceAlteredEvent(schemaName, dataSourceConfigs);
+ return new DataSourceChangedEvent(schemaName, dataSourceConfigs);
}
private boolean isRuleChangedEvent(final String schemaName, final String
eventPath) {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
index c9fb1b8..9a2638f 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
@@ -21,11 +21,11 @@ import com.google.common.collect.ImmutableMap;
import org.apache.commons.dbcp2.BasicDataSource;
import
org.apache.shardingsphere.driver.governance.api.yaml.YamlGovernanceShardingSphereDataSourceFactory;
import
org.apache.shardingsphere.governance.context.metadata.GovernanceMetaDataContexts;
-import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
-import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
+import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.props.PropertiesChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationsChangedEvent;
+import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import
org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
import
org.apache.shardingsphere.governance.repository.api.config.RegistryCenterConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
@@ -106,7 +106,7 @@ public final class GovernanceShardingSphereDataSourceTest {
@Test
public void assertRenewDataSource() throws SQLException {
- metaDataContexts.renew(new
DataSourceAlteredEvent(DefaultSchema.LOGIC_NAME,
getDataSourceConfigurations()));
+ metaDataContexts.renew(new
DataSourceChangedEvent(DefaultSchema.LOGIC_NAME,
getDataSourceConfigurations()));
assertThat(metaDataContexts.getDefaultMetaData().getResource().getDataSources().size(),
is(3));
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
index 7a4a8bf..d5d1ba3 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
@@ -61,14 +61,14 @@ public final class AddResourceBackendHandler extends
SchemaRequiredBackendHandle
@Override
public ResponseHeader execute(final String schemaName, final
AddResourceStatement sqlStatement) {
check(schemaName, sqlStatement);
- Map<String, DataSourceConfiguration> dataSourceConfigurationMap =
DataSourceParameterConverter.getDataSourceConfigurationMap(
+ Map<String, DataSourceConfiguration> dataSourceConfigMap =
DataSourceParameterConverter.getDataSourceConfigurationMap(
DataSourceParameterConverter.getDataSourceParameterMapFromYamlConfiguration(AddResourcesStatementConverter.convert(databaseType,
sqlStatement)));
- Collection<String> invalidDataSourceNames =
dataSourceConfigurationMap.entrySet()
+ Collection<String> invalidDataSourceNames =
dataSourceConfigMap.entrySet()
.stream().filter(entry ->
!dataSourceValidator.validate(entry.getValue())).map(Entry::getKey).collect(Collectors.toList());
if (!invalidDataSourceNames.isEmpty()) {
throw new InvalidResourceException(invalidDataSourceNames);
}
- post(schemaName, dataSourceConfigurationMap);
+ post(schemaName, dataSourceConfigMap);
return new UpdateResponseHeader(sqlStatement);
}
