(shardingsphere) branch master updated: Refactor ShardingSphereSchema.putView (#33817)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 7b87b623137 Refactor ShardingSphereSchema.putView (#33817)
7b87b623137 is described below

commit 7b87b623137b72c75884158c61ad4ea00df9672b
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Nov 26 15:34:32 2024 +0800

    Refactor ShardingSphereSchema.putView (#33817)
---
 .../database/schema/model/ShardingSphereSchema.java   | 19 +++++++++----------
 .../mode/metadata/manager/SchemaMetaDataManager.java  |  2 +-
 .../type/view/AlterViewStatementSchemaRefresher.java  |  2 +-
 .../StandaloneMetaDataManagerPersistService.java      |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
index 9b9ce5f6390..68a58417d9a 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
@@ -92,16 +92,6 @@ public final class ShardingSphereSchema {
         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 final class ShardingSphereSchema {
         }
     }
     
+    /**
+     * Add view.
+     *
+     * @param view view
+     */
+    public void putView(final ShardingSphereView view) {
+        views.put(view.getName().toLowerCase(), view);
+    }
+    
     /**
      * Remove table.
      *
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/SchemaMetaDataManager.java
index 97b852601dc..e06726a585f 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/SchemaMetaDataManager.java
@@ -163,7 +163,7 @@ public final class SchemaMetaDataManager {
         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/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java
index bfc994501d9..46e023a8c65 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/AlterViewStatementSchemaRefresher.java
@@ -82,7 +82,7 @@ public final class AlterViewStatementSchemaRefresher 
implements MetaDataRefreshe
         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/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 2665c2daadd..a3100d20af8 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
@@ -155,7 +155,7 @@ public final class StandaloneMetaDataManagerPersistService 
implements MetaDataMa
                 
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());
         }
     }