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 25fcd6f6d1c Move package of ShardingSphereStatisticsPersistService
(#34437)
25fcd6f6d1c is described below
commit 25fcd6f6d1c88aeae464aae9ef07de6bdee4321a
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 23 14:32:10 2025 +0800
Move package of ShardingSphereStatisticsPersistService (#34437)
---
.../mode/metadata/persist/MetaDataPersistService.java | 14 +++++++-------
.../config/RepositoryTuplePersistService.java | 2 +-
.../config/database/DataSourceUnitPersistService.java | 4 ++--
.../config/database/DatabaseRulePersistService.java | 6 +++---
.../config/global/GlobalRulePersistService.java | 6 +++---
.../config/global/PropertiesPersistService.java | 4 ++--
.../metadata/DatabaseMetaDataPersistFacade.java | 12 ++++++------
.../metadata/database/DatabaseMetaDataPersistService.java | 2 +-
.../metadata/schema/SchemaMetaDataPersistService.java | 8 ++++----
.../metadata/table/TableMetaDataPersistService.java | 4 ++--
.../metadata/table/TableRowDataPersistService.java | 2 +-
.../metadata/table/ViewMetaDataPersistService.java | 4 ++--
.../AlteredShardingSphereDatabaseData.java | 2 +-
.../ShardingSphereStatisticsPersistService.java | 4 ++--
.../version/MetaDataVersionPersistService.java | 2 +-
.../refresher/ShardingSphereStatisticsRefreshEngine.java | 2 +-
.../mode/metadata/factory/MetaDataContextsFactoryTest.java | 8 ++++----
.../mode/metadata/persist/MetaDataPersistServiceTest.java | 10 +++++-----
.../data/ShardingSphereStatisticsPersistServiceTest.java | 4 +++-
.../service/config/RepositoryTuplePersistServiceTest.java | 1 +
.../config/database/DataSourceUnitPersistServiceTest.java | 1 +
.../config/database/DatabaseRulePersistServiceTest.java | 3 ++-
.../config/global/GlobalRulePersistServiceTest.java | 5 +++--
.../config/global/PropertiesPersistServiceTest.java | 3 ++-
.../database/DatabaseMetaDataPersistServiceTest.java | 1 +
.../metadata/schema/SchemaMetaDataPersistServiceTest.java | 7 ++++---
.../metadata/table/TableMetaDataPersistServiceTest.java | 3 ++-
.../metadata/table/TableRowDataPersistServiceTest.java | 1 +
.../metadata/table/ViewMetaDataPersistServiceTest.java | 3 ++-
.../service/version/MetaDataVersionPersistServiceTest.java | 1 +
.../service/ClusterMetaDataManagerPersistService.java | 4 ++--
.../service/StandaloneMetaDataManagerPersistService.java | 2 +-
.../StandaloneMetaDataManagerPersistServiceTest.java | 2 +-
.../distsql/ral/updatable/SetDistVariableExecutorTest.java | 2 +-
34 files changed, 76 insertions(+), 63 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 82951b9fce1..e5c628d5e84 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
@@ -29,13 +29,13 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericS
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.mode.metadata.persist.data.ShardingSphereStatisticsPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DataSourceUnitPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DatabaseRulePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.PropertiesPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.DatabaseMetaDataPersistFacade;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.statistics.ShardingSphereStatisticsPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourceUnitPersistService;
+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.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import javax.sql.DataSource;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/RepositoryTuplePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/RepositoryTuplePersistService.java
similarity index 97%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/RepositoryTuplePersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/RepositoryTuplePersistService.java
index a4c58e91114..bdcc3ebec38 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/RepositoryTuplePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/RepositoryTuplePersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.config;
+package org.apache.shardingsphere.mode.metadata.persist.config;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourceUnitPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
similarity index 96%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourceUnitPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
index 0cbd2dcfc04..419abc68c88 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourceUnitPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.metadata.persist.service.config.database;
+package org.apache.shardingsphere.mode.metadata.persist.config.database;
import com.google.common.base.Strings;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.mode.node.path.metadata.DataSourceMetaDataNodePath;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
similarity index 96%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index f936aed683a..07a544f60f5 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.metadata.persist.service.config.database;
+package org.apache.shardingsphere.mode.metadata.persist.config.database;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseRuleMetaDataNodePath;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.RepositoryTuplePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTupleSwapperEngine;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
similarity index 94%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
index f03b7ed1390..f8f065e3bef 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.config.global;
+package org.apache.shardingsphere.mode.metadata.persist.config.global;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.RepositoryTuplePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.GlobalRuleNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
similarity index 94%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
index df31ebef30e..b7e9a2959dd 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.config.global;
+package org.apache.shardingsphere.mode.metadata.persist.config.global;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.node.path.GlobalPropertiesNodePath;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collections;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/DatabaseMetaDataPersistFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
similarity index 74%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/DatabaseMetaDataPersistFacade.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
index 66ee746f831..2945d36999f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/DatabaseMetaDataPersistFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/DatabaseMetaDataPersistFacade.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.metadata;
+package org.apache.shardingsphere.mode.metadata.persist.metadata;
import lombok.Getter;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.database.DatabaseMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.schema.SchemaMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.table.TableMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.table.ViewMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+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.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/database/DatabaseMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/database/DatabaseMetaDataPersistService.java
similarity index 95%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/database/DatabaseMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/database/DatabaseMetaDataPersistService.java
index 91db33831a6..9ed2b08f827 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/database/DatabaseMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/database/DatabaseMetaDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.metadata.persist.service.metadata.database;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.database;
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/service/metadata/schema/SchemaMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/schema/SchemaMetaDataPersistService.java
similarity index 92%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/schema/SchemaMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/schema/SchemaMetaDataPersistService.java
index 3da1cb1659a..88a343c42ae 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/schema/SchemaMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/schema/SchemaMetaDataPersistService.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.metadata.persist.service.metadata.schema;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.schema;
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.service.metadata.table.TableMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.table.ViewMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+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;
import java.util.Collection;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
similarity index 96%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
index eddb9822276..e8e8c1d1de3 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.metadata.table;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.table;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlTableSwapper;
import org.apache.shardingsphere.mode.node.path.metadata.TableMetaDataNodePath;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableRowDataPersistService.java
similarity index 98%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableRowDataPersistService.java
index b52c2f7d3fa..8ae3ab65f54 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableRowDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.metadata.table;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.table;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
similarity index 96%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
index eea4b3d2a87..25ff9f8714f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.metadata.table;
+package org.apache.shardingsphere.mode.metadata.persist.metadata.table;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereView;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
import org.apache.shardingsphere.mode.node.path.metadata.ViewMetaDataNodePath;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/AlteredShardingSphereDatabaseData.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredShardingSphereDatabaseData.java
similarity index 95%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/AlteredShardingSphereDatabaseData.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredShardingSphereDatabaseData.java
index f5fec23e4e4..1a11b2cc76e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/AlteredShardingSphereDatabaseData.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredShardingSphereDatabaseData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.data;
+package org.apache.shardingsphere.mode.metadata.persist.statistics;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java
similarity index 97%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java
index 4676bc1b29b..af32ad47372 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.data;
+package org.apache.shardingsphere.mode.metadata.persist.statistics;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -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.service.metadata.table.TableRowDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableRowDataPersistService;
import
org.apache.shardingsphere.mode.node.path.metadata.ShardingSphereStatisticsNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/version/MetaDataVersionPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
similarity index 97%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/version/MetaDataVersionPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
index 2f4e6b84413..72dc591b481 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/version/MetaDataVersionPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.metadata.persist.service.version;
+package org.apache.shardingsphere.mode.metadata.persist.version;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
index 42dd7c0a792..28ecec1e8f3 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.infra.metadata.statistics.TableStatistics;
import
org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.infra.yaml.data.swapper.YamlRowStatisticsSwapper;
-import
org.apache.shardingsphere.mode.metadata.persist.data.AlteredShardingSphereDatabaseData;
+import
org.apache.shardingsphere.mode.metadata.persist.statistics.AlteredShardingSphereDatabaseData;
import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.refresher.lock.StatisticsLock;
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 deca0c65f28..bcf24e3fab8 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
@@ -30,10 +30,10 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DatabaseRulePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.PropertiesPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.DatabaseMetaDataPersistFacade;
+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.test.fixture.infra.rule.MockedRule;
import
org.apache.shardingsphere.test.fixture.infra.rule.MockedRuleConfiguration;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
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 9bae9485d22..6c19c1c5edf 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
@@ -29,11 +29,11 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericS
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DataSourceUnitPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DatabaseRulePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.PropertiesPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourceUnitPersistService;
+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.spi.repository.PersistRepository;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistServiceTest.java
index 5b1f6d37bde..5b11495a631 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistServiceTest.java
@@ -23,7 +23,9 @@ 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.service.metadata.table.TableRowDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableRowDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.statistics.AlteredShardingSphereDatabaseData;
+import
org.apache.shardingsphere.mode.metadata.persist.statistics.ShardingSphereStatisticsPersistService;
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/config/RepositoryTuplePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/RepositoryTuplePersistServiceTest.java
index 92b49ce7ac5..1235f4e81b6 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/RepositoryTuplePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/RepositoryTuplePersistServiceTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.mode.metadata.persist.service.config;
+import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourceUnitPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourceUnitPersistServiceTest.java
index e4af2b7830b..f1ac09b461d 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourceUnitPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourceUnitPersistServiceTest.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.mode.metadata.persist.service.config.database;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
+import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourceUnitPersistService;
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/config/database/DatabaseRulePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistServiceTest.java
index 5b7d9753d46..ae00d5355a4 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistServiceTest.java
@@ -18,9 +18,10 @@
package
org.apache.shardingsphere.mode.metadata.persist.service.config.database;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
+import
org.apache.shardingsphere.mode.metadata.persist.config.database.DatabaseRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.fixture.NoTupleRuleConfigurationFixture;
import
org.apache.shardingsphere.mode.metadata.persist.fixture.MetaDataRuleConfigurationFixture;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.RepositoryTuplePersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
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/config/global/GlobalRulePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistServiceTest.java
index 52be39d8b6e..8e3b570ede5 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistServiceTest.java
@@ -21,9 +21,10 @@ import
org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
+import
org.apache.shardingsphere.mode.metadata.persist.config.global.GlobalRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.fixture.MetaDataYamlRuleConfigurationFixture;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.RepositoryTuplePersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistServiceTest.java
index 46623e31e89..1af67293302 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistServiceTest.java
@@ -17,7 +17,8 @@
package org.apache.shardingsphere.mode.metadata.persist.service.config.global;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.global.PropertiesPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
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 3b58e1ac5cc..fbc1439d9ae 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,6 +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.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 5c7af4ef6e7..eb7ec9eb00d 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,10 @@ 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.service.metadata.table.TableMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.table.ViewMetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.version.MetaDataVersionPersistService;
+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.version.MetaDataVersionPersistService;
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/TableMetaDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
index 2803a3b9a00..5e8543f2f2a 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,8 @@
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.service.version.MetaDataVersionPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableMetaDataPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
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/TableRowDataPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/TableRowDataPersistServiceTest.java
index 6267cbaafef..9d9d245f27a 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,6 +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.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 0942c5f210f..22ecafaf6be 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,8 @@
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.service.version.MetaDataVersionPersistService;
+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;
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/version/MetaDataVersionPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/version/MetaDataVersionPersistServiceTest.java
index 41ca7977128..e61f15b088b 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/version/MetaDataVersionPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/version/MetaDataVersionPersistServiceTest.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.mode.metadata.persist.service.version;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
+import
org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
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 410437d211d..7924e2a5fa2 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
@@ -30,8 +30,8 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchema
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DataSourceUnitPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.DatabaseMetaDataPersistFacade;
+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.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
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 809df92dc4e..32846374289 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
@@ -39,7 +39,7 @@ import
org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
import org.apache.shardingsphere.mode.metadata.manager.RuleItemChangedBuilder;
import org.apache.shardingsphere.mode.metadata.manager.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DataSourceUnitPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourceUnitPersistService;
import
org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.spi.rule.item.RuleChangedItem;
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 ef108ce22a3..c5b9163dea1 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
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.manager.RuleItemChangedBuilder;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.metadata.DatabaseMetaDataPersistFacade;
+import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
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;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
index 61196c0b8e7..8bada108d88 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.PropertiesPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.config.global.PropertiesPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
