Refactor ShardingSphereSchema.putView (#33817)

apache · Nov 26, 2024 · 7b87b62 · 7b87b62
1 parent 15dc388
commit 7b87b62
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 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
@@ -92,16 +92,6 @@ public void putTable(final String tableName, final ShardingSphereTable table) {
         tables.put(tableName.toLowerCase(), table);
     }
 
-    /**
-     * Add view.
-     *
-     * @param viewName view name
-     * @param view view
-     */
-    public void putView(final String viewName, final ShardingSphereView view) {
-        views.put(viewName.toLowerCase(), view);
-    }
-
     /**
      * Add tables.
      *
@@ -113,6 +103,15 @@ public void putTables(final Map<String, ShardingSphereTable> tables) {
         }
     }
 
+    /**
+     * Add view.
+     *
+     * @param view view
+     */
+    public void putView(final ShardingSphereView view) {
+        views.put(view.getName().toLowerCase(), view);
+    }
+
     /**
      * Remove table.
      *

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
@@ -163,7 +163,7 @@ private void alterView(final String databaseName, final String schemaName, final
         if (TableRefreshUtils.isSingleTable(beBoChangedView.getName(), database)) {
             database.reloadRules();
         }
-        database.getSchema(schemaName).putView(beBoChangedView.getName(), beBoChangedView);
+        database.getSchema(schemaName).putView(beBoChangedView);
     }
 
     private void dropTable(final String databaseName, final String schemaName, final String toBeDeletedTableName) {

diff --git a/...e/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java b/...e/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java
@@ -82,7 +82,7 @@ private ShardingSphereSchema getSchema(final ShardingSphereDatabase database, fi
         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));
-        result.putView(viewName, new ShardingSphereView(viewName, viewDefinition));
+        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
@@ -155,7 +155,7 @@ private void addViewsToDataNode(final ShardingSphereDatabase database, final Str
                 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));
-            database.getSchema(schemaName).putView(entry.getKey(), entry.getValue());
+            database.getSchema(schemaName).putView(entry.getValue());
         }
     }