This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 ba85e39c45e Rename incorrect meta data manager classes (#32068)
ba85e39c45e is described below
commit ba85e39c45e97a606a623ff2e979a6082d102b00
Author: Haoran Meng <[email protected]>
AuthorDate: Thu Jul 11 19:37:22 2024 +0800
Rename incorrect meta data manager classes (#32068)
---
.../mode/metadata/MetaDataContextManager.java | 12 ++++++------
...taDataManager.java => SchemaMetaDataManager.java} | 4 ++--
...r.java => ShardingSphereDatabaseDataManager.java} | 4 ++--
.../mode/manager/ContextManagerTest.java | 20 ++++++++++----------
.../dispatch/ListenerAssistedSubscriber.java | 4 ++--
.../dispatch/ResourceMetaDataChangedSubscriber.java | 12 ++++++------
.../StandaloneMetaDataManagerPersistService.java | 4 ++--
7 files changed, 30 insertions(+), 30 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 22ebe674dc2..e12adc276e7 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
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericSchemaManager;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.manager.ConfigurationManager;
-import org.apache.shardingsphere.mode.metadata.manager.ResourceMetaDataManager;
+import org.apache.shardingsphere.mode.metadata.manager.SchemaMetaDataManager;
import org.apache.shardingsphere.mode.metadata.manager.ResourceSwitchManager;
import org.apache.shardingsphere.mode.metadata.manager.RuleItemManager;
-import
org.apache.shardingsphere.mode.metadata.manager.ShardingSphereDatabaseManager;
+import
org.apache.shardingsphere.mode.metadata.manager.ShardingSphereDatabaseDataManager;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import java.util.concurrent.atomic.AtomicReference;
@@ -39,11 +39,11 @@ public class MetaDataContextManager {
private final AtomicReference<MetaDataContexts> metaDataContexts;
- private final ShardingSphereDatabaseManager databaseManager;
+ private final ShardingSphereDatabaseDataManager databaseManager;
private final ConfigurationManager configurationManager;
- private final ResourceMetaDataManager resourceMetaDataManager;
+ private final SchemaMetaDataManager schemaMetaDataManager;
private final RuleItemManager ruleItemManager;
@@ -55,9 +55,9 @@ public class MetaDataContextManager {
final PersistRepository repository) {
this.metaDataContexts = metaDataContexts;
resourceSwitchManager = new ResourceSwitchManager();
- databaseManager = new ShardingSphereDatabaseManager(metaDataContexts);
+ databaseManager = new
ShardingSphereDatabaseDataManager(metaDataContexts);
configurationManager = new ConfigurationManager(metaDataContexts,
computeNodeInstanceContext, repository, resourceSwitchManager);
- resourceMetaDataManager = new
ResourceMetaDataManager(metaDataContexts, repository);
+ schemaMetaDataManager = new SchemaMetaDataManager(metaDataContexts,
repository);
ruleItemManager = new RuleItemManager(metaDataContexts, repository,
configurationManager);
metaDataPersistService = new MetaDataPersistService(repository);
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceMetaDataManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
similarity index 98%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceMetaDataManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
index 63ecef5468c..235949b76f9 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceMetaDataManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
@@ -41,13 +41,13 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* Resource meta data manager.
*/
-public final class ResourceMetaDataManager {
+public final class SchemaMetaDataManager {
private final AtomicReference<MetaDataContexts> metaDataContexts;
private final MetaDataPersistService metaDataPersistService;
- public ResourceMetaDataManager(final AtomicReference<MetaDataContexts>
metaDataContexts, final PersistRepository repository) {
+ public SchemaMetaDataManager(final AtomicReference<MetaDataContexts>
metaDataContexts, final PersistRepository repository) {
this.metaDataContexts = metaDataContexts;
metaDataPersistService = new MetaDataPersistService(repository);
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
similarity index 98%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
index e00e7769a5c..d779b57e396 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
@@ -31,10 +31,10 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
/**
- * ShardingSphere database context manager.
+ * ShardingSphere database data manager.
*/
@RequiredArgsConstructor
-public final class ShardingSphereDatabaseManager {
+public final class ShardingSphereDatabaseDataManager {
private final AtomicReference<MetaDataContexts> metaDataContexts;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 083ad044972..67d9b0fc5e9 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -138,14 +138,14 @@ class ContextManagerTest {
@Test
void assertAddDatabase() {
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().addDatabase("new_db");
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase("new_db");
verify(metaDataContexts.getMetaData()).addDatabase(eq("new_db"),
any(DatabaseType.class), any(ConfigurationProperties.class));
}
@Test
void assertAddExistedDatabase() {
when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().addDatabase("foo_db");
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase("foo_db");
verify(metaDataContexts.getMetaData(),
times(0)).addDatabase(eq("foo_db"), any(DatabaseType.class),
any(ConfigurationProperties.class));
}
@@ -153,26 +153,26 @@ class ContextManagerTest {
void assertDropDatabase() {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().dropDatabase("foo_db");
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase("foo_db");
verify(metaDataContexts.getMetaData()).dropDatabase("foo_db");
}
@Test
void assertDropNotExistedDatabase() {
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().dropDatabase("not_existed_db");
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase("not_existed_db");
verify(metaDataContexts.getMetaData(),
times(0)).dropDatabase("not_existed_db");
}
@Test
void assertAddSchema() {
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().addSchema("foo_db",
"bar_schema");
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addSchema("foo_db",
"bar_schema");
verify(metaDataContexts.getMetaData().getDatabase("foo_db")).addSchema(anyString(),
any(ShardingSphereSchema.class));
}
@Test
void assertAddExistedSchema() {
when(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").containsSchema("foo_schema")).thenReturn(true);
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().addSchema("foo_db",
"foo_schema");
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addSchema("foo_db",
"foo_schema");
verify(metaDataContexts.getMetaData().getDatabase("foo_db"),
times(0)).addSchema(anyString(), any(ShardingSphereSchema.class));
}
@@ -183,7 +183,7 @@ class ContextManagerTest {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
ShardingSphereColumn toBeChangedColumn = new
ShardingSphereColumn("foo_col", Types.VARCHAR, false, false, false, true,
false, false);
ShardingSphereTable toBeChangedTable = new
ShardingSphereTable("foo_tbl", Collections.singleton(toBeChangedColumn),
Collections.emptyList(), Collections.emptyList());
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema("foo_db",
"foo_schema", toBeChangedTable, null);
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema("foo_db",
"foo_schema", toBeChangedTable, null);
ShardingSphereTable table =
contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getTables().get("foo_tbl");
assertThat(table.getColumnValues().size(), is(1));
assertTrue(table.containsColumn("foo_col"));
@@ -195,7 +195,7 @@ class ContextManagerTest {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema",
toBeAlteredSchema));
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
ShardingSphereView toBeChangedView = new
ShardingSphereView("foo_view", "select `foo_view`.`foo_view`.`id` AS `id` from
`foo_view`.`foo_view`");
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema("foo_db",
"foo_schema", null, toBeChangedView);
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema("foo_db",
"foo_schema", null, toBeChangedView);
ShardingSphereView view =
contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getView("foo_view");
assertThat(view.getName(), is("foo_view"));
assertThat(view.getViewDefinition(), is("select
`foo_view`.`foo_view`.`id` AS `id` from `foo_view`.`foo_view`"));
@@ -204,14 +204,14 @@ class ContextManagerTest {
@Test
void assertAlterSchemaForTableDropped() {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema",
createToBeAlteredSchema()));
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema("foo_db",
"foo_schema", "foo_tbl", null);
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema("foo_db",
"foo_schema", "foo_tbl", null);
assertFalse(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getTables().containsKey("foo_tbl"));
}
@Test
void assertAlterSchemaForViewDropped() {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchemas()).thenReturn(Collections.singletonMap("foo_schema",
createToBeAlteredSchema()));
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema("foo_db",
"foo_schema", "foo_view", null);
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema("foo_db",
"foo_schema", "foo_view", null);
assertFalse(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema").getViews().containsKey("foo_view"));
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java
index 59d4be84fba..65efe051f07 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java
@@ -56,7 +56,7 @@ public final class ListenerAssistedSubscriber implements
EventSubscriber {
public synchronized void renew(final CreateDatabaseListenerAssistedEvent
event) {
listenerManager.addListener(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()),
new
MetaDataChangedListener(contextManager.getComputeNodeInstanceContext().getEventBusContext()));
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().addDatabase(event.getDatabaseName());
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(event.getDatabaseName());
contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(event.getDatabaseName());
refreshShardingSphereStatisticsData();
}
@@ -69,7 +69,7 @@ public final class ListenerAssistedSubscriber implements
EventSubscriber {
@Subscribe
public synchronized void renew(final DropDatabaseListenerAssistedEvent
event) {
listenerManager.removeListener(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()));
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().dropDatabase(event.getDatabaseName());
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(event.getDatabaseName());
contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(event.getDatabaseName());
refreshShardingSphereStatisticsData();
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriber.java
index 4516026b532..5fcc2ada39b 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriber.java
@@ -53,7 +53,7 @@ public final class ResourceMetaDataChangedSubscriber
implements EventSubscriber
*/
@Subscribe
public synchronized void renew(final SchemaAddedEvent event) {
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().addSchema(event.getDatabaseName(),
event.getSchemaName());
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addSchema(event.getDatabaseName(),
event.getSchemaName());
refreshShardingSphereStatisticsData();
}
@@ -64,7 +64,7 @@ public final class ResourceMetaDataChangedSubscriber
implements EventSubscriber
*/
@Subscribe
public synchronized void renew(final SchemaDeletedEvent event) {
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().dropSchema(event.getDatabaseName(),
event.getSchemaName());
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropSchema(event.getDatabaseName(),
event.getSchemaName());
refreshShardingSphereStatisticsData();
}
@@ -81,7 +81,7 @@ public final class ResourceMetaDataChangedSubscriber
implements EventSubscriber
}
Map<String, ShardingSphereTable> tables =
contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataService()
.getTableMetaDataPersistService().load(event.getDatabaseName(),
event.getSchemaName(), event.getTableName());
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(),
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(),
tables.values().iterator().next(), null);
refreshShardingSphereStatisticsData();
}
@@ -93,7 +93,7 @@ public final class ResourceMetaDataChangedSubscriber
implements EventSubscriber
*/
@Subscribe
public synchronized void renew(final DropTableEvent event) {
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), event.getTableName(), null);
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), event.getTableName(), null);
refreshShardingSphereStatisticsData();
}
@@ -110,7 +110,7 @@ public final class ResourceMetaDataChangedSubscriber
implements EventSubscriber
}
Map<String, ShardingSphereView> views =
contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataService()
.getViewMetaDataPersistService().load(event.getDatabaseName(),
event.getSchemaName(), event.getViewName());
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(),
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(),
null, views.values().iterator().next());
refreshShardingSphereStatisticsData();
}
@@ -122,7 +122,7 @@ public final class ResourceMetaDataChangedSubscriber
implements EventSubscriber
*/
@Subscribe
public synchronized void renew(final DropViewEvent event) {
-
contextManager.getMetaDataContextManager().getResourceMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), null, event.getViewName());
+
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(event.getDatabaseName(),
event.getSchemaName(), null, event.getViewName());
refreshShardingSphereStatisticsData();
}
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/StandaloneMetaDataManagerPersistService.java
index 8b39d21b551..2f8216509fa 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/StandaloneMetaDataManagerPersistService.java
@@ -79,14 +79,14 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
@Override
public void createDatabase(final String databaseName) {
-
metaDataContextManager.getResourceMetaDataManager().addDatabase(databaseName);
+
metaDataContextManager.getSchemaMetaDataManager().addDatabase(databaseName);
metaDataPersistService.getDatabaseMetaDataService().addDatabase(databaseName);
clearServiceCache();
}
@Override
public void dropDatabase(final String databaseName) {
-
metaDataContextManager.getResourceMetaDataManager().dropDatabase(databaseName);
+
metaDataContextManager.getSchemaMetaDataManager().dropDatabase(databaseName);
metaDataPersistService.getDatabaseMetaDataService().dropDatabase(databaseName);
clearServiceCache();
}
