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 887909f048f Rename StatisticsManager (#34506)
887909f048f is described below
commit 887909f048fbfe9fccffb9b4c3653b749c809036
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 26 13:39:05 2025 +0800
Rename StatisticsManager (#34506)
---
.../mode/metadata/MetaDataContextManager.java | 6 +++---
.../{DatabaseDataManager.java => StatisticsManager.java} | 14 +++++++-------
.../handler/global/StatisticsChangedHandler.java | 16 ++++++++--------
.../handler/global/StatisticsChangedHandlerTest.java | 6 +++---
4 files changed, 21 insertions(+), 21 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 e4c1e4cd618..234a39edb27 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
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.mode.metadata.manager.GlobalConfigurationManage
import org.apache.shardingsphere.mode.metadata.manager.ResourceSwitchManager;
import org.apache.shardingsphere.mode.metadata.manager.RuleItemManager;
import org.apache.shardingsphere.mode.metadata.manager.SchemaMetaDataManager;
-import org.apache.shardingsphere.mode.metadata.manager.DatabaseDataManager;
+import org.apache.shardingsphere.mode.metadata.manager.StatisticsManager;
import org.apache.shardingsphere.mode.metadata.manager.StorageUnitManager;
import org.apache.shardingsphere.mode.metadata.manager.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
@@ -58,7 +58,7 @@ public class MetaDataContextManager {
private final MetaDataPersistService metaDataPersistService;
- private final DatabaseDataManager databaseManager;
+ private final StatisticsManager databaseManager;
private final SchemaMetaDataManager schemaMetaDataManager;
@@ -77,7 +77,7 @@ public class MetaDataContextManager {
this.computeNodeInstanceContext = computeNodeInstanceContext;
metaDataPersistService = new MetaDataPersistService(repository);
resourceSwitchManager = new ResourceSwitchManager();
- databaseManager = new DatabaseDataManager(metaDataContexts);
+ databaseManager = new StatisticsManager(metaDataContexts);
storageUnitManager = new StorageUnitManager(metaDataContexts,
computeNodeInstanceContext, resourceSwitchManager, metaDataPersistService);
databaseRuleConfigurationManager = new
DatabaseRuleConfigurationManager(metaDataContexts, computeNodeInstanceContext,
metaDataPersistService);
schemaMetaDataManager = new SchemaMetaDataManager(metaDataContexts,
metaDataPersistService);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseDataManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/StatisticsManager.java
similarity index 93%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseDataManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/StatisticsManager.java
index b2ada75ff63..a2d4a38ea99 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseDataManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/StatisticsManager.java
@@ -30,10 +30,10 @@ import java.util.ArrayList;
import java.util.List;
/**
- * Database data manager.
+ * Statistics manager.
*/
@RequiredArgsConstructor
-public final class DatabaseDataManager {
+public final class StatisticsManager {
private final MetaDataContexts metaDataContexts;
@@ -120,14 +120,14 @@ public final class DatabaseDataManager {
}
/**
- * Alter ShardingSphere row data.
+ * Alter row statistics.
*
* @param databaseName database name
* @param schemaName schema name
* @param tableName table name
- * @param yamlRowData yaml row data
+ * @param yamlRowData YAML row data
*/
- public synchronized void alterShardingSphereRowData(final String
databaseName, final String schemaName, final String tableName, final
YamlRowStatistics yamlRowData) {
+ public synchronized void alterRowStatistics(final String databaseName,
final String schemaName, final String tableName, final YamlRowStatistics
yamlRowData) {
if
(!metaDataContexts.getStatistics().containsDatabaseStatistics(databaseName) ||
!metaDataContexts.getStatistics().getDatabaseStatistics(databaseName).containsSchemaStatistics(schemaName)
||
!metaDataContexts.getStatistics().getDatabaseStatistics(databaseName).getSchemaStatistics(schemaName).containsTableStatistics(tableName))
{
return;
@@ -142,14 +142,14 @@ public final class DatabaseDataManager {
}
/**
- * Delete ShardingSphere row data.
+ * Delete row statistics.
*
* @param databaseName database name
* @param schemaName schema name
* @param tableName table name
* @param uniqueKey row uniqueKey
*/
- public synchronized void deleteShardingSphereRowData(final String
databaseName, final String schemaName, final String tableName, final String
uniqueKey) {
+ public synchronized void deleteRowStatistics(final String databaseName,
final String schemaName, final String tableName, final String uniqueKey) {
if
(!metaDataContexts.getStatistics().containsDatabaseStatistics(databaseName) ||
!metaDataContexts.getStatistics().getDatabaseStatistics(databaseName).containsSchemaStatistics(schemaName)
||
!metaDataContexts.getStatistics().getDatabaseStatistics(databaseName).getSchemaStatistics(schemaName).containsTableStatistics(tableName))
{
return;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandler.java
index 197c2a45284..bb3f62c399f 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandler.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler;
-import org.apache.shardingsphere.mode.metadata.manager.DatabaseDataManager;
+import org.apache.shardingsphere.mode.metadata.manager.StatisticsManager;
import java.util.Arrays;
import java.util.Collection;
@@ -48,7 +48,7 @@ public final class StatisticsChangedHandler implements
DataChangedEventHandler {
@Override
public void handle(final ContextManager contextManager, final
DataChangedEvent event) {
- DatabaseDataManager databaseManager =
contextManager.getMetaDataContextManager().getDatabaseManager();
+ StatisticsManager databaseManager =
contextManager.getMetaDataContextManager().getDatabaseManager();
Optional<String> databaseName =
ShardingSphereStatisticsNodePath.findDatabaseName(event.getKey(), false);
if (databaseName.isPresent()) {
handleDatabaseChanged(databaseManager, event.getType(),
databaseName.get());
@@ -82,7 +82,7 @@ public final class StatisticsChangedHandler implements
DataChangedEventHandler {
}
}
- private void handleDatabaseChanged(final DatabaseDataManager
databaseManager, final Type type, final String databaseName) {
+ private void handleDatabaseChanged(final StatisticsManager
databaseManager, final Type type, final String databaseName) {
switch (type) {
case ADDED:
case UPDATED:
@@ -95,7 +95,7 @@ public final class StatisticsChangedHandler implements
DataChangedEventHandler {
}
}
- private void handleSchemaChanged(final DatabaseDataManager
databaseManager, final Type type, final String databaseName, final String
schemaName) {
+ private void handleSchemaChanged(final StatisticsManager databaseManager,
final Type type, final String databaseName, final String schemaName) {
switch (type) {
case ADDED:
case UPDATED:
@@ -108,7 +108,7 @@ public final class StatisticsChangedHandler implements
DataChangedEventHandler {
}
}
- private void handleTableChanged(final DatabaseDataManager databaseManager,
final Type type, final String databaseName, final String schemaName, final
String tableName) {
+ private void handleTableChanged(final StatisticsManager databaseManager,
final Type type, final String databaseName, final String schemaName, final
String tableName) {
switch (type) {
case ADDED:
case UPDATED:
@@ -121,12 +121,12 @@ public final class StatisticsChangedHandler implements
DataChangedEventHandler {
}
}
- private void handleRowDataChanged(final DatabaseDataManager
databaseManager, final Type type, final String eventValue,
+ private void handleRowDataChanged(final StatisticsManager databaseManager,
final Type type, final String eventValue,
final String databaseName, final String
schemaName, final String tableName, final String uniqueKey) {
if ((Type.ADDED == type || Type.UPDATED == type) &&
!Strings.isNullOrEmpty(eventValue)) {
- databaseManager.alterShardingSphereRowData(databaseName,
schemaName, tableName, YamlEngine.unmarshal(eventValue,
YamlRowStatistics.class));
+ databaseManager.alterRowStatistics(databaseName, schemaName,
tableName, YamlEngine.unmarshal(eventValue, YamlRowStatistics.class));
} else if (Type.DELETED == type) {
- databaseManager.deleteShardingSphereRowData(databaseName,
schemaName, tableName, uniqueKey);
+ databaseManager.deleteRowStatistics(databaseName, schemaName,
tableName, uniqueKey);
}
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandlerTest.java
index ea0c54d094a..1daf75ffea5 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandlerTest.java
@@ -91,13 +91,13 @@ class StatisticsChangedHandlerTest {
YamlRowStatistics rowData = new YamlRowStatistics();
rowData.setUniqueKey("1");
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema/tables/foo_tbl/1",
"{uniqueKey: 1}", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).alterShardingSphereRowData(eq("foo_db"),
eq("foo_schema"), eq("foo_tbl"), refEq(rowData));
+
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).alterRowStatistics(eq("foo_db"),
eq("foo_schema"), eq("foo_tbl"), refEq(rowData));
}
@Test
void assertHandleWithShardingSphereRowDeleted() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema/tables/foo_tbl/1",
"{uniqueKey: 1}", Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).deleteShardingSphereRowData("foo_db",
"foo_schema", "foo_tbl", "1");
+
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).deleteRowStatistics("foo_db",
"foo_schema", "foo_tbl", "1");
}
@Test
@@ -121,6 +121,6 @@ class StatisticsChangedHandlerTest {
@Test
void assertHandleWithMissedRowEventKey() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema/tables/foo_tbl/",
"", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager(),
times(0)).alterShardingSphereRowData(any(), any(), any(), any());
+
verify(contextManager.getMetaDataContextManager().getDatabaseManager(),
times(0)).alterRowStatistics(any(), any(), any(), any());
}
}
