(shardingsphere) branch master updated: Refactor SingleTableDataNodeLoader (#36953)

[zh...@apache.org]

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 8c2b08e79f5 Refactor SingleTableDataNodeLoader (#36953)
8c2b08e79f5 is described below

commit 8c2b08e79f578ec20f368eb185d4df1329ddba6f
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Oct 28 16:08:54 2025 +0800

    Refactor SingleTableDataNodeLoader (#36953)
---
 .../org/apache/shardingsphere/infra/datanode/DataNodeTest.java    | 6 +++---
 .../shardingsphere/single/datanode/SingleTableDataNodeLoader.java | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
index 97b13ba0c1f..17eb4116a2d 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
@@ -211,8 +211,8 @@ class DataNodeTest {
     void assertNewDataNodeWithDatabaseType() {
         DataNode dataNode = new DataNode("test_db", TypedSPILoader.getService(DatabaseType.class, "PostgreSQL"), "ds.schema.tbl");
         assertThat(dataNode.getDataSourceName(), is("ds"));
-        assertThat(dataNode.getTableName(), is("tbl"));
         assertThat(dataNode.getSchemaName(), is("schema"));
+        assertThat(dataNode.getTableName(), is("tbl"));
     }
     
     @Test
@@ -231,16 +231,16 @@ class DataNodeTest {
         DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "MySQL");
         DataNode dataNode = new DataNode("test_db", databaseType, "ds.tbl");
         assertThat(dataNode.getDataSourceName(), is("ds"));
-        assertThat(dataNode.getTableName(), is("tbl"));
         assertThat(dataNode.getSchemaName(), is("test_db"));
+        assertThat(dataNode.getTableName(), is("tbl"));
     }
     
     @Test
     void assertNewDataNodeWithDatabaseTypeAndInvalidThreeSegment() {
         DataNode dataNode = new DataNode("test_db", TypedSPILoader.getService(DatabaseType.class, "MySQL"), "ds.schema.tbl");
         assertThat(dataNode.getDataSourceName(), is("ds"));
-        assertThat(dataNode.getTableName(), is("schema.tbl"));
         assertThat(dataNode.getSchemaName(), is("test_db"));
+        assertThat(dataNode.getTableName(), is("schema.tbl"));
     }
     
     @Test
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
index b5f172095d5..7ba33ba3bba 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
@@ -124,27 +124,27 @@ public final class SingleTableDataNodeLoader {
                                                               final Map<String, Map<String, Collection<String>>> configuredTableMap) {
         for (DataNode each : dataNodes) {
             if (featureRequiredSingleTables.contains(each.getTableName())) {
-                return getSingleDataNodeCollection(each);
+                return getSingleDataNodes(each);
             }
             Map<String, Collection<String>> configuredTablesForDataSource = configuredTableMap.get(each.getDataSourceName());
             if (null == configuredTablesForDataSource || configuredTablesForDataSource.isEmpty()) {
                 continue;
             }
             if (configuredTablesForDataSource.containsKey(SingleTableConstants.ASTERISK)) {
-                return getSingleDataNodeCollection(each);
+                return getSingleDataNodes(each);
             }
             Collection<String> configuredTablesForSchema = configuredTablesForDataSource.get(each.getSchemaName());
             if (null == configuredTablesForSchema || configuredTablesForSchema.isEmpty()) {
                 continue;
             }
             if (configuredTablesForSchema.contains(SingleTableConstants.ASTERISK) || configuredTablesForSchema.contains(each.getTableName().toLowerCase())) {
-                return getSingleDataNodeCollection(each);
+                return getSingleDataNodes(each);
             }
         }
         return Collections.emptyList();
     }
     
-    private static Collection<DataNode> getSingleDataNodeCollection(final DataNode dataNode) {
+    private static Collection<DataNode> getSingleDataNodes(final DataNode dataNode) {
         Collection<DataNode> result = new LinkedList<>();
         result.add(dataNode);
         return result;