This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 71f1190c6c2 Fix sonar issues (#27303)
71f1190c6c2 is described below
commit 71f1190c6c22aaed6f088ac0651feef8df1a95e9
Author: zhaojinchao <[email protected]>
AuthorDate: Thu Jul 20 10:44:29 2023 +0800
Fix sonar issues (#27303)
* Remove useless ViewMetaData
* Fix sonar issue
---
.../context/ConfigurationContextManager.java | 44 ----------------------
.../subscriber/ConfigurationChangedSubscriber.java | 12 ------
.../NewConfigurationChangedSubscriber.java | 44 ----------------------
3 files changed, 100 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
index 09f1c3668ba..ec5bfd6d966 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
@@ -141,50 +141,6 @@ public final class ConfigurationContextManager {
switchingResource.closeStaleDataSources();
}
- /**
- * Alter data source nodes configuration.
- *
- * @param databaseName database name
- * @param dataSourcePropsMap altered data source properties map
- */
- public synchronized void alterDataSourceNodesConfiguration(final String
databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap) {
- // TODO Support for registering storage node #25447
- }
-
- /**
- * Register storage node.
- *
- * @param databaseName database name
- * @param dataSourceProps data source properties
- */
- @SuppressWarnings("rawtypes")
- public synchronized void registerStorageNode(final String databaseName,
final Map<String, DataSourceProperties> dataSourceProps) {
- // TODO Support for registering storage node #25447
- }
-
- /**
- * Alter storage node.
- *
- * @param databaseName database name
- * @param storageUnitName storage unit name
- * @param dataSourceProps data source properties
- */
- @SuppressWarnings("rawtypes")
- public synchronized void alterStorageNode(final String databaseName, final
String storageUnitName, final Map<String, DataSourceProperties>
dataSourceProps) {
- // TODO Support for registering storage node #25447
- }
-
- /**
- * Unregister storage node.
- *
- * @param databaseName database name
- * @param storageUnitName storage unit name
- */
- @SuppressWarnings("rawtypes")
- public synchronized void unregisterStorageNode(final String databaseName,
final String storageUnitName) {
- // TODO Support for registering storage node #25447
- }
-
/**
* Alter rule configuration.
*
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
index e09fce9a667..5bc6a121d9a 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDatabas
import
org.apache.shardingsphere.infra.rule.identifier.type.StaticDataSourceContainedRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.RegistryCenter;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.datasource.DataSourceNodesChangedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.datasource.DataSourceUnitsChangedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.props.PropertiesChangedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
@@ -65,17 +64,6 @@ public final class ConfigurationChangedSubscriber {
disableDataSources();
}
- /**
- * Renew data source nodes configuration.
- *
- * @param event data source changed event.
- */
- @Subscribe
- public synchronized void renew(final DataSourceNodesChangedEvent event) {
-
contextManager.getConfigurationContextManager().alterDataSourceNodesConfiguration(event.getDatabaseName(),
event.getDataSourcePropertiesMap());
- disableDataSources();
- }
-
/**
* Renew rule configurations.
*
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
index eb1b2cb0a0f..49a9f10edf5 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
@@ -22,9 +22,6 @@ import
org.apache.shardingsphere.mode.event.config.AlterDatabaseRuleConfiguratio
import
org.apache.shardingsphere.mode.event.config.DropDatabaseRuleConfigurationEvent;
import
org.apache.shardingsphere.mode.event.config.global.AlterGlobalRuleConfigurationEvent;
import org.apache.shardingsphere.mode.event.config.global.AlterPropertiesEvent;
-import
org.apache.shardingsphere.mode.event.datasource.nodes.AlterStorageNodeEvent;
-import
org.apache.shardingsphere.mode.event.datasource.nodes.RegisterStorageNodeEvent;
-import
org.apache.shardingsphere.mode.event.datasource.nodes.UnregisterStorageNodeEvent;
import
org.apache.shardingsphere.mode.event.datasource.unit.AlterStorageUnitEvent;
import
org.apache.shardingsphere.mode.event.datasource.unit.RegisterStorageUnitEvent;
import
org.apache.shardingsphere.mode.event.datasource.unit.UnregisterStorageUnitEvent;
@@ -85,47 +82,6 @@ public final class NewConfigurationChangedSubscriber {
contextManager.getConfigurationContextManager().unregisterStorageUnit(event.getDatabaseName(),
event.getStorageUnitName());
}
- /**
- * Renew for register storage node.
- *
- * @param event register storage node event
- */
- @Subscribe
- public void renew(final RegisterStorageNodeEvent event) {
- if
(!event.getActiveVersion().equals(contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().getActiveVersionByFullPath(event.getActiveVersionKey())))
{
- return;
- }
-
contextManager.getConfigurationContextManager().registerStorageNode(event.getDatabaseName(),
-
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService().load(event.getDatabaseName(),
event.getStorageNodeName()));
- }
-
- /**
- * Renew for alter storage node.
- *
- * @param event register storage node event
- */
- @Subscribe
- public void renew(final AlterStorageNodeEvent event) {
- if
(!event.getActiveVersion().equals(contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().getActiveVersionByFullPath(event.getActiveVersionKey())))
{
- return;
- }
-
contextManager.getConfigurationContextManager().alterStorageNode(event.getDatabaseName(),
event.getStorageNodeName(),
-
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService().load(event.getDatabaseName(),
event.getStorageNodeName()));
- }
-
- /**
- * Renew for unregister storage node.
- *
- * @param event register storage node event
- */
- @Subscribe
- public void renew(final UnregisterStorageNodeEvent event) {
- if
(!contextManager.getMetaDataContexts().getMetaData().containsDatabase(event.getDatabaseName()))
{
- return;
- }
-
contextManager.getConfigurationContextManager().unregisterStorageNode(event.getDatabaseName(),
event.getStorageNodeName());
- }
-
/**
* Renew for database rule configuration.
*
