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 ab5064796fe Rename DatabaseDataManager (#34505)
ab5064796fe is described below
commit ab5064796fe5685578b5403fdd2bf8543f3f579f
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jan 26 13:25:18 2025 +0800
Rename DatabaseDataManager (#34505)
* Refactor SchemaMetaDataManagerTest
* Refactor SchemaMetaDataManager
* Rename DatabaseDataManager
---
.../shardingsphere/mode/metadata/MetaDataContextManager.java | 6 +++---
...hereDatabaseDataManager.java => DatabaseDataManager.java} | 4 ++--
.../mode/metadata/manager/SchemaMetaDataManager.java | 2 +-
.../mode/metadata/manager/SchemaMetaDataManagerTest.java | 4 ++--
.../dispatch/handler/global/StatisticsChangedHandler.java | 12 ++++++------
5 files changed, 14 insertions(+), 14 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 77035ac4946..e4c1e4cd618 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.ShardingSphereDatabaseDataManager;
+import org.apache.shardingsphere.mode.metadata.manager.DatabaseDataManager;
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 ShardingSphereDatabaseDataManager databaseManager;
+ private final DatabaseDataManager databaseManager;
private final SchemaMetaDataManager schemaMetaDataManager;
@@ -77,7 +77,7 @@ public class MetaDataContextManager {
this.computeNodeInstanceContext = computeNodeInstanceContext;
metaDataPersistService = new MetaDataPersistService(repository);
resourceSwitchManager = new ResourceSwitchManager();
- databaseManager = new
ShardingSphereDatabaseDataManager(metaDataContexts);
+ databaseManager = new DatabaseDataManager(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/ShardingSphereDatabaseDataManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseDataManager.java
similarity index 98%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseDataManager.java
index af07e426d8c..b2ada75ff63 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseDataManager.java
@@ -30,10 +30,10 @@ import java.util.ArrayList;
import java.util.List;
/**
- * ShardingSphere database data manager.
+ * Database data manager.
*/
@RequiredArgsConstructor
-public final class ShardingSphereDatabaseDataManager {
+public final class DatabaseDataManager {
private final MetaDataContexts metaDataContexts;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
index 3d4982d54da..3f6b0b6cd5c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
@@ -36,7 +36,7 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Resource meta data manager.
+ * Schema meta data manager.
*/
@RequiredArgsConstructor
public final class SchemaMetaDataManager {
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
index 354080e7340..d0b0e77537e 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
@@ -135,7 +135,7 @@ class SchemaMetaDataManagerTest {
ShardingSphereSchema toBeAlteredSchema = createToBeAlteredSchema();
when(metaDataContexts.getMetaData().getDatabase("foo_db").getAllSchemas()).thenReturn(Collections.singleton(toBeAlteredSchema));
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
- schemaMetaDataManager.alterSchema("foo_db", "bar_schema", null,
(ShardingSphereView) null);
+ schemaMetaDataManager.alterSchema("foo_db", "bar_schema", null, null);
verify(metaDataContexts.getMetaData().getDatabase("foo_db"),
times(0)).getSchema(any());
}
@@ -144,7 +144,7 @@ class SchemaMetaDataManagerTest {
ShardingSphereSchema toBeAlteredSchema = createToBeAlteredSchema();
when(metaDataContexts.getMetaData().getDatabase("foo_db").getAllSchemas()).thenReturn(Collections.singleton(toBeAlteredSchema));
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
- schemaMetaDataManager.alterSchema("foo_db", "foo_schema", null,
(ShardingSphereView) null);
+ schemaMetaDataManager.alterSchema("foo_db", "foo_schema", null, null);
verify(metaDataContexts.getMetaData().getDatabase("foo_db"),
times(0)).getSchema(any());
}
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 a18323a94fa..197c2a45284 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.ShardingSphereDatabaseDataManager;
+import org.apache.shardingsphere.mode.metadata.manager.DatabaseDataManager;
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) {
- ShardingSphereDatabaseDataManager databaseManager =
contextManager.getMetaDataContextManager().getDatabaseManager();
+ DatabaseDataManager 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 ShardingSphereDatabaseDataManager
databaseManager, final Type type, final String databaseName) {
+ private void handleDatabaseChanged(final DatabaseDataManager
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 ShardingSphereDatabaseDataManager
databaseManager, final Type type, final String databaseName, final String
schemaName) {
+ private void handleSchemaChanged(final DatabaseDataManager
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 ShardingSphereDatabaseDataManager
databaseManager, final Type type, final String databaseName, final String
schemaName, final String tableName) {
+ private void handleTableChanged(final DatabaseDataManager databaseManager,
final Type type, final String databaseName, final String schemaName, final
String tableName) {
switch (type) {
case ADDED:
case UPDATED:
@@ -121,7 +121,7 @@ public final class StatisticsChangedHandler implements
DataChangedEventHandler {
}
}
- private void handleRowDataChanged(final ShardingSphereDatabaseDataManager
databaseManager, final Type type, final String eventValue,
+ private void handleRowDataChanged(final DatabaseDataManager
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));
