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 dd0a45d4e00 Rename StatisticsPersistService (#34447)
dd0a45d4e00 is described below
commit dd0a45d4e00b507a4361a4743d449f23d3e597ef
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 23 21:27:08 2025 +0800
Rename StatisticsPersistService (#34447)
---
.../shardingsphere/mode/metadata/MetaDataContextManager.java | 2 +-
.../apache/shardingsphere/mode/metadata/MetaDataContexts.java | 2 +-
.../mode/metadata/factory/MetaDataContextsFactory.java | 4 ++--
.../metadata/factory/init/MetaDataContextsInitFactory.java | 2 +-
.../type/LocalConfigurationMetaDataContextsInitFactory.java | 2 +-
.../mode/metadata/persist/MetaDataPersistService.java | 6 +++---
...isticsPersistService.java => StatisticsPersistService.java} | 6 +++---
.../metadata/refresher/statistics/StatisticsRefreshEngine.java | 4 ++--
...rsistServiceTest.java => StatisticsPersistServiceTest.java} | 10 +++++-----
.../mode/metadata/refresher/StatisticsRefreshEngineTest.java | 2 +-
.../persist/service/ClusterMetaDataManagerPersistService.java | 4 ++--
.../test/it/data/pipeline/core/util/PipelineContextUtils.java | 2 +-
12 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
index 59b0ce4c9b2..77035ac4946 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
@@ -125,7 +125,7 @@ public class MetaDataContextManager {
RuleMetaData changedGlobalMetaData = new
RuleMetaData(GlobalRulesBuilder.buildRules(globalRuleConfigs,
metaDataContexts.getMetaData().getAllDatabases(), props));
ShardingSphereMetaData metaData = new ShardingSphereMetaData(
metaDataContexts.getMetaData().getAllDatabases(),
metaDataContexts.getMetaData().getGlobalResourceMetaData(),
changedGlobalMetaData, props);
- MetaDataContexts result = new MetaDataContexts(metaData,
ShardingSphereStatisticsFactory.create(metaData,
metaDataPersistService.getShardingSphereStatisticsPersistService().load(metaData)));
+ MetaDataContexts result = new MetaDataContexts(metaData,
ShardingSphereStatisticsFactory.create(metaData,
metaDataPersistService.getStatisticsPersistService().load(metaData)));
switchingResource.closeStaleDataSources();
return result;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
index 3ce147b87e5..2b4b1f61be4 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
@@ -76,6 +76,6 @@ public final class MetaDataContexts {
*/
public void update(final ShardingSphereMetaData metaData, final
MetaDataPersistService metaDataPersistService) {
this.metaData.set(metaData);
- this.statistics.set(ShardingSphereStatisticsFactory.create(metaData,
metaDataPersistService.getShardingSphereStatisticsPersistService().load(metaData)));
+ this.statistics.set(ShardingSphereStatisticsFactory.create(metaData,
metaDataPersistService.getStatisticsPersistService().load(metaData)));
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactory.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactory.java
index fd104dc4f25..4247c049f05 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactory.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/MetaDataContextsFactory.java
@@ -98,7 +98,7 @@ public final class MetaDataContextsFactory {
GlobalRulesBuilder.buildRules(originalMetaDataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations(),
clonedMetaData.getAllDatabases(), props));
ShardingSphereMetaData metaData = new ShardingSphereMetaData(
clonedMetaData.getAllDatabases(),
originalMetaDataContexts.getMetaData().getGlobalResourceMetaData(),
changedGlobalMetaData, props);
- return new MetaDataContexts(metaData,
ShardingSphereStatisticsFactory.create(metaData,
persistService.getShardingSphereStatisticsPersistService().load(metaData)));
+ return new MetaDataContexts(metaData,
ShardingSphereStatisticsFactory.create(metaData,
persistService.getStatisticsPersistService().load(metaData)));
}
/**
@@ -120,7 +120,7 @@ public final class MetaDataContextsFactory {
GlobalRulesBuilder.buildRules(originalMetaDataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations(),
clonedMetaData.getAllDatabases(), props));
ShardingSphereMetaData metaData = new ShardingSphereMetaData(
clonedMetaData.getAllDatabases(),
originalMetaDataContexts.getMetaData().getGlobalResourceMetaData(),
changedGlobalMetaData, props);
- return new MetaDataContexts(metaData,
ShardingSphereStatisticsFactory.create(metaData,
persistService.getShardingSphereStatisticsPersistService().load(metaData)));
+ return new MetaDataContexts(metaData,
ShardingSphereStatisticsFactory.create(metaData,
persistService.getStatisticsPersistService().load(metaData)));
}
private ShardingSphereMetaData cloneMetaData(final ShardingSphereMetaData
originalMetaData, final ShardingSphereDatabase changedDatabase) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/MetaDataContextsInitFactory.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/MetaDataContextsInitFactory.java
index 09d0a29f305..47e542459dc 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/MetaDataContextsInitFactory.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/MetaDataContextsInitFactory.java
@@ -54,7 +54,7 @@ public abstract class MetaDataContextsInitFactory {
final
Collection<ShardingSphereDatabase> databases, final ConfigurationProperties
props, final MetaDataPersistService persistService) {
Collection<ShardingSphereRule> globalRules =
GlobalRulesBuilder.buildRules(globalRuleConfigs, databases, props);
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databases, new ResourceMetaData(globalDataSources), new
RuleMetaData(globalRules), props);
- ShardingSphereStatistics statistics =
ShardingSphereStatisticsFactory.create(metaData,
persistService.getShardingSphereStatisticsPersistService().load(metaData));
+ ShardingSphereStatistics statistics =
ShardingSphereStatisticsFactory.create(metaData,
persistService.getStatisticsPersistService().load(metaData));
return new MetaDataContexts(metaData, statistics);
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactory.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactory.java
index ab0148c9fcf..5ba6d020124 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactory.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/factory/init/type/LocalConfigurationMetaDataContextsInitFactory.java
@@ -79,7 +79,7 @@ public final class
LocalConfigurationMetaDataContextsInitFactory extends MetaDat
}));
for (Entry<String, DatabaseStatistics> databaseStatisticsEntry :
metaDataContexts.getStatistics().getDatabaseStatisticsMap().entrySet()) {
for (Entry<String, SchemaStatistics> schemaStatisticsEntry :
databaseStatisticsEntry.getValue().getSchemaStatisticsMap().entrySet()) {
-
persistService.getShardingSphereStatisticsPersistService().persist(
+ persistService.getStatisticsPersistService().persist(
metaDataContexts.getMetaData().getDatabase(databaseStatisticsEntry.getKey()),
schemaStatisticsEntry.getKey(), schemaStatisticsEntry.getValue());
}
}
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 e5c628d5e84..7a17b9e82fe 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,7 +29,7 @@ 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.statistics.ShardingSphereStatisticsPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.statistics.StatisticsPersistService;
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;
@@ -68,7 +68,7 @@ public final class MetaDataPersistService {
private final PropertiesPersistService propsService;
- private final ShardingSphereStatisticsPersistService
shardingSphereStatisticsPersistService;
+ private final StatisticsPersistService statisticsPersistService;
public MetaDataPersistService(final PersistRepository repository) {
this.repository = repository;
@@ -78,7 +78,7 @@ public final class MetaDataPersistService {
databaseRulePersistService = new
DatabaseRulePersistService(repository);
globalRuleService = new GlobalRulePersistService(repository,
metaDataVersionPersistService);
propsService = new PropertiesPersistService(repository,
metaDataVersionPersistService);
- shardingSphereStatisticsPersistService = new
ShardingSphereStatisticsPersistService(repository);
+ statisticsPersistService = new StatisticsPersistService(repository);
}
/**
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/StatisticsPersistService.java
similarity index 97%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/ShardingSphereStatisticsPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
index c50bdfe1b5d..1ce0011ea70 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/StatisticsPersistService.java
@@ -34,15 +34,15 @@ import java.util.Collection;
import java.util.stream.Collectors;
/**
- * ShardingSphere statistics persist service.
+ * Statistics persist service.
*/
-public final class ShardingSphereStatisticsPersistService {
+public final class StatisticsPersistService {
private final PersistRepository repository;
private final TableRowDataPersistService tableRowDataPersistService;
- public ShardingSphereStatisticsPersistService(final PersistRepository
repository) {
+ public StatisticsPersistService(final PersistRepository repository) {
this.repository = repository;
tableRowDataPersistService = new
TableRowDataPersistService(repository);
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/statistics/StatisticsRefreshEngine.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/statistics/StatisticsRefreshEngine.java
index 273f5edd33e..5da38d1d6d3 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/statistics/StatisticsRefreshEngine.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/statistics/StatisticsRefreshEngine.java
@@ -154,7 +154,7 @@ public final class StatisticsRefreshEngine {
for (Entry<String, DatabaseStatistics> entry :
currentStatistics.getDatabaseStatisticsMap().entrySet()) {
if (!changedStatistics.containsDatabaseStatistics(entry.getKey()))
{
currentStatistics.dropDatabaseStatistics(entry.getKey());
-
contextManager.getPersistServiceFacade().getMetaDataPersistService().getShardingSphereStatisticsPersistService().delete(entry.getKey());
+
contextManager.getPersistServiceFacade().getMetaDataPersistService().getStatisticsPersistService().delete(entry.getKey());
}
}
}
@@ -178,7 +178,7 @@ public final class StatisticsRefreshEngine {
if (!currentTableStatistics.equals(changedTableStatistics)) {
currentStatistics.getDatabaseStatistics(databaseName).getSchemaStatistics(schemaName).putTableStatistics(changedTableStatistics.getName(),
changedTableStatistics);
AlteredDatabaseStatistics alteredDatabaseStatistics =
createAlteredDatabaseStatistics(databaseName, schemaName, table,
currentTableStatistics, changedTableStatistics);
-
contextManager.getPersistServiceFacade().getMetaDataPersistService().getShardingSphereStatisticsPersistService().update(alteredDatabaseStatistics);
+
contextManager.getPersistServiceFacade().getMetaDataPersistService().getStatisticsPersistService().update(alteredDatabaseStatistics);
}
}
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/StatisticsPersistServiceTest.java
similarity index 94%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/ShardingSphereStatisticsPersistServiceTest.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/data/StatisticsPersistServiceTest.java
index 3e72800d60b..0c530fa06a8 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/StatisticsPersistServiceTest.java
@@ -25,7 +25,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.AlteredDatabaseStatistics;
-import
org.apache.shardingsphere.mode.metadata.persist.statistics.ShardingSphereStatisticsPersistService;
+import
org.apache.shardingsphere.mode.metadata.persist.statistics.StatisticsPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -46,9 +46,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ShardingSphereStatisticsPersistServiceTest {
+class StatisticsPersistServiceTest {
- private ShardingSphereStatisticsPersistService persistService;
+ private StatisticsPersistService persistService;
@Mock
private PersistRepository repository;
@@ -58,8 +58,8 @@ class ShardingSphereStatisticsPersistServiceTest {
@BeforeEach
void setUp() throws ReflectiveOperationException {
- persistService = new
ShardingSphereStatisticsPersistService(repository);
-
Plugins.getMemberAccessor().set(ShardingSphereStatisticsPersistService.class.getDeclaredField("tableRowDataPersistService"),
persistService, tableRowDataPersistService);
+ persistService = new StatisticsPersistService(repository);
+
Plugins.getMemberAccessor().set(StatisticsPersistService.class.getDeclaredField("tableRowDataPersistService"),
persistService, tableRowDataPersistService);
}
@Test
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/StatisticsRefreshEngineTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/StatisticsRefreshEngineTest.java
index 38d62634ffc..44c2a5395a8 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/StatisticsRefreshEngineTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/StatisticsRefreshEngineTest.java
@@ -61,7 +61,7 @@ class StatisticsRefreshEngineTest {
PropertiesBuilder.build(new
Property(TemporaryConfigurationPropertyKey.PROXY_META_DATA_COLLECTOR_ENABLED.getKey(),
Boolean.TRUE.toString()))));
when(contextManager.getComputeNodeInstanceContext().getLockContext().tryLock(any(),
anyLong())).thenReturn(true);
new StatisticsRefreshEngine(contextManager).refresh();
-
verify(contextManager.getPersistServiceFacade().getMetaDataPersistService().getShardingSphereStatisticsPersistService()).update(any());
+
verify(contextManager.getPersistServiceFacade().getMetaDataPersistService().getStatisticsPersistService()).update(any());
}
private ShardingSphereStatistics mockStatistics() {
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 7924e2a5fa2..a4196b75343 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
@@ -184,7 +184,7 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
private void afterStorageUnitsAltered(final String databaseName, final
MetaDataContexts originalMetaDataContexts, final MetaDataContexts
reloadMetaDataContexts) {
Optional.ofNullable(reloadMetaDataContexts.getStatistics().getDatabaseStatistics(databaseName))
- .ifPresent(optional ->
optional.getSchemaStatisticsMap().forEach((schemaName, schemaStatistics) ->
metaDataPersistService.getShardingSphereStatisticsPersistService()
+ .ifPresent(optional ->
optional.getSchemaStatisticsMap().forEach((schemaName, schemaStatistics) ->
metaDataPersistService.getStatisticsPersistService()
.persist(originalMetaDataContexts.getMetaData().getDatabase(databaseName),
schemaName, schemaStatistics)));
metaDataPersistService.persistReloadDatabaseByAlter(databaseName,
reloadMetaDataContexts.getMetaData().getDatabase(databaseName),
originalMetaDataContexts.getMetaData().getDatabase(databaseName));
@@ -194,7 +194,7 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getAllSchemas().forEach(each
-> metaDataPersistService.getDatabaseMetaDataFacade()
.getSchema().alterByRuleDropped(reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getName(),
each));
Optional.ofNullable(reloadMetaDataContexts.getStatistics().getDatabaseStatistics(databaseName))
- .ifPresent(optional ->
optional.getSchemaStatisticsMap().forEach((schemaName, schemaStatistics) ->
metaDataPersistService.getShardingSphereStatisticsPersistService()
+ .ifPresent(optional ->
optional.getSchemaStatisticsMap().forEach((schemaName, schemaStatistics) ->
metaDataPersistService.getStatisticsPersistService()
.persist(originalMetaDataContexts.getMetaData().getDatabase(databaseName),
schemaName, schemaStatistics)));
metaDataPersistService.persistReloadDatabaseByDrop(databaseName,
reloadMetaDataContexts.getMetaData().getDatabase(databaseName),
originalMetaDataContexts.getMetaData().getDatabase(databaseName));
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
index e3170755ffb..4dd93d28789 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
@@ -145,7 +145,7 @@ public final class PipelineContextUtils {
new ShardingSphereColumn("status", Types.VARCHAR, false,
false, false, true, false, false)),
Collections.emptyList(), Collections.emptyList()));
tables.forEach(each ->
old.getMetaData().getDatabase("logic_db").getSchema("logic_db").putTable(each));
- return new MetaDataContexts(old.getMetaData(),
ShardingSphereStatisticsFactory.create(old.getMetaData(),
persistService.getShardingSphereStatisticsPersistService().load(old.getMetaData())));
+ return new MetaDataContexts(old.getMetaData(),
ShardingSphereStatisticsFactory.create(old.getMetaData(),
persistService.getStatisticsPersistService().load(old.getMetaData())));
}
/**
