[shardingsphere] branch master updated: Modify `SHOW INSTANCE MODE` display (#16464)

[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 18c38f6  Modify `SHOW INSTANCE MODE` display (#16464)
18c38f6 is described below

commit 18c38f64cb1fd4d30bee230a8f23d0ba274ab3fc
Author: lanchengx <52209337+lanche...@users.noreply.github.com>
AuthorDate: Tue Mar 29 18:31:26 2022 +0800

    Modify `SHOW INSTANCE MODE` display (#16464)
---
 .../distsql/ral/common/queryable/ShowInstanceModeHandler.java | 11 +++++++----
 .../ral/common/queryable/ShowInstanceModeHandlerTest.java     |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandler.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandler.java
index cf69423..26c5554 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandler.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandler.java
@@ -17,10 +17,10 @@
 
 package 
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.queryable;
 
+import com.google.gson.Gson;
 import 
org.apache.shardingsphere.distsql.parser.statement.ral.common.queryable.ShowInstanceModeStatement;
 import 
org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration;
 import org.apache.shardingsphere.infra.instance.InstanceContext;
-import org.apache.shardingsphere.infra.properties.PropertiesConverter;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
 import 
org.apache.shardingsphere.proxy.backend.text.distsql.ral.QueryableRALBackendHandler;
@@ -54,8 +54,11 @@ public final class ShowInstanceModeHandler extends 
QueryableRALBackendHandler<Sh
     protected Collection<List<Object>> getRows(final ContextManager 
contextManager) {
         InstanceContext instanceContext = 
ProxyContext.getInstance().getContextManager().getInstanceContext();
         PersistRepositoryConfiguration repositoryConfiguration = 
instanceContext.getModeConfiguration().getRepository();
-        return 
Collections.singleton(Arrays.asList(instanceContext.getInstance().getInstanceDefinition().getInstanceId().getId(),
 instanceContext.getModeConfiguration().getType(),
-                null == repositoryConfiguration ? "" : 
repositoryConfiguration.getType(), null == repositoryConfiguration ? "" : 
PropertiesConverter.convert(repositoryConfiguration.getProps()),
-                
String.valueOf(instanceContext.getModeConfiguration().isOverwrite())));
+        String instanceId = 
instanceContext.getInstance().getInstanceDefinition().getInstanceId().getId();
+        String modeType = instanceContext.getModeConfiguration().getType();
+        String repositoryType = null == repositoryConfiguration ? "" : 
repositoryConfiguration.getType();
+        String props = null == repositoryConfiguration || null == 
repositoryConfiguration.getProps() ? "" : new 
Gson().toJson(repositoryConfiguration.getProps());
+        String overwrite = 
String.valueOf(instanceContext.getModeConfiguration().isOverwrite());
+        return Collections.singleton(Arrays.asList(instanceId, modeType, 
repositoryType, props, overwrite));
     }
 }
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandlerTest.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandlerTest.java
index b950bd7..f22bfdf 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandlerTest.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ShowInstanceModeHandlerTest.java
@@ -51,7 +51,7 @@ public final class ShowInstanceModeHandlerTest {
         assertThat(data.get(0), is("127.0.0.1@3309"));
         assertThat(data.get(1), is("Cluster"));
         assertThat(data.get(2), is("ZooKeeper"));
-        assertThat(data.get(3), is("key=value"));
+        assertThat(data.get(3), is("{\"key\":\"value1,value2\"}"));
         assertThat(data.get(4), is("false"));
     }
     
@@ -59,7 +59,7 @@ public final class ShowInstanceModeHandlerTest {
         InstanceContext result = mock(InstanceContext.class, 
RETURNS_DEEP_STUBS);
         
when(result.getInstance().getInstanceDefinition().getInstanceId().getId()).thenReturn("127.0.0.1@3309");
         when(result.getModeConfiguration()).thenReturn(new 
ModeConfiguration("Cluster", 
-                new ClusterPersistRepositoryConfiguration("ZooKeeper", 
"governance_ds", "127.0.0.1:2181", createProperties("key", "value")), false));
+                new ClusterPersistRepositoryConfiguration("ZooKeeper", 
"governance_ds", "127.0.0.1:2181", createProperties("key", "value1,value2")), 
false));
         return result;
     }