Refactor ShardingSphereSchema.putTable (#33818)

* Refactor ShardingSphereSchema.putView * Refactor ShardingSphereSchema.putTable * Refactor ShardingSphereSchema.putTable
apache · Nov 26, 2024 · d6459a5 · d6459a5
1 parent 7b87b62
commit d6459a5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/.../org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java b/.../org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
@@ -85,11 +85,10 @@ public ShardingSphereView getView(final String viewName) {
     /**
      * Add table.
      *
-     * @param tableName table name
      * @param table table
      */
-    public void putTable(final String tableName, final ShardingSphereTable table) {
-        tables.put(tableName.toLowerCase(), table);
+    public void putTable(final ShardingSphereTable table) {
+        tables.put(table.getName().toLowerCase(), table);
     }
 
     /**
@@ -99,7 +98,7 @@ public void putTable(final String tableName, final ShardingSphereTable table) {
      */
     public void putTables(final Map<String, ShardingSphereTable> tables) {
         for (Entry<String, ShardingSphereTable> entry : tables.entrySet()) {
-            putTable(entry.getKey(), entry.getValue());
+            putTable(entry.getValue());
         }
     }
 

diff --git a/.../apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java b/.../apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
@@ -28,6 +28,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 class ShardingSphereSchemaTest {
 
@@ -55,7 +56,8 @@ void assertGetView() {
     void assertPutTable() {
         ShardingSphereSchema actual = new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME, Collections.emptyMap(), Collections.emptyMap());
         ShardingSphereTable table = mock(ShardingSphereTable.class);
-        actual.putTable("tbl", table);
+        when(table.getName()).thenReturn("tbl");
+        actual.putTable(table);
         assertThat(actual.getTable("tbl"), is(table));
     }
 

diff --git a/...ache/shardingsphere/single/route/validator/ddl/SingleDropSchemaMetaDataValidatorTest.java b/...ache/shardingsphere/single/route/validator/ddl/SingleDropSchemaMetaDataValidatorTest.java
@@ -62,7 +62,7 @@ void assertValidate() {
     private ShardingSphereDatabase mockDatabase() {
         ShardingSphereDatabase result = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
         ShardingSphereSchema schema = new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME);
-        schema.putTable("foo_tbl", new ShardingSphereTable("foo_tbl", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), TableType.TABLE));
+        schema.putTable(new ShardingSphereTable("foo_tbl", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), TableType.TABLE));
         when(result.getSchemas()).thenReturn(Collections.singletonMap("foo_schema", schema));
         return result;
     }

diff --git a/.../src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java b/.../src/main/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManager.java
@@ -155,7 +155,7 @@ private void alterTable(final String databaseName, final String schemaName, fina
         if (TableRefreshUtils.isSingleTable(beBoChangedTable.getName(), database)) {
             database.reloadRules();
         }
-        database.getSchema(schemaName).putTable(beBoChangedTable.getName(), beBoChangedTable);
+        database.getSchema(schemaName).putTable(beBoChangedTable);
     }
 
     private void alterView(final String databaseName, final String schemaName, final ShardingSphereView beBoChangedView) {

diff --git a/...e/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java b/...e/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java
@@ -81,7 +81,7 @@ private ShardingSphereSchema getSchema(final ShardingSphereDatabase database, fi
         Map<String, ShardingSphereSchema> schemaMap = GenericSchemaBuilder.build(Collections.singletonList(viewName), material);
         Optional<ShardingSphereTable> actualViewMetaData = Optional.ofNullable(schemaMap.get(schemaName)).map(optional -> optional.getTable(viewName));
         ShardingSphereSchema result = new ShardingSphereSchema(schemaName);
-        actualViewMetaData.ifPresent(optional -> result.putTable(viewName, optional));
+        actualViewMetaData.ifPresent(result::putTable);
         result.putView(new ShardingSphereView(viewName, viewDefinition));
         return result;
     }

diff --git a/...ardingsphere/mode/manager/standalone/persist/StandaloneMetaDataManagerPersistService.java b/...ardingsphere/mode/manager/standalone/persist/StandaloneMetaDataManagerPersistService.java
@@ -144,7 +144,7 @@ private void addTablesToDataNode(final ShardingSphereDatabase database, final St
             if (!Strings.isNullOrEmpty(logicDataSourceName) && TableRefreshUtils.isSingleTable(entry.getKey(), database)) {
                 database.getRuleMetaData().getAttributes(MutableDataNodeRuleAttribute.class).forEach(rule -> rule.put(logicDataSourceName, schemaName, entry.getKey()));
             }
-            database.getSchema(schemaName).putTable(entry.getKey(), entry.getValue());
+            database.getSchema(schemaName).putTable(entry.getValue());
         }
     }
 
@@ -154,7 +154,7 @@ private void addViewsToDataNode(final ShardingSphereDatabase database, final Str
             if (!Strings.isNullOrEmpty(logicDataSourceName) && TableRefreshUtils.isSingleTable(entry.getKey(), database)) {
                 database.getRuleMetaData().getAttributes(MutableDataNodeRuleAttribute.class).forEach(each -> each.put(logicDataSourceName, schemaName, entry.getKey()));
             }
-            Optional.ofNullable(toBeAddedTables.get(entry.getKey().toLowerCase())).ifPresent(optional -> database.getSchema(schemaName).putTable(entry.getKey(), optional));
+            Optional.ofNullable(toBeAddedTables.get(entry.getKey().toLowerCase())).ifPresent(optional -> database.getSchema(schemaName).putTable(optional));
             database.getSchema(schemaName).putView(entry.getValue());
         }
     }
@@ -366,7 +366,7 @@ private void addTableToDataNode(final ShardingSphereDatabase database, final Str
         if (!Strings.isNullOrEmpty(logicDataSourceName) && TableRefreshUtils.isSingleTable(table.getName(), database)) {
             database.getRuleMetaData().getAttributes(MutableDataNodeRuleAttribute.class).forEach(rule -> rule.put(logicDataSourceName, schemaName, table.getName()));
         }
-        database.getSchema(schemaName).putTable(table.getName(), table);
+        database.getSchema(schemaName).putTable(table);
     }
 
     private void clearServiceCache() {