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 f3f453cde67 Rename AlteredDatabaseStatistics (#34438)
f3f453cde67 is described below
commit f3f453cde679bf0175ae31581650f44e3182f9c3
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 23 14:47:14 2025 +0800
Rename AlteredDatabaseStatistics (#34438)
* Move package of ShardingSphereStatisticsPersistService
* Rename AlteredDatabaseStatistics
* Rename AlteredDatabaseStatistics
* Rename AlteredDatabaseStatistics
---
...hereDatabaseData.java => AlteredDatabaseStatistics.java} | 4 ++--
.../statistics/ShardingSphereStatisticsPersistService.java | 13 ++++++++-----
.../refresher/ShardingSphereStatisticsRefreshEngine.java | 12 ++++++------
.../data/ShardingSphereStatisticsPersistServiceTest.java | 12 ++++++------
4 files changed, 22 insertions(+), 19 deletions(-)
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 1a11b2cc76e..5040b810c29 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.Collection;
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 af32ad47372..c50bdfe1b5d 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,15 @@ public final class ShardingSphereStatisticsPersistService
{
/**
* 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 28ecec1e8f3..704a29852ab 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.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 @@ public final class ShardingSphereStatisticsRefreshEngine {
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<String, RowStatistics> tableStatisticsMap =
tableStatistics.getRows().stream().collect(Collectors.toMap(RowStatistics::getUniqueKey,
Function.identity()));
Map<String, RowStatistics> 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 5b11495a631..3e72800d60b 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.SchemaStatistics;
import org.apache.shardingsphere.infra.metadata.statistics.TableStatistics;
import org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics;
import
org.apache.shardingsphere.mode.metadata.persist.metadata.table.TableRowDataPersistService;
-import
org.apache.shardingsphere.mode.metadata.persist.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 @@ class ShardingSphereStatisticsPersistServiceTest {
Collection<YamlRowStatistics> addedRows =
Collections.singletonList(mock(YamlRowStatistics.class));
Collection<YamlRowStatistics> updatedRows =
Collections.singletonList(mock(YamlRowStatistics.class));
Collection<YamlRowStatistics> 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);
