Refactor ClusterPersistRepository (#34992)

Author: terrymanu

mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/repository/PersistRepository.java

@@ -63,15 +63,6 @@ public interface PersistRepository extends TypedSPI, AutoCloseable {
      */
     void persist(String key, String value);
 
-    /**
-     * Persist ephemeral data.
-     *
-     * @param key key of data
-     * @param value value of data
-     */
-    default void persistEphemeral(String key, String value) {
-    }
-    
     /**
      * Update data.
      *

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java

@@ -20,15 +20,15 @@
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.type.global.state.DatabaseListenerCoordinatorNodePath;
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 
 /**
  * Cluster database listener persist coordinator.
  */
 @RequiredArgsConstructor
 public final class ClusterDatabaseListenerPersistCoordinator {
 
-    private final PersistRepository repository;
+    private final ClusterPersistRepository repository;
 
     /**
      * Persist database listener assisted state.

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/facade/ClusterPersistServiceFacade.java

@@ -25,7 +25,7 @@
 import org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterProcessPersistService;
 import org.apache.shardingsphere.mode.metadata.manager.MetaDataContextManager;
 import org.apache.shardingsphere.mode.persist.mode.ModePersistServiceFacade;
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 
 /**
  * Cluster persist service facade.
@@ -42,7 +42,7 @@ public final class ClusterPersistServiceFacade implements ModePersistServiceFaca
     @Getter(AccessLevel.NONE)
     private final ComputeNodeInstance computeNodeInstance;
 
-    public ClusterPersistServiceFacade(final MetaDataContextManager metaDataContextManager, final PersistRepository repository) {
+    public ClusterPersistServiceFacade(final MetaDataContextManager metaDataContextManager, final ClusterPersistRepository repository) {
         metaDataManagerPersistService = new ClusterMetaDataManagerPersistService(metaDataContextManager, repository);
         computeNodePersistService = new ClusterComputeNodePersistService(repository);
         processPersistService = new ClusterProcessPersistService(repository);

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/facade/ClusterPersistServiceFacadeBuilder.java

@@ -20,6 +20,7 @@
 import org.apache.shardingsphere.mode.metadata.manager.MetaDataContextManager;
 import org.apache.shardingsphere.mode.persist.mode.ModePersistServiceFacade;
 import org.apache.shardingsphere.mode.persist.mode.ModePersistServiceFacadeBuilder;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
 /**
@@ -29,7 +30,7 @@ public final class ClusterPersistServiceFacadeBuilder implements ModePersistServ
 
     @Override
     public ModePersistServiceFacade build(final MetaDataContextManager metaDataContextManager, final PersistRepository repository) {
-        return new ClusterPersistServiceFacade(metaDataContextManager, repository);
+        return new ClusterPersistServiceFacade(metaDataContextManager, (ClusterPersistRepository) repository);
     }
 
     @Override

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistService.java

@@ -35,7 +35,7 @@
 import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.StatusNodePath;
 import org.apache.shardingsphere.mode.node.path.type.global.node.compute.workerid.ComputeNodeWorkerIDNodePath;
 import org.apache.shardingsphere.mode.persist.service.ComputeNodePersistService;
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -52,7 +52,7 @@
 @Slf4j
 public final class ClusterComputeNodePersistService implements ComputeNodePersistService {
 
-    private final PersistRepository repository;
+    private final ClusterPersistRepository repository;
 
     /**
      * Register compute node online.

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java

@@ -30,8 +30,8 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
-import org.apache.shardingsphere.mode.manager.cluster.exception.ReloadMetaDataContextFailedException;
 import org.apache.shardingsphere.mode.exception.LoadTableMetaDataFailedException;
+import org.apache.shardingsphere.mode.manager.cluster.exception.ReloadMetaDataContextFailedException;
 import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
 import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
 import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
@@ -40,7 +40,7 @@
 import org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
 import org.apache.shardingsphere.mode.metadata.refresher.metadata.util.TableRefreshUtils;
 import org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
 import org.apache.shardingsphere.single.rule.SingleRule;
 
@@ -65,7 +65,7 @@ public final class ClusterMetaDataManagerPersistService implements MetaDataManag
 
     private final ClusterDatabaseListenerPersistCoordinator clusterDatabaseListenerPersistCoordinator;
 
-    public ClusterMetaDataManagerPersistService(final MetaDataContextManager metaDataContextManager, final PersistRepository repository) {
+    public ClusterMetaDataManagerPersistService(final MetaDataContextManager metaDataContextManager, final ClusterPersistRepository repository) {
         this.metaDataContextManager = metaDataContextManager;
         metaDataPersistFacade = metaDataContextManager.getMetaDataPersistFacade();
         clusterDatabaseListenerPersistCoordinator = new ClusterDatabaseListenerPersistCoordinator(repository);

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/fixture/ClusterPersistRepositoryFixture.java

@@ -57,6 +57,10 @@ public void persist(final String key, final String value) {
     public void update(final String key, final String value) {
     }
 
+    @Override
+    public void persistEphemeral(final String key, final String value) {
+    }
+    
     @Override
     public boolean persistExclusiveEphemeral(final String key, final String value) {
         return true;

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java

@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database;
 
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
@@ -30,7 +30,7 @@
 class ClusterDatabaseListenerPersistCoordinatorTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PersistRepository repository;
+    private ClusterPersistRepository repository;
 
     @Test
     void assertPersist() {

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterComputeNodePersistServiceTest.java

@@ -23,7 +23,7 @@
 import org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeData;
 import org.apache.shardingsphere.infra.state.instance.InstanceState;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -50,7 +50,7 @@ class ClusterComputeNodePersistServiceTest {
     private ClusterComputeNodePersistService computeNodePersistService;
 
     @Mock
-    private PersistRepository repository;
+    private ClusterPersistRepository repository;
 
     @BeforeEach
     void setUp() {

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java

@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
 import org.apache.shardingsphere.mode.metadata.manager.MetaDataContextManager;
 import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
 import org.apache.shardingsphere.single.rule.SingleRule;
 import org.apache.shardingsphere.test.fixture.database.MockedDatabaseType;
@@ -68,7 +68,7 @@ class ClusterMetaDataManagerPersistServiceTest {
     @SneakyThrows(ReflectiveOperationException.class)
     @BeforeEach
     void setUp() {
-        metaDataManagerPersistService = new ClusterMetaDataManagerPersistService(metaDataContextManager, mock(PersistRepository.class));
+        metaDataManagerPersistService = new ClusterMetaDataManagerPersistService(metaDataContextManager, mock(ClusterPersistRepository.class));
         Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("metaDataPersistFacade"), metaDataManagerPersistService, metaDataPersistFacade);
         Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("clusterDatabaseListenerPersistCoordinator"),
                 metaDataManagerPersistService, clusterDatabaseListenerPersistCoordinator);

mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java

@@ -35,6 +35,14 @@ public interface ClusterPersistRepository extends PersistRepository {
      */
     void init(ClusterPersistRepositoryConfiguration config, ComputeNodeInstanceContext computeNodeInstanceContext);
 
+    /**
+     * Persist ephemeral data.
+     *
+     * @param key key of data
+     * @param value value of data
+     */
+    void persistEphemeral(String key, String value);
+    
     /**
      * Persist exclusive ephemeral data.
      *

proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java

@@ -26,7 +26,6 @@
 import org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyServerConfiguration;
 import org.apache.shardingsphere.proxy.backend.distsql.export.ExportedMetaData;
 
-import java.sql.SQLException;
 import java.util.Collection;
 import java.util.LinkedList;
 
@@ -51,15 +50,14 @@ public MetaDataImportExecutor(final ContextManager contextManager) {
      * Import cluster configurations.
      *
      * @param exportedMetaData exported metadata
-     * @throws SQLException SQL exception
      */
-    public void importClusterConfigurations(final ExportedMetaData exportedMetaData) throws SQLException {
+    public void importClusterConfigurations(final ExportedMetaData exportedMetaData) {
         Collection<YamlProxyDatabaseConfiguration> databaseConfigs = getYamlProxyDatabaseConfigurations(exportedMetaData);
         importServerConfiguration(exportedMetaData);
         importDatabaseConfigurations(databaseConfigs);
     }
 
-    private void importServerConfiguration(final ExportedMetaData exportedMetaData) throws SQLException {
+    private void importServerConfiguration(final ExportedMetaData exportedMetaData) {
         YamlProxyServerConfiguration yamlServerConfig = YamlEngine.unmarshal(exportedMetaData.getRules() + System.lineSeparator() + exportedMetaData.getProps(), YamlProxyServerConfiguration.class);
         if (null == yamlServerConfig) {
             return;