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 31bd10ee608 Move package of ClusterDatabaseListenerPersistCoordinator
and ClusterProcessPersistCoordinator (#34490)
31bd10ee608 is described below
commit 31bd10ee60866f966a1597e11433fe059796c25a
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 25 19:31:54 2025 +0800
Move package of ClusterDatabaseListenerPersistCoordinator and
ClusterProcessPersistCoordinator (#34490)
---
.../handler/global/DatabaseListenerChangedHandler.java | 12 ++++++------
.../coordinator/ClusterPersistCoordinatorFacadeBuilder.java | 1 +
.../ClusterDatabaseListenerCoordinatorType.java} | 6 +++---
.../ClusterDatabaseListenerPersistCoordinator.java | 10 +++++-----
.../{ => process}/ClusterProcessPersistCoordinator.java | 2 +-
.../service/ClusterMetaDataManagerPersistService.java | 8 ++++----
.../ClusterDatabaseListenerPersistCoordinatorTest.java | 6 +++---
.../{ => process}/ClusterProcessPersistCoordinatorTest.java | 2 +-
.../service/ClusterMetaDataManagerPersistServiceTest.java | 8 ++++----
9 files changed, 28 insertions(+), 27 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
index d2f8e132427..d2738fd390d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
@@ -27,8 +27,8 @@ import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRe
import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.ClusterDatabaseListenerPersistCoordinator;
-import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.DatabaseListenerCoordinatorType;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
import java.util.Arrays;
import java.util.Collection;
@@ -50,15 +50,15 @@ public final class DatabaseListenerChangedHandler
implements DataChangedEventHan
@Override
public void handle(final ContextManager contextManager, final
DataChangedEvent event) {
- StatesNodePath.findDatabaseName(event.getKey()).ifPresent(optional ->
handle(contextManager, optional,
DatabaseListenerCoordinatorType.valueOf(event.getValue())));
+ StatesNodePath.findDatabaseName(event.getKey()).ifPresent(optional ->
handle(contextManager, optional,
ClusterDatabaseListenerCoordinatorType.valueOf(event.getValue())));
}
- private static void handle(final ContextManager contextManager, final
String databaseName, final DatabaseListenerCoordinatorType
databaseListenerCoordinatorType) {
+ private static void handle(final ContextManager contextManager, final
String databaseName, final ClusterDatabaseListenerCoordinatorType
clusterDatabaseListenerCoordinatorType) {
ClusterPersistRepository repository = (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
- if (DatabaseListenerCoordinatorType.CREATE_DATABASE ==
databaseListenerCoordinatorType) {
+ if (ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE ==
clusterDatabaseListenerCoordinatorType) {
repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(databaseName);
- } else if (DatabaseListenerCoordinatorType.DROP_DATABASE ==
databaseListenerCoordinatorType) {
+ } else if (ClusterDatabaseListenerCoordinatorType.DROP_DATABASE ==
clusterDatabaseListenerCoordinatorType) {
repository.removeDataListener(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(databaseName);
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterPersistCoordinatorFacadeBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterPersistCoordinatorFacadeBuilder.java
index 617bae94bde..abd713c10b3 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterPersistCoordinatorFacadeBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterPersistCoordinatorFacadeBuilder.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.process.ClusterProcessPersistCoordinator;
import
org.apache.shardingsphere.mode.persist.coordinator.PersistCoordinatorFacadeBuilder;
import
org.apache.shardingsphere.mode.persist.coordinator.ProcessPersistCoordinator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/DatabaseListenerCoordinatorType.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerCoordinatorType.java
similarity index 89%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/DatabaseListenerCoordinatorType.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerCoordinatorType.java
index dd1e9479226..02de681da71 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/DatabaseListenerCoordinatorType.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerCoordinatorType.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
+package
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database;
/**
- * Database listener coordinator type.
+ * Cluster database listener coordinator type.
*/
-public enum DatabaseListenerCoordinatorType {
+public enum ClusterDatabaseListenerCoordinatorType {
// TODO rename to CREATE and DROP after meta data compatible complete
@haoran
CREATE_DATABASE, DROP_DATABASE
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinator.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java
similarity index 80%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinator.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java
index c3e2da12579..383c7e517c1 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinator.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
+package
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
- * Database listener persist coordinator.
+ * Cluster database listener persist coordinator.
*/
@RequiredArgsConstructor
public final class ClusterDatabaseListenerPersistCoordinator {
@@ -33,10 +33,10 @@ public final class
ClusterDatabaseListenerPersistCoordinator {
* Persist database listener assisted state.
*
* @param databaseName database name
- * @param databaseListenerCoordinatorType database changed listener
assisted type
+ * @param clusterDatabaseListenerCoordinatorType database changed listener
assisted type
*/
- public void persist(final String databaseName, final
DatabaseListenerCoordinatorType databaseListenerCoordinatorType) {
-
repository.persistEphemeral(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName),
databaseListenerCoordinatorType.name());
+ public void persist(final String databaseName, final
ClusterDatabaseListenerCoordinatorType clusterDatabaseListenerCoordinatorType) {
+
repository.persistEphemeral(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName),
clusterDatabaseListenerCoordinatorType.name());
}
/**
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinator.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinator.java
similarity index 99%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinator.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinator.java
index 4f5c1cadb9e..113ad32b267 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinator.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
+package
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.process;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.executor.sql.process.Process;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 67fb6a7e3cb..6b0834b618a 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -29,8 +29,8 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
-import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.ClusterDatabaseListenerPersistCoordinator;
-import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.DatabaseListenerCoordinatorType;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
@@ -73,13 +73,13 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
@Override
public void createDatabase(final String databaseName) {
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().add(databaseName);
- clusterDatabaseListenerPersistCoordinator.persist(databaseName,
DatabaseListenerCoordinatorType.CREATE_DATABASE);
+ clusterDatabaseListenerPersistCoordinator.persist(databaseName,
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE);
}
@Override
public void dropDatabase(final String databaseName) {
String droppedDatabaseName =
metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName();
- clusterDatabaseListenerPersistCoordinator.persist(droppedDatabaseName,
DatabaseListenerCoordinatorType.DROP_DATABASE);
+ clusterDatabaseListenerPersistCoordinator.persist(droppedDatabaseName,
ClusterDatabaseListenerCoordinatorType.DROP_DATABASE);
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().drop(droppedDatabaseName);
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinatorTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java
similarity index 90%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinatorTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java
index 6b427e4745e..7e8bd836311 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinatorTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
+package
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.Test;
@@ -34,8 +34,8 @@ class ClusterDatabaseListenerPersistCoordinatorTest {
@Test
void assertPersist() {
- new
ClusterDatabaseListenerPersistCoordinator(repository).persist("foo_db",
DatabaseListenerCoordinatorType.CREATE_DATABASE);
-
verify(repository).persistEphemeral("/states/listener_assisted/foo_db",
DatabaseListenerCoordinatorType.CREATE_DATABASE.name());
+ new
ClusterDatabaseListenerPersistCoordinator(repository).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE);
+
verify(repository).persistEphemeral("/states/listener_assisted/foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE.name());
}
@Test
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinatorTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinatorTest.java
similarity index 99%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinatorTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinatorTest.java
index 407b4066750..f64d5841dda 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinatorTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
+package
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.process;
import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
index 74d6d167bd6..c1173f46a2c 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
@@ -22,8 +22,8 @@ import
org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
-import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.ClusterDatabaseListenerPersistCoordinator;
-import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.DatabaseListenerCoordinatorType;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -75,14 +75,14 @@ class ClusterMetaDataManagerPersistServiceTest {
void assertCreateDatabase() {
metaDataManagerPersistService.createDatabase("foo_db");
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).add("foo_db");
- verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
DatabaseListenerCoordinatorType.CREATE_DATABASE);
+ verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE);
}
@Test
void assertDropDatabase() {
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
metaDataManagerPersistService.dropDatabase("foo_db");
- verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
DatabaseListenerCoordinatorType.DROP_DATABASE);
+ verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.DROP_DATABASE);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).drop("foo_db");
}
