This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 8375f484142 Add GlobalRuleConfigurationEventBuilder SPI and adjustment
NewMetaDataChangedWatcher (#26368)
8375f484142 is described below
commit 8375f4841425ae22d4ff638b09ec2eff2e5c1928
Author: zhaojinchao <[email protected]>
AuthorDate: Thu Jun 15 19:09:04 2023 +0800
Add GlobalRuleConfigurationEventBuilder SPI and adjustment
NewMetaDataChangedWatcher (#26368)
* Add datasource change evetn
* Add GlobalRuleConfigurationEventBuilder SPI and adjustment
NewMetaDataChangedWatcher
* Fix checkstyle
* Fix ci
* Fix checkstyle
* Fix checkstyle
---
.../event/AlterGlobalRuleConfigurationEvent.java | 2 -
.../event/DeleteGlobalRuleConfigurationEvent.java | 2 -
.../resources/schema/mysql/sys/sys-config.yaml | 34 +++++-
.../AuthorityRuleConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../GlobalClockRuleConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../LoggingRuleConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../persist/node/NewDatabaseMetaDataNode.java | 124 +++++++++++++++++++--
.../datasource/DataSourceNodeConverter.java | 67 -----------
.../database/NewDataSourcePersistService.java | 8 +-
.../database/NewDatabaseRulePersistService.java | 7 +-
.../persist/node/NewDatabaseMetaDataNodeTest.java | 87 +++++++++++++--
.../event/SingleRuleConfigurationEventBuilder.java | 4 +-
...SQLFederationRuleConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../SQLParserRuleConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../SQLTranslatorConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../TrafficRuleConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../TransactionRuleConfigurationEventBuilder.java | 14 +--
...e.mode.spi.GlobalRuleConfigurationEventBuilder} | 0
.../spi/GlobalRuleConfigurationEventBuilder.java | 23 ++--
.../event/datasource/AlterStorageUnitEvent.java | 16 +--
.../event/datasource/RegisterStorageUnitEvent.java | 16 +--
.../datasource/UnregisterStorageUnitEvent.java | 10 +-
.../event/schema/TableMetaDataChangedEvent.java | 2 +-
.../event/schema/ViewMetaDataChangedEvent.java | 2 +-
.../mode/event/schema/table/AlterTableEvent.java} | 10 +-
.../mode/event/schema/table/DropTableEvent.java | 10 +-
.../mode/event/schema/view/AlterViewEvent.java} | 10 +-
.../mode/event/schema/view/DropViewEvent.java | 10 +-
.../mode/manager/ContextManager.java | 4 +-
.../watcher/NewGlobalRuleChangedWatcher.java | 80 +++++++++++++
.../metadata/watcher/MetaDataChangedWatcher.java | 4 +-
.../watcher/NewMetaDataChangedWatcher.java | 105 +++++++++++++++--
.../NewConfigurationChangedSubscriber.java | 20 ++--
.../NewContextManagerSubscriberFacade.java | 2 +-
.../subscriber/NewDataSourceChangedSubscriber.java | 20 ++--
.../ResourceMetaDataChangedSubscriber.java | 4 +-
...uster.coordinator.registry.NewGovernanceWatcher | 1 +
.../watcher/MetaDataChangedWatcherTest.java | 2 +-
.../ResourceMetaDataChangedSubscriberTest.java | 4 +-
46 files changed, 564 insertions(+), 238 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
index b41226fb02d..71d25214634 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
@@ -29,8 +29,6 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
@Getter
public final class AlterGlobalRuleConfigurationEvent implements
GovernanceEvent {
- private final String databaseName;
-
private final RuleConfiguration config;
private final String ruleSimpleName;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
index 32f62e3a080..0b269d5c9a4 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
@@ -28,7 +28,5 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
@Getter
public final class DeleteGlobalRuleConfigurationEvent implements
GovernanceEvent {
- private final String databaseName;
-
private final String ruleSimpleName;
}
diff --git
a/kernel/logging/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/infra/common/src/main/resources/schema/mysql/sys/sys-config.yaml
similarity index 57%
copy from
kernel/logging/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
copy to infra/common/src/main/resources/schema/mysql/sys/sys-config.yaml
index 4370340f01a..7742857793b 100644
---
a/kernel/logging/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
+++ b/infra/common/src/main/resources/schema/mysql/sys/sys-config.yaml
@@ -15,4 +15,36 @@
# limitations under the License.
#
-org.apache.shardingsphere.logging.event.LoggingRuleConfigurationEventBuilder
+name: sys_config
+columns:
+ variable:
+ caseSensitive: false
+ dataType: 12
+ generated: false
+ name: variable
+ primaryKey: true
+ visible: true
+ value:
+ caseSensitive: false
+ dataType: 12
+ generated: false
+ name: value
+ primaryKey: false
+ visible: true
+ set_time:
+ caseSensitive: false
+ dataType: 93
+ generated: false
+ name: set_time
+ primaryKey: false
+ visible: true
+ set_by:
+ caseSensitive: false
+ dataType: 12
+ generated: false
+ name: set_by
+ primaryKey: false
+ visible: true
+indexes:
+ primary:
+ name: PRIMARY
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/event/AuthorityRuleConfigurationEventBuilder.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/event/AuthorityRuleConfigurationEventBuilder.java
index dcb75f35004..0f4077e829a 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/event/AuthorityRuleConfigurationEventBuilder.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/event/AuthorityRuleConfigurationEventBuilder.java
@@ -29,32 +29,32 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import java.util.Optional;
/**
* Authority rule configuration event builder.
*/
-public final class AuthorityRuleConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class AuthorityRuleConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String AUTHORITY = "authority";
private static final String RULE_TYPE =
AuthorityRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(AUTHORITY,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private AuthorityRuleConfiguration swapToConfig(final String yamlContext) {
diff --git
a/kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/event/GlobalClockRuleConfigurationEventBuilder.java
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/event/GlobalClockRuleConfigurationEventBuilder.java
index 3d3e54a4912..d293668117a 100644
---
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/event/GlobalClockRuleConfigurationEventBuilder.java
+++
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/event/GlobalClockRuleConfigurationEventBuilder.java
@@ -29,32 +29,32 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import java.util.Optional;
/**
* Global clock rule configuration event builder.
*/
-public final class GlobalClockRuleConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class GlobalClockRuleConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String GLOBAL_CLOCK = "global_clock";
private static final String RULE_TYPE =
GlobalClockRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(GLOBAL_CLOCK,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private GlobalClockRuleConfiguration swapToConfig(final String
yamlContext) {
diff --git
a/kernel/global-clock/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/global-clock/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/global-clock/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/global-clock/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/event/LoggingRuleConfigurationEventBuilder.java
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/event/LoggingRuleConfigurationEventBuilder.java
index b0bafc04383..f57fad241d3 100644
---
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/event/LoggingRuleConfigurationEventBuilder.java
+++
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/event/LoggingRuleConfigurationEventBuilder.java
@@ -29,32 +29,32 @@ import
org.apache.shardingsphere.logging.yaml.config.YamlLoggingRuleConfiguratio
import
org.apache.shardingsphere.logging.yaml.swapper.YamlLoggingRuleConfigurationSwapper;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import java.util.Optional;
/**
* Logging rule configuration event builder.
*/
-public final class LoggingRuleConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class LoggingRuleConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String LOGGING = "logging";
private static final String RULE_TYPE = LoggingRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(LOGGING,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private LoggingRuleConfiguration swapToConfig(final String yamlContext) {
diff --git
a/kernel/logging/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/logging/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/logging/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/logging/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNode.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNode.java
index 3298c0dec0c..9d52699a780 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNode.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNode.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.metadata.persist.node;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.metadata.persist.node.metadata.datasource.DataSourceNodeConverter;
import java.util.Optional;
import java.util.regex.Matcher;
@@ -34,12 +33,50 @@ public final class NewDatabaseMetaDataNode {
private static final String ROOT_NODE = "metadata";
+ private static final String DATA_SOURCES_NODE = "data_sources";
+
private static final String RULE_NODE = "rules";
private static final String ACTIVE_VERSION = "active_version";
private static final String VERSIONS = "versions";
+ /**
+ * Is data sources node.
+ *
+ * @param path path
+ * @return true or false
+ */
+ public static boolean isDataSourcesNode(final String path) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)/" + DATA_SOURCES_NODE + "/?", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find();
+ }
+
+ /**
+ * Get data source name by data source node.
+ *
+ * @param path path
+ * @return data source name
+ */
+ public static Optional<String> getDataSourceNameByDataSourceNode(final
String path) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)/" + DATA_SOURCES_NODE + "/([\\w\\-]+)?",
Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
+ }
+
+ /**
+ * Get version by data source node.
+ *
+ * @param path path
+ * @return data source version
+ */
+ public static Optional<String> getVersionByDataSourceNode(final String
path) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)/" + DATA_SOURCES_NODE + "/([\\w\\-]+)/versions/([\\w\\-]+)$",
Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
+ }
+
/**
* Get data Sources node.
*
@@ -47,7 +84,7 @@ public final class NewDatabaseMetaDataNode {
* @return data sources node
*/
public static String getDataSourcesNode(final String databaseName) {
- return String.join("/", getMetaDataNodeNode(),
DataSourceNodeConverter.getDataSourcesPath(databaseName));
+ return String.join("/", getMetaDataNodeNode(), databaseName,
DATA_SOURCES_NODE);
}
/**
@@ -59,7 +96,7 @@ public final class NewDatabaseMetaDataNode {
* @return data source node
*/
public static String getDataSourceNode(final String databaseName, final
String dataSourceName, final String version) {
- return String.join("/", getMetaDataNodeNode(),
DataSourceNodeConverter.getDataSourcePath(databaseName, dataSourceName,
version));
+ return String.join("/", getDataSourceVersionsNode(databaseName,
dataSourceName), version);
}
/**
@@ -70,7 +107,18 @@ public final class NewDatabaseMetaDataNode {
* @return data source active version node
*/
public static String getDataSourceActiveVersionNode(final String
databaseName, final String dataSourceName) {
- return String.join("/", getMetaDataNodeNode(),
DataSourceNodeConverter.getActiveVersionPath(databaseName, dataSourceName));
+ return String.join("/", getDataSourcesNode(databaseName),
dataSourceName, ACTIVE_VERSION);
+ }
+
+ /**
+ * Get data source versions node.
+ *
+ * @param databaseName database name
+ * @param dataSourceName data source name
+ * @return data source versions node
+ */
+ public static String getDataSourceVersionsNode(final String databaseName,
final String dataSourceName) {
+ return String.join("/", getDataSourcesNode(databaseName),
dataSourceName, VERSIONS);
}
/**
@@ -137,17 +185,77 @@ public final class NewDatabaseMetaDataNode {
}
/**
- * Get database name by node.
+ * Get database name.
*
- * @param path config path
+ * @param path path
* @return database name
*/
- public static Optional<String> getDatabaseNameByNode(final String path) {
- Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ public static Optional<String> getDatabaseName(final String path) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
}
+ /**
+ * Get database name by schema path.
+ *
+ * @param schemaPath database path
+ * @return database name
+ */
+ public static Optional<String> getDatabaseNameBySchemaPath(final String
schemaPath) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(schemaPath);
+ return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
+ }
+
+ /**
+ * Get schema name.
+ *
+ * @param path path
+ * @return schema name
+ */
+ public static Optional<String> getSchemaName(final String path) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)/schemas/([\\w\\-]+)$", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
+ }
+
+ /**
+ * Get schema name by table path.
+ *
+ * @param tablePath table path
+ * @return schema name
+ */
+ public static Optional<String> getSchemaNameByTablePath(final String
tablePath) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)/schemas/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(tablePath);
+ return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
+ }
+
+ /**
+ * Get table name.
+ *
+ * @param path path
+ * @return table name
+ */
+ public static Optional<String> getTableName(final String path) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)/schemas/([\\w\\-]+)/tables" + "/([\\w\\-]+)$",
Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
+ }
+
+ /**
+ * Get view name.
+ *
+ * @param path path
+ * @return view name
+ */
+ public static Optional<String> getViewName(final String path) {
+ Pattern pattern = Pattern.compile(getMetaDataNodeNode() +
"/([\\w\\-]+)/schemas/([\\w\\-]+)/views" + "/([\\w\\-]+)$",
Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(path);
+ return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
+ }
+
private static String getMetaDataNodeNode() {
return String.join("/", "", ROOT_NODE);
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/metadata/datasource/DataSourceNodeConverter.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/metadata/datasource/DataSourceNodeConverter.java
deleted file mode 100644
index a921f917a30..00000000000
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/metadata/datasource/DataSourceNodeConverter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.metadata.persist.node.metadata.datasource;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-/**
- * Data source node converter.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DataSourceNodeConverter {
-
- private static final String ROOT_NODE = "data_sources";
-
- private static final String ACTIVE_VERSION = "active_version";
-
- private static final String VERSIONS = "versions";
-
- /**
- * Get data sources path.
- *
- * @param databaseName database name
- * @return data sources path
- */
- public static String getDataSourcesPath(final String databaseName) {
- return String.join("/", databaseName, ROOT_NODE);
- }
-
- /**
- * Get data source path.
- *
- * @param databaseName database name
- * @param dataSourceName data source name
- * @param version data source version
- * @return data source path
- */
- public static String getDataSourcePath(final String databaseName, final
String dataSourceName, final String version) {
- return String.join("/", databaseName, ROOT_NODE, dataSourceName,
VERSIONS, version);
- }
-
- /**
- * Get data source path.
- *
- * @param databaseName database name
- * @param dataSourceName data source name
- * @return active version path
- */
- public static String getActiveVersionPath(final String databaseName, final
String dataSourceName) {
- return String.join("/", databaseName, ROOT_NODE, dataSourceName,
ACTIVE_VERSION);
- }
-}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDataSourcePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDataSourcePersistService.java
index ddc8d105b92..841ce7ddae1 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDataSourcePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDataSourcePersistService.java
@@ -27,6 +27,7 @@ import
org.apache.shardingsphere.metadata.persist.node.NewDatabaseMetaDataNode;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
@@ -49,8 +50,11 @@ public final class NewDataSourcePersistService implements
DatabaseBasedPersistSe
if (Strings.isNullOrEmpty(activeVersion)) {
repository.persist(NewDatabaseMetaDataNode.getDataSourceActiveVersionNode(databaseName,
entry.getKey()), DEFAULT_VERSION);
}
-
repository.persist(NewDatabaseMetaDataNode.getDataSourceNode(databaseName,
entry.getKey(), DEFAULT_VERSION),
- YamlEngine.marshal(new
YamlDataSourceConfigurationSwapper().swapToMap(entry.getValue())));
+ List<String> versions =
repository.getChildrenKeys(NewDatabaseMetaDataNode.getDataSourceVersionsNode(databaseName,
entry.getKey()));
+
repository.persist(NewDatabaseMetaDataNode.getDataSourceNode(databaseName,
entry.getKey(), versions.isEmpty()
+ ? DEFAULT_VERSION
+ : String.valueOf(Integer.parseInt(versions.get(0)) + 1)),
YamlEngine.marshal(new
YamlDataSourceConfigurationSwapper().swapToMap(entry.getValue())));
+
}
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDatabaseRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDatabaseRulePersistService.java
index 2ade1d26e49..c5a4e391385 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDatabaseRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/NewDatabaseRulePersistService.java
@@ -32,6 +32,7 @@ import java.util.Collections;
import java.util.Collection;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.List;
/**
* TODO Rename DatabaseRulePersistService when metadata structure adjustment
completed. #25485
@@ -72,7 +73,11 @@ public final class NewDatabaseRulePersistService extends
AbstractPersistService
if
(Strings.isNullOrEmpty(NewDatabaseMetaDataNode.getDatabaseRuleActiveVersionNode(databaseName,
ruleName, each.getKey()))) {
repository.persist(NewDatabaseMetaDataNode.getDatabaseRuleActiveVersionNode(databaseName,
ruleName, each.getKey()), DEFAULT_VERSION);
}
-
repository.persist(NewDatabaseMetaDataNode.getDatabaseRuleVersionNode(databaseName,
ruleName, each.getKey(), DEFAULT_VERSION), each.getValue());
+ List<String> versions =
repository.getChildrenKeys(NewDatabaseMetaDataNode.getDatabaseRuleVersionsNode(databaseName,
ruleName, each.getKey()));
+
repository.persist(NewDatabaseMetaDataNode.getDatabaseRuleVersionNode(databaseName,
ruleName, each.getKey(), versions.isEmpty()
+ ? DEFAULT_VERSION
+ : String.valueOf(Integer.parseInt(versions.get(0)) + 1)),
each.getValue());
+
}
}
diff --git
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNodeTest.java
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNodeTest.java
index 57a5164a9af..3083a532809 100644
---
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNodeTest.java
+++
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/NewDatabaseMetaDataNodeTest.java
@@ -29,29 +29,98 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
class NewDatabaseMetaDataNodeTest {
@Test
- void assertGetMetaDataDataSourcesPath() {
+ void assertIsDataSourcesNode() {
+
assertTrue(NewDatabaseMetaDataNode.isDataSourcesNode("/metadata/logic_db/data_sources/foo_ds"));
+ }
+
+ @Test
+ void assertGetDataSourceNameByDataSourceNode() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getDataSourceNameByDataSourceNode("/metadata/logic_db/data_sources/foo_ds/versions/0");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_ds"));
+ }
+
+ @Test
+ void assertGetVersionByDataSourceNode() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getVersionByDataSourceNode("/metadata/logic_db/data_sources/foo_ds/versions/0");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("0"));
+ }
+
+ @Test
+ void assertGetDatabaseName() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getDatabaseName("/metadata/foo_db");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_db"));
+ }
+
+ @Test
+ void assertGetDatabaseNameBySchemaPath() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getDatabaseNameBySchemaPath("/metadata/foo_db/schemas/foo_schema");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_db"));
+ }
+
+ @Test
+ void assertGetSchemaName() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getSchemaName("/metadata/foo_db/schemas/foo_schema");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_schema"));
+ }
+
+ @Test
+ void assertGetSchemaNameByTablePath() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getSchemaNameByTablePath("/metadata/foo_db/schemas/foo_schema/tables");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_schema"));
+ }
+
+ @Test
+ void assertGetTableName() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getTableName("/metadata/foo_db/schemas/foo_schema/tables/foo_table");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_table"));
+ }
+
+ @Test
+ void assertGetViewName() {
+ Optional<String> actual =
NewDatabaseMetaDataNode.getViewName("/metadata/foo_db/schemas/foo_schema/views/foo_view");
+ assertTrue(actual.isPresent());
+ assertThat(actual.get(), is("foo_view"));
+ }
+
+ @Test
+ void assertGetMetaDataDataSourcesNode() {
assertThat(NewDatabaseMetaDataNode.getDataSourcesNode("foo_db"),
is("/metadata/foo_db/data_sources"));
}
@Test
- void assertGetMetaDataDataSourcePath() {
+ void assertGetMetaDataDataSourceNode() {
assertThat(NewDatabaseMetaDataNode.getDataSourceNode("foo_db",
"foo_ds", "0"), is("/metadata/foo_db/data_sources/foo_ds/versions/0"));
}
@Test
- void assertGetDatabaseRuleActiveVersionPath() {
+ void assertGetDataSourceVersionsNode() {
+ assertThat(NewDatabaseMetaDataNode.getDataSourceVersionsNode("foo_db",
"foo_ds"), is("/metadata/foo_db/data_sources/foo_ds/versions"));
+ }
+
+ @Test
+ void assertGetDataSourceActiveVersionNode() {
+
assertThat(NewDatabaseMetaDataNode.getDataSourceActiveVersionNode("foo_db",
"foo_ds"), is("/metadata/foo_db/data_sources/foo_ds/active_version"));
+ }
+
+ @Test
+ void assertGetDatabaseRuleActiveVersionNode() {
assertThat(NewDatabaseMetaDataNode.getDatabaseRuleActiveVersionNode("foo_db",
"foo_rule", "foo_tables"),
is("/metadata/foo_db/rules/foo_rule/foo_tables/active_version"));
}
@Test
- void assertGetDatabaseRuleVersionPath() {
-
assertThat(NewDatabaseMetaDataNode.getDatabaseRuleVersionNode("foo_db",
"foo_rule", "foo_tables", "1"),
is("/metadata/foo_db/rules/foo_rule/foo_tables/versions/1"));
+ void assertGetDatabaseRuleVersionsNode() {
+
assertThat(NewDatabaseMetaDataNode.getDatabaseRuleVersionsNode("foo_db",
"sharding", "foo_key"), is("/metadata/foo_db/rules/sharding/foo_key/versions"));
}
@Test
- void assertGetDatabaseNameByPath() {
- Optional<String> actual =
NewDatabaseMetaDataNode.getDatabaseNameByNode("/metadata/foo_db/readwrite_splitting");
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is("foo_db"));
+ void assertGetDatabaseRuleVersionNode() {
+
assertThat(NewDatabaseMetaDataNode.getDatabaseRuleVersionNode("foo_db",
"foo_rule", "foo_tables", "1"),
is("/metadata/foo_db/rules/foo_rule/foo_tables/versions/1"));
}
}
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/event/SingleRuleConfigurationEventBuilder.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/event/SingleRuleConfigurationEventBuilder.java
index f4ad734afc1..5df029863a9 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/event/SingleRuleConfigurationEventBuilder.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/event/SingleRuleConfigurationEventBuilder.java
@@ -52,9 +52,9 @@ public final class SingleRuleConfigurationEventBuilder
implements RuleConfigurat
private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private SingleRuleConfiguration swapToConfig(final String yamlContext) {
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/event/SQLFederationRuleConfigurationEventBuilder.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/event/SQLFederationRuleConfigurationEventBuilder.java
index f7feafa25f9..dd9522b4c35 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/event/SQLFederationRuleConfigurationEventBuilder.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/event/SQLFederationRuleConfigurationEventBuilder.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import
org.apache.shardingsphere.sqlfederation.api.config.SQLFederationRuleConfiguration;
import org.apache.shardingsphere.sqlfederation.rule.SQLFederationRule;
import
org.apache.shardingsphere.sqlfederation.yaml.config.YamlSQLFederationRuleConfiguration;
@@ -36,25 +36,25 @@ import java.util.Optional;
/**
* SQL federation rule configuration event builder.
*/
-public final class SQLFederationRuleConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class SQLFederationRuleConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String SQL_FEDERATION = "sql_federation";
private static final String RULE_TYPE =
SQLFederationRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(SQL_FEDERATION,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private SQLFederationRuleConfiguration swapToConfig(final String
yamlContext) {
diff --git
a/kernel/sql-federation/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/sql-federation/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/sql-federation/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/sql-federation/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/event/SQLParserRuleConfigurationEventBuilder.java
b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/event/SQLParserRuleConfigurationEventBuilder.java
index 9b2a6135293..6ef8f5d332f 100644
---
a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/event/SQLParserRuleConfigurationEventBuilder.java
+++
b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/event/SQLParserRuleConfigurationEventBuilder.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import
org.apache.shardingsphere.parser.yaml.config.YamlSQLParserRuleConfiguration;
@@ -36,25 +36,25 @@ import java.util.Optional;
/**
* SQL parser rule configuration event builder.
*/
-public final class SQLParserRuleConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class SQLParserRuleConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String SQL_PARSER = "sql_parser";
private static final String RULE_TYPE =
SQLParserRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(SQL_PARSER,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private SQLParserRuleConfiguration swapToConfig(final String yamlContext) {
diff --git
a/kernel/sql-parser/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/sql-parser/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/sql-parser/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/sql-parser/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/event/SQLTranslatorConfigurationEventBuilder.java
b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/event/SQLTranslatorConfigurationEventBuilder.java
index d3293fa5376..b04ea347e39 100644
---
a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/event/SQLTranslatorConfigurationEventBuilder.java
+++
b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/event/SQLTranslatorConfigurationEventBuilder.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import
org.apache.shardingsphere.sqltranslator.api.config.SQLTranslatorRuleConfiguration;
import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule;
import
org.apache.shardingsphere.sqltranslator.yaml.config.YamlSQLTranslatorRuleConfiguration;
@@ -36,25 +36,25 @@ import java.util.Optional;
/**
* SQL parser rule configuration event builder.
*/
-public final class SQLTranslatorConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class SQLTranslatorConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String SQL_TRANSLATOR = "sql_translator";
private static final String RULE_TYPE =
SQLTranslatorRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(SQL_TRANSLATOR,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private SQLTranslatorRuleConfiguration swapToConfig(final String
yamlContext) {
diff --git
a/kernel/sql-translator/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/sql-translator/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/sql-translator/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/sql-translator/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/event/TrafficRuleConfigurationEventBuilder.java
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/event/TrafficRuleConfigurationEventBuilder.java
index 5ec5292a510..e397d791c8a 100644
---
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/event/TrafficRuleConfigurationEventBuilder.java
+++
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/event/TrafficRuleConfigurationEventBuilder.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration;
import org.apache.shardingsphere.traffic.rule.TrafficRule;
import
org.apache.shardingsphere.traffic.yaml.config.YamlTrafficRuleConfiguration;
@@ -36,25 +36,25 @@ import java.util.Optional;
/**
* Traffic rule configuration event builder.
*/
-public final class TrafficRuleConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class TrafficRuleConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String TRAFFIC = "traffic";
private static final String RULE_TYPE = TrafficRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(TRAFFIC,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private TrafficRuleConfiguration swapToConfig(final String yamlContext) {
diff --git
a/kernel/traffic/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/traffic/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/traffic/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/traffic/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/event/TransactionRuleConfigurationEventBuilder.java
b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/event/TransactionRuleConfigurationEventBuilder.java
index 559c96e4e60..98f4576376c 100644
---
a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/event/TransactionRuleConfigurationEventBuilder.java
+++
b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/event/TransactionRuleConfigurationEventBuilder.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
import
org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
import
org.apache.shardingsphere.transaction.yaml.config.YamlTransactionRuleConfiguration;
@@ -36,25 +36,25 @@ import java.util.Optional;
/**
* Transaction rule configuration event builder.
*/
-public final class TransactionRuleConfigurationEventBuilder implements
RuleConfigurationEventBuilder {
+public final class TransactionRuleConfigurationEventBuilder implements
GlobalRuleConfigurationEventBuilder {
private static final String TRANSACTION = "transaction";
private static final String RULE_TYPE =
TransactionRule.class.getSimpleName();
@Override
- public Optional<GovernanceEvent> build(final String databaseName, final
DataChangedEvent event) {
+ public Optional<GovernanceEvent> build(final DataChangedEvent event) {
if (!GlobalRuleNodeConverter.isExpectedRuleName(TRANSACTION,
event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- return buildEvent(databaseName, event);
+ return buildEvent(event);
}
- private Optional<GovernanceEvent> buildEvent(final String databaseName,
final DataChangedEvent event) {
+ private Optional<GovernanceEvent> buildEvent(final DataChangedEvent event)
{
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- return Optional.of(new
AlterGlobalRuleConfigurationEvent(databaseName, swapToConfig(event.getValue()),
RULE_TYPE));
+ return Optional.of(new
AlterGlobalRuleConfigurationEvent(swapToConfig(event.getValue()), RULE_TYPE));
}
- return Optional.of(new
DeleteGlobalRuleConfigurationEvent(databaseName, RULE_TYPE));
+ return Optional.of(new DeleteGlobalRuleConfigurationEvent(RULE_TYPE));
}
private TransactionRuleConfiguration swapToConfig(final String
yamlContext) {
diff --git
a/kernel/transaction/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
b/kernel/transaction/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
similarity index 100%
rename from
kernel/transaction/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder
rename to
kernel/transaction/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/GlobalRuleConfigurationEventBuilder.java
similarity index 67%
copy from
infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
copy to
mode/api/src/main/java/org/apache/shardingsphere/mode/spi/GlobalRuleConfigurationEventBuilder.java
index 32f62e3a080..24ca0990acb 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/GlobalRuleConfigurationEventBuilder.java
@@ -15,20 +15,23 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.rule.global.event;
+package org.apache.shardingsphere.mode.spi;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
+
+import java.util.Optional;
/**
- * Delete global rule configuration event.
+ * Rule configuration event builder.
*/
-@RequiredArgsConstructor
-@Getter
-public final class DeleteGlobalRuleConfigurationEvent implements
GovernanceEvent {
-
- private final String databaseName;
+public interface GlobalRuleConfigurationEventBuilder {
- private final String ruleSimpleName;
+ /**
+ * Build global rule changed event.
+ *
+ * @param event data changed event
+ * @return rule changed event
+ */
+ Optional<GovernanceEvent> build(DataChangedEvent event);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/AlterStorageUnitEvent.java
similarity index 73%
copy from
infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
copy to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/AlterStorageUnitEvent.java
index b41226fb02d..44279ff1325 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/AlterStorageUnitEvent.java
@@ -15,23 +15,25 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.rule.global.event;
+package org.apache.shardingsphere.mode.event.datasource;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter global rule configuration event.
+ * Add data source event.
*/
-@RequiredArgsConstructor
@Getter
-public final class AlterGlobalRuleConfigurationEvent implements
GovernanceEvent {
+@RequiredArgsConstructor
+public final class AlterStorageUnitEvent implements GovernanceEvent {
private final String databaseName;
- private final RuleConfiguration config;
+ private final String storageUnitName;
+
+ private final String version;
- private final String ruleSimpleName;
+ private final DataSourceProperties dataSourceProps;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/RegisterStorageUnitEvent.java
similarity index 73%
copy from
infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
copy to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/RegisterStorageUnitEvent.java
index b41226fb02d..735b9e46fab 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/AlterGlobalRuleConfigurationEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/RegisterStorageUnitEvent.java
@@ -15,23 +15,25 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.rule.global.event;
+package org.apache.shardingsphere.mode.event.datasource;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Alter global rule configuration event.
+ * Add data source event.
*/
-@RequiredArgsConstructor
@Getter
-public final class AlterGlobalRuleConfigurationEvent implements
GovernanceEvent {
+@RequiredArgsConstructor
+public final class RegisterStorageUnitEvent implements GovernanceEvent {
private final String databaseName;
- private final RuleConfiguration config;
+ private final String storageUnitName;
+
+ private final String version;
- private final String ruleSimpleName;
+ private final DataSourceProperties dataSourceProps;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/UnregisterStorageUnitEvent.java
similarity index 81%
copy from
infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
copy to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/UnregisterStorageUnitEvent.java
index 32f62e3a080..6bc9b5566a3 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/datasource/UnregisterStorageUnitEvent.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.rule.global.event;
+package org.apache.shardingsphere.mode.event.datasource;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete global rule configuration event.
+ * Add data source event.
*/
-@RequiredArgsConstructor
@Getter
-public final class DeleteGlobalRuleConfigurationEvent implements
GovernanceEvent {
+@RequiredArgsConstructor
+public final class UnregisterStorageUnitEvent implements GovernanceEvent {
private final String databaseName;
- private final String ruleSimpleName;
+ private final String storageUnitName;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/TableMetaDataChangedEvent.java
similarity index 93%
copy from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
copy to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/TableMetaDataChangedEvent.java
index b600ca7c255..0153e48720e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/TableMetaDataChangedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema;
+package org.apache.shardingsphere.mode.event.schema;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/ViewMetaDataChangedEvent.java
similarity index 93%
copy from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
copy to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/ViewMetaDataChangedEvent.java
index 4f6cb231e7d..3c4c1ddc0da 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/ViewMetaDataChangedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema;
+package org.apache.shardingsphere.mode.event.schema;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/AlterTableEvent.java
similarity index 79%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/AlterTableEvent.java
index b600ca7c255..d96c7269f6a 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/TableMetaDataChangedEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/AlterTableEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema;
+package org.apache.shardingsphere.mode.event.schema.table;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -23,17 +23,17 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Table meta data changed event.
+ * Alter table event.
*/
@RequiredArgsConstructor
@Getter
-public final class TableMetaDataChangedEvent implements GovernanceEvent {
+public final class AlterTableEvent implements GovernanceEvent {
private final String databaseName;
private final String schemaName;
- private final ShardingSphereTable changedTableMetaData;
+ private final String version;
- private final String deletedTable;
+ private final ShardingSphereTable table;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/DropTableEvent.java
similarity index 81%
copy from
infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
copy to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/DropTableEvent.java
index 32f62e3a080..39378fa29da 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/DropTableEvent.java
@@ -15,20 +15,22 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.rule.global.event;
+package org.apache.shardingsphere.mode.event.schema.table;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete global rule configuration event.
+ * Drop table event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteGlobalRuleConfigurationEvent implements
GovernanceEvent {
+public final class DropTableEvent implements GovernanceEvent {
private final String databaseName;
- private final String ruleSimpleName;
+ private final String schemaName;
+
+ private final String tableName;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/AlterViewEvent.java
similarity index 79%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/AlterViewEvent.java
index 4f6cb231e7d..94b7490a38c 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/schema/ViewMetaDataChangedEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/AlterViewEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema;
+package org.apache.shardingsphere.mode.event.schema.view;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -23,17 +23,17 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * View meta data changed event.
+ * Alter view event.
*/
@RequiredArgsConstructor
@Getter
-public final class ViewMetaDataChangedEvent implements GovernanceEvent {
+public final class AlterViewEvent implements GovernanceEvent {
private final String databaseName;
private final String schemaName;
- private final ShardingSphereView changedViewMetaData;
+ private final String version;
- private final String deletedView;
+ private final ShardingSphereView view;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/DropViewEvent.java
similarity index 81%
copy from
infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
copy to
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/DropViewEvent.java
index 32f62e3a080..80053c4ba6f 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/DropViewEvent.java
@@ -15,20 +15,22 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.rule.global.event;
+package org.apache.shardingsphere.mode.event.schema.view;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
/**
- * Delete global rule configuration event.
+ * Drop view event.
*/
@RequiredArgsConstructor
@Getter
-public final class DeleteGlobalRuleConfigurationEvent implements
GovernanceEvent {
+public final class DropViewEvent implements GovernanceEvent {
private final String databaseName;
- private final String ruleSimpleName;
+ private final String schemaName;
+
+ private final String viewName;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index d43a661788a..488177a0486 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -468,8 +468,8 @@ public final class ContextManager implements AutoCloseable {
MetaDataContexts reloadedMetaDataContexts =
createMetaDataContexts(databaseName, switchingResource);
deletedSchemaNames(databaseName,
reloadedMetaDataContexts.getMetaData().getDatabase(databaseName), database);
metaDataContexts.set(reloadedMetaDataContexts);
-
metaDataContexts.get().getMetaData().getDatabases().values().forEach(each ->
each.getSchemas()
- .forEach((schemaName, schema) ->
metaDataContexts.get().getPersistService().getDatabaseMetaDataService().compareAndPersist(each.getName(),
schemaName, schema)));
+
metaDataContexts.get().getMetaData().getDatabase(databaseName).getSchemas()
+ .forEach((schemaName, schema) ->
metaDataContexts.get().getPersistService().getDatabaseMetaDataService().compareAndPersist(database.getName(),
schemaName, schema));
switchingResource.closeStaleDataSources();
} catch (final SQLException ex) {
log.error("Reload database meta data: {} failed", databaseName,
ex);
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/watcher/NewGlobalRuleChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/watcher/NewGlobalRuleChangedWatcher.java
new file mode 100644
index 00000000000..b9c2110566d
--- /dev/null
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/watcher/NewGlobalRuleChangedWatcher.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.watcher;
+
+import com.google.common.base.Preconditions;
+import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
+import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
+import org.apache.shardingsphere.metadata.persist.node.GlobalNode;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.NewGovernanceWatcher;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
+import org.apache.shardingsphere.mode.spi.GlobalRuleConfigurationEventBuilder;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * TODO Rename GlobalRuleChangedWatcher when metadata structure adjustment
completed. #25485
+ * Global rule changed watcher.
+ */
+public final class NewGlobalRuleChangedWatcher implements
NewGovernanceWatcher<GlobalRuleConfigurationsChangedEvent> {
+
+ private static final Collection<GlobalRuleConfigurationEventBuilder>
EVENT_BUILDERS =
ShardingSphereServiceLoader.getServiceInstances(GlobalRuleConfigurationEventBuilder.class);
+
+ @Override
+ public Collection<String> getWatchingKeys(final String databaseName) {
+ return Collections.singleton(GlobalNode.getGlobalRuleNode());
+ }
+
+ @Override
+ public Collection<Type> getWatchingTypes() {
+ return Arrays.asList(Type.ADDED, Type.UPDATED, Type.DELETED);
+ }
+
+ @Override
+ public Optional<GlobalRuleConfigurationsChangedEvent>
createGovernanceEvent(final DataChangedEvent event) {
+ Optional<GovernanceEvent> globalRuleEvent =
createGlobalRuleEvent(event);
+ return globalRuleEvent.isPresent() ? Optional.of(new
GlobalRuleConfigurationsChangedEvent(getGlobalRuleConfigurations(event))) :
Optional.empty();
+ }
+
+ private Optional<GovernanceEvent> createGlobalRuleEvent(final
DataChangedEvent event) {
+ for (GlobalRuleConfigurationEventBuilder each : EVENT_BUILDERS) {
+ Optional<GovernanceEvent> result = each.build(event);
+ if (!result.isPresent()) {
+ continue;
+ }
+ return result;
+ }
+ return Optional.empty();
+ }
+
+ @SuppressWarnings("unchecked")
+ private Collection<RuleConfiguration> getGlobalRuleConfigurations(final
DataChangedEvent event) {
+ Collection<YamlRuleConfiguration> globalRuleConfigs =
YamlEngine.unmarshal(event.getValue(), Collection.class);
+ Preconditions.checkState(!globalRuleConfigs.isEmpty(), "No available
global rule to load for governance.");
+ return new
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(globalRuleConfigs);
+ }
+}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
index 25e6e806522..70704f5e572 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -35,8 +35,8 @@ import
org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcher;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.datasource.DataSourceChangedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.RuleConfigurationsChangedEvent;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.event.schema.TableMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.event.schema.ViewMetaDataChangedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/NewMetaDataChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/NewMetaDataChangedWatcher.java
index 2b881667d03..2c75e0c09f2 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/NewMetaDataChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/NewMetaDataChangedWatcher.java
@@ -18,18 +18,36 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
+import
org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
+import
org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
+import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereView;
+import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlTableSwapper;
+import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.metadata.persist.node.NewDatabaseMetaDataNode;
+import org.apache.shardingsphere.mode.event.datasource.AlterStorageUnitEvent;
+import
org.apache.shardingsphere.mode.event.datasource.RegisterStorageUnitEvent;
+import
org.apache.shardingsphere.mode.event.datasource.UnregisterStorageUnitEvent;
+import org.apache.shardingsphere.mode.event.schema.table.AlterTableEvent;
+import org.apache.shardingsphere.mode.event.schema.table.DropTableEvent;
+import org.apache.shardingsphere.mode.event.schema.view.AlterViewEvent;
+import org.apache.shardingsphere.mode.event.schema.view.DropViewEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
import org.apache.shardingsphere.mode.spi.RuleConfigurationEventBuilder;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.NewGovernanceWatcher;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Map;
import java.util.Optional;
-import java.util.Arrays;
/**
* TODO Rename MetaDataChangedWatcher when metadata structure adjustment
completed. #25485
@@ -52,17 +70,90 @@ public final class NewMetaDataChangedWatcher implements
NewGovernanceWatcher<Gov
@Override
public Optional<GovernanceEvent> createGovernanceEvent(final
DataChangedEvent event) {
- return createRuleEvent(event);
+ String key = event.getKey();
+ Optional<String> databaseName =
NewDatabaseMetaDataNode.getDatabaseName(key);
+ if (databaseName.isPresent()) {
+ return createDatabaseChangedEvent(databaseName.get(), event);
+ }
+ databaseName =
NewDatabaseMetaDataNode.getDatabaseNameBySchemaPath(key);
+ Optional<String> schemaName =
NewDatabaseMetaDataNode.getSchemaName(key);
+ if (databaseName.isPresent() && schemaName.isPresent()) {
+ return createSchemaChangedEvent(databaseName.get(),
schemaName.get(), event);
+ }
+ schemaName = NewDatabaseMetaDataNode.getSchemaNameByTablePath(key);
+ Optional<String> tableName = NewDatabaseMetaDataNode.getTableName(key);
+ if (databaseName.isPresent() && schemaName.isPresent() &&
tableName.isPresent()) {
+ return createTableChangedEvent(databaseName.get(),
schemaName.get(), tableName.get(), event);
+ }
+ Optional<String> viewName = NewDatabaseMetaDataNode.getViewName(key);
+ if (databaseName.isPresent() && schemaName.isPresent() &&
viewName.isPresent()) {
+ return createViewChangedEvent(databaseName.get(),
schemaName.get(), viewName.get(), event);
+ }
+ if (!databaseName.isPresent()) {
+ return Optional.empty();
+ }
+ if (NewDatabaseMetaDataNode.isDataSourcesNode(key)) {
+ return createDataSourceEvent(databaseName.get(), event);
+ }
+ return createDatabaseRuleEvent(databaseName.get(), event);
}
- // TODO Change to map to avoid loops.
- private Optional<GovernanceEvent> createRuleEvent(final DataChangedEvent
event) {
- Optional<String> databaseName =
NewDatabaseMetaDataNode.getDatabaseNameByNode(event.getKey());
- if (!databaseName.isPresent()) {
+ private Optional<GovernanceEvent> createDatabaseChangedEvent(final String
databaseName, final DataChangedEvent event) {
+ if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
+ return Optional.of(new DatabaseAddedEvent(databaseName));
+ }
+ if (Type.DELETED == event.getType()) {
+ return Optional.of(new DatabaseDeletedEvent(databaseName));
+ }
+ return Optional.empty();
+ }
+
+ private Optional<GovernanceEvent> createSchemaChangedEvent(final String
databaseName, final String schemaName, final DataChangedEvent event) {
+ if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
+ return Optional.of(new SchemaAddedEvent(databaseName, schemaName));
+ }
+ if (Type.DELETED == event.getType()) {
+ return Optional.of(new SchemaDeletedEvent(databaseName,
schemaName));
+ }
+ return Optional.empty();
+ }
+
+ private Optional<GovernanceEvent> createTableChangedEvent(final String
databaseName, final String schemaName, final String tableName, final
DataChangedEvent event) {
+ return Type.DELETED == event.getType()
+ ? Optional.of(new DropTableEvent(databaseName, schemaName,
tableName))
+ : Optional.of(new AlterTableEvent(databaseName, schemaName,
null, new
YamlTableSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(),
YamlShardingSphereTable.class))));
+ }
+
+ private Optional<GovernanceEvent> createViewChangedEvent(final String
databaseName, final String schemaName, final String viewName, final
DataChangedEvent event) {
+ return Type.DELETED == event.getType()
+ ? Optional.of(new DropViewEvent(databaseName, schemaName,
viewName))
+ : Optional.of(new AlterViewEvent(databaseName, schemaName,
null, new YamlViewSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(),
YamlShardingSphereView.class))));
+ }
+
+ @SuppressWarnings("unchecked")
+ private Optional<GovernanceEvent> createDataSourceEvent(final String
databaseName, final DataChangedEvent event) {
+ Optional<String> dataSourceName =
NewDatabaseMetaDataNode.getDataSourceNameByDataSourceNode(event.getKey());
+ if (!dataSourceName.isPresent()) {
+ return Optional.empty();
+ }
+ Optional<String> version =
NewDatabaseMetaDataNode.getVersionByDataSourceNode(event.getKey());
+ if (!version.isPresent()) {
return Optional.empty();
}
+ if (Type.ADDED == event.getType()) {
+ return Optional.of(new RegisterStorageUnitEvent(databaseName,
dataSourceName.get(), version.get(),
+ new
YamlDataSourceConfigurationSwapper().swapToDataSourceProperties(YamlEngine.unmarshal(event.getValue(),
Map.class))));
+ }
+ if (Type.UPDATED == event.getType()) {
+ return Optional.of(new AlterStorageUnitEvent(databaseName,
dataSourceName.get(), version.get(),
+ new
YamlDataSourceConfigurationSwapper().swapToDataSourceProperties(YamlEngine.unmarshal(event.getValue(),
Map.class))));
+ }
+ return Optional.of(new UnregisterStorageUnitEvent(databaseName,
dataSourceName.get()));
+ }
+
+ private Optional<GovernanceEvent> createDatabaseRuleEvent(final String
databaseName, final DataChangedEvent event) {
for (RuleConfigurationEventBuilder each : EVENT_BUILDERS) {
- Optional<GovernanceEvent> result = each.build(databaseName.get(),
event);
+ Optional<GovernanceEvent> result = each.build(databaseName, event);
if (!result.isPresent()) {
continue;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
index 0c02d27d830..549eaf4b167 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewConfigurationChangedSubscriber.java
@@ -33,7 +33,7 @@ import java.util.LinkedList;
/**
* TODO Rename ConfigurationChangedSubscriber when metadata structure
adjustment completed. #25485
- * New Configuration changed subscriber.
+ * New configuration changed subscriber.
*/
@SuppressWarnings("UnstableApiUsage")
public final class NewConfigurationChangedSubscriber {
@@ -68,12 +68,11 @@ public final class NewConfigurationChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final AlterGlobalRuleConfigurationEvent
event) {
- ShardingSphereDatabase database =
contextManager.getMetaDataContexts().getMetaData().getDatabase(event.getDatabaseName());
- Collection<ShardingSphereRule> rules =
removeSingleGlobalRule(database, event.getRuleSimpleName());
+ Collection<ShardingSphereRule> rules =
removeSingleGlobalRule(event.getRuleSimpleName());
rules.addAll(GlobalRulesBuilder.buildRules(Collections.singletonList(event.getConfig()),
contextManager.getMetaDataContexts().getMetaData().getDatabases(),
contextManager.getMetaDataContexts().getMetaData().getProps()));
- database.getRuleMetaData().getRules().clear();
- database.getRuleMetaData().getRules().addAll(rules);
+
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().clear();
+
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().addAll(rules);
}
/**
@@ -83,14 +82,13 @@ public final class NewConfigurationChangedSubscriber {
*/
@Subscribe
public synchronized void renew(final DeleteGlobalRuleConfigurationEvent
event) {
- ShardingSphereDatabase database =
contextManager.getMetaDataContexts().getMetaData().getDatabase(event.getDatabaseName());
- Collection<ShardingSphereRule> rules =
removeSingleGlobalRule(database, event.getRuleSimpleName());
- database.getRuleMetaData().getRules().clear();
- database.getRuleMetaData().getRules().addAll(rules);
+ Collection<ShardingSphereRule> rules =
removeSingleGlobalRule(event.getRuleSimpleName());
+
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().clear();
+
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules().addAll(rules);
}
- private Collection<ShardingSphereRule> removeSingleGlobalRule(final
ShardingSphereDatabase database, final String ruleSimpleName) {
- Collection<ShardingSphereRule> result = new
LinkedList<>(database.getRuleMetaData().getRules());
+ private Collection<ShardingSphereRule> removeSingleGlobalRule(final String
ruleSimpleName) {
+ Collection<ShardingSphereRule> result = new
LinkedList<>(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
for (ShardingSphereRule each : result) {
if (!each.getType().equals(ruleSimpleName)) {
continue;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewContextManagerSubscriberFacade.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewContextManagerSubscriberFacade.java
index 708b8ee35ce..5159fd6c874 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewContextManagerSubscriberFacade.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewContextManagerSubscriberFacade.java
@@ -29,7 +29,7 @@ public final class NewContextManagerSubscriberFacade {
public NewContextManagerSubscriberFacade(final RegistryCenter
registryCenter, final ContextManager contextManager) {
new NewConfigurationChangedSubscriber(contextManager);
- // TODO replace all to new subscriber
+ new NewDataSourceChangedSubscriber(contextManager);
new ResourceMetaDataChangedSubscriber(contextManager);
new DatabaseChangedSubscriber(contextManager);
new StateChangedSubscriber(registryCenter, contextManager);
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewDataSourceChangedSubscriber.java
similarity index 60%
copy from
infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
copy to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewDataSourceChangedSubscriber.java
index 32f62e3a080..025c8542ee4 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/global/event/DeleteGlobalRuleConfigurationEvent.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/NewDataSourceChangedSubscriber.java
@@ -15,20 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.rule.global.event;
+package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
/**
- * Delete global rule configuration event.
+ * TODO Rename DataSourceChangedSubscriber when metadata structure adjustment
completed. #25485
+ * New data source changed subscriber.
*/
-@RequiredArgsConstructor
-@Getter
-public final class DeleteGlobalRuleConfigurationEvent implements
GovernanceEvent {
+@SuppressWarnings("UnstableApiUsage")
+public final class NewDataSourceChangedSubscriber {
- private final String databaseName;
-
- private final String ruleSimpleName;
+ public NewDataSourceChangedSubscriber(final ContextManager contextManager)
{
+
contextManager.getInstanceContext().getEventBusContext().register(this);
+ }
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
index 340cb6ba862..d2d0b6e52aa 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.event.schema.TableMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.event.schema.ViewMetaDataChangedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
diff --git
a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.NewGovernanceWatcher
b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.NewGovernanceWatcher
index 3128c6eb3dd..b0a0e3a3258 100644
---
a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.NewGovernanceWatcher
+++
b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.NewGovernanceWatcher
@@ -16,3 +16,4 @@
#
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher.NewMetaDataChangedWatcher
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.watcher.NewGlobalRuleChangedWatcher
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
index b69e749a4f3..14abec184af 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.watcher;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.event.schema.TableMetaDataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.junit.jupiter.api.Test;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
index 00459046d53..b4e2f3fec7d 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriberTest.java
@@ -33,8 +33,8 @@ import
org.apache.shardingsphere.infra.rule.identifier.type.ResourceHeldRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
import
org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.TableMetaDataChangedEvent;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.schema.ViewMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.event.schema.TableMetaDataChangedEvent;
+import org.apache.shardingsphere.mode.event.schema.ViewMetaDataChangedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseAddedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.DatabaseDeletedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
