Merge branch 'dev-12123' into dev-12122

apache · Dec 12, 2024 · 0399ba4 · 0399ba4
2 parents 618ace2 + a7ef4be
commit 0399ba4
Show file tree

Hide file tree

Showing 63 changed files with 112 additions and 113 deletions.
diff --git a/distribution/proxy/src/main/resources/bin/start.bat b/distribution/proxy/src/main/resources/bin/start.bat
@@ -19,6 +19,14 @@
 
 cd %~dp0
 
+set LOGS_DIR=..\logs
+
+if not exist %LOGS_DIR% (
+    mkdir %LOGS_DIR%
+)
+
+set STDOUT_FILE=%LOGS_DIR%\stdout.log
+
 set SERVER_NAME=ShardingSphere-Proxy
 
 set CLASS_PATH="..;..\lib\*;..\ext-lib\*"
@@ -81,7 +89,7 @@ if %int_version% == 8 (
 
 echo Starting the %SERVER_NAME% ...
 
-java -server -Xmx2g -Xms2g -Xmn1g -Xss1m -XX:AutoBoxCacheMax=4096 -XX:+DisableExplicitGC -XX:LargePageSizeInBytes=128m %VERSION_OPTS% -Dfile.encoding=UTF-8 -Dio.netty.leakDetection.level=DISABLED -classpath %CLASS_PATH% %MAIN_CLASS%
+javaw -server -Xmx2g -Xms2g -Xmn1g -Xss1m -XX:AutoBoxCacheMax=4096 -XX:+DisableExplicitGC -XX:LargePageSizeInBytes=128m %VERSION_OPTS% -Dfile.encoding=UTF-8 -Dio.netty.leakDetection.level=DISABLED -classpath %CLASS_PATH% %MAIN_CLASS% >> %STDOUT_FILE% 2>&1
 
 goto exit
 

diff --git a/.../org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJob.java b/.../org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJob.java
@@ -22,7 +22,7 @@
 import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
 import org.apache.shardingsphere.mode.lock.GlobalLockContext;
 import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.lock.GlobalLockPersistService;
+import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
 import org.apache.shardingsphere.mode.metadata.refresher.ShardingSphereStatisticsRefreshEngine;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.apache.shardingsphere.mode.spi.PersistRepository;

diff --git a/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -31,11 +31,11 @@
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.manager.ContextManagerBuilder;
 import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDeliverEventSubscriberRegistry;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry.ClusterDispatchEventSubscriberRegistry;
+import org.apache.shardingsphere.mode.manager.cluster.event.deliver.subscriber.ClusterDeliverEventSubscriberRegistry;
+import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.ClusterDispatchEventSubscriberRegistry;
 import org.apache.shardingsphere.mode.manager.cluster.exception.MissingRequiredClusterRepositoryConfigurationException;
-import org.apache.shardingsphere.mode.manager.cluster.listener.DataChangedEventListenerRegistry;
-import org.apache.shardingsphere.mode.manager.cluster.lock.GlobalLockPersistService;
+import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.listener.DataChangedEventListenerRegistry;
+import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
 import org.apache.shardingsphere.mode.manager.cluster.workerid.ClusterWorkerIdGenerator;
 import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;

diff --git a/...lusterDeliverEventSubscriberRegistry.java → ...lusterDeliverEventSubscriberRegistry.java b/...lusterDeliverEventSubscriberRegistry.java → ...lusterDeliverEventSubscriberRegistry.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry;
+package org.apache.shardingsphere.mode.manager.cluster.event.deliver.subscriber;
 
 import lombok.Getter;
 import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
 import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.deliver.DeliverQualifiedDataSourceSubscriber;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 
 import java.util.Collection;

diff --git a/...DeliverQualifiedDataSourceSubscriber.java → ...DeliverQualifiedDataSourceSubscriber.java b/...DeliverQualifiedDataSourceSubscriber.java → ...DeliverQualifiedDataSourceSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.deliver;
+package org.apache.shardingsphere.mode.manager.cluster.event.deliver.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;

diff --git a/...der/ClusterStateDispatchEventBuilder.java → ...der/ClusterStateDispatchEventBuilder.java b/...der/ClusterStateDispatchEventBuilder.java → ...der/ClusterStateDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.infra.state.cluster.ClusterState;
 import org.apache.shardingsphere.metadata.persist.node.StatesNode;

diff --git a/...omputeNodeOnlineDispatchEventBuilder.java → ...omputeNodeOnlineDispatchEventBuilder.java b/...omputeNodeOnlineDispatchEventBuilder.java → ...omputeNodeOnlineDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.infra.instance.ComputeNodeData;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;

diff --git a/...ComputeNodeStateDispatchEventBuilder.java → ...ComputeNodeStateDispatchEventBuilder.java b/...ComputeNodeStateDispatchEventBuilder.java → ...ComputeNodeStateDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;

diff --git a/...r/event/builder/DispatchEventBuilder.java → ...ispatch/builder/DispatchEventBuilder.java b/...r/event/builder/DispatchEventBuilder.java → ...ispatch/builder/DispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;

diff --git a/...ilder/GlobalRuleDispatchEventBuilder.java → ...ilder/GlobalRuleDispatchEventBuilder.java b/...ilder/GlobalRuleDispatchEventBuilder.java → ...ilder/GlobalRuleDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.metadata.persist.node.GlobalNode;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;

diff --git a/...lder/KillProcessDispatchEventBuilder.java → ...lder/KillProcessDispatchEventBuilder.java b/...lder/KillProcessDispatchEventBuilder.java → ...lder/KillProcessDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;

diff --git a/...ListenerAssistedDispatchEventBuilder.java → ...ListenerAssistedDispatchEventBuilder.java b/...ListenerAssistedDispatchEventBuilder.java → ...ListenerAssistedDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.metadata.persist.node.StatesNode;

diff --git a/...ilder/PropertiesDispatchEventBuilder.java → ...ilder/PropertiesDispatchEventBuilder.java b/...ilder/PropertiesDispatchEventBuilder.java → ...ilder/PropertiesDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.metadata.persist.node.GlobalNode;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;

diff --git a/...lifiedDataSourceDispatchEventBuilder.java → ...lifiedDataSourceDispatchEventBuilder.java b/...lifiedDataSourceDispatchEventBuilder.java → ...lifiedDataSourceDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;

diff --git a/...ardingSphereDataDispatchEventBuilder.java → ...ardingSphereDataDispatchEventBuilder.java b/...ardingSphereDataDispatchEventBuilder.java → ...ardingSphereDataDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;

diff --git a/.../ShowProcessListDispatchEventBuilder.java → .../ShowProcessListDispatchEventBuilder.java b/.../ShowProcessListDispatchEventBuilder.java → .../ShowProcessListDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder;
 
 import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;

diff --git a/...ner/DataChangedEventListenerRegistry.java → ...ner/DataChangedEventListenerRegistry.java b/...ner/DataChangedEventListenerRegistry.java → ...ner/DataChangedEventListenerRegistry.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.listener;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.listener;
 
 import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
 import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
 import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.event.builder.DispatchEventBuilder;
+import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.DispatchEventBuilder;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 
 import java.util.Collection;

diff --git a/...ener/DatabaseMetaDataChangedListener.java → ...ener/DatabaseMetaDataChangedListener.java b/...ener/DatabaseMetaDataChangedListener.java → ...ener/DatabaseMetaDataChangedListener.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.listener;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.listener;
 
 import com.google.common.base.Preconditions;
 import lombok.RequiredArgsConstructor;

diff --git a/...stener/GlobalMetaDataChangedListener.java → ...stener/GlobalMetaDataChangedListener.java b/...stener/GlobalMetaDataChangedListener.java → ...stener/GlobalMetaDataChangedListener.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.listener;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.listener;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.builder.DispatchEventBuilder;
+import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.DispatchEventBuilder;
 import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
 
 /**

diff --git a/...iber/dispatch/CacheEvictedSubscriber.java → ...ch/subscriber/CacheEvictedSubscriber.java b/...iber/dispatch/CacheEvictedSubscriber.java → ...ch/subscriber/CacheEvictedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import org.apache.shardingsphere.mode.event.dispatch.DispatchEvent;

diff --git a/...usterDispatchEventSubscriberRegistry.java → ...usterDispatchEventSubscriberRegistry.java b/...usterDispatchEventSubscriberRegistry.java → ...usterDispatchEventSubscriberRegistry.java
@@ -15,23 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import lombok.Getter;
 import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
 import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.CacheEvictedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ComputeNodeStateSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.DatabaseDataChangedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.GlobalRuleConfigurationEventSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ListenerAssistedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ProcessListChangedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.PropertiesEventSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.QualifiedDataSourceSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.MetaDataChangedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.RuleItemChangedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StateChangedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StorageUnitEventSubscriber;
 
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/.../dispatch/ComputeNodeStateSubscriber.java → ...ubscriber/ComputeNodeStateSubscriber.java b/.../dispatch/ComputeNodeStateSubscriber.java → ...ubscriber/ComputeNodeStateSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;

diff --git a/...spatch/DatabaseDataChangedSubscriber.java → ...criber/DatabaseDataChangedSubscriber.java b/...spatch/DatabaseDataChangedSubscriber.java → ...criber/DatabaseDataChangedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;

diff --git a/...obalRuleConfigurationEventSubscriber.java → ...obalRuleConfigurationEventSubscriber.java b/...obalRuleConfigurationEventSubscriber.java → ...obalRuleConfigurationEventSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.base.Preconditions;
 import com.google.common.eventbus.Subscribe;

diff --git a/.../dispatch/ListenerAssistedSubscriber.java → ...ubscriber/ListenerAssistedSubscriber.java b/.../dispatch/ListenerAssistedSubscriber.java → ...ubscriber/ListenerAssistedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;
@@ -26,8 +26,8 @@
 import org.apache.shardingsphere.mode.event.dispatch.assisted.DropDatabaseListenerAssistedEvent;
 import org.apache.shardingsphere.mode.lock.GlobalLockContext;
 import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener;
-import org.apache.shardingsphere.mode.manager.cluster.lock.GlobalLockPersistService;
+import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.listener.DatabaseMetaDataChangedListener;
+import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
 import org.apache.shardingsphere.mode.metadata.refresher.ShardingSphereStatisticsRefreshEngine;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 

diff --git a/...r/dispatch/MetaDataChangedSubscriber.java → ...subscriber/MetaDataChangedSubscriber.java b/...r/dispatch/MetaDataChangedSubscriber.java → ...subscriber/MetaDataChangedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.base.Preconditions;
 import com.google.common.eventbus.Subscribe;
@@ -31,7 +31,7 @@
 import org.apache.shardingsphere.mode.event.dispatch.metadata.schema.view.DropViewEvent;
 import org.apache.shardingsphere.mode.lock.GlobalLockContext;
 import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.lock.GlobalLockPersistService;
+import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
 import org.apache.shardingsphere.mode.metadata.refresher.ShardingSphereStatisticsRefreshEngine;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 

diff --git a/...ispatch/ProcessListChangedSubscriber.java → ...scriber/ProcessListChangedSubscriber.java b/...ispatch/ProcessListChangedSubscriber.java → ...scriber/ProcessListChangedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;

diff --git a/...r/dispatch/PropertiesEventSubscriber.java → ...subscriber/PropertiesEventSubscriber.java b/...r/dispatch/PropertiesEventSubscriber.java → ...subscriber/PropertiesEventSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.base.Preconditions;
 import com.google.common.eventbus.Subscribe;

diff --git a/...spatch/QualifiedDataSourceSubscriber.java → ...criber/QualifiedDataSourceSubscriber.java b/...spatch/QualifiedDataSourceSubscriber.java → ...criber/QualifiedDataSourceSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.base.Preconditions;
 import com.google.common.eventbus.Subscribe;

diff --git a/...r/dispatch/RuleItemChangedSubscriber.java → ...subscriber/RuleItemChangedSubscriber.java b/...r/dispatch/RuleItemChangedSubscriber.java → ...subscriber/RuleItemChangedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;

diff --git a/...iber/dispatch/StateChangedSubscriber.java → ...ch/subscriber/StateChangedSubscriber.java b/...iber/dispatch/StateChangedSubscriber.java → ...ch/subscriber/StateChangedSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.eventbus.Subscribe;
 import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;

diff --git a/.../dispatch/StorageUnitEventSubscriber.java → ...ubscriber/StorageUnitEventSubscriber.java b/.../dispatch/StorageUnitEventSubscriber.java → ...ubscriber/StorageUnitEventSubscriber.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber;
 
 import com.google.common.base.Preconditions;
 import com.google.common.eventbus.Subscribe;

diff --git a/...che/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java b/...che/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java
@@ -125,7 +125,7 @@ public void registerStorageUnits(final String databaseName, final Map<String, Da
             MetaDataContexts reloadMetaDataContexts = MetaDataContextsFactory.createBySwitchResource(databaseName, false,
                     switchingResource, originalMetaDataContexts, metaDataPersistService, metaDataContextManager.getComputeNodeInstanceContext());
             metaDataPersistService.getDataSourceUnitService().persist(databaseName, toBeRegisteredProps);
-            afterStorageUnitsAltered(databaseName, originalMetaDataContexts, reloadMetaDataContexts);
+            afterStorageUnitsRegistered(databaseName, originalMetaDataContexts, reloadMetaDataContexts);
             reloadMetaDataContexts.close();
         } finally {
             closeNewDataSources(newDataSources);
@@ -179,16 +179,20 @@ private Collection<String> getToBeDroppedResourceNames(final String databaseName
         return toBeDroppedResourceNames.stream().filter(propsMap::containsKey).collect(Collectors.toList());
     }
 
-    private void afterStorageUnitsAltered(final String databaseName, final MetaDataContexts originalMetaDataContexts, final MetaDataContexts reloadMetaDataContexts) {
-        reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getAllSchemas().forEach(each -> metaDataPersistService.getDatabaseMetaDataFacade()
-                .getSchema().alterByRuleAltered(reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getName(), each));
+    private void afterStorageUnitsRegistered(final String databaseName, final MetaDataContexts originalMetaDataContexts, final MetaDataContexts reloadMetaDataContexts) {
         Optional.ofNullable(reloadMetaDataContexts.getStatistics().getDatabaseData().get(databaseName))
                 .ifPresent(optional -> optional.getSchemaData().forEach((schemaName, schemaData) -> metaDataPersistService.getShardingSphereDataPersistService()
                         .persist(originalMetaDataContexts.getMetaData().getDatabase(databaseName), schemaName, schemaData)));
         metaDataPersistService.persistReloadDatabaseByAlter(databaseName, reloadMetaDataContexts.getMetaData().getDatabase(databaseName),
                 originalMetaDataContexts.getMetaData().getDatabase(databaseName));
     }
 
+    private void afterStorageUnitsAltered(final String databaseName, final MetaDataContexts originalMetaDataContexts, final MetaDataContexts reloadMetaDataContexts) {
+        reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getAllSchemas().forEach(each -> metaDataPersistService.getDatabaseMetaDataFacade()
+                .getSchema().alterByRuleAltered(reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getName(), each));
+        afterStorageUnitsRegistered(databaseName, originalMetaDataContexts, reloadMetaDataContexts);
+    }
+
     private void afterStorageUnitsDropped(final String databaseName, final MetaDataContexts originalMetaDataContexts, final MetaDataContexts reloadMetaDataContexts) {
         reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getAllSchemas().forEach(each -> metaDataPersistService.getDatabaseMetaDataFacade()
                 .getSchema().alterByRuleDropped(reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getName(), each));