You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/16 05:13:54 UTC
[shardingsphere] branch master updated: Rename alterDatabase to alterSchema (#17689)
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 5b0f030e112 Rename alterDatabase to alterSchema (#17689)
5b0f030e112 is described below
commit 5b0f030e1128aa1d7c06cc35fce302b3a5f233b2
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Mon May 16 13:13:47 2022 +0800
Rename alterDatabase to alterSchema (#17689)
* Rename alterDatabase to alterSchema
* Adjust unit test name
---
.../org/apache/shardingsphere/mode/manager/ContextManager.java | 10 +++++-----
.../apache/shardingsphere/mode/manager/ContextManagerTest.java | 4 ++--
.../cluster/coordinator/ClusterContextManagerCoordinator.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 967a6aaa89a..7b84893b904 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -160,12 +160,12 @@ public final class ContextManager implements AutoCloseable {
}
/**
- * Alter database.
+ * Alter schemas.
*
* @param databaseName database name
* @param schemas schemas
*/
- public void alterDatabase(final String databaseName, final Map<String, ShardingSphereSchema> schemas) {
+ public void alterSchemas(final String databaseName, final Map<String, ShardingSphereSchema> schemas) {
ShardingSphereMetaData alteredMetaData = new ShardingSphereMetaData(databaseName, metaDataContexts.getMetaData(databaseName).getFrontendDatabaseType(),
metaDataContexts.getMetaData(databaseName).getResource(), metaDataContexts.getMetaData(databaseName).getRuleMetaData(), schemas);
Map<String, ShardingSphereMetaData> alteredMetaDataMap = new HashMap<>(metaDataContexts.getMetaDataMap());
@@ -177,14 +177,14 @@ public final class ContextManager implements AutoCloseable {
}
/**
- * Alter database.
+ * Alter schema.
*
* @param databaseName database name
* @param schemaName schema name
* @param changedTableMetaData changed table meta data
* @param deletedTable deleted table
*/
- public void alterDatabase(final String databaseName, final String schemaName, final TableMetaData changedTableMetaData, final String deletedTable) {
+ public void alterSchema(final String databaseName, final String schemaName, final TableMetaData changedTableMetaData, final String deletedTable) {
if (null != metaDataContexts.getMetaData(databaseName)) {
Optional.ofNullable(changedTableMetaData).ifPresent(optional -> alterTableSchema(databaseName, schemaName, optional));
Optional.ofNullable(deletedTable).ifPresent(optional -> deleteTable(databaseName, schemaName, optional));
@@ -394,7 +394,7 @@ public final class ContextManager implements AutoCloseable {
public void reloadMetaData(final String databaseName, final String schemaName) {
try {
Map<String, ShardingSphereSchema> schemas = loadActualSchema(databaseName, schemaName);
- alterDatabase(databaseName, schemas);
+ alterSchemas(databaseName, schemas);
for (ShardingSphereSchema each : schemas.values()) {
metaDataContexts.getMetaDataPersistService().ifPresent(optional -> optional.getSchemaMetaDataService().persistTables(databaseName, schemaName, each));
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 97498f1a706..18eb4d846e5 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -121,8 +121,8 @@ public final class ContextManagerTest {
}
@Test
- public void assertAlterDatabase() {
- contextManager.alterDatabase("foo_db", Collections.singletonMap("foo_db", new ShardingSphereSchema(Collections.singletonMap("foo_table",
+ public void assertAlterSchemas() {
+ contextManager.alterSchemas("foo_db", Collections.singletonMap("foo_db", new ShardingSphereSchema(Collections.singletonMap("foo_table",
new TableMetaData("foo_table", Collections.emptyList(), Collections.emptyList(), Collections.emptyList())))));
assertTrue(contextManager.getMetaDataContexts().getMetaDataMap().get("foo_db").getSchemaByName("foo_db").containsTable("foo_table"));
assertTrue(contextManager.getMetaDataContexts().getOptimizerContext().getFederationMetaData().getDatabases().containsKey("foo_db"));
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
index 09b39fcb6b2..9e7de6338fb 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
@@ -145,7 +145,7 @@ public final class ClusterContextManagerCoordinator {
*/
@Subscribe
public synchronized void renew(final SchemaChangedEvent event) {
- contextManager.alterDatabase(event.getDatabaseName(), event.getSchemaName(), event.getChangedTableMetaData(), event.getDeletedTable());
+ contextManager.alterSchema(event.getDatabaseName(), event.getSchemaName(), event.getChangedTableMetaData(), event.getDeletedTable());
}
/**