This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4d9ce9670a9 Add NamedRuleItemChangedHandler and
UniqueRuleItemChangedHandler (#34229)
4d9ce9670a9 is described below
commit 4d9ce9670a922ce4cf5970aabd2f074f756d8caa
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 3 00:29:24 2025 +0800
Add NamedRuleItemChangedHandler and UniqueRuleItemChangedHandler (#34229)
* Add NamedRuleItemChangedHandler and UniqueRuleItemChangedHandler
* Add NamedRuleItemChangedHandler and UniqueRuleItemChangedHandler
---
.../database/rule/NamedRuleItemChangedHandler.java | 56 ++++++++++++++++++++++
.../rule/RuleConfigurationChangedHandler.java | 37 ++++----------
.../rule/UniqueRuleItemChangedHandler.java | 55 +++++++++++++++++++++
3 files changed, 121 insertions(+), 27 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/NamedRuleItemChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/NamedRuleItemChangedHandler.java
new file mode 100644
index 00000000000..22277e1a0ad
--- /dev/null
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/NamedRuleItemChangedHandler.java
@@ -0,0 +1,56 @@
+/*
+ * 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.event.dispatch.handler.database.rule;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.path.rule.RuleNodePath;
+import org.apache.shardingsphere.mode.spi.item.AlterNamedRuleItem;
+import org.apache.shardingsphere.mode.spi.item.DropNamedRuleItem;
+
+import java.sql.SQLException;
+
+/**
+ * Named rule item changed handler.
+ */
+@RequiredArgsConstructor
+public final class NamedRuleItemChangedHandler {
+
+ private final ContextManager contextManager;
+
+ /**
+ * Handle named rule item changed.
+ *
+ * @param ruleNodePath rule node path
+ * @param databaseName database name
+ * @param itemName item name
+ * @param path path
+ * @param event data changed event
+ * @throws SQLException SQL Exception
+ */
+ public void handle(final RuleNodePath ruleNodePath, final String
databaseName, final String itemName, final String path, final DataChangedEvent
event) throws SQLException {
+ String type = ruleNodePath.getRoot().getRuleType() + "." + path;
+ if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
+
contextManager.getMetaDataContextManager().getRuleItemManager().alterRuleItem(new
AlterNamedRuleItem(databaseName, itemName, event.getKey(), event.getValue(),
type));
+ } else if (Type.DELETED == event.getType()) {
+
contextManager.getMetaDataContextManager().getRuleItemManager().dropRuleItem(new
DropNamedRuleItem(databaseName, itemName, type));
+ }
+ }
+}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
index 5dca721ef45..27b8977777c 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
@@ -18,7 +18,6 @@
package
org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.database.rule;
import com.google.common.base.Strings;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
@@ -27,10 +26,6 @@ import org.apache.shardingsphere.mode.path.rule.RuleNodePath;
import org.apache.shardingsphere.mode.path.rule.item.NamedRuleItemNodePath;
import org.apache.shardingsphere.mode.path.rule.item.UniqueRuleItemNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
-import org.apache.shardingsphere.mode.spi.item.AlterNamedRuleItem;
-import org.apache.shardingsphere.mode.spi.item.AlterUniqueRuleItem;
-import org.apache.shardingsphere.mode.spi.item.DropNamedRuleItem;
-import org.apache.shardingsphere.mode.spi.item.DropUniqueRuleItem;
import java.sql.SQLException;
import java.util.Map.Entry;
@@ -39,10 +34,16 @@ import java.util.Optional;
/**
* Rule configuration changed handler.
*/
-@RequiredArgsConstructor
public final class RuleConfigurationChangedHandler {
- private final ContextManager contextManager;
+ private final NamedRuleItemChangedHandler namedRuleItemChangedHandler;
+
+ private final UniqueRuleItemChangedHandler uniqueRuleItemChangedHandler;
+
+ public RuleConfigurationChangedHandler(final ContextManager
contextManager) {
+ namedRuleItemChangedHandler = new
NamedRuleItemChangedHandler(contextManager);
+ uniqueRuleItemChangedHandler = new
UniqueRuleItemChangedHandler(contextManager);
+ }
/**
* Handle rule changed.
@@ -70,41 +71,23 @@ public final class RuleConfigurationChangedHandler {
for (Entry<String, NamedRuleItemNodePath> entry :
ruleNodePath.getNamedItems().entrySet()) {
Optional<String> itemName = getItemName(event, entry.getValue());
if (itemName.isPresent()) {
- handleNamedRuleItem(ruleNodePath, databaseName,
itemName.get(), entry.getKey(), event);
+ namedRuleItemChangedHandler.handle(ruleNodePath, databaseName,
itemName.get(), entry.getKey(), event);
return true;
}
}
return false;
}
- private void handleNamedRuleItem(final RuleNodePath ruleNodePath, final
String databaseName, final String itemName, final String path, final
DataChangedEvent event) throws SQLException {
- String type = ruleNodePath.getRoot().getRuleType() + "." + path;
- if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().alterRuleItem(new
AlterNamedRuleItem(databaseName, itemName, event.getKey(), event.getValue(),
type));
- } else if (Type.DELETED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().dropRuleItem(new
DropNamedRuleItem(databaseName, itemName, type));
- }
- }
-
private boolean handleUniqueRuleItems(final RuleNodePath ruleNodePath,
final String databaseName, final DataChangedEvent event) throws SQLException {
for (Entry<String, UniqueRuleItemNodePath> entry :
ruleNodePath.getUniqueItems().entrySet()) {
if (entry.getValue().isActiveVersionPath(event.getKey())) {
- handleUniqueRuleItem(ruleNodePath, databaseName,
entry.getKey(), event);
+ uniqueRuleItemChangedHandler.handle(ruleNodePath,
databaseName, entry.getKey(), event);
return true;
}
}
return false;
}
- private void handleUniqueRuleItem(final RuleNodePath ruleNodePath, final
String databaseName, final String path, final DataChangedEvent event) throws
SQLException {
- String type = ruleNodePath.getRoot().getRuleType() + "." + path;
- if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().alterRuleItem(new
AlterUniqueRuleItem(databaseName, event.getKey(), event.getValue(), type));
- } else if (Type.DELETED == event.getType()) {
-
contextManager.getMetaDataContextManager().getRuleItemManager().dropRuleItem(new
DropUniqueRuleItem(databaseName, type));
- }
- }
-
private Optional<String> getItemName(final DataChangedEvent event, final
NamedRuleItemNodePath ruleItemNodePath) {
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
return ruleItemNodePath.getNameByActiveVersion(event.getKey());
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/UniqueRuleItemChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/UniqueRuleItemChangedHandler.java
new file mode 100644
index 00000000000..dc302515c84
--- /dev/null
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/handler/database/rule/UniqueRuleItemChangedHandler.java
@@ -0,0 +1,55 @@
+/*
+ * 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.event.dispatch.handler.database.rule;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.path.rule.RuleNodePath;
+import org.apache.shardingsphere.mode.spi.item.AlterUniqueRuleItem;
+import org.apache.shardingsphere.mode.spi.item.DropUniqueRuleItem;
+
+import java.sql.SQLException;
+
+/**
+ * Unique rule item changed handler.
+ */
+@RequiredArgsConstructor
+public final class UniqueRuleItemChangedHandler {
+
+ private final ContextManager contextManager;
+
+ /**
+ * Handle unique rule item changed.
+ *
+ * @param ruleNodePath rule node path
+ * @param databaseName database name
+ * @param path path
+ * @param event data changed event
+ * @throws SQLException SQL Exception
+ */
+ public void handle(final RuleNodePath ruleNodePath, final String
databaseName, final String path, final DataChangedEvent event) throws
SQLException {
+ String type = ruleNodePath.getRoot().getRuleType() + "." + path;
+ if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
+
contextManager.getMetaDataContextManager().getRuleItemManager().alterRuleItem(new
AlterUniqueRuleItem(databaseName, event.getKey(), event.getValue(), type));
+ } else if (Type.DELETED == event.getType()) {
+
contextManager.getMetaDataContextManager().getRuleItemManager().dropRuleItem(new
DropUniqueRuleItem(databaseName, type));
+ }
+ }
+}
