This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 6e5a76b2e3f Refactor RuleItemManager (#34063)
6e5a76b2e3f is described below
commit 6e5a76b2e3f3aaf3c8f931899f1b76fd9ec81ad8
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Dec 15 10:40:05 2024 +0800
Refactor RuleItemManager (#34063)
* Refactor RuleItemManager
* Refactor RuleItemManager
---
.../mode/metadata/manager/RuleItemManager.java | 14 +++++++-------
.../subscriber/type/ListenerAssistedSubscriber.java | 6 +++---
.../subscriber/type/MetaDataChangedSubscriber.java | 14 +++++++-------
.../service/StandaloneMetaDataManagerPersistService.java | 5 +++--
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/RuleItemManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/RuleItemManager.java
index 194d24bb026..4af0ebe9bc2 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/RuleItemManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/RuleItemManager.java
@@ -37,13 +37,13 @@ public class RuleItemManager {
private final AtomicReference<MetaDataContexts> metaDataContexts;
- private final DatabaseRuleConfigurationManager ruleConfigurationManager;
+ private final DatabaseRuleConfigurationManager ruleConfigManager;
private final MetaDataPersistService metaDataPersistService;
- public RuleItemManager(final AtomicReference<MetaDataContexts>
metaDataContexts, final PersistRepository repository, final
DatabaseRuleConfigurationManager ruleConfigurationManager) {
+ public RuleItemManager(final AtomicReference<MetaDataContexts>
metaDataContexts, final PersistRepository repository, final
DatabaseRuleConfigurationManager ruleConfigManager) {
this.metaDataContexts = metaDataContexts;
- this.ruleConfigurationManager = ruleConfigurationManager;
+ this.ruleConfigManager = ruleConfigManager;
metaDataPersistService = new MetaDataPersistService(repository);
}
@@ -53,7 +53,7 @@ public class RuleItemManager {
* @param event alter rule item event
* @throws SQLException SQL Exception
*/
- @SuppressWarnings({"rawtypes", "unchecked", "unused"})
+ @SuppressWarnings({"rawtypes", "unchecked"})
public void alterRuleItem(final AlterRuleItemEvent event) throws
SQLException {
Preconditions.checkArgument(event.getActiveVersion().equals(metaDataPersistService.getMetaDataVersionPersistService()
.getActiveVersionByFullPath(event.getActiveVersionKey())),
"Invalid active version: {} of key: {}", event.getActiveVersion(),
event.getActiveVersionKey());
@@ -64,7 +64,7 @@ public class RuleItemManager {
RuleConfiguration currentRuleConfig =
processor.findRuleConfiguration(metaDataContexts.get().getMetaData().getDatabase(databaseName));
synchronized (this) {
processor.changeRuleItemConfiguration(event, currentRuleConfig,
processor.swapRuleItemConfiguration(event, yamlContent));
- ruleConfigurationManager.alterRuleConfiguration(databaseName,
currentRuleConfig);
+ ruleConfigManager.alterRuleConfiguration(databaseName,
currentRuleConfig);
}
}
@@ -74,7 +74,7 @@ public class RuleItemManager {
* @param event drop rule item event
* @throws SQLException SQL Exception
*/
- @SuppressWarnings({"rawtypes", "unchecked", "unused"})
+ @SuppressWarnings({"rawtypes", "unchecked"})
public void dropRuleItem(final DropRuleItemEvent event) throws
SQLException {
String databaseName = event.getDatabaseName();
Preconditions.checkState(metaDataContexts.get().getMetaData().containsDatabase(databaseName),
"No database '%s' exists.", databaseName);
@@ -82,7 +82,7 @@ public class RuleItemManager {
RuleConfiguration currentRuleConfig =
processor.findRuleConfiguration(metaDataContexts.get().getMetaData().getDatabase(databaseName));
synchronized (this) {
processor.dropRuleItemConfiguration(event, currentRuleConfig);
- ruleConfigurationManager.dropRuleConfiguration(databaseName,
currentRuleConfig);
+ ruleConfigManager.dropRuleConfiguration(databaseName,
currentRuleConfig);
}
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/ListenerAssistedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/ListenerAssistedSubscriber.java
index b500cad5b03..cb09c7d4378 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/ListenerAssistedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/ListenerAssistedSubscriber.java
@@ -56,7 +56,7 @@ public final class ListenerAssistedSubscriber implements
EventSubscriber {
repository.watch(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()),
new
DatabaseMetaDataChangedListener(contextManager.getComputeNodeInstanceContext().getEventBusContext()));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(event.getDatabaseName());
contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(event.getDatabaseName());
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
/**
@@ -69,10 +69,10 @@ public final class ListenerAssistedSubscriber implements
EventSubscriber {
repository.removeDataListener(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(event.getDatabaseName());
contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(event.getDatabaseName());
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
- private void refreshShardingSphereStatisticsData() {
+ private void refreshStatisticsData() {
if
(contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()
&& InstanceType.PROXY ==
contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType())
{
new ShardingSphereStatisticsRefreshEngine(contextManager, new
GlobalLockContext(new GlobalLockPersistService(repository))).asyncRefresh();
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/MetaDataChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/MetaDataChangedSubscriber.java
index b27967830c5..d096dbd7325 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/MetaDataChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/MetaDataChangedSubscriber.java
@@ -57,7 +57,7 @@ public final class MetaDataChangedSubscriber implements
EventSubscriber {
@Subscribe
public synchronized void renew(final SchemaAddedEvent event) {
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addSchema(event.getDatabaseName(),
event.getSchemaName());
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
/**
@@ -68,7 +68,7 @@ public final class MetaDataChangedSubscriber implements
EventSubscriber {
@Subscribe
public synchronized void renew(final SchemaDeletedEvent event) {
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropSchema(event.getDatabaseName(),
event.getSchemaName());
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
/**
@@ -84,7 +84,7 @@ public final class MetaDataChangedSubscriber implements
EventSubscriber {
ShardingSphereTable table =
contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getTable()
.load(event.getDatabaseName(), event.getSchemaName(),
event.getTableName());
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), table, null);
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
/**
@@ -95,7 +95,7 @@ public final class MetaDataChangedSubscriber implements
EventSubscriber {
@Subscribe
public synchronized void renew(final TableDroppedEvent event) {
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), event.getTableName(), null);
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
/**
@@ -111,7 +111,7 @@ public final class MetaDataChangedSubscriber implements
EventSubscriber {
ShardingSphereView view =
contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getView()
.load(event.getDatabaseName(), event.getSchemaName(),
event.getViewName());
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), null, view);
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
/**
@@ -122,10 +122,10 @@ public final class MetaDataChangedSubscriber implements
EventSubscriber {
@Subscribe
public synchronized void renew(final ViewDroppedEvent event) {
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), null, event.getViewName());
- refreshShardingSphereStatisticsData();
+ refreshStatisticsData();
}
- private void refreshShardingSphereStatisticsData() {
+ private void refreshStatisticsData() {
if
(contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()
&& InstanceType.PROXY ==
contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType())
{
new ShardingSphereStatisticsRefreshEngine(contextManager, new
GlobalLockContext(new GlobalLockPersistService(repository))).asyncRefresh();
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 1518a07cc84..f5badd70606 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -64,15 +64,16 @@ import java.util.stream.Collectors;
*/
public final class StandaloneMetaDataManagerPersistService implements
MetaDataManagerPersistService {
- private final RuleConfigurationChangedEventBuilder
ruleConfigChangedEventBuilder = new RuleConfigurationChangedEventBuilder();
-
private final MetaDataPersistService metaDataPersistService;
private final MetaDataContextManager metaDataContextManager;
+ private final RuleConfigurationChangedEventBuilder
ruleConfigChangedEventBuilder;
+
public StandaloneMetaDataManagerPersistService(final PersistRepository
repository, final MetaDataContextManager metaDataContextManager) {
metaDataPersistService = new MetaDataPersistService(repository);
this.metaDataContextManager = metaDataContextManager;
+ ruleConfigChangedEventBuilder = new
RuleConfigurationChangedEventBuilder();
}
@Override
