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 8ed79edb7c2 Rename MetaDataManagerPersistService.alterSchema() (#34469)
8ed79edb7c2 is described below
commit 8ed79edb7c21bc84d2bcdf6d006566d70b2f7b05
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 24 17:12:01 2025 +0800
Rename MetaDataManagerPersistService.alterSchema() (#34469)
---
.../type/AlterViewFederationMetaDataRefresher.java | 2 +-
.../CreateViewFederationMetaDataRefresher.java | 2 +-
.../type/DropViewFederationMetaDataRefresher.java | 2 +-
.../index/AlterIndexPushDownMetaDataRefresher.java | 2 +-
.../CreateIndexPushDownMetaDataRefresher.java | 2 +-
.../index/DropIndexPushDownMetaDataRefresher.java | 2 +-
.../table/AlterTablePushDownMetaDataRefresher.java | 2 +-
.../RenameTablePushDownMetaDataRefresher.java | 2 +-
.../view/AlterViewPushDownMetaDataRefresher.java | 2 +-
.../view/CreateViewPushDownMetaDataRefresher.java | 2 +-
.../view/DropViewPushDownMetaDataRefresher.java | 2 +-
.../service/MetaDataManagerPersistService.java | 14 +++++-----
.../ClusterMetaDataManagerPersistService.java | 22 ++++++++--------
.../ClusterMetaDataManagerPersistServiceTest.java | 22 ++++++++--------
.../StandaloneMetaDataManagerPersistService.java | 30 +++++++++++-----------
...tandaloneMetaDataManagerPersistServiceTest.java | 16 ++++++------
16 files changed, 63 insertions(+), 63 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
index 83f750401c9..256b4abc02d 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/AlterViewFederationMetaDataRefresher.java
@@ -45,7 +45,7 @@ public final class AlterViewFederationMetaDataRefresher
implements FederationMet
alterSchemaMetaDataPOJO.getDroppedViews().add(viewName);
}
sqlStatement.getViewDefinition().ifPresent(optional ->
alterSchemaMetaDataPOJO.getAlteredViews().add(new ShardingSphereView(viewName,
optional)));
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
index ae2e4589164..50688c6fff5 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/CreateViewFederationMetaDataRefresher.java
@@ -35,7 +35,7 @@ public final class CreateViewFederationMetaDataRefresher
implements FederationMe
String viewName =
TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(),
sqlStatement.getDatabaseType());
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName);
alterSchemaMetaDataPOJO.getAlteredViews().add(new
ShardingSphereView(viewName, sqlStatement.getViewDefinition()));
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/DropViewFederationMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/DropViewFederationMetaDataRefresher.java
index 988271db4df..6398b93b09d 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/DropViewFederationMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/type/DropViewFederationMetaDataRefresher.java
@@ -35,7 +35,7 @@ public final class DropViewFederationMetaDataRefresher
implements FederationMeta
for (SimpleTableSegment each : sqlStatement.getViews()) {
alterSchemaMetaDataPOJO.getDroppedViews().add(each.getTableName().getIdentifier().getValue());
}
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
index b3e967c23ff..ff0aaa2b0e6 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/AlterIndexPushDownMetaDataRefresher.java
@@ -63,7 +63,7 @@ public final class AlterIndexPushDownMetaDataRefresher
implements PushDownMetaDa
newTable.putIndex(new ShardingSphereIndex(renameIndexName, new
LinkedList<>(), false));
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), actualSchemaName);
alterSchemaMetaDataPOJO.getAlteredTables().add(newTable);
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
private Optional<String> findLogicTableName(final ShardingSphereSchema
schema, final String indexName) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/CreateIndexPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/CreateIndexPushDownMetaDataRefresher.java
index e8b9d4503cd..094aeded9d6 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/CreateIndexPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/CreateIndexPushDownMetaDataRefresher.java
@@ -55,7 +55,7 @@ public final class CreateIndexPushDownMetaDataRefresher
implements PushDownMetaD
newTable.putIndex(new ShardingSphereIndex(indexName, new
LinkedList<>(), false));
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName);
alterSchemaMetaDataPOJO.getAlteredTables().add(newTable);
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
index bd181eb5fc0..fc916e15503 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/index/DropIndexPushDownMetaDataRefresher.java
@@ -60,7 +60,7 @@ public final class DropIndexPushDownMetaDataRefresher
implements PushDownMetaDat
newTable.removeIndex(each.getIndexName().getIdentifier().getValue());
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), actualSchemaName);
alterSchemaMetaDataPOJO.getAlteredTables().add(newTable);
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
index 21289160419..1bed6ee4b8e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/AlterTablePushDownMetaDataRefresher.java
@@ -56,7 +56,7 @@ public final class AlterTablePushDownMetaDataRefresher
implements PushDownMetaDa
} else {
alterSchemaMetaDataPOJO.getAlteredTables().add(getTable(database,
logicDataSourceNames, schemaName, tableName, props));
}
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
private ShardingSphereTable getTable(final ShardingSphereDatabase
database, final Collection<String> logicDataSourceNames, final String
schemaName,
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
index 6951f4c9166..323936792a4 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/table/RenameTablePushDownMetaDataRefresher.java
@@ -53,7 +53,7 @@ public final class RenameTablePushDownMetaDataRefresher
implements PushDownMetaD
alterSchemaMetaDataPOJO.getAlteredTables().add(getTable(database,
logicDataSourceNames, schemaName,
TableRefreshUtils.getTableName(each.getRenameTable().getTableName().getIdentifier(),
databaseType), props));
alterSchemaMetaDataPOJO.getDroppedTables().add(each.getTable().getTableName().getIdentifier().getValue());
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
index 70d6345bc0a..1683434fa62 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/AlterViewPushDownMetaDataRefresher.java
@@ -67,7 +67,7 @@ public final class AlterViewPushDownMetaDataRefresher
implements PushDownMetaDat
alterSchemaMetaDataPOJO.getAlteredTables().add(schema.getTable(viewName));
alterSchemaMetaDataPOJO.getAlteredViews().add(schema.getView(viewName));
}
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
private ShardingSphereSchema getSchema(final ShardingSphereDatabase
database, final Collection<String> logicDataSourceNames,
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
index 5ccf25fde59..e65bdef1275 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/CreateViewPushDownMetaDataRefresher.java
@@ -61,7 +61,7 @@ public final class CreateViewPushDownMetaDataRefresher
implements PushDownMetaDa
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName, logicDataSourceNames);
alterSchemaMetaDataPOJO.getAlteredTables().add(actualTableMetaData.get());
alterSchemaMetaDataPOJO.getAlteredViews().add(new
ShardingSphereView(viewName, sqlStatement.getViewDefinition()));
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
index e4719776b35..06733376bee 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/view/DropViewPushDownMetaDataRefresher.java
@@ -41,7 +41,7 @@ public final class DropViewPushDownMetaDataRefresher
implements PushDownMetaData
alterSchemaMetaDataPOJO.getDroppedTables().add(viewName);
alterSchemaMetaDataPOJO.getDroppedViews().add(viewName);
});
-
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
+ metaDataManagerPersistService.alterSchema(alterSchemaMetaDataPOJO);
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
index 6610427c196..fd62c7fa85e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java
@@ -57,6 +57,13 @@ public interface MetaDataManagerPersistService {
*/
void createSchema(String databaseName, String schemaName);
+ /**
+ * Alter schema.
+ *
+ * @param alterSchemaMetaDataPOJO alter schema metadata pojo
+ */
+ void alterSchema(AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO);
+
/**
* Alter schema name.
*
@@ -73,13 +80,6 @@ public interface MetaDataManagerPersistService {
*/
void dropSchema(String databaseName, Collection<String> schemaNames);
- /**
- * Alter schema metadata.
- *
- * @param alterSchemaMetaDataPOJO alter schema metadata pojo
- */
- void alterSchemaMetaData(AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO);
-
/**
* Register storage units.
*
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index d44eda6a09c..b91a4b60cdf 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -87,6 +87,17 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
metaDataPersistService.getDatabaseMetaDataFacade().getSchema().add(databaseName,
schemaName);
}
+ @Override
+ public void alterSchema(final AlterSchemaMetaDataPOJO
alterSchemaMetaDataPOJO) {
+ String databaseName = alterSchemaMetaDataPOJO.getDatabaseName();
+ String schemaName = alterSchemaMetaDataPOJO.getSchemaName();
+ DatabaseMetaDataPersistFacade databaseMetaDataFacade =
metaDataPersistService.getDatabaseMetaDataFacade();
+ databaseMetaDataFacade.getTable().persist(databaseName, schemaName,
alterSchemaMetaDataPOJO.getAlteredTables());
+ databaseMetaDataFacade.getView().persist(databaseName, schemaName,
alterSchemaMetaDataPOJO.getAlteredViews());
+ alterSchemaMetaDataPOJO.getDroppedTables().forEach(each ->
databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
+ alterSchemaMetaDataPOJO.getDroppedViews().forEach(each ->
databaseMetaDataFacade.getView().delete(databaseName, schemaName, each));
+ }
+
@Override
public void alterSchemaName(final AlterSchemaPOJO alterSchemaPOJO) {
String databaseName = alterSchemaPOJO.getDatabaseName();
@@ -105,17 +116,6 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
schemaNames.forEach(each ->
metaDataPersistService.getDatabaseMetaDataFacade().getSchema().drop(databaseName,
each));
}
- @Override
- public void alterSchemaMetaData(final AlterSchemaMetaDataPOJO
alterSchemaMetaDataPOJO) {
- String databaseName = alterSchemaMetaDataPOJO.getDatabaseName();
- String schemaName = alterSchemaMetaDataPOJO.getSchemaName();
- DatabaseMetaDataPersistFacade databaseMetaDataFacade =
metaDataPersistService.getDatabaseMetaDataFacade();
- databaseMetaDataFacade.getTable().persist(databaseName, schemaName,
alterSchemaMetaDataPOJO.getAlteredTables());
- databaseMetaDataFacade.getView().persist(databaseName, schemaName,
alterSchemaMetaDataPOJO.getAlteredViews());
- alterSchemaMetaDataPOJO.getDroppedTables().forEach(each ->
databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
- alterSchemaMetaDataPOJO.getDroppedViews().forEach(each ->
databaseMetaDataFacade.getView().delete(databaseName, schemaName, each));
- }
-
@SneakyThrows
@Override
public void registerStorageUnits(final String databaseName, final
Map<String, DataSourcePoolProperties> toBeRegisteredProps) {
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
index d521cfd5c6a..1573200bd55 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
@@ -23,11 +23,11 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import
org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchemaMetaDataPOJO;
import
org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchemaPOJO;
-import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
-import org.apache.shardingsphere.mode.state.database.ListenerAssistedType;
-import
org.apache.shardingsphere.mode.state.database.ListenerAssistedPersistService;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import
org.apache.shardingsphere.mode.state.database.ListenerAssistedPersistService;
+import org.apache.shardingsphere.mode.state.database.ListenerAssistedType;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -97,7 +97,14 @@ class ClusterMetaDataManagerPersistServiceTest {
}
@Test
- void assertAlterNotEmptySchema() {
+ void assertAlterSchema() {
+ metaDataManagerPersistService.alterSchema(new
AlterSchemaMetaDataPOJO("foo_db", "foo_schema",
Collections.singleton("foo_ds")));
+
verify(metaDataPersistService.getDatabaseMetaDataFacade().getTable()).persist("foo_db",
"foo_schema", Collections.emptyList());
+
verify(metaDataPersistService.getDatabaseMetaDataFacade().getView()).persist("foo_db",
"foo_schema", Collections.emptyList());
+ }
+
+ @Test
+ void assertAlterNotEmptySchemaName() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
assertAlterSchemaName(schema);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getSchema(),
times(0)).add("foo_db", "bar_schema");
@@ -125,13 +132,6 @@ class ClusterMetaDataManagerPersistServiceTest {
verify(metaDataPersistService.getDatabaseMetaDataFacade().getSchema()).drop("foo_db",
"foo_schema");
}
- @Test
- void assertAlterSchemaMetaData() {
- metaDataManagerPersistService.alterSchemaMetaData(new
AlterSchemaMetaDataPOJO("foo_db", "foo_schema",
Collections.singleton("foo_ds")));
-
verify(metaDataPersistService.getDatabaseMetaDataFacade().getTable()).persist("foo_db",
"foo_schema", Collections.emptyList());
-
verify(metaDataPersistService.getDatabaseMetaDataFacade().getView()).persist("foo_db",
"foo_schema", Collections.emptyList());
- }
-
@Test
void assertAlterSingleRuleConfiguration() {
Collection<RuleConfiguration> ruleConfigs = new
LinkedList<>(Arrays.asList(new SingleRuleConfiguration(),
mock(RuleConfiguration.class)));
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 3899a5f4a97..f21646139f8 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -97,6 +97,21 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
metaDataPersistService.getDatabaseMetaDataFacade().getSchema().add(databaseName,
schemaName);
}
+ @Override
+ public void alterSchema(final AlterSchemaMetaDataPOJO
alterSchemaMetaDataPOJO) {
+ String databaseName = alterSchemaMetaDataPOJO.getDatabaseName();
+ String schemaName = alterSchemaMetaDataPOJO.getSchemaName();
+ ShardingSphereMetaData metaData =
metaDataContextManager.getMetaDataContexts().getMetaData();
+ ShardingSphereDatabase database = metaData.getDatabase(databaseName);
+ addDataNode(database,
alterSchemaMetaDataPOJO.getLogicDataSourceName(), schemaName,
alterSchemaMetaDataPOJO.getAlteredTables(),
alterSchemaMetaDataPOJO.getAlteredViews());
+ removeDataNode(database, schemaName,
alterSchemaMetaDataPOJO.getDroppedTables(),
alterSchemaMetaDataPOJO.getDroppedViews());
+ metaData.getGlobalRuleMetaData().getRules().forEach(each ->
((GlobalRule) each).refresh(metaData.getAllDatabases(),
GlobalRuleChangedType.SCHEMA_CHANGED));
+
metaDataPersistService.getDatabaseMetaDataFacade().getTable().persist(databaseName,
schemaName, alterSchemaMetaDataPOJO.getAlteredTables());
+
metaDataPersistService.getDatabaseMetaDataFacade().getView().persist(databaseName,
schemaName, alterSchemaMetaDataPOJO.getAlteredViews());
+ alterSchemaMetaDataPOJO.getDroppedTables().forEach(each ->
metaDataPersistService.getDatabaseMetaDataFacade().getTable().drop(databaseName,
schemaName, each));
+ alterSchemaMetaDataPOJO.getDroppedViews().forEach(each ->
metaDataPersistService.getDatabaseMetaDataFacade().getView().delete(databaseName,
schemaName, each));
+ }
+
@Override
public void alterSchemaName(final AlterSchemaPOJO alterSchemaPOJO) {
ShardingSphereMetaData metaData =
metaDataContextManager.getMetaDataContexts().getMetaData();
@@ -203,21 +218,6 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
metaData.getGlobalRuleMetaData().getRules().forEach(each ->
((GlobalRule) each).refresh(metaData.getAllDatabases(),
GlobalRuleChangedType.SCHEMA_CHANGED));
}
- @Override
- public void alterSchemaMetaData(final AlterSchemaMetaDataPOJO
alterSchemaMetaDataPOJO) {
- String databaseName = alterSchemaMetaDataPOJO.getDatabaseName();
- String schemaName = alterSchemaMetaDataPOJO.getSchemaName();
- ShardingSphereMetaData metaData =
metaDataContextManager.getMetaDataContexts().getMetaData();
- ShardingSphereDatabase database = metaData.getDatabase(databaseName);
- addDataNode(database,
alterSchemaMetaDataPOJO.getLogicDataSourceName(), schemaName,
alterSchemaMetaDataPOJO.getAlteredTables(),
alterSchemaMetaDataPOJO.getAlteredViews());
- removeDataNode(database, schemaName,
alterSchemaMetaDataPOJO.getDroppedTables(),
alterSchemaMetaDataPOJO.getDroppedViews());
- metaData.getGlobalRuleMetaData().getRules().forEach(each ->
((GlobalRule) each).refresh(metaData.getAllDatabases(),
GlobalRuleChangedType.SCHEMA_CHANGED));
-
metaDataPersistService.getDatabaseMetaDataFacade().getTable().persist(databaseName,
schemaName, alterSchemaMetaDataPOJO.getAlteredTables());
-
metaDataPersistService.getDatabaseMetaDataFacade().getView().persist(databaseName,
schemaName, alterSchemaMetaDataPOJO.getAlteredViews());
- alterSchemaMetaDataPOJO.getDroppedTables().forEach(each ->
metaDataPersistService.getDatabaseMetaDataFacade().getTable().drop(databaseName,
schemaName, each));
- alterSchemaMetaDataPOJO.getDroppedViews().forEach(each ->
metaDataPersistService.getDatabaseMetaDataFacade().getView().delete(databaseName,
schemaName, each));
- }
-
@Override
public void registerStorageUnits(final String databaseName, final
Map<String, DataSourcePoolProperties> toBeRegisteredProps) throws SQLException {
SwitchingResource switchingResource =
metaDataContextManager.getResourceSwitchManager().switchByRegisterStorageUnit(metaDataContextManager.getMetaDataContexts()
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index c333409cdcd..c5739499f76 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -98,6 +98,14 @@ class StandaloneMetaDataManagerPersistServiceTest {
verify(metaDataPersistService.getDatabaseMetaDataFacade().getSchema()).add("foo_db",
"foo_schema");
}
+ @Test
+ void assertAlterSchema() {
+ DatabaseMetaDataPersistFacade databaseMetaDataFacade =
mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
+
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
+ metaDataManagerPersistService.alterSchema(new
AlterSchemaMetaDataPOJO("foo_db", "foo_schema",
Collections.singleton("foo_ds")));
+ verify(databaseMetaDataFacade.getTable()).persist("foo_db",
"foo_schema", new LinkedList<>());
+ }
+
@Test
void assertAlterSchemaNameWithEmptyAlteredSchema() {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
@@ -141,14 +149,6 @@ class StandaloneMetaDataManagerPersistServiceTest {
verify(database).dropSchema(any());
}
- @Test
- void assertAlterSchemaMetaData() {
- DatabaseMetaDataPersistFacade databaseMetaDataFacade =
mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
-
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
- metaDataManagerPersistService.alterSchemaMetaData(new
AlterSchemaMetaDataPOJO("foo_db", "foo_schema",
Collections.singleton("foo_ds")));
- verify(databaseMetaDataFacade.getTable()).persist("foo_db",
"foo_schema", new LinkedList<>());
- }
-
@Test
void assertAlterSingleRuleConfiguration() throws SQLException {
RuleConfiguration singleRuleConfig = new SingleRuleConfiguration();
