(shardingsphere) branch master updated: Remove useless ShardingSphereSchema.containsColumn() (#33802)

[zhangliang]

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 b8cbe59022e Remove useless ShardingSphereSchema.containsColumn() 
(#33802)
b8cbe59022e is described below

commit b8cbe59022e8d8ee693d690dc2327ecbe826336a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Nov 25 21:25:59 2024 +0800

    Remove useless ShardingSphereSchema.containsColumn() (#33802)
    
    * Remove useless ShardingSphereSchema.containsColumn()
    
    * Remove useless ShardingSphereSchema.containsColumn()
---
 .../database/schema/model/ShardingSphereSchema.java  | 11 -----------
 .../database/schema/model/ShardingSphereTable.java   | 20 ++++++++++----------
 .../schema/model/ShardingSphereSchemaTest.java       |  7 -------
 3 files changed, 10 insertions(+), 28 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 5fcf2008660..b37664a3129 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
@@ -150,17 +150,6 @@ public final class ShardingSphereSchema {
         return tables.containsKey(tableName.toLowerCase());
     }
     
-    /**
-     * Judge whether contains column name.
-     *
-     * @param tableName table name
-     * @param columnName column name
-     * @return contains column name or not
-     */
-    public boolean containsColumn(final String tableName, final String 
columnName) {
-        return containsTable(tableName) && 
getTable(tableName).containsColumn(columnName);
-    }
-    
     /**
      * Judge whether contains index name.
      *
diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
index b1816709f15..5db71fd7ce1 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
@@ -109,6 +109,16 @@ public final class ShardingSphereTable {
         return result;
     }
     
+    /**
+     * Judge whether contains column.
+     *
+     * @param columnName column name
+     * @return contains column or not
+     */
+    public boolean containsColumn(final String columnName) {
+        return null != columnName && columns.containsKey(new 
ShardingSphereMetaDataIdentifier(columnName));
+    }
+    
     /**
      * Get column.
      *
@@ -128,16 +138,6 @@ public final class ShardingSphereTable {
         return columns.values();
     }
     
-    /**
-     * Judge whether contains column or not.
-     *
-     * @param columnName column name
-     * @return whether contains column or not
-     */
-    public boolean containsColumn(final String columnName) {
-        return null != columnName && columns.containsKey(new 
ShardingSphereMetaDataIdentifier(columnName));
-    }
-    
     /**
      * Put index.
      *
diff --git 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
index d7252d94069..a91a5d7f766 100644
--- 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
+++ 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
@@ -77,13 +77,6 @@ class ShardingSphereSchemaTest {
         assertTrue(new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME, 
Collections.singletonMap("tbl", mock(ShardingSphereTable.class)), 
Collections.emptyMap()).containsTable("tbl"));
     }
     
-    @Test
-    void assertContainsColumn() {
-        ShardingSphereTable table = new ShardingSphereTable("tbl", 
Collections.singletonList(
-                new ShardingSphereColumn("col", 0, false, false, false, true, 
false, false)), Collections.emptyList(), Collections.emptyList());
-        assertTrue(new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME, 
Collections.singletonMap("tbl", table), 
Collections.emptyMap()).containsColumn("tbl", "col"));
-    }
-    
     @Test
     void assertGetAllColumnNamesWhenContainsKey() {
         ShardingSphereTable table = new ShardingSphereTable("tbl", 
Collections.singletonList(