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 d9f25acd644 Refactor MetaDataContextManager (#34539)
d9f25acd644 is described below
commit d9f25acd64449b5f606ec1d92fc32fd69d52a9b7
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Jan 31 01:47:54 2025 +0800
Refactor MetaDataContextManager (#34539)
---
.../mode/metadata/MetaDataContextManager.java | 4 ++--
.../global/type/StatisticsChangedHandler.java | 2 +-
.../global/type/StatisticsChangedHandlerTest.java | 24 +++++++++++-----------
3 files changed, 15 insertions(+), 15 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 f1e16d64461..6692435b724 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
@@ -58,7 +58,7 @@ public class MetaDataContextManager {
private final MetaDataPersistFacade metaDataPersistFacade;
- private final StatisticsManager databaseManager;
+ private final StatisticsManager statisticsManager;
private final DatabaseMetaDataManager databaseMetaDataManager;
@@ -77,7 +77,7 @@ public class MetaDataContextManager {
this.computeNodeInstanceContext = computeNodeInstanceContext;
metaDataPersistFacade = new MetaDataPersistFacade(repository);
resourceSwitchManager = new ResourceSwitchManager();
- databaseManager = new StatisticsManager(metaDataContexts);
+ statisticsManager = new StatisticsManager(metaDataContexts);
storageUnitManager = new StorageUnitManager(metaDataContexts,
computeNodeInstanceContext, resourceSwitchManager, metaDataPersistFacade);
databaseRuleConfigurationManager = new
DatabaseRuleConfigurationManager(metaDataContexts, computeNodeInstanceContext,
metaDataPersistFacade);
databaseMetaDataManager = new
DatabaseMetaDataManager(metaDataContexts, metaDataPersistFacade);
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
index 48678e09163..49ad37ec3c7 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
@@ -48,7 +48,7 @@ public final class StatisticsChangedHandler implements
GlobalDataChangedEventHan
@Override
public void handle(final ContextManager contextManager, final
DataChangedEvent event) {
- StatisticsManager databaseManager =
contextManager.getMetaDataContextManager().getDatabaseManager();
+ StatisticsManager databaseManager =
contextManager.getMetaDataContextManager().getStatisticsManager();
Optional<String> databaseName =
ShardingSphereStatisticsNodePath.findDatabaseName(event.getKey(), false);
if (databaseName.isPresent()) {
handleDatabaseChanged(databaseManager, event.getType(),
databaseName.get());
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java
index 95f142dc1f8..55432be9b49 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java
@@ -53,37 +53,37 @@ class StatisticsChangedHandlerTest {
@Test
void assertHandleWithDatabaseAdded() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db", "", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).addDatabaseStatistics("foo_db");
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).addDatabaseStatistics("foo_db");
}
@Test
void assertHandleWithDatabaseDeleted() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db", "", Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).dropDatabaseStatistics("foo_db");
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).dropDatabaseStatistics("foo_db");
}
@Test
void assertHandleWithSchemaAdded() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema", "",
Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).addSchemaStatistics("foo_db",
"foo_schema");
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).addSchemaStatistics("foo_db",
"foo_schema");
}
@Test
void assertHandleWithSchemaDeleted() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema", "",
Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).dropSchemaStatistics("foo_db",
"foo_schema");
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).dropSchemaStatistics("foo_db",
"foo_schema");
}
@Test
void assertHandleWithTableAdded() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema/tables/foo_tbl",
"", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).addTableStatistics("foo_db",
"foo_schema", "foo_tbl");
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).addTableStatistics("foo_db",
"foo_schema", "foo_tbl");
}
@Test
void assertHandleWithTableDeleted() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema/tables/foo_tbl",
"", Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager()).dropTableStatistics("foo_db",
"foo_schema", "foo_tbl");
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).dropTableStatistics("foo_db",
"foo_schema", "foo_tbl");
}
@Test
@@ -91,36 +91,36 @@ 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()).alterRowStatistics(eq("foo_db"),
eq("foo_schema"), eq("foo_tbl"), refEq(rowData));
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).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()).deleteRowStatistics("foo_db",
"foo_schema", "foo_tbl", "1");
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager()).deleteRowStatistics("foo_db",
"foo_schema", "foo_tbl", "1");
}
@Test
void assertHandleWithMissedDatabaseNameEventKey() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases", "=", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager(),
times(0)).addDatabaseStatistics(any());
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager(),
times(0)).addDatabaseStatistics(any());
}
@Test
void assertHandleWithMissedSchemaNameEventKey() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas", "=", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager(),
times(0)).addSchemaStatistics(any(), any());
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager(),
times(0)).addSchemaStatistics(any(), any());
}
@Test
void assertHandleWithMissedTableNameEventKey() {
handler.handle(contextManager, new
DataChangedEvent("/statistics/databases/foo_db/schemas/foo_schema/tables", "",
Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getDatabaseManager(),
times(0)).addTableStatistics(any(), any(), any());
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager(),
times(0)).addTableStatistics(any(), any(), any());
}
@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)).alterRowStatistics(any(), any(), any(), any());
+
verify(contextManager.getMetaDataContextManager().getStatisticsManager(),
times(0)).alterRowStatistics(any(), any(), any(), any());
}
}
