You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/06/27 09:20:08 UTC
[shardingsphere] branch master updated: Refactor rule changed subscriber (#26624)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 caccd1a904a Refactor rule changed subscriber (#26624)
caccd1a904a is described below
commit caccd1a904a025eaff92b1ca06155a99c360eeab
Author: ChenJiaHao <Pa...@163.com>
AuthorDate: Tue Jun 27 17:20:00 2023 +0800
Refactor rule changed subscriber (#26624)
---
.../BroadcastConfigurationSubscriber.java | 12 ++++----
...ingsphere.mode.subsciber.RuleChangedSubscriber} | 0
.../encrypt/subscriber/EncryptTableSubscriber.java | 12 ++++----
.../encrypt/subscriber/EncryptorSubscriber.java | 10 +++---
.../CompatibleEncryptTableSubscriber.java | 12 ++++----
.../compatible/CompatibleEncryptorSubscriber.java | 10 +++---
...ingsphere.mode.subsciber.RuleChangedSubscriber} | 0
.../mask/subscriber/MaskAlgorithmSubscriber.java | 10 +++---
.../mask/subscriber/MaskTableSubscriber.java | 12 ++++----
...ingsphere.mode.subsciber.RuleChangedSubscriber} | 0
.../ReadwriteSplittingDataSourceSubscriber.java | 16 +++++-----
.../ReadwriteSplittingLoadBalanceSubscriber.java | 9 +++---
...ingsphere.mode.subsciber.RuleChangedSubscriber} | 0
.../DefaultShadowAlgorithmNameSubscriber.java | 10 +++---
.../subscriber/ShadowAlgorithmSubscriber.java | 10 +++---
.../subscriber/ShadowDataSourceSubscriber.java | 12 ++++----
.../shadow/subscriber/ShadowTableSubscriber.java | 10 +++---
...ingsphere.mode.subsciber.RuleChangedSubscriber} | 0
.../subscriber/ShardingAlgorithmSubscriber.java | 18 +++++------
.../ShardingCacheConfigurationSubscriber.java | 12 ++++----
.../ShardingStrategyConfigurationSubscriber.java | 36 +++++++++++-----------
.../ShardingTableConfigurationSubscriber.java | 24 +++++++--------
...ingsphere.mode.subsciber.RuleChangedSubscriber} | 0
.../subscriber/SingleConfigurationSubscriber.java | 12 ++++----
...ingsphere.mode.subsciber.RuleChangedSubscriber} | 0
...NewYamlTransactionRuleConfigurationSwapper.java | 2 +-
.../mode/subsciber}/RuleChangedSubscriber.java | 12 +++-----
.../cluster/NewClusterContextManagerBuilder.java | 8 ++---
28 files changed, 134 insertions(+), 135 deletions(-)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java
index e450bee0601..04044ef6241 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/subscriber/BroadcastConfigurationSubscriber.java
@@ -27,11 +27,11 @@ import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
import org.apache.shardingsphere.broadcast.yaml.config.YamlBroadcastRuleConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
-import java.util.Map;
import java.util.Optional;
/**
@@ -41,7 +41,7 @@ import java.util.Optional;
@Setter
public final class BroadcastConfigurationSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -55,7 +55,7 @@ public final class BroadcastConfigurationSubscriber implements RuleChangedSubscr
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
BroadcastRuleConfiguration needToAddedConfig = swapBroadcastTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
Optional<BroadcastRule> rule = database.getRuleMetaData().findSingleRule(BroadcastRule.class);
@@ -80,7 +80,7 @@ public final class BroadcastConfigurationSubscriber implements RuleChangedSubscr
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
BroadcastRuleConfiguration needToAlteredConfig = swapBroadcastTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
BroadcastRuleConfiguration config = database.getRuleMetaData().getSingleRule(BroadcastRule.class).getConfiguration();
@@ -96,7 +96,7 @@ public final class BroadcastConfigurationSubscriber implements RuleChangedSubscr
*/
@Subscribe
public synchronized void renew(final DeleteBroadcastTableEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
BroadcastRuleConfiguration config = database.getRuleMetaData().getSingleRule(BroadcastRule.class).getConfiguration();
config.getTables().clear();
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber b/features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
similarity index 100%
rename from features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber
rename to features/broadcast/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java
index 71cb03447ea..6b7daef25a8 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java
@@ -29,13 +29,13 @@ import org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleCo
import org.apache.shardingsphere.encrypt.yaml.swapper.rule.YamlEncryptTableRuleConfigurationSwapper;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Optional;
/**
@@ -45,7 +45,7 @@ import java.util.Optional;
@Setter
public final class EncryptTableSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -59,7 +59,7 @@ public final class EncryptTableSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
EncryptTableRuleConfiguration needToAddedConfig = swapEncryptTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), getEncryptRuleConfiguration(database, needToAddedConfig)));
@@ -75,7 +75,7 @@ public final class EncryptTableSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
EncryptTableRuleConfiguration needToAlteredConfig = swapEncryptTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
EncryptRuleConfiguration config = (EncryptRuleConfiguration) database.getRuleMetaData().getSingleRule(EncryptRule.class).getConfiguration();
@@ -94,7 +94,7 @@ public final class EncryptTableSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
EncryptRuleConfiguration config = (EncryptRuleConfiguration) database.getRuleMetaData().getSingleRule(EncryptRule.class).getConfiguration();
config.getTables().removeIf(each -> each.getName().equals(event.getTableName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java
index 4ba56410530..6d0585f2141 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java
@@ -26,15 +26,15 @@ import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Optional;
/**
@@ -44,7 +44,7 @@ import java.util.Optional;
@Setter
public final class EncryptorSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -58,7 +58,7 @@ public final class EncryptorSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), getEncryptRuleConfiguration(database, event)));
}
@@ -72,7 +72,7 @@ public final class EncryptorSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
EncryptRuleConfiguration config = (EncryptRuleConfiguration) database.getRuleMetaData().getSingleRule(EncryptRule.class).getConfiguration();
config.getEncryptors().remove(event.getEncryptorName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java
index cf37c63d189..d94ecd6f4f4 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java
@@ -29,13 +29,13 @@ import org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleCo
import org.apache.shardingsphere.encrypt.yaml.swapper.rule.YamlEncryptTableRuleConfigurationSwapper;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Optional;
/**
@@ -47,7 +47,7 @@ import java.util.Optional;
@Setter
public final class CompatibleEncryptTableSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -61,7 +61,7 @@ public final class CompatibleEncryptTableSubscriber implements RuleChangedSubscr
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
EncryptTableRuleConfiguration needToAddedConfig = swapEncryptTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), getCompatibleEncryptRuleConfiguration(database, needToAddedConfig)));
@@ -77,7 +77,7 @@ public final class CompatibleEncryptTableSubscriber implements RuleChangedSubscr
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
EncryptTableRuleConfiguration needToAlteredConfig = swapEncryptTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
CompatibleEncryptRuleConfiguration config = (CompatibleEncryptRuleConfiguration) database.getRuleMetaData().getSingleRule(EncryptRule.class).getConfiguration();
@@ -96,7 +96,7 @@ public final class CompatibleEncryptTableSubscriber implements RuleChangedSubscr
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
CompatibleEncryptRuleConfiguration config = (CompatibleEncryptRuleConfiguration) database.getRuleMetaData().getSingleRule(EncryptRule.class).getConfiguration();
config.getTables().removeIf(each -> each.getName().equals(event.getTableName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java
index 4fac4e9da9c..94208d648c6 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java
@@ -26,15 +26,15 @@ import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Optional;
/**
@@ -46,7 +46,7 @@ import java.util.Optional;
@Setter
public final class CompatibleEncryptorSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -60,7 +60,7 @@ public final class CompatibleEncryptorSubscriber implements RuleChangedSubscribe
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), getCompatibleEncryptRuleConfiguration(database, event)));
}
@@ -74,7 +74,7 @@ public final class CompatibleEncryptorSubscriber implements RuleChangedSubscribe
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
CompatibleEncryptRuleConfiguration config = (CompatibleEncryptRuleConfiguration) database.getRuleMetaData().getSingleRule(EncryptRule.class).getConfiguration();
config.getEncryptors().remove(event.getEncryptorName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber b/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
similarity index 100%
rename from features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber
rename to features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java
index c203c9e16b5..4dee1ecf849 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java
@@ -22,7 +22,6 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
@@ -31,10 +30,11 @@ import org.apache.shardingsphere.mask.event.algorithm.AlterMaskAlgorithmEvent;
import org.apache.shardingsphere.mask.event.algorithm.DeleteMaskAlgorithmEvent;
import org.apache.shardingsphere.mask.rule.MaskRule;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Optional;
/**
@@ -44,7 +44,7 @@ import java.util.Optional;
@Setter
public final class MaskAlgorithmSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -58,7 +58,7 @@ public final class MaskAlgorithmSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), getMaskRuleConfiguration(database, event)));
}
@@ -69,7 +69,7 @@ public final class MaskAlgorithmSubscriber implements RuleChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final DeleteMaskAlgorithmEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
MaskRuleConfiguration config = (MaskRuleConfiguration) database.getRuleMetaData().getSingleRule(MaskRule.class).getConfiguration();
config.getMaskAlgorithms().remove(event.getAlgorithmName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java
index cf114ba7655..bb4628a1a8c 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java
@@ -21,7 +21,6 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration;
import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration;
@@ -32,10 +31,11 @@ import org.apache.shardingsphere.mask.rule.MaskRule;
import org.apache.shardingsphere.mask.yaml.config.rule.YamlMaskTableRuleConfiguration;
import org.apache.shardingsphere.mask.yaml.swapper.rule.YamlMaskTableRuleConfigurationSwapper;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Optional;
/**
@@ -45,7 +45,7 @@ import java.util.Optional;
@Setter
public final class MaskTableSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -59,7 +59,7 @@ public final class MaskTableSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
MaskTableRuleConfiguration needToAddedConfig = swapMaskTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), getMaskRuleConfiguration(database, needToAddedConfig)));
@@ -75,7 +75,7 @@ public final class MaskTableSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
MaskTableRuleConfiguration needToAlteredConfig = swapMaskTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
MaskRuleConfiguration config = (MaskRuleConfiguration) database.getRuleMetaData().getSingleRule(MaskRule.class).getConfiguration();
@@ -91,7 +91,7 @@ public final class MaskTableSubscriber implements RuleChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final DeleteMaskTableEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
MaskRuleConfiguration config = (MaskRuleConfiguration) database.getRuleMetaData().getSingleRule(MaskRule.class).getConfiguration();
config.getTables().removeIf(each -> each.getName().equals(event.getTableName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber b/features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
similarity index 100%
rename from features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber
rename to features/mask/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceSubscriber.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceSubscriber.java
index 35793c3bc68..b32f84c275f 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceSubscriber.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingDataSourceSubscriber.java
@@ -22,9 +22,10 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
@@ -34,11 +35,10 @@ import org.apache.shardingsphere.readwritesplitting.event.datasource.DeleteReadw
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
import org.apache.shardingsphere.readwritesplitting.yaml.config.rule.YamlReadwriteSplittingDataSourceRuleConfiguration;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedList;
+import java.util.Optional;
/**
* Readwrite-splitting configuration subscriber.
@@ -47,7 +47,7 @@ import java.util.LinkedList;
@Setter
public final class ReadwriteSplittingDataSourceSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -64,7 +64,7 @@ public final class ReadwriteSplittingDataSourceSubscriber implements RuleChanged
ReadwriteSplittingDataSourceRuleConfiguration needToAddedConfig = swapDataSource(event.getGroupName(),
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(),
- getConfig(databases.get(event.getDatabaseName()), needToAddedConfig)));
+ getConfig(contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName()), needToAddedConfig)));
}
/**
@@ -77,7 +77,7 @@ public final class ReadwriteSplittingDataSourceSubscriber implements RuleChanged
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ReadwriteSplittingDataSourceRuleConfiguration needToAlteredConfig = swapDataSource(event.getGroupName(),
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ReadwriteSplittingRuleConfiguration config = (ReadwriteSplittingRuleConfiguration) database.getRuleMetaData().getSingleRule(ReadwriteSplittingRule.class).getConfiguration();
@@ -93,7 +93,7 @@ public final class ReadwriteSplittingDataSourceSubscriber implements RuleChanged
*/
@Subscribe
public synchronized void renew(final DeleteReadwriteSplittingDataSourceEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ReadwriteSplittingRuleConfiguration config = (ReadwriteSplittingRuleConfiguration) database.getRuleMetaData().getSingleRule(ReadwriteSplittingRule.class).getConfiguration();
config.getDataSources().removeIf(each -> each.getName().equals(event.getGroupName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java
index 570ed6681b7..1025d63c461 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/subscriber/ReadwriteSplittingLoadBalanceSubscriber.java
@@ -22,11 +22,12 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.event.loadbalance.AlterLoadBalanceEvent;
import org.apache.shardingsphere.readwritesplitting.event.loadbalance.DeleteLoadBalanceEvent;
@@ -44,7 +45,7 @@ import java.util.Optional;
@Setter
public final class ReadwriteSplittingLoadBalanceSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -61,7 +62,7 @@ public final class ReadwriteSplittingLoadBalanceSubscriber implements RuleChange
AlgorithmConfiguration needToAltered =
swapToAlgorithmConfig(instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(),
- getConfig(databases.get(event.getDatabaseName()), event.getLoadBalanceName(), needToAltered)));
+ getConfig(contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName()), event.getLoadBalanceName(), needToAltered)));
}
/**
@@ -71,7 +72,7 @@ public final class ReadwriteSplittingLoadBalanceSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final DeleteLoadBalanceEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ReadwriteSplittingRuleConfiguration config = (ReadwriteSplittingRuleConfiguration) database.getRuleMetaData().getSingleRule(ReadwriteSplittingRule.class).getConfiguration();
config.getLoadBalancers().remove(event.getLoadBalanceName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber b/features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
similarity index 100%
rename from features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber
rename to features/readwrite-splitting/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameSubscriber.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameSubscriber.java
index fb5ef540b57..90bdf5afc83 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameSubscriber.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/DefaultShadowAlgorithmNameSubscriber.java
@@ -21,14 +21,14 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.event.algorithm.AlterDefaultShadowAlgorithmNameEvent;
import org.apache.shardingsphere.shadow.event.algorithm.DeleteDefaultShadowAlgorithmNameEvent;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
-import java.util.Map;
import java.util.Optional;
/**
@@ -38,7 +38,7 @@ import java.util.Optional;
@Setter
public final class DefaultShadowAlgorithmNameSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -49,7 +49,7 @@ public final class DefaultShadowAlgorithmNameSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final AlterDefaultShadowAlgorithmNameEvent event) {
- Optional<ShadowRule> rule = databases.get(event.getDatabaseName()).getRuleMetaData().findSingleRule(ShadowRule.class);
+ Optional<ShadowRule> rule = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName()).getRuleMetaData().findSingleRule(ShadowRule.class);
ShadowRuleConfiguration config;
if (rule.isPresent()) {
config = (ShadowRuleConfiguration) rule.get().getConfiguration();
@@ -67,7 +67,7 @@ public final class DefaultShadowAlgorithmNameSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final DeleteDefaultShadowAlgorithmNameEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShadowRuleConfiguration config = (ShadowRuleConfiguration) database.getRuleMetaData().getSingleRule(ShadowRule.class).getConfiguration();
config.setDefaultShadowAlgorithmName(null);
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmSubscriber.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmSubscriber.java
index 8a8e6b41072..2350e9426a2 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmSubscriber.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowAlgorithmSubscriber.java
@@ -22,17 +22,17 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.event.algorithm.AlterShadowAlgorithmEvent;
import org.apache.shardingsphere.shadow.event.algorithm.DeleteShadowAlgorithmEvent;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
-import java.util.Map;
import java.util.Optional;
/**
@@ -42,7 +42,7 @@ import java.util.Optional;
@Setter
public final class ShadowAlgorithmSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -55,7 +55,7 @@ public final class ShadowAlgorithmSubscriber implements RuleChangedSubscriber {
public synchronized void renew(final AlterShadowAlgorithmEvent event) {
AlgorithmConfiguration needToAlteredConfig =
swapToAlgorithmConfig(instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
- Optional<ShadowRule> rule = databases.get(event.getDatabaseName()).getRuleMetaData().findSingleRule(ShadowRule.class);
+ Optional<ShadowRule> rule = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName()).getRuleMetaData().findSingleRule(ShadowRule.class);
ShadowRuleConfiguration config;
if (rule.isPresent()) {
config = (ShadowRuleConfiguration) rule.get().getConfiguration();
@@ -73,7 +73,7 @@ public final class ShadowAlgorithmSubscriber implements RuleChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final DeleteShadowAlgorithmEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShadowRuleConfiguration config = (ShadowRuleConfiguration) database.getRuleMetaData().getSingleRule(ShadowRule.class).getConfiguration();
config.getShadowAlgorithms().remove(event.getAlgorithmName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceSubscriber.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceSubscriber.java
index 5ad9ca24743..bdc28abfd16 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceSubscriber.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowDataSourceSubscriber.java
@@ -21,9 +21,10 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
import org.apache.shardingsphere.shadow.event.datasource.AddShadowDataSourceEvent;
@@ -32,7 +33,6 @@ import org.apache.shardingsphere.shadow.event.datasource.DeleteShadowDataSourceE
import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.shadow.yaml.config.datasource.YamlShadowDataSourceConfiguration;
-import java.util.Map;
import java.util.Optional;
/**
@@ -42,7 +42,7 @@ import java.util.Optional;
@Setter
public final class ShadowDataSourceSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -58,7 +58,7 @@ public final class ShadowDataSourceSubscriber implements RuleChangedSubscriber {
}
ShadowDataSourceConfiguration needToAddedConfig = swapShadowDataSourceRuleConfig(event.getDataSourceName(),
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
- Optional<ShadowRule> rule = databases.get(event.getDatabaseName()).getRuleMetaData().findSingleRule(ShadowRule.class);
+ Optional<ShadowRule> rule = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName()).getRuleMetaData().findSingleRule(ShadowRule.class);
ShadowRuleConfiguration config;
if (rule.isPresent()) {
config = (ShadowRuleConfiguration) rule.get().getConfiguration();
@@ -81,7 +81,7 @@ public final class ShadowDataSourceSubscriber implements RuleChangedSubscriber {
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShadowDataSourceConfiguration needToAlteredConfig = swapShadowDataSourceRuleConfig(event.getDataSourceName(),
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShadowRuleConfiguration config = (ShadowRuleConfiguration) database.getRuleMetaData().getSingleRule(ShadowRule.class).getConfiguration();
@@ -97,7 +97,7 @@ public final class ShadowDataSourceSubscriber implements RuleChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final DeleteShadowDataSourceEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShadowRuleConfiguration config = (ShadowRuleConfiguration) database.getRuleMetaData().getSingleRule(ShadowRule.class).getConfiguration();
config.getDataSources().removeIf(each -> each.getName().equals(event.getDataSourceName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableSubscriber.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableSubscriber.java
index 5fdbcc239b2..1bc9625f41d 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableSubscriber.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/subscriber/ShadowTableSubscriber.java
@@ -21,9 +21,10 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
import org.apache.shardingsphere.shadow.event.table.AddShadowTableEvent;
@@ -33,7 +34,6 @@ import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.shadow.yaml.config.table.YamlShadowTableConfiguration;
import org.apache.shardingsphere.shadow.yaml.swapper.table.YamlShadowTableConfigurationSwapper;
-import java.util.Map;
import java.util.Optional;
/**
@@ -43,7 +43,7 @@ import java.util.Optional;
@Setter
public final class ShadowTableSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -70,7 +70,7 @@ public final class ShadowTableSubscriber implements RuleChangedSubscriber {
}
private void renew(final String databaseName, final String tableName, final ShadowTableConfiguration needToAlteredConfig) {
- Optional<ShadowRule> rule = databases.get(databaseName).getRuleMetaData().findSingleRule(ShadowRule.class);
+ Optional<ShadowRule> rule = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(databaseName).getRuleMetaData().findSingleRule(ShadowRule.class);
ShadowRuleConfiguration config;
if (rule.isPresent()) {
config = (ShadowRuleConfiguration) rule.get().getConfiguration();
@@ -88,7 +88,7 @@ public final class ShadowTableSubscriber implements RuleChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final DeleteShadowTableEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShadowRuleConfiguration config = (ShadowRuleConfiguration) database.getRuleMetaData().getSingleRule(ShadowRule.class).getConfiguration();
config.getTables().remove(event.getTableName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber b/features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
similarity index 100%
rename from features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber
rename to features/shadow/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
index ad491915b8b..4562fea2053 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
@@ -22,11 +22,12 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.event.algorithm.auditor.AlterAuditorEvent;
import org.apache.shardingsphere.sharding.event.algorithm.auditor.DeleteAuditorEvent;
@@ -36,7 +37,6 @@ import org.apache.shardingsphere.sharding.event.algorithm.sharding.AlterSharding
import org.apache.shardingsphere.sharding.event.algorithm.sharding.DeleteShardingAlgorithmEvent;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import java.util.Map;
import java.util.Optional;
/**
@@ -46,7 +46,7 @@ import java.util.Optional;
@Setter
public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -57,7 +57,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
*/
@Subscribe
public synchronized void renew(final AlterShardingAlgorithmEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
config.getShardingAlgorithms().put(event.getAlgorithmName(), swapToAlgorithmConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion())));
@@ -71,7 +71,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
*/
@Subscribe
public synchronized void renew(final AlterKeyGeneratorEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
config.getKeyGenerators().put(event.getKeyGeneratorName(), swapToAlgorithmConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion())));
@@ -85,7 +85,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
*/
@Subscribe
public synchronized void renew(final AlterAuditorEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
config.getAuditors().put(event.getAuditorName(), swapToAlgorithmConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion())));
@@ -99,7 +99,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
*/
@Subscribe
public synchronized void renew(final DeleteShardingAlgorithmEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.getShardingAlgorithms().remove(event.getAlgorithmName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -112,7 +112,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
*/
@Subscribe
public synchronized void renew(final DeleteKeyGeneratorEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.getKeyGenerators().remove(event.getKeyGeneratorName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -125,7 +125,7 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
*/
@Subscribe
public synchronized void renew(final DeleteAuditorEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.getAuditors().remove(event.getAuditorName());
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java
index e10afd2f16f..a83fad5d4fb 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingCacheConfigurationSubscriber.java
@@ -21,9 +21,10 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.cache.ShardingCacheConfiguration;
import org.apache.shardingsphere.sharding.event.cache.AddShardingCacheConfigurationEvent;
@@ -33,7 +34,6 @@ import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.yaml.config.cache.YamlShardingCacheConfiguration;
import org.apache.shardingsphere.sharding.yaml.swapper.cache.YamlShardingCacheConfigurationSwapper;
-import java.util.Map;
import java.util.Optional;
/**
@@ -43,7 +43,7 @@ import java.util.Optional;
@Setter
public final class ShardingCacheConfigurationSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -54,7 +54,7 @@ public final class ShardingCacheConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final AddShardingCacheConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingCacheConfiguration needToAddedConfig = swapToShardingCacheConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
Optional<ShardingRule> rule = database.getRuleMetaData().findSingleRule(ShardingRule.class);
@@ -75,7 +75,7 @@ public final class ShardingCacheConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final AlterShardingCacheConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingCacheConfiguration needToAlteredConfig = swapToShardingCacheConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -90,7 +90,7 @@ public final class ShardingCacheConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final DeleteShardingCacheConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.setShardingCache(null);
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
index 33251177e27..118071ef05a 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
@@ -21,9 +21,10 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
@@ -51,7 +52,6 @@ import org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlKeyGenerateS
import org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingAuditStrategyConfigurationSwapper;
import org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingStrategyConfigurationSwapper;
-import java.util.Map;
import java.util.Optional;
/**
@@ -61,7 +61,7 @@ import java.util.Optional;
@Setter
public final class ShardingStrategyConfigurationSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -72,7 +72,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AddDatabaseShardingStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingStrategyConfiguration needToAddedConfig = swapShardingStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
@@ -87,7 +87,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AddTableShardingStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingStrategyConfiguration needToAddedConfig = swapShardingStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
@@ -102,7 +102,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AddKeyGenerateStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
KeyGenerateStrategyConfiguration needToAddedConfig = swapKeyGenerateStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
@@ -117,7 +117,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AddShardingAuditorStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingAuditStrategyConfiguration needToAddedConfig = swapShardingAuditorStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
@@ -132,7 +132,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AddDefaultShardingColumnEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
String needToAddedConfig = instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion());
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
config.setDefaultShardingColumn(needToAddedConfig);
@@ -146,7 +146,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AlterDatabaseShardingStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingStrategyConfiguration needToAlteredConfig = swapShardingStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -161,7 +161,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AlterTableShardingStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingStrategyConfiguration needToAlteredConfig = swapShardingStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -176,7 +176,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AlterKeyGenerateStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
KeyGenerateStrategyConfiguration needToAlteredConfig = swapKeyGenerateStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -191,7 +191,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AlterShardingAuditorStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingAuditStrategyConfiguration needToAlteredConfig = swapShardingAuditorStrategyConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -206,7 +206,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final AlterDefaultShardingColumnEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
String needToAlteredConfig = instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.setDefaultShardingColumn(needToAlteredConfig);
@@ -220,7 +220,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final DeleteDatabaseShardingStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.setDefaultDatabaseShardingStrategy(null);
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -233,7 +233,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final DeleteTableShardingStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.setDefaultTableShardingStrategy(null);
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -246,7 +246,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final DeleteKeyGenerateStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.setDefaultKeyGenerateStrategy(null);
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -259,7 +259,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final DeleteShardingAuditorStrategyConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.setDefaultAuditStrategy(null);
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -272,7 +272,7 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
*/
@Subscribe
public synchronized void renew(final DeleteDefaultShardingColumnEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.setDefaultAuditStrategy(null);
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
index 44e587f1966..3647d4bfe78 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
@@ -21,9 +21,10 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
@@ -44,7 +45,6 @@ import org.apache.shardingsphere.sharding.yaml.swapper.rule.YamlShardingAutoTabl
import org.apache.shardingsphere.sharding.yaml.swapper.rule.YamlShardingTableReferenceRuleConfigurationConverter;
import org.apache.shardingsphere.sharding.yaml.swapper.rule.YamlShardingTableRuleConfigurationSwapper;
-import java.util.Map;
import java.util.Optional;
/**
@@ -54,7 +54,7 @@ import java.util.Optional;
@Setter
public final class ShardingTableConfigurationSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -68,7 +68,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingTableRuleConfiguration needToAddedConfig = swapShardingTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
@@ -88,7 +88,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingAutoTableRuleConfiguration needToAddedConfig = swapShardingAutoTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
@@ -105,7 +105,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final AddShardingTableReferenceConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingTableReferenceRuleConfiguration needToAddedConfig = swapShardingTableReferenceRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = getShardingRuleConfiguration(database);
@@ -125,7 +125,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingTableRuleConfiguration needToAlteredConfig = swapShardingTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -144,7 +144,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
if (!event.getActiveVersion().equals(instanceContext.getModeContextManager().getActiveVersionByKey(event.getActiveVersionKey()))) {
return;
}
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingAutoTableRuleConfiguration needToAlteredConfig = swapShardingAutoTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -160,7 +160,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final AlterShardingTableReferenceConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingTableReferenceRuleConfiguration needToAlteredConfig = swapShardingTableReferenceRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
@@ -176,7 +176,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final DeleteShardingTableConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.getTables().removeIf(each -> each.getLogicTable().equals(event.getTableName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -189,7 +189,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final DeleteShardingAutoTableConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.getAutoTables().removeIf(each -> each.getLogicTable().equals(event.getTableName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
@@ -202,7 +202,7 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
*/
@Subscribe
public synchronized void renew(final DeleteShardingTableReferenceConfigurationEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
ShardingRuleConfiguration config = (ShardingRuleConfiguration) database.getRuleMetaData().getSingleRule(ShardingRule.class).getConfiguration();
config.getBindingTableGroups().removeIf(each -> each.getName().equals(event.getTableName()));
instanceContext.getEventBusContext().post(new DatabaseRuleConfigurationChangedEvent(event.getDatabaseName(), config));
diff --git a/features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber b/features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
similarity index 100%
rename from features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber
rename to features/sharding/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleConfigurationSubscriber.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleConfigurationSubscriber.java
index 3c5651e19e4..5b973a08d62 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleConfigurationSubscriber.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/subscriber/SingleConfigurationSubscriber.java
@@ -21,9 +21,10 @@ import com.google.common.eventbus.Subscribe;
import lombok.Setter;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.config.DatabaseRuleConfigurationChangedEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.single.api.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.event.config.AddSingleTableEvent;
import org.apache.shardingsphere.single.event.config.AlterSingleTableEvent;
@@ -31,7 +32,6 @@ import org.apache.shardingsphere.single.event.config.DeleteSingleTableEvent;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.apache.shardingsphere.single.yaml.config.pojo.YamlSingleRuleConfiguration;
-import java.util.Map;
import java.util.Optional;
/**
@@ -41,7 +41,7 @@ import java.util.Optional;
@Setter
public final class SingleConfigurationSubscriber implements RuleChangedSubscriber {
- private Map<String, ShardingSphereDatabase> databases;
+ private ContextManager contextManager;
private InstanceContext instanceContext;
@@ -52,7 +52,7 @@ public final class SingleConfigurationSubscriber implements RuleChangedSubscribe
*/
@Subscribe
public synchronized void renew(final AddSingleTableEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
SingleRuleConfiguration needToAddedConfig = swapSingleTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
Optional<SingleRule> rule = database.getRuleMetaData().findSingleRule(SingleRule.class);
@@ -74,7 +74,7 @@ public final class SingleConfigurationSubscriber implements RuleChangedSubscribe
*/
@Subscribe
public synchronized void renew(final AlterSingleTableEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
SingleRuleConfiguration needToAlteredConfig = swapSingleTableRuleConfig(
instanceContext.getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion()));
SingleRuleConfiguration config = database.getRuleMetaData().getSingleRule(SingleRule.class).getConfiguration();
@@ -90,7 +90,7 @@ public final class SingleConfigurationSubscriber implements RuleChangedSubscribe
*/
@Subscribe
public synchronized void renew(final DeleteSingleTableEvent event) {
- ShardingSphereDatabase database = databases.get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
SingleRuleConfiguration config = database.getRuleMetaData().getSingleRule(SingleRule.class).getConfiguration();
config.getTables().clear();
config.setDefaultDataSource(null);
diff --git a/kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber b/kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
similarity index 100%
rename from kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.RuleChangedSubscriber
rename to kernel/single/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber
diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java
index b2b6e2935f4..b9b858a35fb 100644
--- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java
+++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java
@@ -61,7 +61,7 @@ public final class NewYamlTransactionRuleConfigurationSwapper implements NewYaml
}
return new TransactionRuleConfiguration(TransactionType.LOCAL.name(), null, new Properties());
}
-
+
private TransactionRuleConfiguration swapToObject(final YamlTransactionRuleConfiguration yamlConfig) {
return new TransactionRuleConfiguration(yamlConfig.getDefaultType(), yamlConfig.getProviderType(), null == yamlConfig.getProps() ? new Properties() : yamlConfig.getProps());
}
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/RuleChangedSubscriber.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleChangedSubscriber.java
similarity index 80%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/rule/RuleChangedSubscriber.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleChangedSubscriber.java
index fc3ca0def6d..3b825126940 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/RuleChangedSubscriber.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleChangedSubscriber.java
@@ -15,12 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.rule;
+package org.apache.shardingsphere.mode.subsciber;
import org.apache.shardingsphere.infra.instance.InstanceContext;
-import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-
-import java.util.Map;
+import org.apache.shardingsphere.mode.manager.ContextManager;
/**
* Rule changed subscriber.
@@ -28,11 +26,11 @@ import java.util.Map;
public interface RuleChangedSubscriber {
/**
- * Set databases.
+ * Set context manager.
*
- * @param databases databases to be set
+ * @param contextManager context manager
*/
- void setDatabases(Map<String, ShardingSphereDatabase> databases);
+ void setContextManager(ContextManager contextManager);
/**
* Set instance context.
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java
index e60ec0fefbf..99b0675ce98 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.instance.InstanceContextAware;
-import org.apache.shardingsphere.infra.rule.RuleChangedSubscriber;
+import org.apache.shardingsphere.mode.subsciber.RuleChangedSubscriber;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
@@ -84,7 +84,7 @@ public final class NewClusterContextManagerBuilder implements ContextManagerBuil
loadClusterStatus(registryCenter, contextManager);
contextManager.getInstanceContext().getInstance().setLabels(param.getLabels());
contextManager.getInstanceContext().getAllClusterInstances().addAll(registryCenter.getComputeNodeStatusService().loadAllComputeNodeInstances());
- registerRuleConfigurationSubscribers(contextManager.getMetaDataContexts(), contextManager.getInstanceContext());
+ registerRuleConfigurationSubscribers(contextManager, contextManager.getInstanceContext());
new NewContextManagerSubscriberFacade(registryCenter, contextManager);
}
@@ -93,9 +93,9 @@ public final class NewClusterContextManagerBuilder implements ContextManagerBuil
contextManager.updateClusterState(registryCenter.getClusterStatusService().loadClusterStatus());
}
- private void registerRuleConfigurationSubscribers(final MetaDataContexts metaDataContexts, final InstanceContext instanceContext) {
+ private void registerRuleConfigurationSubscribers(final ContextManager contextManager, final InstanceContext instanceContext) {
for (RuleChangedSubscriber each : ShardingSphereServiceLoader.getServiceInstances(RuleChangedSubscriber.class)) {
- each.setDatabases(metaDataContexts.getMetaData().getDatabases());
+ each.setContextManager(contextManager);
each.setInstanceContext(instanceContext);
instanceContext.getEventBusContext().register(each);
}