diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java index 68c7fa88a57de..a5be33de72f76 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java @@ -57,49 +57,49 @@ private static ShardingSphereSchema getToBeAddedTablesBySchema(final ShardingSph * * @param reloadTables reload tables * @param currentTables current tables - * @return To be added table meta data + * @return to be added tables */ public static Map getToBeAddedTables(final Map reloadTables, final Map currentTables) { return reloadTables.entrySet().stream().filter(entry -> !entry.getValue().equals(currentTables.get(entry.getKey()))).collect(Collectors.toMap(Entry::getKey, Entry::getValue)); } /** - * Get to be deleted tables by schemas. + * Get to be dropped tables by schemas. * * @param reloadSchemas reload schemas * @param currentSchemas current schemas - * @return To be deleted table meta data + * @return to be dropped table */ - public static Map getToBeDeletedTablesBySchemas(final Map reloadSchemas, final Map currentSchemas) { + public static Map getToBeDroppedTablesBySchemas(final Map reloadSchemas, final Map currentSchemas) { Map result = new LinkedHashMap<>(currentSchemas.size(), 1F); currentSchemas.entrySet().stream().filter(entry -> reloadSchemas.containsKey(entry.getKey())).collect(Collectors.toMap(Entry::getKey, Entry::getValue)) - .forEach((key, value) -> result.put(key, getToBeDeletedTablesBySchema(reloadSchemas.get(key), value))); + .forEach((key, value) -> result.put(key, getToBeDroppedTablesBySchema(reloadSchemas.get(key), value))); return result; } - private static ShardingSphereSchema getToBeDeletedTablesBySchema(final ShardingSphereSchema reloadSchema, final ShardingSphereSchema currentSchema) { - return new ShardingSphereSchema(currentSchema.getName(), getToBeDeletedTables(reloadSchema.getTables(), currentSchema.getTables()), new LinkedHashMap<>()); + private static ShardingSphereSchema getToBeDroppedTablesBySchema(final ShardingSphereSchema reloadSchema, final ShardingSphereSchema currentSchema) { + return new ShardingSphereSchema(currentSchema.getName(), getToBeDroppedTables(reloadSchema.getTables(), currentSchema.getTables()), new LinkedHashMap<>()); } /** - * Get to be deleted tables. + * Get to be drop tables. * * @param reloadTables reload tables * @param currentTables current tables - * @return To be deleted table meta data + * @return to be dropped table */ - public static Map getToBeDeletedTables(final Map reloadTables, final Map currentTables) { + public static Map getToBeDroppedTables(final Map reloadTables, final Map currentTables) { return currentTables.entrySet().stream().filter(entry -> !reloadTables.containsKey(entry.getKey())).collect(Collectors.toMap(Entry::getKey, Entry::getValue)); } /** - * Get to be deleted schema names. + * Get to be dropped schemas. * * @param reloadSchemas reload schemas * @param currentSchemas current schemas - * @return To be deleted schema names + * @return to be dropped schemas */ - public static Map getToBeDeletedSchemaNames(final Map reloadSchemas, final Map currentSchemas) { + public static Map getToBeDroppedSchemas(final Map reloadSchemas, final Map currentSchemas) { return currentSchemas.entrySet().stream().filter(entry -> !reloadSchemas.containsKey(entry.getKey())).collect(Collectors.toMap(Entry::getKey, Entry::getValue)); } } diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManagerTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManagerTest.java index b460ad91611fc..a10b840706685 100644 --- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManagerTest.java +++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManagerTest.java @@ -45,12 +45,12 @@ void assertGetToBeAddedTablesBySchemas() { } @Test - void assertGetToBeDeletedTablesBySchemas() { + void assertGetToBeDroppedTablesBySchemas() { Map currentSchemas = Collections.singletonMap("foo_schema", new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME, Collections.singletonMap("foo_table", new ShardingSphereTable("foo_table", Collections.emptyList(), Collections.emptyList(), Collections.emptyList())), Collections.emptyMap())); Map reloadSchemas = Collections.singletonMap("foo_schema", new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME, Collections.emptyMap(), Collections.emptyMap())); - Map actual = GenericSchemaManager.getToBeDeletedTablesBySchemas(reloadSchemas, currentSchemas); + Map actual = GenericSchemaManager.getToBeDroppedTablesBySchemas(reloadSchemas, currentSchemas); assertThat(actual.size(), is(1)); assertThat(actual.get("foo_schema").getTables().size(), is(1)); assertTrue(actual.get("foo_schema").getTables().containsKey("foo_table")); @@ -64,16 +64,16 @@ void assertGetToBeAddedTables() { } @Test - void assertGetToBeDeletedTables() { - Map actual = GenericSchemaManager.getToBeDeletedTables(Collections.emptyMap(), Collections.singletonMap("foo_table", new ShardingSphereTable())); + void assertGetToBeDroppedTables() { + Map actual = GenericSchemaManager.getToBeDroppedTables(Collections.emptyMap(), Collections.singletonMap("foo_table", new ShardingSphereTable())); assertThat(actual.size(), is(1)); assertTrue(actual.containsKey("foo_table")); } @Test - void assertGetToBeDeletedSchemaNames() { + void assertGetToBeDroppedSchemas() { Map actual = - GenericSchemaManager.getToBeDeletedSchemaNames(Collections.emptyMap(), Collections.singletonMap("foo_schema", new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME))); + GenericSchemaManager.getToBeDroppedSchemas(Collections.emptyMap(), Collections.singletonMap("foo_schema", new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME))); assertThat(actual.size(), is(1)); assertTrue(actual.containsKey("foo_schema")); diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java index 1ddb919b8cae4..a64e74e6a47dd 100644 --- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java +++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java @@ -149,7 +149,7 @@ public Map loadDataSourceConfigurations(final S * @param currentDatabase current database */ public void persistReloadDatabaseByAlter(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) { - Map toBeDeletedSchemas = GenericSchemaManager.getToBeDeletedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas()); + Map toBeDeletedSchemas = GenericSchemaManager.getToBeDroppedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas()); Map toBeAddedSchemas = GenericSchemaManager.getToBeAddedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas()); toBeAddedSchemas.forEach((key, value) -> databaseMetaDataService.persistByAlterConfiguration(databaseName, key, value)); toBeDeletedSchemas.forEach((key, value) -> databaseMetaDataService.delete(databaseName, key, value)); @@ -163,7 +163,7 @@ public void persistReloadDatabaseByAlter(final String databaseName, final Shardi * @param currentDatabase current database */ public void persistReloadDatabaseByDrop(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) { - Map toBeAlterSchemas = GenericSchemaManager.getToBeDeletedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas()); + Map toBeAlterSchemas = GenericSchemaManager.getToBeDroppedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas()); Map toBeAddedSchemas = GenericSchemaManager.getToBeAddedTablesBySchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas()); toBeAddedSchemas.forEach((key, value) -> databaseMetaDataService.persistByDropConfiguration(databaseName, key, value)); toBeAlterSchemas.forEach((key, value) -> databaseMetaDataService.delete(databaseName, key, value)); diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java index 1ebf6e0495a3c..e0fdcbec3f12b 100644 --- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java +++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java @@ -112,7 +112,7 @@ public void compareAndPersist(final String databaseName, final String schemaName } Map currentTables = tableMetaDataPersistService.load(databaseName, schemaName); tableMetaDataPersistService.persist(databaseName, schemaName, GenericSchemaManager.getToBeAddedTables(schema.getTables(), currentTables)); - GenericSchemaManager.getToBeDeletedTables(schema.getTables(), currentTables).forEach((key, value) -> tableMetaDataPersistService.delete(databaseName, schemaName, key)); + GenericSchemaManager.getToBeDroppedTables(schema.getTables(), currentTables).forEach((key, value) -> tableMetaDataPersistService.delete(databaseName, schemaName, key)); } /** 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 b39cb56cc1186..09724a2f17768 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 @@ -89,15 +89,15 @@ public MetaDataContextManager(final AtomicReference metaDataCo } /** - * Delete schema names. + * Drop schemas. * * @param databaseName database name * @param reloadDatabase reload database * @param currentDatabase current database */ - public void deletedSchemaNames(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) { - GenericSchemaManager.getToBeDeletedSchemaNames(reloadDatabase.getSchemas(), currentDatabase.getSchemas()).keySet() - .forEach(each -> metaDataPersistService.getDatabaseMetaDataService().dropSchema(databaseName, each)); + public void dropSchemas(final String databaseName, final ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase currentDatabase) { + GenericSchemaManager.getToBeDroppedSchemas(reloadDatabase.getSchemas(), currentDatabase.getSchemas()) + .keySet().forEach(each -> metaDataPersistService.getDatabaseMetaDataService().dropSchema(databaseName, each)); } /** @@ -138,7 +138,7 @@ public void forceRefreshDatabaseMetaData(final ShardingSphereDatabase database) public void refreshTableMetaData(final ShardingSphereDatabase database) { try { MetaDataContexts reloadedMetaDataContexts = createMetaDataContexts(database); - deletedSchemaNames(database.getName(), reloadedMetaDataContexts.getMetaData().getDatabase(database.getName()), database); + dropSchemas(database.getName(), reloadedMetaDataContexts.getMetaData().getDatabase(database.getName()), database); metaDataContexts.set(reloadedMetaDataContexts); metaDataContexts.get().getMetaData().getDatabase(database.getName()).getSchemas() .forEach((schemaName, schema) -> metaDataPersistService.getDatabaseMetaDataService().compareAndPersist(database.getName(), schemaName, schema)); 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 8932e7d76ffef..f672c048fef1d 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 @@ -272,7 +272,7 @@ public void unregisterStorageUnits(final String databaseName, final Collection