[shardingsphere] branch master updated: Fix export storage nodes data (#24715)

[jianglongtao]

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

jianglongtao 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 84c4aa4c298 Fix export storage nodes data (#24715)
84c4aa4c298 is described below

commit 84c4aa4c2986b097561118585483b63a8bfe9775
Author: ChenJiaHao <pace2...@163.com>
AuthorDate: Tue Mar 21 17:29:37 2023 +0800

    Fix export storage nodes data (#24715)
    
    * Fix export storage nodes data
    
    * add blank line
---
 .../handler/distsql/ral/queryable/ExportStorageNodesExecutor.java     | 4 ++--
 .../handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java | 2 +-
 .../core/src/test/resources/expected/export-storage-nodes.json        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
index 90f2507d762..71359001e91 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
@@ -93,8 +93,8 @@ public final class ExportStorageNodesExecutor implements 
MetaDataRequiredQueryab
                 return;
             }
             Map<String, Object> standardProperties = 
DataSourcePropertiesCreator.create(value).getConnectionPropertySynonyms().getStandardProperties();
-            ExportedStorageNode exportedStorageNode = new 
ExportedStorageNode(dataSourceMetaData.getHostname(), 
String.valueOf(dataSourceMetaData.getPort()), dataSourceMetaData.getCatalog(),
-                    String.valueOf(standardProperties.get("username")), 
String.valueOf(standardProperties.get("password")));
+            ExportedStorageNode exportedStorageNode = new 
ExportedStorageNode(dataSourceMetaData.getHostname(), 
String.valueOf(dataSourceMetaData.getPort()),
+                    String.valueOf(standardProperties.get("username")), 
String.valueOf(standardProperties.get("password")), 
dataSourceMetaData.getCatalog());
             storageNodes.put(databaseInstanceIp, exportedStorageNode);
         });
         return Collections.singletonMap(database.getName(), 
storageNodes.values());
diff --git 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
index 7ceb90e725a..cb765df9e06 100644
--- 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
+++ 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
@@ -157,7 +157,7 @@ public final class ExportStorageNodesExecutorTest {
         MockedDataSource result = new MockedDataSource();
         result.setUrl(String.format("jdbc:mock://127.0.0.1/%s", name));
         result.setUsername("root");
-        result.setPassword("");
+        result.setPassword("test");
         result.setMaxPoolSize(50);
         result.setMinPoolSize(1);
         return result;
diff --git 
a/proxy/backend/core/src/test/resources/expected/export-storage-nodes.json 
b/proxy/backend/core/src/test/resources/expected/export-storage-nodes.json
index 86d36da5346..48cdcf65002 100644
--- a/proxy/backend/core/src/test/resources/expected/export-storage-nodes.json
+++ b/proxy/backend/core/src/test/resources/expected/export-storage-nodes.json
@@ -1 +1 @@
-{"storage_nodes":{"normal_db":[{"port":"0","password":"root","database":""}]}}
+{"storage_nodes":{"normal_db":[{"port":"0","username":"root","password":"test"}]}}