Refactor RuleItemChangedBuilder

apache · Feb 8, 2025 · 5c2b45d · 5c2b45d
1 parent fd26976
commit 5c2b45d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 27 deletions.
diff --git a/...src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedBuilder.java b/...src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedBuilder.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.mode.metadata.changed;
 
-import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
 import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.mode.metadata.changed.executor.RuleItemChangedBuildExecutor;
 import org.apache.shardingsphere.mode.node.spi.RuleNodePathProvider;
@@ -34,17 +33,18 @@ public final class RuleItemChangedBuilder {
      * Build rule item changed.
      *
      * @param databaseName database name
-     * @param metaDataVersion meta data version
+     * @param path path
+     * @param currentActiveVersion current active version
      * @param executor rule item changed build executor
      * @param <T> type of rule changed item
      * @return built rule item
      */
-    public <T extends RuleChangedItem> Optional<T> build(final String databaseName, final MetaDataVersion metaDataVersion, final RuleItemChangedBuildExecutor<T> executor) {
+    public <T extends RuleChangedItem> Optional<T> build(final String databaseName, final String path, final Integer currentActiveVersion, final RuleItemChangedBuildExecutor<T> executor) {
         for (RuleNodePathProvider each : ShardingSphereServiceLoader.getServiceInstances(RuleNodePathProvider.class)) {
-            if (!each.getRuleNodePath().getRoot().isValidatedPath(metaDataVersion.getPath())) {
+            if (!each.getRuleNodePath().getRoot().isValidatedPath(path)) {
                 continue;
             }
-            Optional<T> result = executor.build(each.getRuleNodePath(), databaseName, metaDataVersion);
+            Optional<T> result = executor.build(each.getRuleNodePath(), databaseName, path, currentActiveVersion);
             if (result.isPresent()) {
                 return result;
             }

diff --git a/...rg/apache/shardingsphere/mode/metadata/changed/executor/RuleItemChangedBuildExecutor.java b/...rg/apache/shardingsphere/mode/metadata/changed/executor/RuleItemChangedBuildExecutor.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.mode.metadata.changed.executor;
 
-import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
 import org.apache.shardingsphere.mode.node.path.config.rule.RuleNodePath;
 import org.apache.shardingsphere.mode.spi.rule.item.RuleChangedItem;
 
@@ -35,8 +34,9 @@ public interface RuleItemChangedBuildExecutor<T extends RuleChangedItem> {
      *
      * @param ruleNodePath rule node path
      * @param databaseName database name
-     * @param metaDataVersion meta data version
+     * @param path path
+     * @param currentActiveVersion current active version
      * @return built rule item
      */
-    Optional<T> build(RuleNodePath ruleNodePath, String databaseName, MetaDataVersion metaDataVersion);
+    Optional<T> build(RuleNodePath ruleNodePath, String databaseName, String path, Integer currentActiveVersion);
 }
diff --git a/...ache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java b/...ache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.mode.metadata.changed.executor.type;
 
-import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
 import org.apache.shardingsphere.mode.metadata.changed.executor.RuleItemChangedBuildExecutor;
 import org.apache.shardingsphere.mode.node.path.config.rule.RuleNodePath;
 import org.apache.shardingsphere.mode.node.path.config.rule.item.NamedRuleItemNodePath;
@@ -35,18 +34,16 @@
 public final class RuleItemAlteredBuildExecutor implements RuleItemChangedBuildExecutor<AlterRuleItem> {
 
     @Override
-    public Optional<AlterRuleItem> build(final RuleNodePath ruleNodePath, final String databaseName, final MetaDataVersion metaDataVersion) {
+    public Optional<AlterRuleItem> build(final RuleNodePath ruleNodePath, final String databaseName, final String path, final Integer currentActiveVersion) {
         for (Entry<String, NamedRuleItemNodePath> entry : ruleNodePath.getNamedItems().entrySet()) {
-            Optional<String> itemName = entry.getValue().getVersionNodePathParser().findIdentifierByActiveVersionPath(metaDataVersion.getPath(), 1);
+            Optional<String> itemName = entry.getValue().getVersionNodePathParser().findIdentifierByActiveVersionPath(path, 1);
             if (itemName.isPresent()) {
-                return Optional.of(new AlterNamedRuleItem(databaseName, itemName.get(), metaDataVersion.getPath(),
-                        metaDataVersion.getNextActiveVersion(), ruleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
+                return Optional.of(new AlterNamedRuleItem(databaseName, itemName.get(), path, currentActiveVersion, ruleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
             }
         }
         for (Entry<String, UniqueRuleItemNodePath> entry : ruleNodePath.getUniqueItems().entrySet()) {
-            if (entry.getValue().getVersionNodePathParser().isActiveVersionPath(metaDataVersion.getPath())) {
-                return Optional.of(new AlterUniqueRuleItem(databaseName, metaDataVersion.getPath(),
-                        metaDataVersion.getNextActiveVersion(), ruleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
+            if (entry.getValue().getVersionNodePathParser().isActiveVersionPath(path)) {
+                return Optional.of(new AlterUniqueRuleItem(databaseName, path, currentActiveVersion, ruleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
             }
         }
         return Optional.empty();

diff --git a/...ache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java b/...ache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.mode.metadata.changed.executor.type;
 
-import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
 import org.apache.shardingsphere.mode.metadata.changed.executor.RuleItemChangedBuildExecutor;
 import org.apache.shardingsphere.mode.node.path.config.rule.RuleNodePath;
 import org.apache.shardingsphere.mode.node.path.config.rule.item.NamedRuleItemNodePath;
@@ -35,15 +34,15 @@
 public final class RuleItemDroppedBuildExecutor implements RuleItemChangedBuildExecutor<DropRuleItem> {
 
     @Override
-    public Optional<DropRuleItem> build(final RuleNodePath ruleNodePath, final String databaseName, final MetaDataVersion metaDataVersion) {
+    public Optional<DropRuleItem> build(final RuleNodePath ruleNodePath, final String databaseName, final String path, final Integer currentActiveVersion) {
         for (Entry<String, NamedRuleItemNodePath> entry : ruleNodePath.getNamedItems().entrySet()) {
-            Optional<String> itemName = entry.getValue().findNameByItemPath(metaDataVersion.getPath());
+            Optional<String> itemName = entry.getValue().findNameByItemPath(path);
             if (itemName.isPresent()) {
                 return Optional.of(new DropNamedRuleItem(databaseName, itemName.get(), ruleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
             }
         }
         for (Entry<String, UniqueRuleItemNodePath> entry : ruleNodePath.getUniqueItems().entrySet()) {
-            if (entry.getValue().getVersionNodePathParser().isActiveVersionPath(metaDataVersion.getPath())) {
+            if (entry.getValue().getVersionNodePathParser().isActiveVersionPath(path)) {
                 return Optional.of(new DropUniqueRuleItem(databaseName, ruleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
             }
         }

diff --git a/.../mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java b/.../mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule;
 
 import com.google.common.base.Strings;
-import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
 import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -62,12 +61,12 @@ public void handle(final String databaseName, final DataChangedEvent event) thro
                 return;
             }
             int version = Integer.parseInt(event.getValue());
-            Optional<AlterRuleItem> alterRuleItem = ruleItemChangedBuilder.build(databaseName, new MetaDataVersion(event.getKey(), version, version), new RuleItemAlteredBuildExecutor());
+            Optional<AlterRuleItem> alterRuleItem = ruleItemChangedBuilder.build(databaseName, event.getKey(), version, new RuleItemAlteredBuildExecutor());
             if (alterRuleItem.isPresent()) {
                 contextManager.getMetaDataContextManager().getDatabaseRuleItemManager().alter(alterRuleItem.get());
             }
         } else if (Type.DELETED == event.getType()) {
-            Optional<DropRuleItem> dropRuleItem = ruleItemChangedBuilder.build(databaseName, new MetaDataVersion(event.getKey()), new RuleItemDroppedBuildExecutor());
+            Optional<DropRuleItem> dropRuleItem = ruleItemChangedBuilder.build(databaseName, event.getKey(), null, new RuleItemDroppedBuildExecutor());
             if (dropRuleItem.isPresent()) {
                 contextManager.getMetaDataContextManager().getDatabaseRuleItemManager().drop(dropRuleItem.get());
             }

diff --git a/...here/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java b/...here/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -211,7 +211,7 @@ public void alterRuleConfiguration(final ShardingSphereDatabase database, final
         Collection<MetaDataVersion> metaDataVersions = metaDataPersistFacade.getDatabaseRuleService().persist(database.getName(), Collections.singleton(toBeAlteredRuleConfig));
         metaDataPersistFacade.getMetaDataVersionService().switchActiveVersion(metaDataVersions);
         for (MetaDataVersion each : metaDataVersions) {
-            Optional<AlterRuleItem> alterRuleItem = ruleItemChangedBuilder.build(database.getName(), each, new RuleItemAlteredBuildExecutor());
+            Optional<AlterRuleItem> alterRuleItem = ruleItemChangedBuilder.build(database.getName(), each.getPath(), each.getCurrentActiveVersion(), new RuleItemAlteredBuildExecutor());
             if (alterRuleItem.isPresent()) {
                 metaDataContextManager.getDatabaseRuleItemManager().alter(alterRuleItem.get());
             }
@@ -226,7 +226,7 @@ public void removeRuleConfigurationItem(final ShardingSphereDatabase database, f
         }
         Collection<MetaDataVersion> metaDataVersions = metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(), Collections.singleton(toBeRemovedRuleConfig));
         for (MetaDataVersion each : metaDataVersions) {
-            Optional<DropRuleItem> dropRuleItem = ruleItemChangedBuilder.build(database.getName(), each, new RuleItemDroppedBuildExecutor());
+            Optional<DropRuleItem> dropRuleItem = ruleItemChangedBuilder.build(database.getName(), each.getPath(), each.getCurrentActiveVersion(), new RuleItemDroppedBuildExecutor());
             if (dropRuleItem.isPresent()) {
                 metaDataContextManager.getDatabaseRuleItemManager().drop(dropRuleItem.get());
             }

diff --git a/.../mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java b/.../mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -176,7 +176,7 @@ void assertAlterRuleConfiguration() throws SQLException {
         when(metaDataPersistFacade.getDatabaseRuleService().persist("foo_db", Collections.singleton(ruleConfig))).thenReturn(metaDataVersion);
         AlterRuleItem alterRuleItem = mock(AlterRuleItem.class);
         RuleItemChangedBuilder ruleItemChangedBuilder = mock(RuleItemChangedBuilder.class);
-        when(ruleItemChangedBuilder.build(eq("foo_db"), any(), any())).thenReturn(Optional.of(alterRuleItem));
+        when(ruleItemChangedBuilder.build(eq("foo_db"), any(), any(), any())).thenReturn(Optional.of(alterRuleItem));
         setRuleConfigurationEventBuilder(ruleItemChangedBuilder);
         metaDataManagerPersistService.alterRuleConfiguration(database, ruleConfig);
         verify(metaDataPersistFacade.getMetaDataVersionService()).switchActiveVersion(metaDataVersion);
@@ -196,7 +196,7 @@ void assertRemoveRuleConfigurationItem() throws SQLException {
         when(metaDataPersistFacade.getDatabaseRuleService().delete("foo_db", Collections.singleton(ruleConfig))).thenReturn(metaDataVersion);
         RuleItemChangedBuilder ruleItemChangedBuilder = mock(RuleItemChangedBuilder.class);
         DropRuleItem dropRuleItem = mock(DropRuleItem.class);
-        when(ruleItemChangedBuilder.build(eq("foo_db"), any(), any())).thenReturn(Optional.of(dropRuleItem));
+        when(ruleItemChangedBuilder.build(eq("foo_db"), any(), any(), any())).thenReturn(Optional.of(dropRuleItem));
         setRuleConfigurationEventBuilder(ruleItemChangedBuilder);
         metaDataManagerPersistService.removeRuleConfigurationItem(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), ruleConfig);
         verify(metaDataContextManager.getDatabaseRuleItemManager()).drop(any(DropRuleItem.class));