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 a67e4587786 Rename DatabaseMetaDataManager (#34507)
a67e4587786 is described below
commit a67e45877869355143ad6603121794b35c3ed7ef
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 26 13:49:07 2025 +0800
Rename DatabaseMetaDataManager (#34507)
---
.../mode/metadata/MetaDataContextManager.java | 6 ++--
...taManager.java => DatabaseMetaDataManager.java} | 4 +--
...rTest.java => DatabaseMetaDataManagerTest.java} | 34 +++++++++++-----------
.../database/metadata/SchemaChangedHandler.java | 4 +--
.../database/metadata/TableChangedHandler.java | 4 +--
.../database/metadata/ViewChangedHandler.java | 4 +--
.../global/DatabaseListenerChangedHandler.java | 4 +--
.../metadata/MetaDataChangedHandlerTest.java | 16 +++++-----
.../global/DatabaseListenerChangedHandlerTest.java | 4 +--
.../StandaloneMetaDataManagerPersistService.java | 6 ++--
...tandaloneMetaDataManagerPersistServiceTest.java | 4 +--
11 files changed, 45 insertions(+), 45 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 234a39edb27..48cb5294e2e 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
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.mode.metadata.manager.DatabaseRuleConfiguration
import
org.apache.shardingsphere.mode.metadata.manager.GlobalConfigurationManager;
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.DatabaseMetaDataManager;
import org.apache.shardingsphere.mode.metadata.manager.StatisticsManager;
import org.apache.shardingsphere.mode.metadata.manager.StorageUnitManager;
import org.apache.shardingsphere.mode.metadata.manager.SwitchingResource;
@@ -60,7 +60,7 @@ public class MetaDataContextManager {
private final StatisticsManager databaseManager;
- private final SchemaMetaDataManager schemaMetaDataManager;
+ private final DatabaseMetaDataManager databaseMetaDataManager;
private final RuleItemManager ruleItemManager;
@@ -80,7 +80,7 @@ public class MetaDataContextManager {
databaseManager = new StatisticsManager(metaDataContexts);
storageUnitManager = new StorageUnitManager(metaDataContexts,
computeNodeInstanceContext, resourceSwitchManager, metaDataPersistService);
databaseRuleConfigurationManager = new
DatabaseRuleConfigurationManager(metaDataContexts, computeNodeInstanceContext,
metaDataPersistService);
- schemaMetaDataManager = new SchemaMetaDataManager(metaDataContexts,
metaDataPersistService);
+ databaseMetaDataManager = new
DatabaseMetaDataManager(metaDataContexts, metaDataPersistService);
ruleItemManager = new RuleItemManager(metaDataContexts,
databaseRuleConfigurationManager, metaDataPersistService);
globalConfigurationManager = new
GlobalConfigurationManager(metaDataContexts, metaDataPersistService);
}
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/DatabaseMetaDataManager.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseMetaDataManager.java
index 3f6b0b6cd5c..7de3ea1ab6c 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/DatabaseMetaDataManager.java
@@ -36,10 +36,10 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Schema meta data manager.
+ * Database meta data manager.
*/
@RequiredArgsConstructor
-public final class SchemaMetaDataManager {
+public final class DatabaseMetaDataManager {
private final MetaDataContexts metaDataContexts;
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/DatabaseMetaDataManagerTest.java
similarity index 88%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseMetaDataManagerTest.java
index d0b0e77537e..d67f9465322 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/DatabaseMetaDataManagerTest.java
@@ -54,12 +54,12 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class SchemaMetaDataManagerTest {
+class DatabaseMetaDataManagerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private MetaDataContexts metaDataContexts;
- private SchemaMetaDataManager schemaMetaDataManager;
+ private DatabaseMetaDataManager databaseMetaDataManager;
@BeforeEach
void setUp() {
@@ -67,7 +67,7 @@ class SchemaMetaDataManagerTest {
when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(database);
when(metaDataContexts.getMetaData().getAllDatabases()).thenReturn(Collections.singleton(database));
- schemaMetaDataManager = new SchemaMetaDataManager(metaDataContexts,
mock(MetaDataPersistService.class));
+ databaseMetaDataManager = new
DatabaseMetaDataManager(metaDataContexts, mock(MetaDataPersistService.class));
}
private ShardingSphereDatabase mockDatabase() {
@@ -80,14 +80,14 @@ class SchemaMetaDataManagerTest {
@Test
void assertAddNotExistedDatabase() {
- schemaMetaDataManager.addDatabase("new_db");
+ databaseMetaDataManager.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);
- schemaMetaDataManager.addDatabase("foo_db");
+ databaseMetaDataManager.addDatabase("foo_db");
verify(metaDataContexts.getMetaData(),
times(0)).addDatabase(eq("foo_db"), any(DatabaseType.class),
any(ConfigurationProperties.class));
}
@@ -95,38 +95,38 @@ class SchemaMetaDataManagerTest {
void assertDropExistedDatabase() {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
when(metaDataContexts.getMetaData().containsDatabase("foo_db")).thenReturn(true);
- schemaMetaDataManager.dropDatabase("foo_db");
+ databaseMetaDataManager.dropDatabase("foo_db");
verify(metaDataContexts.getMetaData()).dropDatabase("foo_db");
}
@Test
void assertDropNotExistedDatabase() {
- schemaMetaDataManager.dropDatabase("not_existed_db");
+ databaseMetaDataManager.dropDatabase("not_existed_db");
verify(metaDataContexts.getMetaData(),
times(0)).dropDatabase("not_existed_db");
}
@Test
void assertAddNotExistedSchema() {
- schemaMetaDataManager.addSchema("foo_db", "bar_schema");
+ databaseMetaDataManager.addSchema("foo_db", "bar_schema");
verify(metaDataContexts.getMetaData().getDatabase("foo_db")).addSchema(any(ShardingSphereSchema.class));
}
@Test
void assertAddExistedSchema() {
when(metaDataContexts.getMetaData().getDatabase("foo_db").containsSchema("foo_schema")).thenReturn(true);
- schemaMetaDataManager.addSchema("foo_db", "foo_schema");
+ databaseMetaDataManager.addSchema("foo_db", "foo_schema");
verify(metaDataContexts.getMetaData().getDatabase("foo_db"),
times(0)).addSchema(any(ShardingSphereSchema.class));
}
@Test
void assertDropNotExistedSchema() {
- schemaMetaDataManager.dropSchema("foo_db", "bar_schema");
+ databaseMetaDataManager.dropSchema("foo_db", "bar_schema");
verify(metaDataContexts.getMetaData().getDatabase("foo_db"),
times(0)).dropSchema(anyString());
}
@Test
void assertDropExistedSchema() {
- schemaMetaDataManager.dropSchema("foo_db", "foo_schema");
+ databaseMetaDataManager.dropSchema("foo_db", "foo_schema");
verify(metaDataContexts.getMetaData().getDatabase("foo_db")).dropSchema("foo_schema");
}
@@ -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, null);
+ databaseMetaDataManager.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, null);
+ databaseMetaDataManager.alterSchema("foo_db", "foo_schema", null,
null);
verify(metaDataContexts.getMetaData().getDatabase("foo_db"),
times(0)).getSchema(any());
}
@@ -155,7 +155,7 @@ class SchemaMetaDataManagerTest {
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());
- schemaMetaDataManager.alterSchema("foo_db", "foo_schema",
toBeChangedTable, null);
+ databaseMetaDataManager.alterSchema("foo_db", "foo_schema",
toBeChangedTable, null);
ShardingSphereTable table =
metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema").getTable("foo_tbl");
assertThat(table.getAllColumns().size(), is(1));
assertTrue(table.containsColumn("foo_col"));
@@ -167,7 +167,7 @@ class SchemaMetaDataManagerTest {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getAllSchemas()).thenReturn(Collections.singleton(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`");
- schemaMetaDataManager.alterSchema("foo_db", "foo_schema", null,
toBeChangedView);
+ databaseMetaDataManager.alterSchema("foo_db", "foo_schema", null,
toBeChangedView);
ShardingSphereView view =
metaDataContexts.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`"));
@@ -176,14 +176,14 @@ class SchemaMetaDataManagerTest {
@Test
void assertDropTable() {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getAllSchemas()).thenReturn(Collections.singleton(createToBeAlteredSchema()));
- schemaMetaDataManager.dropTable("foo_db", "foo_schema", "foo_tbl");
+ databaseMetaDataManager.dropTable("foo_db", "foo_schema", "foo_tbl");
assertFalse(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema").containsTable("foo_tbl"));
}
@Test
void assertDropView() {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getAllSchemas()).thenReturn(Collections.singleton(createToBeAlteredSchema()));
- schemaMetaDataManager.dropView("foo_db", "foo_schema", "foo_view");
+ databaseMetaDataManager.dropView("foo_db", "foo_schema", "foo_view");
assertFalse(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema").containsView("foo_view"));
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
index bb277c84d03..799536e3bf4 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
@@ -41,7 +41,7 @@ public final class SchemaChangedHandler {
* @param schemaName schema name
*/
public void handleCreated(final String databaseName, final String
schemaName) {
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addSchema(databaseName,
schemaName);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().addSchema(databaseName,
schemaName);
statisticsRefreshEngine.asyncRefresh();
}
@@ -52,7 +52,7 @@ public final class SchemaChangedHandler {
* @param schemaName schema name
*/
public void handleDropped(final String databaseName, final String
schemaName) {
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropSchema(databaseName,
schemaName);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropSchema(databaseName,
schemaName);
statisticsRefreshEngine.asyncRefresh();
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
index 3b0bab15755..b6434fdb921 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
@@ -49,7 +49,7 @@ public final class TableChangedHandler {
String tableName =
TableMetaDataNodePath.getTableNameByActiveVersionPath(event.getKey()).orElseThrow(()
-> new IllegalStateException("Table name not found."));
ActiveVersionChecker.checkActiveVersion(contextManager, event);
ShardingSphereTable table =
contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getTable().load(databaseName,
schemaName, tableName);
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(databaseName,
schemaName, table, null);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().alterSchema(databaseName,
schemaName, table, null);
statisticsRefreshEngine.asyncRefresh();
}
@@ -62,7 +62,7 @@ public final class TableChangedHandler {
*/
public void handleDropped(final String databaseName, final String
schemaName, final DataChangedEvent event) {
String tableName =
TableMetaDataNodePath.findTableName(event.getKey()).orElseThrow(() -> new
IllegalStateException("Table name not found."));
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropTable(databaseName,
schemaName, tableName);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropTable(databaseName,
schemaName, tableName);
statisticsRefreshEngine.asyncRefresh();
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
index 4a849a82bee..6c14b210bc4 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
@@ -49,7 +49,7 @@ public final class ViewChangedHandler {
String viewName =
ViewMetaDataNodePath.getViewNameByActiveVersionPath(event.getKey()).orElseThrow(()
-> new IllegalStateException("View name not found."));
ActiveVersionChecker.checkActiveVersion(contextManager, event);
ShardingSphereView view =
contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getView().load(databaseName,
schemaName, viewName);
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().alterSchema(databaseName,
schemaName, null, view);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().alterSchema(databaseName,
schemaName, null, view);
statisticsRefreshEngine.asyncRefresh();
}
@@ -62,7 +62,7 @@ public final class ViewChangedHandler {
*/
public void handleDropped(final String databaseName, final String
schemaName, final DataChangedEvent event) {
String viewName =
ViewMetaDataNodePath.findViewName(event.getKey()).orElseThrow(() -> new
IllegalStateException("View name not found."));
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropView(databaseName,
schemaName, viewName);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropView(databaseName,
schemaName, viewName);
statisticsRefreshEngine.asyncRefresh();
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
index 1e5f3d1b066..9f3627bad46 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
@@ -57,10 +57,10 @@ public final class DatabaseListenerChangedHandler
implements DataChangedEventHan
ClusterPersistRepository repository = (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
if (ClusterDatabaseListenerCoordinatorType.CREATE ==
clusterDatabaseListenerCoordinatorType) {
repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(databaseName);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().addDatabase(databaseName);
} else if (ClusterDatabaseListenerCoordinatorType.DROP ==
clusterDatabaseListenerCoordinatorType) {
repository.removeDataListener(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
-
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(databaseName);
+
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropDatabase(databaseName);
}
new
ClusterDatabaseListenerPersistCoordinator(repository).delete(databaseName);
if (InstanceType.PROXY ==
contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType())
{
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
index b565844f4f9..66de116683c 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
@@ -61,14 +61,14 @@ class MetaDataChangedHandlerTest {
void assertHandleSchemaCreated() {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.PROXY);
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema", "", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).addSchema("foo_db",
"foo_schema");
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).addSchema("foo_db",
"foo_schema");
}
@Test
void assertHandleSchemaDropped() {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.PROXY);
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema", "", Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).dropSchema("foo_db",
"foo_schema");
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).dropSchema("foo_db",
"foo_schema");
}
@Test
@@ -78,7 +78,7 @@ class MetaDataChangedHandlerTest {
when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getTable().load("foo_db",
"foo_schema", "foo_tbl"))
.thenReturn(table);
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version/0",
"0", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).alterSchema("foo_db",
"foo_schema", table, null);
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).alterSchema("foo_db",
"foo_schema", table, null);
}
@Test
@@ -88,13 +88,13 @@ class MetaDataChangedHandlerTest {
when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getTable().load("foo_db",
"foo_schema", "foo_tbl"))
.thenReturn(table);
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version/0",
"0", Type.UPDATED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).alterSchema("foo_db",
"foo_schema", table, null);
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).alterSchema("foo_db",
"foo_schema", table, null);
}
@Test
void assertHandleTableDropped() {
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl", "",
Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).dropTable("foo_db",
"foo_schema", "foo_tbl");
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).dropTable("foo_db",
"foo_schema", "foo_tbl");
}
@Test
@@ -104,7 +104,7 @@ class MetaDataChangedHandlerTest {
when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getView().load("foo_db",
"foo_schema", "foo_view"))
.thenReturn(view);
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version/0",
"0", Type.ADDED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).alterSchema("foo_db",
"foo_schema", null, view);
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).alterSchema("foo_db",
"foo_schema", null, view);
}
@Test
@@ -114,13 +114,13 @@ class MetaDataChangedHandlerTest {
when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getDatabaseMetaDataFacade().getView().load("foo_db",
"foo_schema", "foo_view"))
.thenReturn(view);
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version/0",
"0", Type.UPDATED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).alterSchema("foo_db",
"foo_schema", null, view);
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).alterSchema("foo_db",
"foo_schema", null, view);
}
@Test
void assertHandleViewDropped() {
handler.handle("foo_db", new
DataChangedEvent("/metadata/foo_db/schemas/foo_schema/views/foo_view", "",
Type.DELETED));
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).dropView("foo_db",
"foo_schema", "foo_view");
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).dropView("foo_db",
"foo_schema", "foo_view");
}
@Test
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
index e3231f41ead..f38a8b4875c 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
@@ -71,7 +71,7 @@ class DatabaseListenerChangedHandlerTest {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.JDBC);
handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db", "CREATE",
Type.ADDED));
verify(repository).watch(eq("/metadata/foo_db"), any());
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).addDatabase("foo_db");
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).addDatabase("foo_db");
verify(repository).delete(StatesNodePath.getDatabaseListenerCoordinatorNodePath("foo_db"));
}
@@ -80,7 +80,7 @@ class DatabaseListenerChangedHandlerTest {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.PROXY);
handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db", "DROP",
Type.ADDED));
verify(repository).removeDataListener("/metadata/foo_db");
-
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).dropDatabase("foo_db");
+
verify(contextManager.getMetaDataContextManager().getDatabaseMetaDataManager()).dropDatabase("foo_db");
verify(repository).delete(StatesNodePath.getDatabaseListenerCoordinatorNodePath("foo_db"));
}
}
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 0b5d7256628..aa1aff94e3d 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
@@ -75,21 +75,21 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
@Override
public void createDatabase(final String databaseName) {
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().add(databaseName);
-
metaDataContextManager.getSchemaMetaDataManager().addDatabase(databaseName);
+
metaDataContextManager.getDatabaseMetaDataManager().addDatabase(databaseName);
clearServiceCache();
}
@Override
public void dropDatabase(final String databaseName) {
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().drop(databaseName);
-
metaDataContextManager.getSchemaMetaDataManager().dropDatabase(databaseName);
+
metaDataContextManager.getDatabaseMetaDataManager().dropDatabase(databaseName);
clearServiceCache();
}
@Override
public void createSchema(final String databaseName, final String
schemaName) {
metaDataPersistService.getDatabaseMetaDataFacade().getSchema().add(databaseName,
schemaName);
-
metaDataContextManager.getSchemaMetaDataManager().addSchema(databaseName,
schemaName);
+
metaDataContextManager.getDatabaseMetaDataManager().addSchema(databaseName,
schemaName);
}
@Override
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 4a6fc2f96e3..10a00ceb229 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
@@ -80,14 +80,14 @@ class StandaloneMetaDataManagerPersistServiceTest {
@Test
void assertCreateDatabase() {
metaDataManagerPersistService.createDatabase("foo_db");
-
verify(metaDataContextManager.getSchemaMetaDataManager()).addDatabase("foo_db");
+
verify(metaDataContextManager.getDatabaseMetaDataManager()).addDatabase("foo_db");
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).add("foo_db");
}
@Test
void assertDropDatabase() {
metaDataManagerPersistService.dropDatabase("foo_db");
-
verify(metaDataContextManager.getSchemaMetaDataManager()).dropDatabase("foo_db");
+
verify(metaDataContextManager.getDatabaseMetaDataManager()).dropDatabase("foo_db");
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).drop("foo_db");
}
