[shardingsphere] branch master updated: Fix wrong view zk path with new metadata structure (#28698)

[zhaojinchao]

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

zhaojinchao 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 57943cc29c4 Fix wrong view zk path with new metadata structure (#28698)
57943cc29c4 is described below

commit 57943cc29c427c3a4af1295fd3d5f9cb9370db16
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Mon Oct 9 17:19:01 2023 +0800

    Fix wrong view zk path with new metadata structure (#28698)
---
 .../persist/service/schema/NewViewMetaDataPersistService.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/NewViewMetaDataPersistService.java
 
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/NewViewMetaDataPersistService.java
index c70d3426293..c20818d96c0 100644
--- 
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/NewViewMetaDataPersistService.java
+++ 
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/NewViewMetaDataPersistService.java
@@ -32,8 +32,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 /**
@@ -67,16 +67,13 @@ public final class NewViewMetaDataPersistService implements 
SchemaMetaDataPersis
         for (Entry<String, ShardingSphereView> entry : views.entrySet()) {
             String viewName = entry.getKey().toLowerCase();
             List<String> versions = 
repository.getChildrenKeys(NewDatabaseMetaDataNode.getViewVersionsNode(databaseName,
 schemaName, viewName));
-            String nextActiveVersion = 
NewDatabaseMetaDataNode.getViewVersionNode(databaseName, schemaName, viewName, 
versions.isEmpty()
-                    ? DEFAULT_VERSION
-                    : String.valueOf(Integer.parseInt(versions.get(0)) + 1));
+            String nextActiveVersion = versions.isEmpty() ? DEFAULT_VERSION : 
String.valueOf(Integer.parseInt(versions.get(0)) + 1);
             
repository.persist(NewDatabaseMetaDataNode.getViewVersionNode(databaseName, 
schemaName, viewName, nextActiveVersion),
                     YamlEngine.marshal(new 
YamlViewSwapper().swapToYamlConfiguration(entry.getValue())));
             if (Strings.isNullOrEmpty(getActiveVersion(databaseName, 
schemaName, viewName))) {
                 
repository.persist(NewDatabaseMetaDataNode.getViewActiveVersionNode(databaseName,
 schemaName, viewName), DEFAULT_VERSION);
             }
-            result.add(new 
MetaDataVersion(NewDatabaseMetaDataNode.getViewNode(databaseName, schemaName, 
viewName),
-                    getActiveVersion(databaseName, schemaName, viewName), 
nextActiveVersion));
+            result.add(new 
MetaDataVersion(NewDatabaseMetaDataNode.getViewNode(databaseName, schemaName, 
viewName), getActiveVersion(databaseName, schemaName, viewName), 
nextActiveVersion));
         }
         return result;
     }