(shardingsphere) branch master updated: Refactor ComputeNodePersistService (#34308)

[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 9d85047cc1d Refactor ComputeNodePersistService (#34308)
9d85047cc1d is described below

commit 9d85047cc1de40836301d2358dfaf1812cbb2f04
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jan 11 15:51:40 2025 +0800

    Refactor ComputeNodePersistService (#34308)
---
 .../mode/persist/service/unified/ComputeNodePersistService.java       | 4 ++--
 .../proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
index 1c1e5614521..6a9f5dd8704 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
@@ -90,8 +90,8 @@ public final class ComputeNodePersistService {
         for (String each : 
repository.getChildrenKeys(ComputeNodePath.getOnlinePath(instanceType))) {
             String value = 
repository.query(ComputeNodePath.getOnlinePath(each, instanceType));
             if (!Strings.isNullOrEmpty(value)) {
-                result.add(loadInstance(
-                        InstanceMetaDataFactory.create(each, instanceType, new 
YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(value, 
YamlComputeNodeData.class)))));
+                ComputeNodeData computeNodeData = new 
YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(value, 
YamlComputeNodeData.class));
+                result.add(loadInstance(InstanceMetaDataFactory.create(each, 
instanceType, computeNodeData)));
             }
         }
         return result;
diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
index 54c141f8a64..fc7b328ee1a 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
@@ -96,7 +96,6 @@ public final class YamlDatabaseConfigurationImportExecutor {
     }
     
     private void checkDatabase(final String databaseName) {
-        ShardingSpherePreconditions.checkNotEmpty(databaseName, 
MissingRequiredDatabaseException::new);
         ShardingSpherePreconditions.checkNotEmpty(databaseName, 
MissingRequiredDatabaseException::new);
         
ShardingSpherePreconditions.checkState(!contextManager.getMetaDataContexts().getMetaData().containsDatabase(databaseName),
 () -> new DatabaseCreateExistsException(databaseName));
     }