This is an automated email from the ASF dual-hosted git repository.
totalo 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 269782c144c Modify remaining replica query to readwrite-splitting
(#21529)
269782c144c is described below
commit 269782c144c0bd6429bff275c2ee97a0f7241212
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Oct 12 19:43:21 2022 +0800
Modify remaining replica query to readwrite-splitting (#21529)
---
docs/document/content/faq/_index.cn.md | 2 +-
docs/document/content/faq/_index.en.md | 2 +-
.../proxy/spring/boot/mybatis/ProxySpringBootStarterExample.java | 2 +-
.../checker/AbstractReadwriteSplittingRuleConfigurationChecker.java | 2 +-
.../readwritesplitting/rule/ReadwriteSplittingRule.java | 4 ++--
.../bootstrap/src/main/resources/conf/config-readwrite-splitting.yaml | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/document/content/faq/_index.cn.md
b/docs/document/content/faq/_index.cn.md
index 89c0bf8d0fe..a41f754700a 100644
--- a/docs/document/content/faq/_index.cn.md
+++ b/docs/document/content/faq/_index.cn.md
@@ -20,7 +20,7 @@ chapter = true
Spring 命名空间使用规范并未强制要求将 xsd 文件部署至公网地址，但考虑到部分用户的需求，我们也将相关 xsd 文件部署至
ShardingSphere 官网。
实际上 shardingsphere-jdbc-spring-namespace 的 jar 包中 META-INF\spring.schemas 配置了
xsd 文件的位置：
-META-INF\namespace\sharding.xsd 和 META-INF\namespace\replica-query.xsd，只需确保
jar 包中该文件存在即可。
+META-INF\namespace\sharding.xsd 和
META-INF\namespace\readwrite-splitting.xsd，只需确保 jar 包中该文件存在即可。
### [JDBC] 引入 `shardingsphere-transaction-xa-core` 后，如何避免 spring-boot 自动加载默认的
JtaTransactionManager？
diff --git a/docs/document/content/faq/_index.en.md
b/docs/document/content/faq/_index.en.md
index 731e06006bd..4a1e9e8f4b1 100644
--- a/docs/document/content/faq/_index.en.md
+++ b/docs/document/content/faq/_index.en.md
@@ -20,7 +20,7 @@ Answer:
The norm of Spring Namespace does not require deploying xsd files to the
official website. But considering some users' needs, we will deploy them to
ShardingSphere's official website.
Actually, META-INF\spring.schemas in the jar package of
shardingsphere-jdbc-spring-namespace has been configured with the position of
xsd files:
-META-INF\namespace\sharding.xsd and META-INF\namespace\replica-query.xsd, so
you only need to make sure that the file is in the jar package.
+META-INF\namespace\sharding.xsd and
META-INF\namespace\readwrite-splitting.xsd, so you only need to make sure that
the file is in the jar package.
### [JDBC] Found a JtaTransactionManager in spring boot project when
integrating with XAtransaction.
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/proxy/spring/boot/mybatis/ProxySpringBootStarterExample.java
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/proxy/spring/boot/mybatis/ProxySpringBootStarterExample.java
index 7b1eef4db1c..72bf8ae9280 100644
---
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/proxy/spring/boot/mybatis/ProxySpringBootStarterExample.java
+++
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/java/org/apache/shardingsphere/example/proxy/spring/boot/mybatis/ProxySpringBootStarterExample.java
@@ -30,7 +30,7 @@ import java.sql.SQLException;
* 1. Copy resources/conf/*.yaml to ShardingSphere-Proxy conf folder and
overwrite original file.
*
* If you want to use sharding, please select config-sharding.yaml
- * If you want to use replica-query, please select
config-readwrite-splitting.yaml
+ * If you want to use readwrite-splitting, please select
config-readwrite-splitting.yaml
*
* 2. Please make sure ShardingSphere-Proxy is running before you run this
example.
*/
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
index 838d7ef66c5..4c45bbff36a 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
@@ -51,7 +51,7 @@ public abstract class
AbstractReadwriteSplittingRuleConfigurationChecker<T exten
@Override
public final void check(final String databaseName, final T config, final
Map<String, DataSource> dataSourceMap, final Collection<ShardingSphereRule>
rules) {
Collection<ReadwriteSplittingDataSourceRuleConfiguration> configs =
getDataSources(config);
- Preconditions.checkArgument(!configs.isEmpty(), "Replica query data
source rules can not be empty.");
+ Preconditions.checkArgument(!configs.isEmpty(), "Readwrite-splitting
data source rules can not be empty.");
checkDataSources(databaseName, configs, dataSourceMap, rules);
checkLoadBalancerDataSourceName(databaseName, configs,
getLoadBalancer(config), rules);
}
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 8c43248e430..e723232c372 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
@@ -139,7 +139,7 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
/**
* Get single data source rule.
*
- * @return replica query data source rule
+ * @return readwrite-splitting data source rule
*/
public ReadwriteSplittingDataSourceRule getSingleDataSourceRule() {
return dataSourceRules.values().iterator().next();
@@ -149,7 +149,7 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
* Find data source rule.
*
* @param dataSourceName data source name
- * @return replica query data source rule
+ * @return readwrite-splitting data source rule
*/
public Optional<ReadwriteSplittingDataSourceRule> findDataSourceRule(final
String dataSourceName) {
return Optional.ofNullable(dataSourceRules.get(dataSourceName));
diff --git
a/proxy/bootstrap/src/main/resources/conf/config-readwrite-splitting.yaml
b/proxy/bootstrap/src/main/resources/conf/config-readwrite-splitting.yaml
index cdb3929cde6..cbb7b69641b 100644
--- a/proxy/bootstrap/src/main/resources/conf/config-readwrite-splitting.yaml
+++ b/proxy/bootstrap/src/main/resources/conf/config-readwrite-splitting.yaml
@@ -18,7 +18,7 @@
######################################################################################################
#
# Here you can configure the rules for the proxy.
-# This example is configuration of replica-query rule.
+# This example is configuration of readwrite-splitting rule.
#
######################################################################################################
#
