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 bd910599661 Rename MetaDataPersistFacade (#34534)
bd910599661 is described below
commit bd9105996613da01fb3c2055019eb66129af2060
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Jan 30 19:30:28 2025 +0800
Rename MetaDataPersistFacade (#34534)
---
.../mode/metadata/persist/MetaDataPersistService.java | 6 +++---
...taDataPersistFacade.java => MetaDataPersistFacade.java} | 14 +++++++-------
.../DatabaseMetaDataPersistService.java | 2 +-
.../{schema => service}/SchemaMetaDataPersistService.java | 4 +---
.../{table => service}/TableMetaDataPersistService.java | 2 +-
.../{table => service}/TableRowDataPersistService.java | 2 +-
.../{table => service}/ViewMetaDataPersistService.java | 2 +-
.../persist/statistics/StatisticsPersistService.java | 2 +-
.../mode/metadata/factory/MetaDataContextsFactoryTest.java | 10 +++++-----
.../mode/metadata/persist/MetaDataPersistServiceTest.java | 4 ++--
.../persist/data/StatisticsPersistServiceTest.java | 2 +-
.../database/DatabaseMetaDataPersistServiceTest.java | 2 +-
.../metadata/schema/SchemaMetaDataPersistServiceTest.java | 6 +++---
.../metadata/table/TableMetaDataPersistServiceTest.java | 2 +-
.../metadata/table/TableRowDataPersistServiceTest.java | 2 +-
.../metadata/table/ViewMetaDataPersistServiceTest.java | 2 +-
.../service/ClusterMetaDataManagerPersistService.java | 4 ++--
.../service/StandaloneMetaDataManagerPersistService.java | 4 ++--
.../StandaloneMetaDataManagerPersistServiceTest.java | 8 ++++----
19 files changed, 39 insertions(+), 41 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
index 7a17b9e82fe..d7c2c521854 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourc
import
org.apache.shardingsphere.mode.metadata.persist.config.database.DatabaseRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.global.GlobalRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.global.PropertiesPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.MetaDataPersistFacade;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -60,7 +60,7 @@ public final class MetaDataPersistService {
private final DataSourceUnitPersistService dataSourceUnitService;
- private final DatabaseMetaDataPersistFacade databaseMetaDataFacade;
+ private final MetaDataPersistFacade databaseMetaDataFacade;
private final DatabaseRulePersistService databaseRulePersistService;
@@ -74,7 +74,7 @@ public final class MetaDataPersistService {
this.repository = repository;
metaDataVersionPersistService = new
MetaDataVersionPersistService(repository);
dataSourceUnitService = new DataSourceUnitPersistService(repository);
- databaseMetaDataFacade = new DatabaseMetaDataPersistFacade(repository,
metaDataVersionPersistService);
+ databaseMetaDataFacade = new MetaDataPersistFacade(repository,
metaDataVersionPersistService);
databaseRulePersistService = new
DatabaseRulePersistService(repository);
globalRuleService = new GlobalRulePersistService(repository,
metaDataVersionPersistService);
propsService = new PropertiesPersistService(repository,
metaDataVersionPersistService);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/MetaDataPersistFacade.java
similarity index 83%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/MetaDataPersistFacade.java
index 2945d36999f..fa038d93b86 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/MetaDataPersistFacade.java
@@ -18,18 +18,18 @@
package org.apache.shardingsphere.mode.metadata.persist.metadata;
import lombok.Getter;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.database.DatabaseMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.schema.SchemaMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.ViewMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.DatabaseMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.SchemaMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.TableMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.ViewMetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
- * Database meta data persist facade.
+ * Meta data persist facade.
*/
@Getter
-public final class DatabaseMetaDataPersistFacade {
+public final class MetaDataPersistFacade {
private final DatabaseMetaDataPersistService database;
@@ -39,7 +39,7 @@ public final class DatabaseMetaDataPersistFacade {
private final ViewMetaDataPersistService view;
- public DatabaseMetaDataPersistFacade(final PersistRepository repository,
final MetaDataVersionPersistService metaDataVersionPersistService) {
+ public MetaDataPersistFacade(final PersistRepository repository, final
MetaDataVersionPersistService metaDataVersionPersistService) {
database = new DatabaseMetaDataPersistService(repository);
schema = new SchemaMetaDataPersistService(repository,
metaDataVersionPersistService);
table = new TableMetaDataPersistService(repository,
metaDataVersionPersistService);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/database/DatabaseMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/database/DatabaseMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
index 9ed2b08f827..11c5b97dec1 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/database/DatabaseMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.metadata.database;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/schema/SchemaMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
similarity index 96%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/schema/SchemaMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
index 88a343c42ae..b5c3a28aa0e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/schema/SchemaMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.metadata.schema;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.ViewMetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
index 4a16c108663..4dfc9fe9d35 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.metadata.table;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableRowDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableRowDataPersistService.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableRowDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableRowDataPersistService.java
index 8ae3ab65f54..75e832c6ca1 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableRowDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableRowDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.metadata.table;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
index 3ebb0ba7fdb..650b3760fd3 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.metadata.table;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
index 1ce0011ea70..156aa4d381f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.metadata.statistics.SchemaStatistics;
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics;
import
org.apache.shardingsphere.infra.yaml.data.swapper.YamlRowStatisticsSwapper;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableRowDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.TableRowDataPersistService;
import
org.apache.shardingsphere.mode.node.path.metadata.ShardingSphereStatisticsNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java
index 99d2e28b7f1..d237bd93423 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactoryTest.java
@@ -33,7 +33,7 @@ import
org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.database.DatabaseRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.global.GlobalRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.global.PropertiesPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.MetaDataPersistFacade;
import org.apache.shardingsphere.test.fixture.infra.rule.MockedRule;
import
org.apache.shardingsphere.test.fixture.infra.rule.MockedRuleConfiguration;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
@@ -73,7 +73,7 @@ class MetaDataContextsFactoryTest {
private MetaDataPersistService metaDataPersistService;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private DatabaseMetaDataPersistFacade databaseMetaDataPersistFacade;
+ private MetaDataPersistFacade metaDataPersistFacade;
@BeforeEach
void setUp() {
@@ -85,7 +85,7 @@ class MetaDataContextsFactoryTest {
PropertiesPersistService propertiesPersistService =
mock(PropertiesPersistService.class);
when(propertiesPersistService.load()).thenReturn(new Properties());
when(metaDataPersistService.getPropsService()).thenReturn(propertiesPersistService);
-
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataPersistFacade);
+
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(metaDataPersistFacade);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
when(database.getProtocolType()).thenReturn(databaseType);
@@ -119,8 +119,8 @@ class MetaDataContextsFactoryTest {
@Test
void assertCreateWithProxyInstanceMetaData() throws SQLException {
-
when(databaseMetaDataPersistFacade.getDatabase().loadAllDatabaseNames()).thenReturn(Collections.singletonList("foo_db"));
-
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataPersistFacade);
+
when(metaDataPersistFacade.getDatabase().loadAllDatabaseNames()).thenReturn(Collections.singletonList("foo_db"));
+
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(metaDataPersistFacade);
MetaDataContexts actual = new
MetaDataContextsFactory(metaDataPersistService,
mock(ComputeNodeInstanceContext.class,
RETURNS_DEEP_STUBS)).create(createContextManagerBuilderParameter());
assertThat(actual.getMetaData().getGlobalRuleMetaData().getRules().size(),
is(1));
assertThat(actual.getMetaData().getGlobalRuleMetaData().getRules().iterator().next(),
instanceOf(MockedRule.class));
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index 6c19c1c5edf..0ec2c1381a8 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -33,7 +33,7 @@ import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourc
import
org.apache.shardingsphere.mode.metadata.persist.config.database.DatabaseRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.global.GlobalRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.global.PropertiesPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.MetaDataPersistFacade;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
@@ -68,7 +68,7 @@ class MetaDataPersistServiceTest {
private DataSourceUnitPersistService dataSourceUnitService;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private DatabaseMetaDataPersistFacade databaseMetaDataFacade;
+ private MetaDataPersistFacade databaseMetaDataFacade;
@Mock
private DatabaseRulePersistService databaseRulePersistService;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/StatisticsPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/StatisticsPersistServiceTest.java
index 0c530fa06a8..28b4fcbf414 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/StatisticsPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/StatisticsPersistServiceTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import org.apache.shardingsphere.infra.metadata.statistics.SchemaStatistics;
import org.apache.shardingsphere.infra.metadata.statistics.TableStatistics;
import org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableRowDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.TableRowDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.statistics.AlteredDatabaseStatistics;
import
org.apache.shardingsphere.mode.metadata.persist.statistics.StatisticsPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/database/DatabaseMetaDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/database/DatabaseMetaDataPersistServiceTest.java
index fbc1439d9ae..cc8744a512d 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/database/DatabaseMetaDataPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/database/DatabaseMetaDataPersistServiceTest.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.mode.metadata.persist.service.metadata.database;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.database.DatabaseMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/schema/SchemaMetaDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/schema/SchemaMetaDataPersistServiceTest.java
index eb7ec9eb00d..acece422a59 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/schema/SchemaMetaDataPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/schema/SchemaMetaDataPersistServiceTest.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.mode.metadata.persist.service.metadata.schema;
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.metadata.persist.metadata.schema.SchemaMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.ViewMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.SchemaMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.TableMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.ViewMetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
index 5e8543f2f2a..d640ad3466c 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.metadata.persist.service.metadata.table;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.TableMetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistServiceTest.java
index 9d9d245f27a..678a21d82d1 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistServiceTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.metadata.persist.service.metadata.table;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.statistics.TableStatistics;
import org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableRowDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.TableRowDataPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
index dd1d0c3926d..f9e83b62d0a 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.metadata.persist.service.metadata.table;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.ViewMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.ViewMetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
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 94dbbec95b2..9cf8a05c667 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
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
import org.apache.shardingsphere.mode.metadata.manager.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourceUnitPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.MetaDataPersistFacade;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
@@ -89,7 +89,7 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
public void alterSchema(final String databaseName, final String schemaName,
final Collection<ShardingSphereTable>
alteredTables, final Collection<ShardingSphereView> alteredViews,
final Collection<String> droppedTables, final
Collection<String> droppedViews) {
- DatabaseMetaDataPersistFacade databaseMetaDataFacade =
metaDataPersistService.getDatabaseMetaDataFacade();
+ MetaDataPersistFacade databaseMetaDataFacade =
metaDataPersistService.getDatabaseMetaDataFacade();
databaseMetaDataFacade.getTable().persist(databaseName, schemaName,
alteredTables);
databaseMetaDataFacade.getView().persist(databaseName, schemaName,
alteredViews);
droppedTables.forEach(each ->
databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 4967f6036fe..9b8433d9ba9 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -37,7 +37,7 @@ import
org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
import org.apache.shardingsphere.mode.metadata.manager.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourceUnitPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.MetaDataPersistFacade;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.spi.rule.item.RuleChangedItem;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterRuleItem;
@@ -93,7 +93,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
public void alterSchema(final String databaseName, final String schemaName,
final Collection<ShardingSphereTable>
alteredTables, final Collection<ShardingSphereView> alteredViews,
final Collection<String> droppedTables, final
Collection<String> droppedViews) {
- DatabaseMetaDataPersistFacade databaseMetaDataFacade =
metaDataPersistService.getDatabaseMetaDataFacade();
+ MetaDataPersistFacade databaseMetaDataFacade =
metaDataPersistService.getDatabaseMetaDataFacade();
databaseMetaDataFacade.getTable().persist(databaseName, schemaName,
alteredTables);
databaseMetaDataFacade.getView().persist(databaseName, schemaName,
alteredViews);
droppedTables.forEach(each ->
databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index e296bdf9235..a9ca8a243fa 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import
org.apache.shardingsphere.mode.manager.standalone.changed.RuleItemChangedBuilder;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.MetaDataPersistFacade;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropRuleItem;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
@@ -99,7 +99,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
@Test
void assertAlterSchema() {
- DatabaseMetaDataPersistFacade databaseMetaDataFacade =
mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
+ MetaDataPersistFacade databaseMetaDataFacade =
mock(MetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
metaDataManagerPersistService.alterSchema("foo_db", "foo_schema",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
Collections.emptyList());
verify(databaseMetaDataFacade.getTable()).persist("foo_db",
"foo_schema", new LinkedList<>());
@@ -111,7 +111,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
when(database.getName()).thenReturn("foo_db");
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new
ConfigurationProperties(new Properties()));
when(metaDataContextManager.getMetaDataContexts().getMetaData()).thenReturn(metaData);
- DatabaseMetaDataPersistFacade databaseMetaDataFacade =
mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
+ MetaDataPersistFacade databaseMetaDataFacade =
mock(MetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
metaDataManagerPersistService.renameSchema("foo_db", "foo_schema",
"bar_schema");
verify(databaseMetaDataFacade.getSchema(), times(0)).add("foo_db",
"bar_schema");
@@ -128,7 +128,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
when(database.getSchema("bar_schema")).thenReturn(new
ShardingSphereSchema("bar_schema"));
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new
ConfigurationProperties(new Properties()));
when(metaDataContextManager.getMetaDataContexts().getMetaData()).thenReturn(metaData);
- DatabaseMetaDataPersistFacade databaseMetaDataFacade =
mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
+ MetaDataPersistFacade databaseMetaDataFacade =
mock(MetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
metaDataManagerPersistService.renameSchema("foo_db", "foo_schema",
"bar_schema");
verify(databaseMetaDataFacade.getSchema()).add("foo_db", "bar_schema");
