You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/01/10 15:50:47 UTC
[shardingsphere] branch master updated: Fixed SHOW DB_DISCOVERY RULES result not right. (#14665)
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 76226e9 Fixed SHOW DB_DISCOVERY RULES result not right. (#14665)
76226e9 is described below
commit 76226e93ce00ca3b4f9ef5920c8ed51a27b4c295
Author: zhaojinchao <33...@users.noreply.github.com>
AuthorDate: Mon Jan 10 23:49:42 2022 +0800
Fixed SHOW DB_DISCOVERY RULES result not right. (#14665)
---
.../distsql/handler/query/DatabaseDiscoveryRuleQueryResultSet.java | 6 ++++--
.../handler/query/DatabaseDiscoveryRuleQueryResultSetTest.java | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSet.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQuer [...]
index 4502e5d..0e5dc57 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSet.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSet.java
@@ -42,12 +42,14 @@ import java.util.Optional;
*/
public final class DatabaseDiscoveryRuleQueryResultSet implements DistSQLResultSet {
- private static final String NAME = "group_name";
+ private static final String GROUP_NAME = "group_name";
private static final String DATA_SOURCE_NAMES = "data_source_names";
private static final String PRIMARY_DATA_SOURCE_NAME = "primary_data_source_name";
+ private static final String NAME = "name";
+
private static final String DISCOVER_TYPE = "discovery_type";
private static final String HEARTBEAT = "discovery_heartbeat";
@@ -74,7 +76,7 @@ public final class DatabaseDiscoveryRuleQueryResultSet implements DistSQLResultS
@Override
public Collection<String> getColumnNames() {
- return Arrays.asList(NAME, DATA_SOURCE_NAMES, PRIMARY_DATA_SOURCE_NAME, DISCOVER_TYPE, HEARTBEAT);
+ return Arrays.asList(GROUP_NAME, DATA_SOURCE_NAMES, PRIMARY_DATA_SOURCE_NAME, DISCOVER_TYPE, HEARTBEAT);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSetTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRule [...]
index 9364672..7e7356b9 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSetTest.java
@@ -61,8 +61,8 @@ public final class DatabaseDiscoveryRuleQueryResultSetTest {
assertThat(actual.get(0), is("ms_group"));
assertThat(actual.get(1), is("ds_0,ds_1"));
assertThat(actual.get(2), is(""));
- assertThat(actual.get(3).toString(), is("{group_name=type_test, type=MGR, props={}}"));
- assertThat(actual.get(4).toString(), is("{group_name=heartbeat_test, props={}}"));
+ assertThat(actual.get(3).toString(), is("{name=type_test, type=MGR, props={}}"));
+ assertThat(actual.get(4).toString(), is("{name=heartbeat_test, props={}}"));
}
private RuleConfiguration createRuleConfiguration() {