(shardingsphere) branch master updated: Refactor DataNode (#36951)

[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 b81bf18afb7 Refactor DataNode (#36951)
b81bf18afb7 is described below

commit b81bf18afb7aa47de87ddbe7971f511af783f7ab
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Oct 28 15:37:40 2025 +0800

    Refactor DataNode (#36951)
---
 .../java/org/apache/shardingsphere/infra/datanode/DataNode.java     | 4 ++--
 .../org/apache/shardingsphere/single/util/SingleTableLoadUtils.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
index 19bccb4b8c6..1bf06121b0d 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
@@ -68,7 +68,7 @@ public final class DataNode {
      *
      * @param databaseName database name
      * @param databaseType database type
-     * @param dataNode string of data node. use {@code .} to split data source 
name and table name
+     * @param dataNode data node use {@code .} to split schema name and table 
name
      */
     public DataNode(final String databaseName, final DatabaseType 
databaseType, final String dataNode) {
         ShardingSpherePreconditions.checkState(dataNode.contains(DELIMITER), 
() -> new InvalidDataNodeFormatException(dataNode));
@@ -81,7 +81,7 @@ public final class DataNode {
     }
     
     private String getSchemaName(final String databaseName, final 
DialectDatabaseMetaData dialectDatabaseMetaData, final boolean containsSchema, 
final List<String> segments) {
-        return 
dialectDatabaseMetaData.getSchemaOption().getDefaultSchema().map(defaultSchema 
-> containsSchema ? segments.get(1) : ASTERISK).orElse(databaseName);
+        return 
dialectDatabaseMetaData.getSchemaOption().getDefaultSchema().map(optional -> 
containsSchema ? segments.get(1) : ASTERISK).orElse(databaseName);
     }
     
     private boolean isValidDataNode(final String dataNodeStr, final int tier) {
diff --git 
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
 
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
index aab99e0bb40..c790fae9458 100644
--- 
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
+++ 
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
@@ -103,11 +103,11 @@ public final class SingleTableLoadUtils {
      *
      * @param databaseName database name
      * @param databaseType database type
-     * @param tables tables in configuration
+     * @param dataNodes data nodes
      * @return data nodes
      */
-    public static Collection<DataNode> convertToDataNodes(final String 
databaseName, final DatabaseType databaseType, final Collection<String> tables) 
{
-        return tables.stream().map(each -> new DataNode(databaseName, 
databaseType, each)).collect(Collectors.toCollection(() -> new 
LinkedHashSet<>(tables.size(), 1F)));
+    public static Collection<DataNode> convertToDataNodes(final String 
databaseName, final DatabaseType databaseType, final Collection<String> 
dataNodes) {
+        return dataNodes.stream().map(each -> new DataNode(databaseName, 
databaseType, each)).collect(Collectors.toCollection(() -> new 
LinkedHashSet<>(dataNodes.size(), 1F)));
     }
     
     /**