From e2ec8dd97a6b7d3c674ebd13cb99dc39f94a6a91 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Thu, 23 Jan 2025 14:27:55 +0800 Subject: [PATCH 1/4] Move package of ShardingSphereStatisticsPersistService --- .../metadata/persist/MetaDataPersistService.java | 14 +++++++------- .../config/RepositoryTuplePersistService.java | 2 +- .../database/DataSourceUnitPersistService.java | 4 ++-- .../database/DatabaseRulePersistService.java | 6 +++--- .../config/global/GlobalRulePersistService.java | 6 +++--- .../config/global/PropertiesPersistService.java | 4 ++-- .../metadata/DatabaseMetaDataPersistFacade.java | 12 ++++++------ .../database/DatabaseMetaDataPersistService.java | 2 +- .../schema/SchemaMetaDataPersistService.java | 8 ++++---- .../table/TableMetaDataPersistService.java | 4 ++-- .../metadata/table/TableRowDataPersistService.java | 2 +- .../metadata/table/ViewMetaDataPersistService.java | 4 ++-- .../AlteredShardingSphereDatabaseData.java | 2 +- .../ShardingSphereStatisticsPersistService.java | 4 ++-- .../version/MetaDataVersionPersistService.java | 2 +- .../ShardingSphereStatisticsRefreshEngine.java | 2 +- .../factory/MetaDataContextsFactoryTest.java | 8 ++++---- .../persist/MetaDataPersistServiceTest.java | 10 +++++----- ...ShardingSphereStatisticsPersistServiceTest.java | 4 +++- .../config/RepositoryTuplePersistServiceTest.java | 1 + .../database/DataSourceUnitPersistServiceTest.java | 1 + .../database/DatabaseRulePersistServiceTest.java | 3 ++- .../global/GlobalRulePersistServiceTest.java | 5 +++-- .../global/PropertiesPersistServiceTest.java | 3 ++- .../DatabaseMetaDataPersistServiceTest.java | 1 + .../schema/SchemaMetaDataPersistServiceTest.java | 7 ++++--- .../table/TableMetaDataPersistServiceTest.java | 3 ++- .../table/TableRowDataPersistServiceTest.java | 1 + .../table/ViewMetaDataPersistServiceTest.java | 3 ++- .../version/MetaDataVersionPersistServiceTest.java | 1 + .../ClusterMetaDataManagerPersistService.java | 4 ++-- .../StandaloneMetaDataManagerPersistService.java | 2 +- ...tandaloneMetaDataManagerPersistServiceTest.java | 2 +- .../ral/updatable/SetDistVariableExecutorTest.java | 2 +- 34 files changed, 76 insertions(+), 63 deletions(-) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/config/RepositoryTuplePersistService.java (97%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/config/database/DataSourceUnitPersistService.java (96%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/config/database/DatabaseRulePersistService.java (96%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/config/global/GlobalRulePersistService.java (94%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/config/global/PropertiesPersistService.java (94%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/metadata/DatabaseMetaDataPersistFacade.java (74%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/metadata/database/DatabaseMetaDataPersistService.java (95%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/metadata/schema/SchemaMetaDataPersistService.java (92%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/metadata/table/TableMetaDataPersistService.java (96%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/metadata/table/TableRowDataPersistService.java (98%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/metadata/table/ViewMetaDataPersistService.java (96%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{data => statistics}/AlteredShardingSphereDatabaseData.java (95%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{data => statistics}/ShardingSphereStatisticsPersistService.java (97%) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/{service => }/version/MetaDataVersionPersistService.java (97%) 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 82951b9fce12b..e5c628d5e8496 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.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 a4c58e91114f6..bdcc3ebec38a2 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 0cbd2dcfc0487..419abc68c88ae 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.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 f936aed683ac6..07a544f60f553 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.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 f03b7ed139045..f8f065e3bef1c 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 df31ebef30e74..b7e9a2959dda2 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 66ee746f8319e..2945d36999f9d 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 91db33831a681..9ed2b08f82749 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 3da1cb1659a19..88a343c42aeec 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 eddb9822276db..e8e8c1d1de348 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.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 b52c2f7d3fac1..8ae3ab65f54df 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 eea4b3d2a8731..25ff9f8714f75 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.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 f5fec23e4e470..1a11b2cc76e98 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 4676bc1b29b88..af32ad4737229 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.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 2f4e6b8441358..72dc591b4817a 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 42dd7c0a7921c..28ecec1e8f3f8 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.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 deca0c65f2811..bcf24e3fab8bb 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.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 9bae9485d22ee..6c19c1c5edfbc 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.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 5b1f6d37bde23..5b11495a631d9 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.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 92b49ce7ac567..1235f4e81b6c9 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 e4af2b7830b57..f1ac09b461d16 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 @@ 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 5b7d9753d463c..ae00d5355a4e8 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 52be39d8b6e01..8e3b570ede5a1 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.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 46623e31e89b8..1af67293302fa 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 3b58e1ac5cc57..fbc1439d9ae4b 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 5c7af4ef6e780..eb7ec9eb00dbf 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 @@ 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 2803a3b9a0096..5e8543f2f2a11 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 6267cbaafef53..9d9d245f27af3 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 @@ 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 0942c5f210f05..22ecafaf6be23 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 41ca79771287c..e61f15b088b4a 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 410437d211d41..7924e2a5fa2f1 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.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 809df92dc4e93..32846374289d7 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.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 ef108ce22a355..c5b9163dea19b 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.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 61196c0b8e709..8bada108d8803 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.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; From 0cbd7f469e510af2900ee92b7e36874b2b1c7a38 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Thu, 23 Jan 2025 14:34:16 +0800 Subject: [PATCH 2/4] Rename AlteredDatabaseStatistics --- ...abaseData.java => AlteredDatabaseStatistics.java} | 4 ++-- .../ShardingSphereStatisticsPersistService.java | 10 +++++----- .../ShardingSphereStatisticsRefreshEngine.java | 12 ++++++------ .../ShardingSphereStatisticsPersistServiceTest.java | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) rename mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/{AlteredShardingSphereDatabaseData.java => AlteredDatabaseStatistics.java} (93%) diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredShardingSphereDatabaseData.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredDatabaseStatistics.java similarity index 93% rename from mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredShardingSphereDatabaseData.java rename to mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredDatabaseStatistics.java index 1a11b2cc76e98..5040b810c29b4 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredShardingSphereDatabaseData.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/AlteredDatabaseStatistics.java @@ -25,11 +25,11 @@ import java.util.LinkedList; /** - * Altered ShardingSphere database data. + * Altered database statistics. */ @RequiredArgsConstructor @Getter -public final class AlteredShardingSphereDatabaseData { +public final class AlteredDatabaseStatistics { private final String databaseName; diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java index af32ad4737229..cb047aa4f9143 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java @@ -116,12 +116,12 @@ private void persistTableData(final String databaseName, final String schemaName /** * Update ShardingSphere database data. * - * @param alteredData altered ShardingSphere database data + * @param alteredDatabaseStatistics altered database statistics */ - public void update(final AlteredShardingSphereDatabaseData alteredData) { - tableRowDataPersistService.persist(alteredData.getDatabaseName(), alteredData.getSchemaName(), alteredData.getTableName(), alteredData.getAddedRows()); - tableRowDataPersistService.persist(alteredData.getDatabaseName(), alteredData.getSchemaName(), alteredData.getTableName(), alteredData.getUpdatedRows()); - tableRowDataPersistService.delete(alteredData.getDatabaseName(), alteredData.getSchemaName(), alteredData.getTableName(), alteredData.getDeletedRows()); + public void update(final AlteredDatabaseStatistics alteredDatabaseStatistics) { + tableRowDataPersistService.persist(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getAddedRows()); + tableRowDataPersistService.persist(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getUpdatedRows()); + tableRowDataPersistService.delete(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getDeletedRows()); } /** 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 28ecec1e8f3f8..704a29852abee 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.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.statistics.AlteredShardingSphereDatabaseData; +import org.apache.shardingsphere.mode.metadata.persist.statistics.AlteredDatabaseStatistics; import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.metadata.refresher.lock.StatisticsLock; @@ -177,14 +177,14 @@ private void compareAndUpdateForTable(final String databaseName, final String sc final TableStatistics changedTableStatistics, final ShardingSphereStatistics statistics, final ShardingSphereTable table) { if (!tableStatistics.equals(changedTableStatistics)) { statistics.getDatabaseStatistics(databaseName).getSchemaStatistics(schemaName).putTableStatistics(changedTableStatistics.getName(), changedTableStatistics); - AlteredShardingSphereDatabaseData alteredShardingSphereDatabaseData = createAlteredShardingSphereDatabaseData(databaseName, schemaName, tableStatistics, changedTableStatistics, table); - contextManager.getPersistServiceFacade().getMetaDataPersistService().getShardingSphereStatisticsPersistService().update(alteredShardingSphereDatabaseData); + AlteredDatabaseStatistics alteredDatabaseStatistics = createAlteredDatabaseStatistics(databaseName, schemaName, tableStatistics, changedTableStatistics, table); + contextManager.getPersistServiceFacade().getMetaDataPersistService().getShardingSphereStatisticsPersistService().update(alteredDatabaseStatistics); } } - private AlteredShardingSphereDatabaseData createAlteredShardingSphereDatabaseData(final String databaseName, final String schemaName, final TableStatistics tableStatistics, - final TableStatistics changedTableStatistics, final ShardingSphereTable table) { - AlteredShardingSphereDatabaseData result = new AlteredShardingSphereDatabaseData(databaseName, schemaName, tableStatistics.getName()); + private AlteredDatabaseStatistics createAlteredDatabaseStatistics(final String databaseName, final String schemaName, final TableStatistics tableStatistics, + final TableStatistics changedTableStatistics, final ShardingSphereTable table) { + AlteredDatabaseStatistics result = new AlteredDatabaseStatistics(databaseName, schemaName, tableStatistics.getName()); Map tableStatisticsMap = tableStatistics.getRows().stream().collect(Collectors.toMap(RowStatistics::getUniqueKey, Function.identity())); Map changedTableStatisticsMap = changedTableStatistics.getRows().stream().collect(Collectors.toMap(RowStatistics::getUniqueKey, Function.identity())); YamlRowStatisticsSwapper swapper = new YamlRowStatisticsSwapper(new ArrayList<>(table.getAllColumns())); 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 5b11495a631d9..3e72800d60b22 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 @@ -24,7 +24,7 @@ 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.statistics.AlteredShardingSphereDatabaseData; +import org.apache.shardingsphere.mode.metadata.persist.statistics.AlteredDatabaseStatistics; import org.apache.shardingsphere.mode.metadata.persist.statistics.ShardingSphereStatisticsPersistService; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; import org.junit.jupiter.api.BeforeEach; @@ -115,11 +115,11 @@ void assertUpdate() { Collection addedRows = Collections.singletonList(mock(YamlRowStatistics.class)); Collection updatedRows = Collections.singletonList(mock(YamlRowStatistics.class)); Collection deletedRows = Collections.singletonList(mock(YamlRowStatistics.class)); - AlteredShardingSphereDatabaseData alteredData = new AlteredShardingSphereDatabaseData("foo_db", "foo_schema", "foo_tbl"); - alteredData.getAddedRows().addAll(addedRows); - alteredData.getUpdatedRows().addAll(updatedRows); - alteredData.getDeletedRows().addAll(deletedRows); - persistService.update(alteredData); + AlteredDatabaseStatistics alteredDatabaseStatistics = new AlteredDatabaseStatistics("foo_db", "foo_schema", "foo_tbl"); + alteredDatabaseStatistics.getAddedRows().addAll(addedRows); + alteredDatabaseStatistics.getUpdatedRows().addAll(updatedRows); + alteredDatabaseStatistics.getDeletedRows().addAll(deletedRows); + persistService.update(alteredDatabaseStatistics); verify(tableRowDataPersistService).persist("foo_db", "foo_schema", "foo_tbl", addedRows); verify(tableRowDataPersistService).persist("foo_db", "foo_schema", "foo_tbl", updatedRows); verify(tableRowDataPersistService).delete("foo_db", "foo_schema", "foo_tbl", deletedRows); From 2f5071f2a97fc1b035ac705f57e72c8766d1edfb Mon Sep 17 00:00:00 2001 From: zhangliang Date: Thu, 23 Jan 2025 14:36:58 +0800 Subject: [PATCH 3/4] Rename AlteredDatabaseStatistics --- .../statistics/ShardingSphereStatisticsPersistService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java index e27f5a76401f7..cb047aa4f9143 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java @@ -123,7 +123,7 @@ public void update(final AlteredDatabaseStatistics alteredDatabaseStatistics) { tableRowDataPersistService.persist(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getUpdatedRows()); tableRowDataPersistService.delete(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getDeletedRows()); } - + /** * Delete sharding sphere database data. * From a6a667f6faf175d8ee79026c13549b566f039ab9 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Thu, 23 Jan 2025 14:39:59 +0800 Subject: [PATCH 4/4] Rename AlteredDatabaseStatistics --- .../ShardingSphereStatisticsPersistService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java index cb047aa4f9143..c50bdfe1b5d00 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java @@ -119,9 +119,12 @@ private void persistTableData(final String databaseName, final String schemaName * @param alteredDatabaseStatistics altered database statistics */ public void update(final AlteredDatabaseStatistics alteredDatabaseStatistics) { - tableRowDataPersistService.persist(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getAddedRows()); - tableRowDataPersistService.persist(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getUpdatedRows()); - tableRowDataPersistService.delete(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), alteredDatabaseStatistics.getDeletedRows()); + tableRowDataPersistService.persist(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), + alteredDatabaseStatistics.getAddedRows()); + tableRowDataPersistService.persist(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), + alteredDatabaseStatistics.getUpdatedRows()); + tableRowDataPersistService.delete(alteredDatabaseStatistics.getDatabaseName(), alteredDatabaseStatistics.getSchemaName(), alteredDatabaseStatistics.getTableName(), + alteredDatabaseStatistics.getDeletedRows()); } /**