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 fefcec5e317 Rename MetaDataManagerPersistService.alterSchemaName()
(#34466)
fefcec5e317 is described below
commit fefcec5e317fbc7d88ceb313151b12a49e89dec2
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 24 15:57:04 2025 +0800
Rename MetaDataManagerPersistService.alterSchemaName() (#34466)
* Rename MetaDataManagerPersistService.alterSchemaName()
* Rename MetaDataManagerPersistService.alterSchemaName()
---
.../type/schema/AlterSchemaPushDownMetaDataRefresher.java | 2 +-
.../mode/persist/service/MetaDataManagerPersistService.java | 4 ++--
.../persist/service/ClusterMetaDataManagerPersistService.java | 2 +-
.../service/ClusterMetaDataManagerPersistServiceTest.java | 10 +++++-----
.../service/StandaloneMetaDataManagerPersistService.java | 2 +-
.../service/StandaloneMetaDataManagerPersistServiceTest.java | 8 ++++----
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
index f8818371730..9ac703d2a73 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/pushdown/type/schema/AlterSchemaPushDownMetaDataRefresher.java
@@ -41,7 +41,7 @@ public final class AlterSchemaPushDownMetaDataRefresher
implements PushDownMetaD
if (!renameSchemaName.isPresent()) {
return;
}
- metaDataManagerPersistService.alterSchema(new
AlterSchemaPOJO(database.getName(),
sqlStatement.getSchemaName().getValue().toLowerCase(), renameSchemaName.get(),
logicDataSourceNames));
+ metaDataManagerPersistService.alterSchemaName(new
AlterSchemaPOJO(database.getName(),
sqlStatement.getSchemaName().getValue().toLowerCase(), renameSchemaName.get(),
logicDataSourceNames));
}
@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 eb381b5e7b0..6610427c196 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
@@ -58,12 +58,12 @@ public interface MetaDataManagerPersistService {
void createSchema(String databaseName, String schemaName);
/**
- * Alter schema.
+ * Alter schema name.
*
* @param alterSchemaPOJO alter schema pojo
* @throws SQLException SQL exception
*/
- void alterSchema(AlterSchemaPOJO alterSchemaPOJO) throws SQLException;
+ void alterSchemaName(AlterSchemaPOJO alterSchemaPOJO) throws SQLException;
/**
* Drop schema.
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 a4196b75343..d44eda6a09c 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
@@ -88,7 +88,7 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
}
@Override
- public void alterSchema(final AlterSchemaPOJO alterSchemaPOJO) {
+ public void alterSchemaName(final AlterSchemaPOJO alterSchemaPOJO) {
String databaseName = alterSchemaPOJO.getDatabaseName();
String schemaName = alterSchemaPOJO.getSchemaName();
ShardingSphereSchema schema =
metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getSchema(schemaName);
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 93932c141dd..d521cfd5c6a 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
@@ -99,21 +99,21 @@ class ClusterMetaDataManagerPersistServiceTest {
@Test
void assertAlterNotEmptySchema() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- assertAlterSchema(schema);
+ assertAlterSchemaName(schema);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getSchema(),
times(0)).add("foo_db", "bar_schema");
}
@Test
- void assertAlterEmptySchema() {
+ void assertAlterEmptySchemaName() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.isEmpty()).thenReturn(true);
- assertAlterSchema(schema);
+ assertAlterSchemaName(schema);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getSchema()).add("foo_db",
"bar_schema");
}
- private void assertAlterSchema(final ShardingSphereSchema schema) {
+ private void assertAlterSchemaName(final ShardingSphereSchema schema) {
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(schema);
- metaDataManagerPersistService.alterSchema(new
AlterSchemaPOJO("foo_db", "foo_schema", "bar_schema",
Collections.singleton("foo_ds")));
+ metaDataManagerPersistService.alterSchemaName(new
AlterSchemaPOJO("foo_db", "foo_schema", "bar_schema",
Collections.singleton("foo_ds")));
verify(metaDataPersistService.getDatabaseMetaDataFacade().getTable()).persist(eq("foo_db"),
eq("bar_schema"), anyCollection());
verify(metaDataPersistService.getDatabaseMetaDataFacade().getView()).persist(eq("foo_db"),
eq("bar_schema"), anyCollection());
verify(metaDataPersistService.getDatabaseMetaDataFacade().getSchema()).drop("foo_db",
"foo_schema");
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 255cfcf3890..3899a5f4a97 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
@@ -98,7 +98,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
}
@Override
- public void alterSchema(final AlterSchemaPOJO alterSchemaPOJO) {
+ public void alterSchemaName(final AlterSchemaPOJO alterSchemaPOJO) {
ShardingSphereMetaData metaData =
metaDataContextManager.getMetaDataContexts().getMetaData();
ShardingSphereDatabase database =
metaData.getDatabase(alterSchemaPOJO.getDatabaseName());
putSchemaMetaData(database, alterSchemaPOJO.getSchemaName(),
alterSchemaPOJO.getRenameSchemaName(),
alterSchemaPOJO.getLogicDataSourceName());
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 b406597c808..c333409cdcd 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
@@ -99,14 +99,14 @@ class StandaloneMetaDataManagerPersistServiceTest {
}
@Test
- void assertAlterSchemaWithEmptyAlteredSchema() {
+ void assertAlterSchemaNameWithEmptyAlteredSchema() {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new
ConfigurationProperties(new Properties()));
when(metaDataContextManager.getMetaDataContexts().getMetaData()).thenReturn(metaData);
DatabaseMetaDataPersistFacade databaseMetaDataFacade =
mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
- metaDataManagerPersistService.alterSchema(new
AlterSchemaPOJO("foo_db", "foo_schema", "bar_schema",
Collections.singleton("foo_ds")));
+ metaDataManagerPersistService.alterSchemaName(new
AlterSchemaPOJO("foo_db", "foo_schema", "bar_schema",
Collections.singleton("foo_ds")));
verify(databaseMetaDataFacade.getSchema(), times(0)).add("foo_db",
"bar_schema");
verify(databaseMetaDataFacade.getTable()).persist(eq("foo_db"),
eq("bar_schema"), anyCollection());
verify(databaseMetaDataFacade.getView()).persist(eq("foo_db"),
eq("bar_schema"), anyCollection());
@@ -114,7 +114,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
}
@Test
- void assertAlterSchemaWithNotEmptyAlteredSchema() {
+ void assertAlterSchemaNameWithNotEmptyAlteredSchema() {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
when(database.getSchema("foo_schema")).thenReturn(new
ShardingSphereSchema("foo_schema"));
@@ -123,7 +123,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
when(metaDataContextManager.getMetaDataContexts().getMetaData()).thenReturn(metaData);
DatabaseMetaDataPersistFacade databaseMetaDataFacade =
mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
when(metaDataPersistService.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
- metaDataManagerPersistService.alterSchema(new
AlterSchemaPOJO("foo_db", "foo_schema", "bar_schema",
Collections.singleton("foo_ds")));
+ metaDataManagerPersistService.alterSchemaName(new
AlterSchemaPOJO("foo_db", "foo_schema", "bar_schema",
Collections.singleton("foo_ds")));
verify(databaseMetaDataFacade.getSchema()).add("foo_db", "bar_schema");
verify(databaseMetaDataFacade.getTable()).persist(eq("foo_db"),
eq("bar_schema"), anyCollection());
verify(databaseMetaDataFacade.getView()).persist(eq("foo_db"),
eq("bar_schema"), anyCollection());
