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 2023/05/09 10:29:10 UTC
[shardingsphere] branch master updated: Remove deprecated row delay_time (#25537)
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 2ac479465a6 Remove deprecated row delay_time (#25537)
2ac479465a6 is described below
commit 2ac479465a67ec3f86f162563e8f602448df9b7e
Author: ChenJiaHao <Pa...@163.com>
AuthorDate: Tue May 9 18:29:03 2023 +0800
Remove deprecated row delay_time (#25537)
---
...show-status-from-readwrite-splitting-rule.cn.md | 65 +++++++++++-----------
...show-status-from-readwrite-splitting-rule.en.md | 65 +++++++++++-----------
...wStatusFromReadwriteSplittingRulesExecutor.java | 4 +-
...tusFromReadwriteSplittingRulesExecutorTest.java | 2 +-
.../show_status_from_readwrite_splitting_rules.xml | 3 +-
5 files changed, 68 insertions(+), 71 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 04221673ee8..1b9676cbcdc 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
@@ -37,7 +37,6 @@ databaseName ::=
|----------------|--------|
| resource | 存储单元名称 |
| status | 存储单元状态 |
-| delay_time(ms) | 延迟时间 |
### 示例
@@ -49,14 +48,14 @@ 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;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.01 sec)
```
@@ -68,14 +67,14 @@ SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.00 sec)
```
@@ -87,14 +86,14 @@ SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.01 sec)
```
@@ -106,14 +105,14 @@ mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.01 sec)
```
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 1320b64474f..f50f57ad9ff 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
@@ -37,7 +37,6 @@ databaseName ::=
|----------------|---------------------|
| resource | storage unit name |
| status | storage unit status |
-| delay_time(ms) | delay time |
### Example
@@ -49,14 +48,14 @@ 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;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.01 sec)
```
@@ -68,14 +67,14 @@ SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES FROM sharding_db;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.00 sec)
```
@@ -87,14 +86,14 @@ SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULE ms_group_0;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.01 sec)
```
@@ -106,14 +105,14 @@ mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
```sql
mysql> SHOW STATUS FROM READWRITE_SPLITTING RULES;
-+----------+---------+----------------+
-| resource | status | delay_time(ms) |
-+----------+---------+----------------+
-| ds_0 | enabled | 0 |
-| ds_1 | enabled | 0 |
-| ds_2 | enabled | 0 |
-| ds_3 | enabled | 0 |
-+----------+---------+----------------+
++----------+---------+
+| resource | status |
++----------+---------+
+| ds_0 | enabled |
+| ds_1 | enabled |
+| ds_2 | enabled |
+| ds_3 | enabled |
++----------+---------+
4 rows in set (0.01 sec)
```
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java
index 3005f216e27..0a1157b21d4 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java
@@ -58,7 +58,7 @@ public final class ShowStatusFromReadwriteSplittingRulesExecutor implements Conn
@Override
public Collection<String> getColumnNames() {
- return Arrays.asList("storage_unit", "status", "delay_time(ms)");
+ return Arrays.asList("storage_unit", "status");
}
@Override
@@ -128,7 +128,7 @@ public final class ShowStatusFromReadwriteSplittingRulesExecutor implements Conn
private LocalDataQueryResultRow buildRow(final String resource, final StorageNodeDataSource storageNodeDataSource) {
if (null == storageNodeDataSource) {
- return new LocalDataQueryResultRow(resource, DataSourceState.ENABLED.name(), "0");
+ return new LocalDataQueryResultRow(resource, DataSourceState.ENABLED.name());
}
String status = storageNodeDataSource.getStatus().name();
return new LocalDataQueryResultRow(resource, status);
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java
index 8be380ae268..78786d700e1 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java
@@ -64,7 +64,7 @@ class ShowStatusFromReadwriteSplittingRulesExecutorTest {
void assertGetColumns() {
ShowStatusFromReadwriteSplittingRulesExecutor executor = new ShowStatusFromReadwriteSplittingRulesExecutor();
Collection<String> columns = executor.getColumnNames();
- assertThat(columns.size(), is(3));
+ assertThat(columns.size(), is(2));
Iterator<String> iterator = columns.iterator();
assertThat(iterator.next(), is("storage_unit"));
assertThat(iterator.next(), is("status"));
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 477ef0362d4..09c26e9e7bc 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
@@ -19,7 +19,6 @@
<metadata>
<column name="storage_unit" />
<column name="status" />
- <column name="delay_time(ms)" />
</metadata>
- <row values="read_ds_0| ENABLED| 0" />
+ <row values="read_ds_0| ENABLED" />
</dataset>