You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by tu...@apache.org on 2023/03/02 05:59:36 UTC
[shardingsphere] branch master updated: Remove primary data source support query when replica data sources are shutdown logic. (#24399)
This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 ffeb4206a1a Remove primary data source support query when replica data sources are shutdown logic. (#24399)
ffeb4206a1a is described below
commit ffeb4206a1a1d41e12fcbff9af91da25d93a8878
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Thu Mar 2 13:59:29 2023 +0800
Remove primary data source support query when replica data sources are shutdown logic. (#24399)
* Remove primary data source support query when replica data sources are shutdown logic.
* Fix checkstyle
---
.../yaml-config/rules/readwrite-splitting.cn.md | 1 -
.../yaml-config/rules/readwrite-splitting.en.md | 1 -
.../alter-readwrite-splitting-rule.cn.md | 7 ++--
.../alter-readwrite-splitting-rule.en.md | 5 ++-
.../create-readwrite-splitting-rule.cn.md | 10 +++---
.../create-readwrite-splitting-rule.en.md | 10 +++---
.../distsql/syntax/reserved-word.cn.md | 2 +-
.../distsql/syntax/reserved-word.en.md | 2 +-
.../show-readwrite-splitting-rule.cn.md | 41 +++++++++++----------
.../show-readwrite-splitting-rule.en.md | 41 +++++++++++----------
...micReadwriteSplittingStrategyConfiguration.java | 2 --
.../impl/ReadwriteSplittingDataSourceRouter.java | 8 +----
.../rule/ReadwriteSplittingRule.java | 2 +-
.../ReadwriteSplittingStrategyFactory.java | 4 +--
.../type/DynamicReadwriteSplittingStrategy.java | 2 --
...writeSplittingStrategyConfigurationSwapper.java | 3 +-
...writeSplittingRuleConfigurationCheckerTest.java | 2 +-
.../route/ReadwriteSplittingSQLRouterTest.java | 42 ----------------------
...teSplittingDataSourceRuleConfigurationTest.java | 2 +-
.../DynamicReadwriteSplittingStrategyTest.java | 2 +-
.../ReadwriteSplittingRuleStatementConverter.java | 2 +-
.../query/ShowReadwriteSplittingRuleExecutor.java | 8 +----
...adwriteSplittingRuleStatementConverterTest.java | 2 +-
.../ShowReadwriteSplittingRuleExecutorTest.java | 37 +++++++++----------
...ReadwriteSplittingRuleStatementUpdaterTest.java | 2 +-
...ReadwriteSplittingRuleStatementUpdaterTest.java | 4 +--
.../antlr4/imports/readwrite-splitting/Keyword.g4 | 12 -------
.../imports/readwrite-splitting/RDLStatement.g4 | 2 +-
.../ReadwriteSplittingDistSQLStatementVisitor.java | 2 +-
.../segment/ReadwriteSplittingRuleSegment.java | 8 ++---
.../common/constant/DistSQLScriptConstants.java | 4 +--
.../ConvertYamlConfigurationExecutor.java | 3 +-
.../src/test/resources/expected/convert-mix.yaml | 6 ++--
.../alter_readwrite_splitting_rules.xml | 3 +-
.../create_readwrite_splitting_rules.xml | 3 +-
.../drop_readwrite_splitting_rules.xml | 1 -
.../show_readwrite_splitting_rules.xml | 21 ++++++-----
.../show_readwrite_splitting_rules.xml | 21 ++++++-----
.../show_readwrite_splitting_rules.xml | 3 +-
.../show_readwrite_splitting_rules.xml | 3 +-
40 files changed, 117 insertions(+), 219 deletions(-)
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md
index cce0557b072..80b30601d9a 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.cn.md
@@ -38,7 +38,6 @@ rules:
<data_source_name> (+): # 读写分离逻辑数据源名称
dynamic_strategy: # 读写分离类型
auto_aware_data_source_name: # 数据库发现逻辑数据源名称
- write_data_source_query_enabled: # 从库全部下线,主库是否承担读流量
loadBalancerName: # 负载均衡算法名称
# 负载均衡算法配置
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md
index 7b6823cc63e..7bf9278ff92 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/readwrite-splitting.en.md
@@ -37,7 +37,6 @@ rules:
<data_source_name> (+): # Logic data source name of readwrite-splitting
dynamic_strategy: # Readwrite-splitting type
auto_aware_data_source_name: # Database discovery logic data source name
- write_data_source_query_enabled: # All read data source are offline, write data source whether the data source is responsible for read traffic
loadBalancerName: # Load balance algorithm name
# Load balance algorithm configuration
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.cn.md
index 008415d4d48..b520cc36afe 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.cn.md
@@ -22,7 +22,7 @@ staticReadwriteSplittingDefinition ::=
'WRITE_STORAGE_UNIT' '=' writeStorageUnitName ',' 'READ_STORAGE_UNITS' '(' storageUnitName (',' storageUnitName)* ')'
dynamicReadwriteSplittingDefinition ::=
- 'AUTO_AWARE_RESOURCE' '=' resourceName (',' 'WRITE_DATA_SOURCE_QUERY_ENABLED' '=' ('TRUE' | 'FALSE'))?
+ 'AUTO_AWARE_RESOURCE' '=' resourceName
loadBalancerDefinition ::=
'TYPE' '(' 'NAME' '=' loadBalancerType (',' propertiesDefinition)? ')'
@@ -78,15 +78,14 @@ ALTER READWRITE_SPLITTING RULE ms_group_0 (
```sql
ALTER READWRITE_SPLITTING RULE ms_group_1 (
- AUTO_AWARE_RESOURCE=group_0,
- WRITE_DATA_SOURCE_QUERY_ENABLED=false,
+ AUTO_AWARE_RESOURCE=group_0
TYPE(NAME="random")
);
```
### 保留字
-`ALTER`、`READWRITE_SPLITTING`、`RULE`、`WRITE_STORAGE_UNIT`、`READ_STORAGE_UNITS`、`AUTO_AWARE_RESOURCE`、`WRITE_DATA_SOURCE_QUERY_ENABLED`
+`ALTER`、`READWRITE_SPLITTING`、`RULE`、`WRITE_STORAGE_UNIT`、`READ_STORAGE_UNITS`、`AUTO_AWARE_RESOURCE`
、`TYPE`、`NAME`、`PROPERTIES`、`TRUE`、`FALSE`
### 相关链接
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.en.md
index c2a619c9889..64a7331fa67 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/alter-readwrite-splitting-rule.en.md
@@ -22,7 +22,7 @@ staticReadwriteSplittingDefinition ::=
'WRITE_STORAGE_UNIT' '=' writeStorageUnitName ',' 'READ_STORAGE_UNITS' '(' storageUnitName (',' storageUnitName)* ')'
dynamicReadwriteSplittingDefinition ::=
- 'AUTO_AWARE_RESOURCE' '=' resourceName (',' 'WRITE_DATA_SOURCE_QUERY_ENABLED' '=' ('TRUE' | 'FALSE'))?
+ 'AUTO_AWARE_RESOURCE' '=' resourceName
loadBalancerDefinition ::=
'TYPE' '(' 'NAME' '=' loadBalancerType (',' propertiesDefinition)? ')'
@@ -79,7 +79,6 @@ ALTER READWRITE_SPLITTING RULE ms_group_0 (
```sql
ALTER READWRITE_SPLITTING RULE ms_group_1 (
AUTO_AWARE_RESOURCE=group_0,
- WRITE_DATA_SOURCE_QUERY_ENABLED=false,
TYPE(NAME="random")
);
```
@@ -87,7 +86,7 @@ ALTER READWRITE_SPLITTING RULE ms_group_1 (
### Reserved word
`ALTER`, `READWRITE_SPLITTING`, `RULE`, `WRITE_STORAGE_UNIT`, `READ_STORAGE_UNITS`, `AUTO_AWARE_RESOURCE`
-, `WRITE_DATA_SOURCE_QUERY_ENABLED`, `TYPE`, `NAME`, `PROPERTIES`, `TRUE`, `FALSE`
+, `TYPE`, `NAME`, `PROPERTIES`, `TRUE`, `FALSE`
### Related links
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.cn.md
index c37318bef9c..a2ff8492f8b 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.cn.md
@@ -25,7 +25,7 @@ staticReadwriteSplittingDefinition ::=
'WRITE_STORAGE_UNIT' '=' writeStorageUnitName ',' 'READ_STORAGE_UNITS' '(' storageUnitName (',' storageUnitName)* ')'
dynamicReadwriteSplittingDefinition ::=
- 'AUTO_AWARE_RESOURCE' '=' resourceName (',' 'WRITE_DATA_SOURCE_QUERY_ENABLED' '=' ('TRUE' | 'FALSE'))?
+ 'AUTO_AWARE_RESOURCE' '=' resourceName
loadBalancerDefinition ::=
'TYPE' '(' 'NAME' '=' loadBalancerType (',' propertiesDefinition)? ')'
@@ -84,8 +84,7 @@ CREATE READWRITE_SPLITTING RULE ms_group_0 (
```sql
CREATE READWRITE_SPLITTING RULE ms_group_1 (
- AUTO_AWARE_RESOURCE=group_0,
- WRITE_DATA_SOURCE_QUERY_ENABLED=false,
+ AUTO_AWARE_RESOURCE=group_0
TYPE(NAME="random")
);
```
@@ -106,15 +105,14 @@ CREATE READWRITE_SPLITTING RULE IF NOT EXISTS ms_group_0 (
```sql
CREATE READWRITE_SPLITTING RULE IF NOT EXISTS ms_group_1 (
- AUTO_AWARE_RESOURCE=group_0,
- WRITE_DATA_SOURCE_QUERY_ENABLED=false,
+ AUTO_AWARE_RESOURCE=group_0
TYPE(NAME="random")
);
```
### 保留字
-`CREATE`、`READWRITE_SPLITTING`、`RULE`、`WRITE_STORAGE_UNIT`、`READ_STORAGE_UNITS`、`AUTO_AWARE_RESOURCE`、`WRITE_DATA_SOURCE_QUERY_ENABLED`
+`CREATE`、`READWRITE_SPLITTING`、`RULE`、`WRITE_STORAGE_UNIT`、`READ_STORAGE_UNITS`、`AUTO_AWARE_RESOURCE`
、`TYPE`、`NAME`、`PROPERTIES`、`TRUE`、`FALSE`
### 相关链接
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.en.md
index a9578b4cc1f..e1fb31dd89b 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/readwrite-splitting/create-readwrite-splitting-rule.en.md
@@ -25,7 +25,7 @@ staticReadwriteSplittingDefinition ::=
'WRITE_STORAGE_UNIT' '=' writeStorageUnitName ',' 'READ_STORAGE_UNITS' '(' storageUnitName (',' storageUnitName)* ')'
dynamicReadwriteSplittingDefinition ::=
- 'AUTO_AWARE_RESOURCE' '=' resourceName (',' 'WRITE_DATA_SOURCE_QUERY_ENABLED' '=' ('TRUE' | 'FALSE'))?
+ 'AUTO_AWARE_RESOURCE' '=' resourceName
loadBalancerDefinition ::=
'TYPE' '(' 'NAME' '=' loadBalancerType (',' propertiesDefinition)? ')'
@@ -84,8 +84,7 @@ CREATE READWRITE_SPLITTING RULE ms_group_0 (
```sql
CREATE READWRITE_SPLITTING RULE ms_group_1 (
- AUTO_AWARE_RESOURCE=group_0,
- WRITE_DATA_SOURCE_QUERY_ENABLED=false,
+ AUTO_AWARE_RESOURCE=group_0
TYPE(NAME="random")
);
```
@@ -106,8 +105,7 @@ CREATE READWRITE_SPLITTING RULE IF NOT EXISTS ms_group_0 (
```sql
CREATE READWRITE_SPLITTING RULE IF NOT EXISTS ms_group_1 (
- AUTO_AWARE_RESOURCE=group_0,
- WRITE_DATA_SOURCE_QUERY_ENABLED=false,
+ AUTO_AWARE_RESOURCE=group_0
TYPE(NAME="random")
);
```
@@ -115,7 +113,7 @@ CREATE READWRITE_SPLITTING RULE IF NOT EXISTS ms_group_1 (
### Reserved word
`CREATE`, `READWRITE_SPLITTING`, `RULE`, `WRITE_STORAGE_UNIT`, `READ_STORAGE_UNITS`, `AUTO_AWARE_RESOURCE`
-, `WRITE_DATA_SOURCE_QUERY_ENABLED`, `TYPE`, `NAME`, `PROPERTIES`, `TRUE`, `FALSE`
+, `TYPE`, `NAME`, `PROPERTIES`, `TRUE`, `FALSE`
### Related links
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.cn.md
index 621330caf80..d5f94228169 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.cn.md
@@ -29,7 +29,7 @@ weight = 5
#### 读写分离
`READWRITE_SPLITTING`、`WRITE_STORAGE_UNIT`、`READ_STORAGE_UNITS`
-、`AUTO_AWARE_RESOURCE`、`WRITE_DATA_SOURCE_QUERY_ENABLED`
+、`AUTO_AWARE_RESOURCE`
#### 数据加密
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.en.md
index a018f23af82..cd08e48d384 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/reserved-word.en.md
@@ -30,7 +30,7 @@ weight = 5
#### Readwrite Splitting
`READWRITE_SPLITTING`, `WRITE_STORAGE_UNIT`, `READ_STORAGE_UNITS`
-, `AUTO_AWARE_RESOURCE`, `WRITE_DATA_SOURCE_QUERY_ENABLED`
+, `AUTO_AWARE_RESOURCE`
#### Encrypt
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.cn.md
index ad526855c27..ab81fa5f67d 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.cn.md
@@ -37,7 +37,6 @@ databaseName ::=
| ------------------------------- | --------------------------------------- |
| name | 读写分离规则名称 |
| auto_aware_data_source_name | 自动发现数据源名称(配置动态读写分离规则显示)|
-| write_data_source_query_enabled | 读库全部下线,主库是否承担读流量 |
| write_data_source_name | 写数据源名称 |
| read_data_source_names | 读数据源名称列表 |
| load_balancer_type | 负载均衡算法类型 |
@@ -54,11 +53,11 @@ SHOW READWRITE_SPLITTING RULES FROM readwrite_splitting_db;
```sql
mysql> SHOW READWRITE_SPLITTING RULES FROM readwrite_splitting_db;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
@@ -70,11 +69,11 @@ SHOW READWRITE_SPLITTING RULES;
```sql
mysql> SHOW READWRITE_SPLITTING RULES;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
@@ -86,11 +85,11 @@ SHOW READWRITE_SPLITTING RULE ms_group_0 FROM readwrite_splitting_db;
```sql
mysql> SHOW READWRITE_SPLITTING RULE ms_group_0 FROM readwrite_splitting_db;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
@@ -102,11 +101,11 @@ SHOW READWRITE_SPLITTING RULE ms_group_0;
```sql
mysql> SHOW READWRITE_SPLITTING RULE ms_group_0;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.en.md
index cdd02ddd64a..a72ecd86cdf 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/readwrite-splitting/show-readwrite-splitting-rule.en.md
@@ -37,7 +37,6 @@ databaseName ::=
| ------------------------------- | ---------------------------------------------------------------------------------------------------------- |
| name | Readwrite splitting rule name |
| auto_aware_data_source_name | Auto-Aware discovery data source name (Display configuration dynamic readwrite splitting rules) |
-| write_data_source_query_enabled | All read data source are offline, write data source whether the data source is responsible for read traffic|
| write_data_source_name | Write data source name |
| read_data_source_names | Read data source name list |
| load_balancer_type | Load balance algorithm type |
@@ -54,11 +53,11 @@ SHOW READWRITE_SPLITTING RULES FROM readwrite_splitting_db;
```sql
mysql> SHOW READWRITE_SPLITTING RULES FROM readwrite_splitting_db;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
@@ -70,11 +69,11 @@ SHOW READWRITE_SPLITTING RULES;
```sql
mysql> SHOW READWRITE_SPLITTING RULES;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
@@ -86,11 +85,11 @@ SHOW READWRITE_SPLITTING RULE ms_group_0 FROM readwrite_splitting_db;
```sql
mysql> SHOW READWRITE_SPLITTING RULE ms_group_0 FROM readwrite_splitting_db;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
@@ -102,11 +101,11 @@ SHOW READWRITE_SPLITTING RULE ms_group_0;
```sql
mysql> SHOW READWRITE_SPLITTING RULE ms_group_0;
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| name | auto_aware_data_source_name | write_data_source_query_enabled | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
-| ms_group_0 | | | resource_1 | ds_0,ds_1 | random | |
-+------------+-----------------------------+---------------------------------+------------------------+------------------------+--------------------+---------------------+
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| name | auto_aware_data_source_name | write_data_source_name | read_data_source_names | load_balancer_type | load_balancer_props |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
+| ms_group_0 | | resource_1 | ds_0,ds_1 | random | |
++------------+-----------------------------+------------------------+------------------------+--------------------+---------------------+
1 row in set (0.01 sec)
```
diff --git a/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/strategy/DynamicReadwriteSplittingStrategyConfiguration.java b/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/strategy/DynamicReadwriteSplittingStrategyConfiguration.java
index d20da6633a6..6aa2d1c1177 100644
--- a/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/strategy/DynamicReadwriteSplittingStrategyConfiguration.java
+++ b/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/strategy/DynamicReadwriteSplittingStrategyConfiguration.java
@@ -28,6 +28,4 @@ import lombok.RequiredArgsConstructor;
public final class DynamicReadwriteSplittingStrategyConfiguration {
private final String autoAwareDataSourceName;
-
- private final String writeDataSourceQueryEnabled;
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
index 6af19a11ecc..429d466c34d 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
@@ -24,7 +24,6 @@ import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementConte
import org.apache.shardingsphere.infra.context.ConnectionContext;
import org.apache.shardingsphere.infra.hint.HintManager;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceRule;
-import org.apache.shardingsphere.readwritesplitting.strategy.type.DynamicReadwriteSplittingStrategy;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.handler.dml.SelectStatementHandler;
@@ -54,7 +53,7 @@ public final class ReadwriteSplittingDataSourceRouter {
}
private boolean isPrimaryRoute(final SQLStatementContext<?> sqlStatementContext) {
- return isWriteRouteStatement(sqlStatementContext) || isHintWriteRouteOnly(sqlStatementContext) || isAllowWriteDataSourceQuery();
+ return isWriteRouteStatement(sqlStatementContext) || isHintWriteRouteOnly(sqlStatementContext);
}
private boolean isWriteRouteStatement(final SQLStatementContext<?> sqlStatementContext) {
@@ -73,9 +72,4 @@ public final class ReadwriteSplittingDataSourceRouter {
private boolean isHintWriteRouteOnly(final SQLStatementContext<?> sqlStatementContext) {
return HintManager.isWriteRouteOnly() || (sqlStatementContext instanceof CommonSQLStatementContext && ((CommonSQLStatementContext<?>) sqlStatementContext).isHintWriteRouteOnly());
}
-
- private boolean isAllowWriteDataSourceQuery() {
- return rule.getEnabledReplicaDataSources().isEmpty() && (rule.getReadwriteSplittingStrategy() instanceof DynamicReadwriteSplittingStrategy)
- && ((DynamicReadwriteSplittingStrategy) rule.getReadwriteSplittingStrategy()).isAllowWriteDataSourceQuery();
- }
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
index 1d29b8de945..582ddd8f4f0 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
@@ -145,7 +145,7 @@ public final class ReadwriteSplittingRule implements DatabaseRule, DataSourceCon
private ReadwriteSplittingDataSourceRuleConfiguration createDynamicDataSourceRuleConfiguration(final ReadwriteSplittingDataSourceRuleConfiguration config, final int index,
final List<String> readwriteDataSourceNames, final List<String> autoAwareDataSourceNames) {
return new ReadwriteSplittingDataSourceRuleConfiguration(readwriteDataSourceNames.get(index), null,
- new DynamicReadwriteSplittingStrategyConfiguration(autoAwareDataSourceNames.get(index), config.getDynamicStrategy().getWriteDataSourceQueryEnabled()), config.getLoadBalancerName());
+ new DynamicReadwriteSplittingStrategyConfiguration(autoAwareDataSourceNames.get(index)), config.getLoadBalancerName());
}
/**
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategyFactory.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategyFactory.java
index 14802b6a728..25d3a71de4a 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategyFactory.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategyFactory.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.readwritesplitting.strategy;
-import com.google.common.base.Strings;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -57,7 +56,6 @@ public final class ReadwriteSplittingStrategyFactory {
private static DynamicReadwriteSplittingStrategy createDynamicReadwriteSplittingStrategy(final DynamicReadwriteSplittingStrategyConfiguration dynamicConfig,
final Collection<ShardingSphereRule> builtRules) {
Optional<ShardingSphereRule> dynamicDataSourceStrategy = builtRules.stream().filter(each -> each instanceof DynamicDataSourceContainedRule).findFirst();
- boolean allowWriteDataSourceQuery = Strings.isNullOrEmpty(dynamicConfig.getWriteDataSourceQueryEnabled()) ? Boolean.TRUE : Boolean.parseBoolean(dynamicConfig.getWriteDataSourceQueryEnabled());
- return new DynamicReadwriteSplittingStrategy(dynamicConfig.getAutoAwareDataSourceName(), allowWriteDataSourceQuery, (DynamicDataSourceContainedRule) dynamicDataSourceStrategy.get());
+ return new DynamicReadwriteSplittingStrategy(dynamicConfig.getAutoAwareDataSourceName(), (DynamicDataSourceContainedRule) dynamicDataSourceStrategy.get());
}
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategy.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategy.java
index a4c316fd555..78f8d333c67 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategy.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategy.java
@@ -36,8 +36,6 @@ public final class DynamicReadwriteSplittingStrategy implements ReadwriteSplitti
private final String autoAwareDataSourceName;
- private final boolean allowWriteDataSourceQuery;
-
private final DynamicDataSourceContainedRule dynamicDataSource;
@Override
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/strategy/YamlDynamicReadwriteSplittingStrategyConfigurationSwapper.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/strategy/YamlDynamicReadwriteSplittingStrategyConfigurationSwapper.java
index 46be8113917..9d84f629ebd 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/strategy/YamlDynamicReadwriteSplittingStrategyConfigurationSwapper.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/strategy/YamlDynamicReadwriteSplittingStrategyConfigurationSwapper.java
@@ -32,12 +32,11 @@ public final class YamlDynamicReadwriteSplittingStrategyConfigurationSwapper
public YamlDynamicReadwriteSplittingStrategyConfiguration swapToYamlConfiguration(final DynamicReadwriteSplittingStrategyConfiguration config) {
YamlDynamicReadwriteSplittingStrategyConfiguration result = new YamlDynamicReadwriteSplittingStrategyConfiguration();
result.setAutoAwareDataSourceName(config.getAutoAwareDataSourceName());
- result.setWriteDataSourceQueryEnabled(config.getWriteDataSourceQueryEnabled());
return result;
}
@Override
public DynamicReadwriteSplittingStrategyConfiguration swapToObject(final YamlDynamicReadwriteSplittingStrategyConfiguration config) {
- return null == config ? null : new DynamicReadwriteSplittingStrategyConfiguration(config.getAutoAwareDataSourceName(), config.getWriteDataSourceQueryEnabled());
+ return null == config ? null : new DynamicReadwriteSplittingStrategyConfiguration(config.getAutoAwareDataSourceName());
}
}
diff --git a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
index d1160bb13ae..cfea73ea91a 100644
--- a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
+++ b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
@@ -57,7 +57,7 @@ public final class ReadwriteSplittingRuleConfigurationCheckerTest {
ReadwriteSplittingRuleConfiguration result = mock(ReadwriteSplittingRuleConfiguration.class);
ReadwriteSplittingDataSourceRuleConfiguration dataSourceConfig = mock(ReadwriteSplittingDataSourceRuleConfiguration.class);
when(dataSourceConfig.getName()).thenReturn("readwrite_ds");
- when(dataSourceConfig.getDynamicStrategy()).thenReturn(new DynamicReadwriteSplittingStrategyConfiguration("ds0", "false"));
+ when(dataSourceConfig.getDynamicStrategy()).thenReturn(new DynamicReadwriteSplittingStrategyConfiguration("ds0"));
when(result.getDataSources()).thenReturn(Collections.singletonList(dataSourceConfig));
return result;
}
diff --git a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java
index a5200e6f030..562f8e48f1e 100644
--- a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java
+++ b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java
@@ -33,11 +33,9 @@ import org.apache.shardingsphere.infra.route.SQLRouter;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
-import org.apache.shardingsphere.infra.rule.identifier.type.DynamicDataSourceContainedRule;
import org.apache.shardingsphere.infra.util.spi.type.ordered.OrderedSPILoader;
import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
-import org.apache.shardingsphere.readwritesplitting.api.strategy.DynamicReadwriteSplittingStrategyConfiguration;
import org.apache.shardingsphere.readwritesplitting.api.strategy.StaticReadwriteSplittingStrategyConfiguration;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.LockSegment;
@@ -76,28 +74,17 @@ public final class ReadwriteSplittingSQLRouterTest {
private ReadwriteSplittingRule staticRule;
- private ReadwriteSplittingRule dynamicRule;
-
@Mock
private CommonSQLStatementContext<SQLStatement> sqlStatementContext;
private ReadwriteSplittingSQLRouter sqlRouter;
- private ReadwriteSplittingSQLRouter dynamicSqlRouter;
-
@Before
public void setUp() {
staticRule = new ReadwriteSplittingRule("logic_db", new ReadwriteSplittingRuleConfiguration(Collections.singleton(new ReadwriteSplittingDataSourceRuleConfiguration(DATASOURCE_NAME,
new StaticReadwriteSplittingStrategyConfiguration(WRITE_DATASOURCE, Collections.singletonList(READ_DATASOURCE)), null, "")),
Collections.emptyMap()), Collections.emptyList(), mock(InstanceContext.class));
sqlRouter = (ReadwriteSplittingSQLRouter) OrderedSPILoader.getServices(SQLRouter.class, Collections.singleton(staticRule)).get(staticRule);
- DynamicDataSourceContainedRule dynamicDataSourceRule = mock(DynamicDataSourceContainedRule.class, RETURNS_DEEP_STUBS);
- when(dynamicDataSourceRule.getPrimaryDataSourceName("readwrite_ds")).thenReturn(WRITE_DATASOURCE);
- when(dynamicDataSourceRule.getReplicaDataSourceNames("readwrite_ds")).thenReturn(Collections.emptyList());
- dynamicRule = new ReadwriteSplittingRule("logic_db", new ReadwriteSplittingRuleConfiguration(Collections.singleton(new ReadwriteSplittingDataSourceRuleConfiguration(DATASOURCE_NAME, null,
- new DynamicReadwriteSplittingStrategyConfiguration("readwrite_ds", "true"), "")), Collections.emptyMap()),
- Collections.singleton(dynamicDataSourceRule), mock(InstanceContext.class));
- dynamicSqlRouter = (ReadwriteSplittingSQLRouter) OrderedSPILoader.getServices(SQLRouter.class, Collections.singleton(dynamicRule)).get(dynamicRule);
}
@Test
@@ -247,35 +234,6 @@ public final class ReadwriteSplittingSQLRouterTest {
assertThat(routedDataSourceNames.next(), is(WRITE_DATASOURCE));
}
- @Test
- public void assertCreateRouteContextToPrimaryDataSourceWithWriteDataSourceQueryEnabled() {
- MySQLSelectStatement selectStatement = mock(MySQLSelectStatement.class);
- when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList());
- ShardingSphereRuleMetaData ruleMetaData = new ShardingSphereRuleMetaData(Collections.singleton(dynamicRule));
- ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
- mock(DatabaseType.class), mock(ShardingSphereResourceMetaData.class, RETURNS_DEEP_STUBS), ruleMetaData, Collections.emptyMap());
- RouteContext actual = dynamicSqlRouter.createRouteContext(queryContext,
- mock(ShardingSphereRuleMetaData.class), database, dynamicRule, new ConfigurationProperties(new Properties()), new ConnectionContext());
- Iterator<String> routedDataSourceNames = actual.getActualDataSourceNames().iterator();
- assertThat(routedDataSourceNames.next(), is(WRITE_DATASOURCE));
- }
-
- @Test
- public void assertDecorateRouteContextToPrimaryDataSourceWithWriteDataSourceQueryEnabled() {
- RouteContext actual = mockRouteContext();
- MySQLSelectStatement selectStatement = mock(MySQLSelectStatement.class);
- when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList());
- ShardingSphereRuleMetaData ruleMetaData = new ShardingSphereRuleMetaData(Collections.singleton(dynamicRule));
- ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
- mock(DatabaseType.class), mock(ShardingSphereResourceMetaData.class, RETURNS_DEEP_STUBS), ruleMetaData, Collections.emptyMap());
- dynamicSqlRouter.decorateRouteContext(actual, queryContext, database, dynamicRule, new ConfigurationProperties(new Properties()), new ConnectionContext());
- Iterator<String> routedDataSourceNames = actual.getActualDataSourceNames().iterator();
- assertThat(routedDataSourceNames.next(), is(NONE_READWRITE_SPLITTING_DATASOURCE_NAME));
- assertThat(routedDataSourceNames.next(), is(WRITE_DATASOURCE));
- }
-
private RouteContext mockRouteContext() {
RouteContext result = new RouteContext();
RouteUnit routeUnit = new RouteUnit(new RouteMapper(DATASOURCE_NAME, DATASOURCE_NAME), Collections.singletonList(new RouteMapper("table", "table_0")));
diff --git a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadWriteSplittingDataSourceRuleConfigurationTest.java b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadWriteSplittingDataSourceRuleConfigurationTest.java
index 46d3b2032e7..58927f7a4fd 100644
--- a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadWriteSplittingDataSourceRuleConfigurationTest.java
+++ b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadWriteSplittingDataSourceRuleConfigurationTest.java
@@ -40,7 +40,7 @@ public final class ReadWriteSplittingDataSourceRuleConfigurationTest {
readwriteSplittingDataSourceRuleConfig = new ReadwriteSplittingDataSourceRuleConfiguration("ds",
new StaticReadwriteSplittingStrategyConfiguration("write_ds", Arrays.asList("read_ds_0", "read_ds_1")), null, "");
readwriteSplittingDataSourceRuleConfigDynamic = new ReadwriteSplittingDataSourceRuleConfiguration("ds", null,
- new DynamicReadwriteSplittingStrategyConfiguration("readwrite_ds", "false"), "");
+ new DynamicReadwriteSplittingStrategyConfiguration("readwrite_ds"), "");
}
@Test
diff --git a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategyTest.java b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategyTest.java
index 7655f6b5c88..6c095203db1 100644
--- a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategyTest.java
+++ b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategyTest.java
@@ -30,7 +30,7 @@ public final class DynamicReadwriteSplittingStrategyTest {
@Test
public void assertGetDataSourceMapper() {
- DynamicReadwriteSplittingStrategy dynamicReadwriteSplittingStrategy = new DynamicReadwriteSplittingStrategy("database_discovery_ds", true, mock(DynamicDataSourceContainedRule.class));
+ DynamicReadwriteSplittingStrategy dynamicReadwriteSplittingStrategy = new DynamicReadwriteSplittingStrategy("database_discovery_ds", mock(DynamicDataSourceContainedRule.class));
assertThat(dynamicReadwriteSplittingStrategy.getAllDataSources(), is(Collections.singletonList("database_discovery_ds")));
}
}
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java
index c589f86d222..c9a62b3e9c5 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java
@@ -62,7 +62,7 @@ public final class ReadwriteSplittingRuleStatementConverter {
private static ReadwriteSplittingDataSourceRuleConfiguration createDataSourceRuleConfiguration(final ReadwriteSplittingRuleSegment segment,
final String loadBalancerName, final boolean isAutoAware) {
return isAutoAware ? new ReadwriteSplittingDataSourceRuleConfiguration(segment.getName(), null,
- new DynamicReadwriteSplittingStrategyConfiguration(segment.getAutoAwareResource(), segment.getWriteDataSourceQueryEnabled()), loadBalancerName)
+ new DynamicReadwriteSplittingStrategyConfiguration(segment.getAutoAwareResource()), loadBalancerName)
: new ReadwriteSplittingDataSourceRuleConfiguration(segment.getName(),
new StaticReadwriteSplittingStrategyConfiguration(segment.getWriteDataSource(), new ArrayList<>(segment.getReadDataSources())), null, loadBalancerName);
}
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
index 32f3971b264..966f76b1a49 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
@@ -81,7 +81,6 @@ public final class ShowReadwriteSplittingRuleExecutor implements RQLExecutor<Sho
Optional<AlgorithmConfiguration> loadBalancer = Optional.ofNullable(loadBalancers.get(dataSourceRuleConfig.getLoadBalancerName()));
return new LocalDataQueryResultRow(name,
getAutoAwareDataSourceName(dataSourceRuleConfig),
- getWriteDataSourceQueryEnabled(dataSourceRuleConfig),
getWriteDataSourceName(dataSourceRuleConfig, exportDataSources),
getReadDataSourceNames(dataSourceRuleConfig, exportDataSources),
loadBalancer.map(AlgorithmConfiguration::getType).orElse(""),
@@ -97,10 +96,6 @@ public final class ShowReadwriteSplittingRuleExecutor implements RQLExecutor<Sho
return null == dataSourceRuleConfig.getDynamicStrategy() ? "" : dataSourceRuleConfig.getDynamicStrategy().getAutoAwareDataSourceName();
}
- private String getWriteDataSourceQueryEnabled(final ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig) {
- return null == dataSourceRuleConfig.getDynamicStrategy() ? "" : dataSourceRuleConfig.getDynamicStrategy().getWriteDataSourceQueryEnabled();
- }
-
private String getWriteDataSourceName(final ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig, final Map<String, String> exportDataSources) {
return null == exportDataSources ? dataSourceRuleConfig.getStaticStrategy().getWriteDataSourceName() : exportDataSources.get(ExportableItemConstants.PRIMARY_DATA_SOURCE_NAME);
}
@@ -113,8 +108,7 @@ public final class ShowReadwriteSplittingRuleExecutor implements RQLExecutor<Sho
@Override
public Collection<String> getColumnNames() {
- return Arrays.asList("name", "auto_aware_data_source_name", "write_data_source_query_enabled",
- "write_storage_unit_name", "read_storage_unit_names", "load_balancer_type", "load_balancer_props");
+ return Arrays.asList("name", "auto_aware_data_source_name", "write_storage_unit_name", "read_storage_unit_names", "load_balancer_type", "load_balancer_props");
}
@Override
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
index c49a9ac9dd4..4c16b220d34 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
@@ -114,6 +114,6 @@ public final class ReadwriteSplittingRuleStatementConverterTest {
}
private ReadwriteSplittingRuleSegment createReadwriteSplittingRuleSegment(final String name, final String autoAwareResource, final String loadBalancer, final Properties props) {
- return new ReadwriteSplittingRuleSegment(name, autoAwareResource, "false", loadBalancer, props);
+ return new ReadwriteSplittingRuleSegment(name, autoAwareResource, loadBalancer, props);
}
}
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java
index 20bbb6334ab..7801da17ff9 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java
@@ -75,11 +75,10 @@ public final class ShowReadwriteSplittingRuleExecutorTest {
LocalDataQueryResultRow row = iterator.next();
assertThat(row.getCell(1), is("readwrite_ds"));
assertThat(row.getCell(2), is(""));
- assertThat(row.getCell(3), is(""));
- assertThat(row.getCell(4), is("ds_primary"));
- assertThat(row.getCell(5), is("ds_slave_0,ds_slave_1"));
- assertThat(row.getCell(6), is("random"));
- assertThat(row.getCell(7), is("read_weight=2:1"));
+ assertThat(row.getCell(3), is("ds_primary"));
+ assertThat(row.getCell(4), is("ds_slave_0,ds_slave_1"));
+ assertThat(row.getCell(5), is("random"));
+ assertThat(row.getCell(6), is("read_weight=2:1"));
}
@Test
@@ -96,11 +95,10 @@ public final class ShowReadwriteSplittingRuleExecutorTest {
LocalDataQueryResultRow row = iterator.next();
assertThat(row.getCell(1), is("readwrite_ds"));
assertThat(row.getCell(2), is(""));
- assertThat(row.getCell(3), is(""));
- assertThat(row.getCell(4), is("ds_primary"));
- assertThat(row.getCell(5), is("ds_slave_0,ds_slave_1"));
- assertThat(row.getCell(6), is("random"));
- assertThat(row.getCell(7), is("read_weight=2:1"));
+ assertThat(row.getCell(3), is("ds_primary"));
+ assertThat(row.getCell(4), is("ds_slave_0,ds_slave_1"));
+ assertThat(row.getCell(5), is("random"));
+ assertThat(row.getCell(6), is("read_weight=2:1"));
}
private Map<String, Object> createExportedData() {
@@ -132,11 +130,10 @@ public final class ShowReadwriteSplittingRuleExecutorTest {
LocalDataQueryResultRow row = iterator.next();
assertThat(row.getCell(1), is("readwrite_ds"));
assertThat(row.getCell(2), is(""));
- assertThat(row.getCell(3), is(""));
- assertThat(row.getCell(4), is("write_ds"));
- assertThat(row.getCell(5), is("read_ds_0,read_ds_1"));
+ assertThat(row.getCell(3), is("write_ds"));
+ assertThat(row.getCell(4), is("read_ds_0,read_ds_1"));
+ assertThat(row.getCell(5), is(""));
assertThat(row.getCell(6), is(""));
- assertThat(row.getCell(7), is(""));
}
private RuleConfiguration createRuleConfigurationWithoutLoadBalancer() {
@@ -160,22 +157,20 @@ public final class ShowReadwriteSplittingRuleExecutorTest {
LocalDataQueryResultRow row = iterator.next();
assertThat(row.getCell(1), is("readwrite_ds"));
assertThat(row.getCell(2), is("rd_rs"));
- assertThat(row.getCell(3), is("false"));
- assertThat(row.getCell(4), is("write_ds"));
- assertThat(row.getCell(5), is("read_ds_0,read_ds_1"));
+ assertThat(row.getCell(3), is("write_ds"));
+ assertThat(row.getCell(4), is("read_ds_0,read_ds_1"));
+ assertThat(row.getCell(5), is(""));
assertThat(row.getCell(6), is(""));
- assertThat(row.getCell(7), is(""));
}
@Test
public void assertGetColumnNames() {
RQLExecutor<ShowReadwriteSplittingRulesStatement> executor = new ShowReadwriteSplittingRuleExecutor();
Collection<String> columns = executor.getColumnNames();
- assertThat(columns.size(), is(7));
+ assertThat(columns.size(), is(6));
Iterator<String> iterator = columns.iterator();
assertThat(iterator.next(), is("name"));
assertThat(iterator.next(), is("auto_aware_data_source_name"));
- assertThat(iterator.next(), is("write_data_source_query_enabled"));
assertThat(iterator.next(), is("write_storage_unit_name"));
assertThat(iterator.next(), is("read_storage_unit_names"));
assertThat(iterator.next(), is("load_balancer_type"));
@@ -212,7 +207,7 @@ public final class ShowReadwriteSplittingRuleExecutorTest {
private RuleConfiguration createRuleConfigurationWithAutoAwareDataSource() {
ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig = new ReadwriteSplittingDataSourceRuleConfiguration("readwrite_ds", null,
- new DynamicReadwriteSplittingStrategyConfiguration("rd_rs", "false"), "");
+ new DynamicReadwriteSplittingStrategyConfiguration("rd_rs"), "");
return new ReadwriteSplittingRuleConfiguration(Collections.singleton(dataSourceRuleConfig), null);
}
}
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
index 6faaba6c994..b20c7594efe 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
@@ -85,7 +85,7 @@ public final class AlterReadwriteSplittingRuleStatementUpdaterTest {
ExportableRule exportableRule = mock(ExportableRule.class);
when(exportableRule.getExportData()).thenReturn(Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, Collections.singletonMap("ms_group", "ds_0")));
when(database.getRuleMetaData().findRules(ExportableRule.class)).thenReturn(Collections.singleton(exportableRule));
- ReadwriteSplittingRuleSegment ruleSegment = new ReadwriteSplittingRuleSegment("readwrite_ds", "ha_group", "false", "TEST", new Properties());
+ ReadwriteSplittingRuleSegment ruleSegment = new ReadwriteSplittingRuleSegment("readwrite_ds", "ha_group", "TEST", new Properties());
updater.checkSQLStatement(database, new AlterReadwriteSplittingRuleStatement(Collections.singleton(ruleSegment)), createCurrentRuleConfiguration());
}
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
index 3af6b75f8a6..4c6fc12f326 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
@@ -95,7 +95,7 @@ public final class CreateReadwriteSplittingRuleStatementUpdaterTest {
ExportableRule exportableRule = mock(ExportableRule.class);
when(exportableRule.getExportData()).thenReturn(Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, Collections.singletonMap("ms_group", "ds_0")));
when(database.getRuleMetaData().findRules(ExportableRule.class)).thenReturn(Collections.singleton(exportableRule));
- ReadwriteSplittingRuleSegment ruleSegment = new ReadwriteSplittingRuleSegment("dynamic_rule", "ha_group", "false", "TEST", new Properties());
+ ReadwriteSplittingRuleSegment ruleSegment = new ReadwriteSplittingRuleSegment("dynamic_rule", "ha_group", "TEST", new Properties());
assertThrows(MissingRequiredStorageUnitsException.class, () -> updater.checkSQLStatement(database, createSQLStatement(false, ruleSegment), null));
}
@@ -140,7 +140,7 @@ public final class CreateReadwriteSplittingRuleStatementUpdaterTest {
when(exportableRule.getExportData()).thenReturn(Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES, Collections.singletonMap("ms_group", "ds_0")));
when(database.getRuleMetaData().findRules(ExportableRule.class)).thenReturn(Collections.singleton(exportableRule));
when(TypedSPILoader.contains(ReadQueryLoadBalanceAlgorithm.class, "TEST")).thenReturn(true);
- ReadwriteSplittingRuleSegment dynamicSegment = new ReadwriteSplittingRuleSegment("dynamic_rule", "ms_group", "false", "TEST", new Properties());
+ ReadwriteSplittingRuleSegment dynamicSegment = new ReadwriteSplittingRuleSegment("dynamic_rule", "ms_group", "TEST", new Properties());
ReadwriteSplittingRuleSegment staticSegment = new ReadwriteSplittingRuleSegment("static_rule", "write_ds_0", Arrays.asList("read_ds_0", "read_ds_1"), "TEST", new Properties());
CreateReadwriteSplittingRuleStatement statement = createSQLStatement(false, dynamicSegment, staticSegment);
updater.checkSQLStatement(database, statement, null);
diff --git a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Keyword.g4 b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Keyword.g4
index f31ab775cd7..a415800ae42 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Keyword.g4
+++ b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/Keyword.g4
@@ -111,18 +111,6 @@ COUNT
: C O U N T
;
-WRITE_DATA_SOURCE_QUERY_ENABLED
- : W R I T E UL_ D A T A UL_ S O U R C E UL_ Q U E R Y UL_ E N A B L E D
- ;
-
-TRUE
- : T R U E
- ;
-
-FALSE
- : F A L S E
- ;
-
ROUND_ROBIN
: R O U N D UL_ R O B I N
;
diff --git a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4 b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4
index 5d503885599..8225b96a078 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4
+++ b/features/readwrite-splitting/distsql/parser/src/main/antlr4/imports/readwrite-splitting/RDLStatement.g4
@@ -40,7 +40,7 @@ staticReadwriteSplittingRuleDefinition
;
dynamicReadwriteSplittingRuleDefinition
- : AUTO_AWARE_RESOURCE EQ_ resourceName (COMMA_ WRITE_DATA_SOURCE_QUERY_ENABLED EQ_ writeDataSourceQueryEnabled)?
+ : AUTO_AWARE_RESOURCE EQ_ resourceName
;
ruleName
diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
index eedbc9838e4..d8ff27730ba 100644
--- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
+++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
@@ -96,7 +96,7 @@ public final class ReadwriteSplittingDistSQLStatementVisitor extends ReadwriteSp
}
if (null == ctx.staticReadwriteSplittingRuleDefinition()) {
return new ReadwriteSplittingRuleSegment(getIdentifierValue(ctx.ruleName()), getIdentifierValue(ctx.dynamicReadwriteSplittingRuleDefinition().resourceName()),
- getIdentifierValue(ctx.dynamicReadwriteSplittingRuleDefinition().writeDataSourceQueryEnabled()), algorithmTypeName, props);
+ algorithmTypeName, props);
}
StaticReadwriteSplittingRuleDefinitionContext staticRuleDefinitionCtx = ctx.staticReadwriteSplittingRuleDefinition();
return new ReadwriteSplittingRuleSegment(getIdentifierValue(ctx.ruleName()),
diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/segment/ReadwriteSplittingRuleSegment.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/segment/ReadwriteSplittingRuleSegment.java
index bacb8c0a363..47009ada90c 100644
--- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/segment/ReadwriteSplittingRuleSegment.java
+++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/segment/ReadwriteSplittingRuleSegment.java
@@ -37,8 +37,6 @@ public final class ReadwriteSplittingRuleSegment implements ASTNode {
private final String autoAwareResource;
- private final String writeDataSourceQueryEnabled;
-
private final String writeDataSource;
private final Collection<String> readDataSources;
@@ -47,12 +45,12 @@ public final class ReadwriteSplittingRuleSegment implements ASTNode {
private final Properties props;
- public ReadwriteSplittingRuleSegment(final String name, final String autoAwareResource, final String writeDataSourceQueryEnabled, final String loadBalancer, final Properties props) {
- this(name, autoAwareResource, writeDataSourceQueryEnabled, null, null, loadBalancer, props);
+ public ReadwriteSplittingRuleSegment(final String name, final String autoAwareResource, final String loadBalancer, final Properties props) {
+ this(name, autoAwareResource, null, null, loadBalancer, props);
}
public ReadwriteSplittingRuleSegment(final String name, final String writeDataSource, final Collection<String> readDataSources, final String loadBalancer, final Properties props) {
- this(name, null, null, writeDataSource, readDataSources, loadBalancer, props);
+ this(name, null, writeDataSource, readDataSources, loadBalancer, props);
}
/**
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java
index 54750085155..7191b82107f 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java
@@ -139,9 +139,7 @@ public final class DistSQLScriptConstants {
public static final String READWRITE_SPLITTING_FOR_DYNAMIC = " %s ("
+ System.lineSeparator()
- + "AUTO_AWARE_RESOURCE=%s,"
- + System.lineSeparator()
- + "WRITE_DATA_SOURCE_QUERY_ENABLED=%s%s"
+ + "AUTO_AWARE_RESOURCE=%s"
+ System.lineSeparator()
+ ")";
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
index f2e56e6ff55..d53a31a5b12 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
@@ -414,9 +414,8 @@ public final class ConvertYamlConfigurationExecutor implements QueryableRALExecu
return;
}
String loadBalancerType = getLoadBalancerType(loadBalancers.get(dataSourceRuleConfig.getLoadBalancerName()));
- boolean allowWriteDataSourceQuery = Strings.isNullOrEmpty(dynamicConfig.getWriteDataSourceQueryEnabled()) ? Boolean.TRUE : Boolean.parseBoolean(dynamicConfig.getWriteDataSourceQueryEnabled());
result.append(String.format(DistSQLScriptConstants.READWRITE_SPLITTING_FOR_DYNAMIC,
- dataSourceRuleConfig.getName(), dynamicConfig.getAutoAwareDataSourceName(), allowWriteDataSourceQuery, loadBalancerType));
+ dataSourceRuleConfig.getName(), dynamicConfig.getAutoAwareDataSourceName(), loadBalancerType));
}
private void appendStaticReadWriteSplittingRule(final StaticReadwriteSplittingStrategyConfiguration staticConfig, final Map<String, AlgorithmConfiguration> loadBalancers,
diff --git a/proxy/backend/core/src/test/resources/expected/convert-mix.yaml b/proxy/backend/core/src/test/resources/expected/convert-mix.yaml
index d92dbcb03b3..04830ce502c 100644
--- a/proxy/backend/core/src/test/resources/expected/convert-mix.yaml
+++ b/proxy/backend/core/src/test/resources/expected/convert-mix.yaml
@@ -60,11 +60,9 @@ HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
CREATE READWRITE_SPLITTING RULE replica_ds_0 (
-AUTO_AWARE_RESOURCE=readwrite_ds_0,
-WRITE_DATA_SOURCE_QUERY_ENABLED=true
+AUTO_AWARE_RESOURCE=readwrite_ds_0
), replica_ds_1 (
-AUTO_AWARE_RESOURCE=readwrite_ds_1,
-WRITE_DATA_SOURCE_QUERY_ENABLED=true
+AUTO_AWARE_RESOURCE=readwrite_ds_1
);
CREATE ENCRYPT RULE t_encrypt (
diff --git a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_readwrite_splitting_rules.xml
index a56d106e20f..2b3c5f05300 100644
--- a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_readwrite_splitting_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_readwrite_splitting_rules.xml
@@ -19,11 +19,10 @@
<metadata>
<column name="name" />
<column name="auto_aware_data_source_name" />
- <column name="write_data_source_query_enabled" />
<column name="write_storage_unit_name" />
<column name="read_storage_unit_names" />
<column name="load_balancer_type" />
<column name="load_balancer_props" />
</metadata>
- <row values="readwrite_ds| | | ds_0| ds_0| RANDOM| " />
+ <row values="readwrite_ds| | ds_0| ds_0| RANDOM| " />
</dataset>
diff --git a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_readwrite_splitting_rules.xml
index 6d03712b925..10dd014a1c7 100644
--- a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_readwrite_splitting_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_readwrite_splitting_rules.xml
@@ -19,11 +19,10 @@
<metadata>
<column name="name" />
<column name="auto_aware_data_source_name" />
- <column name="write_data_source_query_enabled" />
<column name="write_storage_unit_name" />
<column name="read_storage_unit_names" />
<column name="load_balancer_type" />
<column name="load_balancer_props" />
</metadata>
- <row values="readwrite_ds| | | ds_0| ds_1| RANDOM| " />
+ <row values="readwrite_ds| | ds_0| ds_1| RANDOM| " />
</dataset>
diff --git a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_readwrite_splitting_rules.xml
index f81ae08d6e2..e1819f78d46 100644
--- a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_readwrite_splitting_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_readwrite_splitting_rules.xml
@@ -19,7 +19,6 @@
<metadata>
<column name="name" />
<column name="auto_aware_data_source_name" />
- <column name="write_data_source_query_enabled" />
<column name="write_storage_unit_name" />
<column name="read_storage_unit_names" />
<column name="load_balancer_type" />
diff --git a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_readwrite_splitting_rules.xml
index b9bb8056a00..b4445e94538 100644
--- a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_readwrite_splitting_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_readwrite_splitting_rules.xml
@@ -19,20 +19,19 @@
<metadata>
<column name="name" />
<column name="auto_aware_data_source_name" />
- <column name="write_data_source_query_enabled" />
<column name="write_storage_unit_name" />
<column name="read_storage_unit_names" />
<column name="load_balancer_type" />
<column name="load_balancer_props" />
</metadata>
- <row values="readwrite_ds_0| | | write_ds_0| read_ds_0| ROUND_ROBIN| " />
- <row values="readwrite_ds_1| | | write_ds_1| read_ds_1| ROUND_ROBIN| " />
- <row values="readwrite_ds_2| | | write_ds_2| read_ds_2| ROUND_ROBIN| " />
- <row values="readwrite_ds_3| | | write_ds_3| read_ds_3| ROUND_ROBIN| " />
- <row values="readwrite_ds_4| | | write_ds_4| read_ds_4| ROUND_ROBIN| " />
- <row values="readwrite_ds_5| | | write_ds_5| read_ds_5| ROUND_ROBIN| " />
- <row values="readwrite_ds_6| | | write_ds_6| read_ds_6| ROUND_ROBIN| " />
- <row values="readwrite_ds_7| | | write_ds_7| read_ds_7| ROUND_ROBIN| " />
- <row values="readwrite_ds_8| | | write_ds_8| read_ds_8| ROUND_ROBIN| " />
- <row values="readwrite_ds_9| | | write_ds_9| read_ds_9| ROUND_ROBIN| " />
+ <row values="readwrite_ds_0| | write_ds_0| read_ds_0| ROUND_ROBIN| " />
+ <row values="readwrite_ds_1| | write_ds_1| read_ds_1| ROUND_ROBIN| " />
+ <row values="readwrite_ds_2| | write_ds_2| read_ds_2| ROUND_ROBIN| " />
+ <row values="readwrite_ds_3| | write_ds_3| read_ds_3| ROUND_ROBIN| " />
+ <row values="readwrite_ds_4| | write_ds_4| read_ds_4| ROUND_ROBIN| " />
+ <row values="readwrite_ds_5| | write_ds_5| read_ds_5| ROUND_ROBIN| " />
+ <row values="readwrite_ds_6| | write_ds_6| read_ds_6| ROUND_ROBIN| " />
+ <row values="readwrite_ds_7| | write_ds_7| read_ds_7| ROUND_ROBIN| " />
+ <row values="readwrite_ds_8| | write_ds_8| read_ds_8| ROUND_ROBIN| " />
+ <row values="readwrite_ds_9| | write_ds_9| read_ds_9| ROUND_ROBIN| " />
</dataset>
diff --git a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_readwrite_splitting_rules.xml
index 7bef83358b0..891e4caca25 100644
--- a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_readwrite_splitting_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_readwrite_splitting_rules.xml
@@ -19,20 +19,19 @@
<metadata>
<column name="name" />
<column name="auto_aware_data_source_name" />
- <column name="write_data_source_query_enabled" />
<column name="write_storage_unit_name" />
<column name="read_storage_unit_names" />
<column name="load_balancer_type" />
<column name="load_balancer_props" />
</metadata>
- <row values="readwrite_ds_0| | | encrypt_write_ds_0| encrypt_read_ds_0| ROUND_ROBIN| " />
- <row values="readwrite_ds_1| | | encrypt_write_ds_1| encrypt_read_ds_1| ROUND_ROBIN| " />
- <row values="readwrite_ds_2| | | encrypt_write_ds_2| encrypt_read_ds_2| ROUND_ROBIN| " />
- <row values="readwrite_ds_3| | | encrypt_write_ds_3| encrypt_read_ds_3| ROUND_ROBIN| " />
- <row values="readwrite_ds_4| | | encrypt_write_ds_4| encrypt_read_ds_4| ROUND_ROBIN| " />
- <row values="readwrite_ds_5| | | encrypt_write_ds_5| encrypt_read_ds_5| ROUND_ROBIN| " />
- <row values="readwrite_ds_6| | | encrypt_write_ds_6| encrypt_read_ds_6| ROUND_ROBIN| " />
- <row values="readwrite_ds_7| | | encrypt_write_ds_7| encrypt_read_ds_7| ROUND_ROBIN| " />
- <row values="readwrite_ds_8| | | encrypt_write_ds_8| encrypt_read_ds_8| ROUND_ROBIN| " />
- <row values="readwrite_ds_9| | | encrypt_write_ds_9| encrypt_read_ds_9| ROUND_ROBIN| " />
+ <row values="readwrite_ds_0| | encrypt_write_ds_0| encrypt_read_ds_0| ROUND_ROBIN| " />
+ <row values="readwrite_ds_1| | encrypt_write_ds_1| encrypt_read_ds_1| ROUND_ROBIN| " />
+ <row values="readwrite_ds_2| | encrypt_write_ds_2| encrypt_read_ds_2| ROUND_ROBIN| " />
+ <row values="readwrite_ds_3| | encrypt_write_ds_3| encrypt_read_ds_3| ROUND_ROBIN| " />
+ <row values="readwrite_ds_4| | encrypt_write_ds_4| encrypt_read_ds_4| ROUND_ROBIN| " />
+ <row values="readwrite_ds_5| | encrypt_write_ds_5| encrypt_read_ds_5| ROUND_ROBIN| " />
+ <row values="readwrite_ds_6| | encrypt_write_ds_6| encrypt_read_ds_6| ROUND_ROBIN| " />
+ <row values="readwrite_ds_7| | encrypt_write_ds_7| encrypt_read_ds_7| ROUND_ROBIN| " />
+ <row values="readwrite_ds_8| | encrypt_write_ds_8| encrypt_read_ds_8| ROUND_ROBIN| " />
+ <row values="readwrite_ds_9| | encrypt_write_ds_9| encrypt_read_ds_9| ROUND_ROBIN| " />
</dataset>
diff --git a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_readwrite_splitting_rules.xml
index e53ee007b4b..dde8cfc456b 100644
--- a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_readwrite_splitting_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_readwrite_splitting_rules.xml
@@ -19,11 +19,10 @@
<metadata>
<column name="name" />
<column name="auto_aware_data_source_name" />
- <column name="write_data_source_query_enabled" />
<column name="write_storage_unit_name" />
<column name="read_storage_unit_names" />
<column name="load_balancer_type" />
<column name="load_balancer_props" />
</metadata>
- <row values="readwrite_ds| | | encrypt_write_ds| encrypt_read_ds| ROUND_ROBIN| " />
+ <row values="readwrite_ds| | encrypt_write_ds| encrypt_read_ds| ROUND_ROBIN| " />
</dataset>
diff --git a/test/e2e/suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_readwrite_splitting_rules.xml
index 3cc73e0e503..62638f0d3c5 100644
--- a/test/e2e/suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_readwrite_splitting_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_readwrite_splitting_rules.xml
@@ -19,11 +19,10 @@
<metadata>
<column name="name" />
<column name="auto_aware_data_source_name" />
- <column name="write_data_source_query_enabled" />
<column name="write_storage_unit_name" />
<column name="read_storage_unit_names" />
<column name="load_balancer_type" />
<column name="load_balancer_props" />
</metadata>
- <row values="write-read-ds| | | write_ds| read_0,read_1| | " />
+ <row values="write-read-ds| | write_ds| read_0,read_1| | " />
</dataset>