You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/03/19 15:14:32 UTC

(shardingsphere) branch master updated: Refactor MetaDataImportExecutor (#38520)

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 8f617ea2a37 Refactor MetaDataImportExecutor (#38520)
8f617ea2a37 is described below

commit 8f617ea2a37eaf5899ef4d5a16e063fbb628f11c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Mar 19 23:14:24 2026 +0800

    Refactor MetaDataImportExecutor (#38520)
---
 .../shardingsphere/proxy/backend/util/MetaDataImportExecutor.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
index 115292ed26a..27302b8beab 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
@@ -53,10 +53,10 @@ public final class MetaDataImportExecutor {
      * @param exportedMetaData exported metadata
      */
     public void importClusterConfigurations(final ExportedMetaData exportedMetaData) {
-        Map<String, YamlProxyDatabaseConfiguration> databaseConfigs = getYamlProxyDatabaseConfigurations(exportedMetaData);
-        YamlProxyServerConfiguration yamlServerConfig = getYamlServerConfig(exportedMetaData);
+        Map<String, YamlProxyDatabaseConfiguration> yamlDatabaseConfigs = getYamlProxyDatabaseConfigurations(exportedMetaData);
+        YamlProxyServerConfiguration yamlServerConfig = getYamlServerConfiguration(exportedMetaData);
         importServerConfiguration(yamlServerConfig);
-        importDatabaseConfigurations(databaseConfigs.values());
+        importDatabaseConfigurations(yamlDatabaseConfigs.values());
     }
     
     private void importServerConfiguration(final YamlProxyServerConfiguration yamlServerConfig) {
@@ -83,7 +83,7 @@ public final class MetaDataImportExecutor {
                 Collectors.toMap(Entry::getKey, entry -> YamlEngine.unmarshal(entry.getValue(), YamlProxyDatabaseConfiguration.class), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
     }
     
-    private YamlProxyServerConfiguration getYamlServerConfig(final ExportedMetaData exportedMetaData) {
+    private YamlProxyServerConfiguration getYamlServerConfiguration(final ExportedMetaData exportedMetaData) {
         return YamlEngine.unmarshal(exportedMetaData.getRules() + System.lineSeparator() + exportedMetaData.getProps(), YamlProxyServerConfiguration.class);
     }