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 9086f36d7c7 Show rule name in status query results (#37464)
9086f36d7c7 is described below
commit 9086f36d7c700083960f2077439f7a54bbb7b177
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 23 00:47:53 2025 +0800
Show rule name in status query results (#37464)
* Add back ProxySQLExecutorTest
* Show rule name in status query results
---
...show-status-from-readwrite-splitting-rule.cn.md | 51 +++++++++++-----------
...show-status-from-readwrite-splitting-rule.en.md | 49 +++++++++++----------
...wStatusFromReadwriteSplittingRulesExecutor.java | 8 ++--
.../show-status-from-readwrite-splitting-rules.xml | 4 +-
.../show_status_from_readwrite_splitting_rules.xml | 3 +-
5 files changed, 59 insertions(+), 56 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.cn.md
index 36bb8b4f2c2..0fb594bce37 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.cn.md
@@ -33,10 +33,11 @@ databaseName ::=
### 返回值说明
-| 列 | 说明 |
-|----------------|--------|
-| storage_unit | 存储单元名称 |
-| status | 存储单元状态 |
+| 列 | 说明 |
+|--------------|----------|
+| name | 读写分离规则名称 |
+| storage_unit | 存储单元名称 |
+| status | 存储单元状态 |
### 示例
@@ -48,11 +49,11 @@ SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0 FROM
sharding_db;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0 FROM sharding_db;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.01 sec)
```
@@ -64,11 +65,11 @@ SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.00 sec)
```
@@ -80,11 +81,11 @@ SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.01 sec)
```
@@ -96,11 +97,11 @@ mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.01 sec)
```
@@ -110,4 +111,4 @@ mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
### 相关链接
-- [保留字](/cn/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word/)
\ No newline at end of file
+- [保留字](/cn/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word/)
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.en.md
index 29cba40f19e..a3c45cb9319 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/circuit-breaker/show-status-from-readwrite-splitting-rule.en.md
@@ -33,10 +33,11 @@ databaseName ::=
### Return Value Description
-| Columns | Description |
-|----------------|---------------------|
-| storage_unit | storage unit name |
-| status | storage unit status |
+| Columns | Description |
+|--------------|---------------------------------|
+| name | readwrite-splitting rule name |
+| storage_unit | storage unit name |
+| status | storage unit status |
### Example
@@ -48,11 +49,11 @@ SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0 FROM
sharding_db;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0 FROM sharding_db;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.01 sec)
```
@@ -64,11 +65,11 @@ SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.01 sec)
```
@@ -80,11 +81,11 @@ SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.01 sec)
```
@@ -96,11 +97,11 @@ mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
-+--------------+----------+
-| storage_unit | status |
-+--------------+----------+
-| ds_0 | disabled |
-+--------------+----------+
++-------------+--------------+----------+
+| name | storage_unit | status |
++-------------+--------------+----------+
+| ms_group_0 | ds_0 | disabled |
++-------------+--------------+----------+
1 rows in set (0.01 sec)
```
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
index 31318252483..417de0e22d6 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
@@ -42,7 +42,7 @@ public final class
ShowStatusFromReadwriteSplittingRulesExecutor implements Dist
@Override
public Collection<String> getColumnNames(final
ShowStatusFromReadwriteSplittingRulesStatement sqlStatement) {
- return Arrays.asList("storage_unit", "status");
+ return Arrays.asList("name", "storage_unit", "status");
}
@Override
@@ -62,11 +62,11 @@ public final class
ShowStatusFromReadwriteSplittingRulesExecutor implements Dist
private Collection<LocalDataQueryResultRow> buildRows(final
ReadwriteSplittingDataSourceGroupRule dataSourceGroupRule) {
return
dataSourceGroupRule.getReadwriteSplittingGroup().getReadDataSources().stream()
- .map(each -> buildRow(each,
dataSourceGroupRule.getDisabledDataSourceNames().contains(each))).collect(Collectors.toList());
+ .map(each -> buildRow(dataSourceGroupRule.getName(), each,
dataSourceGroupRule.getDisabledDataSourceNames().contains(each))).collect(Collectors.toList());
}
- private LocalDataQueryResultRow buildRow(final String dataSourceName,
final boolean disabled) {
- return new LocalDataQueryResultRow(dataSourceName, disabled ?
DataSourceState.DISABLED : DataSourceState.ENABLED);
+ private LocalDataQueryResultRow buildRow(final String ruleName, final
String dataSourceName, final boolean disabled) {
+ return new LocalDataQueryResultRow(ruleName, dataSourceName, disabled
? DataSourceState.DISABLED : DataSourceState.ENABLED);
}
@Override
diff --git
a/features/readwrite-splitting/distsql/handler/src/test/resources/cases/show-status-from-readwrite-splitting-rules.xml
b/features/readwrite-splitting/distsql/handler/src/test/resources/cases/show-status-from-readwrite-splitting-rules.xml
index fdddbc5fae8..b0f1927452e 100644
---
a/features/readwrite-splitting/distsql/handler/src/test/resources/cases/show-status-from-readwrite-splitting-rules.xml
+++
b/features/readwrite-splitting/distsql/handler/src/test/resources/cases/show-status-from-readwrite-splitting-rules.xml
@@ -20,10 +20,10 @@
<test-case dist-sql="SHOW STATUS FROM READWRITE_SPLITTING RULES"
current-rule-config-yaml-file="cases/show-status-from-readwrite-splitting-rules-current-config.yaml">
<expected-query-result-rows>
<expected-query-result-row>
- read_ds_0|ENABLED
+ foo_rule|read_ds_0|ENABLED
</expected-query-result-row>
<expected-query-result-row>
- read_ds_1|DISABLED
+ foo_rule|read_ds_1|DISABLED
</expected-query-result-row>
</expected-query-result-rows>
</test-case>
diff --git
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_status_from_readwrite_splitting_rules.xml
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_status_from_readwrite_splitting_rules.xml
index 09c26e9e7bc..016f9438d44 100644
---
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_status_from_readwrite_splitting_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_status_from_readwrite_splitting_rules.xml
@@ -17,8 +17,9 @@
<dataset>
<metadata>
+ <column name="name" />
<column name="storage_unit" />
<column name="status" />
</metadata>
- <row values="read_ds_0| ENABLED" />
+ <row values="readwrite_ds_0| read_ds_0| ENABLED" />
</dataset>
