You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/10/01 13:55:47 UTC
[shardingsphere] branch master updated: Remove overwrite parameter of mode (#21281)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 0e709c883a4 Remove overwrite parameter of mode (#21281)
0e709c883a4 is described below
commit 0e709c883a486dc29f9d138a22b35e5872f6c09b
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Sat Oct 1 21:55:35 2022 +0800
Remove overwrite parameter of mode (#21281)
---
docs/blog/content/material/proxyIntroduce.cn.md | 1 -
.../builtin-algorithm/metadata-repository.cn.md | 2 --
.../builtin-algorithm/metadata-repository.en.md | 2 --
.../user-manual/shardingsphere-jdbc/java-api/mode.cn.md | 10 +++++-----
.../user-manual/shardingsphere-jdbc/java-api/mode.en.md | 8 ++++----
.../shardingsphere-jdbc/spring-boot-starter/mode.cn.md | 9 ++-------
.../shardingsphere-jdbc/spring-boot-starter/mode.en.md | 10 +++-------
.../spring-boot-starter/rules/sharding.cn.md | 3 +--
.../spring-boot-starter/rules/sharding.en.md | 3 +--
.../shardingsphere-jdbc/spring-namespace/mode.cn.md | 10 ++++------
.../shardingsphere-jdbc/spring-namespace/mode.en.md | 12 +++++-------
.../user-manual/shardingsphere-jdbc/yaml-config/mode.cn.md | 8 ++------
.../user-manual/shardingsphere-jdbc/yaml-config/mode.en.md | 10 +++-------
.../user-manual/shardingsphere-proxy/migration/build.cn.md | 1 -
.../user-manual/shardingsphere-proxy/migration/build.en.md | 1 -
.../docker/shardingsphere-proxy/sharding/conf/server.yaml | 1 -
.../resources/template/jdbc/java/config/Configuration.ftl | 6 +++---
.../jdbc/resources/mode/spring-boot-starter/cluster-etcd.ftl | 1 -
.../resources/mode/spring-boot-starter/cluster-zookeeper.ftl | 1 -
.../jdbc/resources/mode/spring-boot-starter/standalone.ftl | 1 -
.../jdbc/resources/mode/spring-namespace/cluster.ftl | 2 +-
.../resources/mode/spring-namespace/config/standalone.ftl | 2 +-
.../jdbc/resources/mode/spring-namespace/standalone.ftl | 2 +-
.../src/main/resources/template/proxy/mode/cluster-etcd.ftl | 1 -
.../main/resources/template/proxy/mode/cluster-zookeeper.ftl | 1 -
.../src/main/resources/template/proxy/mode/standalone.ftl | 3 +--
.../raw/jdbc/ClusterModeRawJavaConfigurationExample.java | 2 +-
.../mode/raw/jdbc/config/ClusterModeConfigurationUtil.java | 10 +++++-----
.../src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml | 1 -
.../META-INF/zookeeper/cloud/readwrite-splitting.yaml | 1 -
.../src/main/resources/META-INF/zookeeper/cloud/shadow.yaml | 1 -
.../META-INF/zookeeper/cloud/sharding-databases-tables.yaml | 1 -
.../src/main/resources/META-INF/zookeeper/local/encrypt.yaml | 1 -
.../META-INF/zookeeper/local/readwrite-splitting.yaml | 1 -
.../src/main/resources/META-INF/zookeeper/local/shadow.yaml | 1 -
.../META-INF/zookeeper/local/sharding-databases-tables.yaml | 1 -
.../resources/application-cloud-zookeeper-encrypt.properties | 1 -
...pplication-cloud-zookeeper-readwrite-splitting.properties | 1 -
.../resources/application-cloud-zookeeper-shadow.properties | 1 -
...tion-cloud-zookeeper-sharding-databases-tables.properties | 1 -
.../resources/application-local-zookeeper-encrypt.properties | 1 -
...pplication-local-zookeeper-readwrite-splitting.properties | 1 -
.../resources/application-local-zookeeper-shadow.properties | 1 -
...tion-local-zookeeper-sharding-databases-tables.properties | 1 -
.../application-sharding-databases-tables.properties | 3 +--
.../application-sharding-databases-tables.properties | 3 +--
.../application-sharding-databases-tables.properties | 3 +--
.../jdbc/config/ShardingDatabasesConfigurationPrecise.java | 2 +-
.../src/main/resources/META-INF/sharding-databases.yaml | 3 +--
.../application-sharding-databases-tables.properties | 3 +--
.../src/main/resources/conf/server.yaml | 1 -
.../src/main/resources/server/server.yaml | 1 -
.../src/main/resources/conf/server.yaml | 1 -
.../metrics/prometheus/collector/ProxyInfoCollectorTest.java | 2 +-
.../prometheus/service/PrometheusPluginBootServiceTest.java | 2 +-
.../dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java | 2 +-
.../dbdiscovery/rule/DatabaseDiscoveryRuleTest.java | 2 +-
.../AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java | 2 +-
.../rule/builder/DatabaseDiscoveryRuleBuilderTest.java | 2 +-
.../algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java | 4 ++--
.../keygen/CosIdSnowflakeKeyGenerateAlgorithmTest.java | 10 +++++-----
.../shardingsphere/infra/config/mode/ModeConfiguration.java | 2 --
.../infra/yaml/config/pojo/mode/YamlModeConfiguration.java | 2 --
.../config/swapper/mode/YamlModeConfigurationSwapper.java | 5 ++---
.../shardingsphere/infra/instance/InstanceContextTest.java | 4 ++--
.../infra/metadata/database/ShardingSphereDatabaseTest.java | 3 ---
.../infra/rule/builder/global/GlobalRulesBuilderTest.java | 2 +-
.../swapper/mode/YamlModeConfigurationSwapperTest.java | 7 +------
.../driver/api/ShardingSphereDataSourceFactoryTest.java | 12 ++++++------
.../META-INF/additional-spring-configuration-metadata.json | 5 -----
.../namespace/parser/DataSourceBeanDefinitionParser.java | 2 --
.../spring/namespace/tag/mode/ModeBeanDefinitionTag.java | 2 --
.../src/main/resources/META-INF/namespace/datasource.xsd | 1 -
.../test/resources/spring/standalone-application-context.xml | 2 +-
.../mode/manager/ContextManagerBuilderParameter.java | 2 +-
.../mode/metadata/persist/MetaDataPersistService.java | 11 +++++------
.../service/config/database/DataSourcePersistService.java | 4 ++--
.../service/config/database/DatabaseBasedPersistService.java | 5 ++---
.../service/config/database/DatabaseRulePersistService.java | 4 ++--
.../persist/service/config/global/GlobalPersistService.java | 10 ++++++++--
.../service/config/global/GlobalRulePersistService.java | 11 ++++++++---
.../service/config/global/PropertiesPersistService.java | 11 ++++++++---
.../mode/manager/ContextManagerBuilderFactoryTest.java | 2 +-
.../mode/manager/ContextManagerBuilderParameterTest.java | 4 +---
.../mode/metadata/persist/MetaDataPersistServiceTest.java | 12 ++++++------
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 2 +-
.../coordinator/ClusterContextManagerCoordinatorTest.java | 2 +-
.../manager/standalone/StandaloneContextManagerBuilder.java | 2 +-
.../standalone/StandaloneContextManagerBuilderTextTest.java | 2 +-
.../distsql/ral/UpdatableGlobalRuleRALBackendHandler.java | 2 +-
.../handler/distsql/ral/queryable/ShowModeInfoHandler.java | 7 ++-----
.../handler/distsql/ral/updatable/SetVariableHandler.java | 2 +-
.../distsql/ral/queryable/ShowInstanceInfoHandlerTest.java | 2 +-
.../distsql/ral/queryable/ShowInstanceListHandlerTest.java | 4 ++--
.../distsql/ral/queryable/ShowModeInfoHandlerTest.java | 5 ++---
.../src/test/resources/conf/config_loader/server.yaml | 1 -
.../src/test/resources/conf/swap/server.yaml | 1 -
.../src/main/resources/conf/server.yaml | 1 -
.../src/test/resources/conf/local/server.yaml | 1 -
.../src/test/resources/conf/reg_center/server.yaml | 1 -
.../configWithReadwriteSplittingDataSourceWithProps.yaml | 1 -
.../configWithReadwriteSplittingDataSourceWithoutProps.yaml | 1 -
.../integrate/sharding/configWithDataSourceWithProps.yaml | 1 -
.../integrate/sharding/configWithDataSourceWithoutProps.yaml | 1 -
.../integrate/sharding/configWithoutDataSourceWithProps.yaml | 1 -
.../sharding/configWithoutDataSourceWithoutProps.yaml | 1 -
.../configWithDataSourceWithProps.yaml | 1 -
.../configWithDataSourceWithoutProps.yaml | 1 -
.../configWithDataSourceWithoutRules.yaml | 1 -
.../configWithoutDataSourceWithProps.yaml | 1 -
.../configWithoutDataSourceWithoutProps.yaml | 1 -
.../src/test/resources/yaml/unit/sharding.yaml | 1 -
.../atomic/adapter/impl/ShardingSphereJdbcContainer.java | 1 -
.../test/resources/env/scenario/mysql_ha/proxy/server.yaml | 1 -
.../src/test/resources/env/mysql/server-5.yaml | 1 -
.../src/test/resources/env/mysql/server-8.yaml | 1 -
.../src/test/resources/env/opengauss/server.yaml | 1 -
.../src/test/resources/env/postgresql/server.yaml | 1 -
.../test/resources/env/common/cluster/proxy/conf/server.yaml | 1 -
.../test/resources/env/common/cluster/proxy/conf/server.yaml | 1 -
.../resources/env/common/standalone/proxy/conf/server.yaml | 1 -
.../src/test/resources/env/mysql/server.yaml | 1 -
.../src/test/resources/env/opengauss/server.yaml | 1 -
.../src/test/resources/env/postgresql/server.yaml | 1 -
.../data/pipeline/core/util/PipelineContextUtil.java | 2 +-
125 files changed, 133 insertions(+), 238 deletions(-)
diff --git a/docs/blog/content/material/proxyIntroduce.cn.md b/docs/blog/content/material/proxyIntroduce.cn.md
index 7b07473fab0..1a1d46fc6b1 100644
--- a/docs/blog/content/material/proxyIntroduce.cn.md
+++ b/docs/blog/content/material/proxyIntroduce.cn.md
@@ -109,7 +109,6 @@ mode:
type: H2
props:
jdbcUrl: jdbc:h2:file:~/config_data # 元数据持久化数据库连接 URL
- overwrite: false # 是否覆盖已存在的元数据
rules: # 认证信息
- !AUTHORITY
diff --git a/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.cn.md b/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.cn.md
index 0531e92018c..66640334c39 100644
--- a/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.cn.md
+++ b/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.cn.md
@@ -88,7 +88,6 @@ mode:
jdbc_url: jdbc:h2:mem:config;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
username: test
password: Test@123
- overwrite: false
```
- 集群模式
@@ -105,5 +104,4 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
```
diff --git a/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.en.md b/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.en.md
index eab919c99ff..711daed22c4 100644
--- a/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.en.md
+++ b/docs/document/content/user-manual/common-config/builtin-algorithm/metadata-repository.en.md
@@ -87,7 +87,6 @@ mode:
jdbc_url: jdbc:h2:mem:config;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
username: test
password: Test@123
- overwrite: false
```
- Cluster mode.
@@ -104,5 +103,4 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.cn.md
index a7cd615808b..76f8b5ce85d 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.cn.md
@@ -17,8 +17,7 @@ chapter = true
| *名称* | *数据类型* | *说明* | *默认值* |
| ---------- | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
| type | String | 运行模式类型<br />可选配置：Standalone、Cluster | Standalone |
-| repository | PersistRepositoryConfiguration | 持久化仓库配置<br />Standalone 类型使用 StandalonePersistRepositoryConfiguration<br />Cluster 类型使用 ClusterPersistRepositoryConfiguration | |
-| overwrite | boolean | 是否使用本地配置覆盖持久化配置 | false |
+| repository | PersistRepositoryConfiguration | 持久化仓库配置<br />Standalone 类型使用 StandalonePersistRepositoryConfiguration<br />Cluster 类型使用 ClusterPersistRepositoryConfiguration | | | false |
### Standalone 持久化配置
@@ -47,7 +46,8 @@ chapter = true
## 注意事项
1. 生产环境建议使用集群模式部署。
-2. 集群模式部署推荐使用 `ZooKeeper` 注册中心。
+1. 集群模式部署推荐使用 `ZooKeeper` 注册中心。
+1. `ZooKeeper` 存在配置信息时，则以 `ZooKeeper` 中的配置为准。
## 操作步骤
@@ -75,7 +75,7 @@ Properties props = ... // 构建属性配置
DataSource dataSource = ShardingSphereDataSourceFactory.createDataSource(databaseName, modeConfig, dataSourceMap, ruleConfigs, props);
private ModeConfiguration createModeConfiguration() {
- return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties()), true);
+ return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("JDBC", new Properties()));
}
```
@@ -89,7 +89,7 @@ Properties props = ... // 构建属性配置
DataSource dataSource = ShardingSphereDataSourceFactory.createDataSource(databaseName, modeConfig, dataSourceMap, ruleConfigs, props);
private ModeConfiguration createModeConfiguration() {
- return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance-sharding-db", "localhost:2181", new Properties()), true);
+ return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance-sharding-db", "localhost:2181", new Properties()));
}
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.en.md
index f3f4b6e658d..01396d071ed 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/mode.en.md
@@ -18,7 +18,6 @@ Attributes:
| ---------- | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
| type | String | Type of mode configuration<br />Values could be: Standalone or Cluster | Standalone |
| repository | PersistRepositoryConfiguration | Persist repository configuration<br />Standalone type uses StandalonePersistRepositoryConfiguration<br />Cluster type uses ClusterPersistRepositoryConfiguration | |
-| overwrite | boolean | Whether overwrite persistent configuration with local configuration | false |
### Standalone Persist Configuration
@@ -47,7 +46,8 @@ Attributes:
## Notes
1. Cluster mode deployment is recommended for production environment.
-2. The 'ZooKeeper' registry center is recommended for cluster mode deployment.
+1. The `ZooKeeper` registry center is recommended for cluster mode deployment.
+1. If there is configuration information in the `ZooKeeper`, please refer to the config information there.
## Procedure
@@ -75,7 +75,7 @@ Properties props = ... // Build property configuration
DataSource dataSource = ShardingSphereDataSourceFactory.createDataSource(databaseName, modeConfig, dataSourceMap, ruleConfigs, props);
private ModeConfiguration createModeConfiguration() {
- return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties()), true);
+ return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("JDBC", new Properties()));
}
```
@@ -89,7 +89,7 @@ Properties props = ... // Build property configuration
DataSource dataSource = ShardingSphereDataSourceFactory.createDataSource(databaseName, modeConfig, dataSourceMap, ruleConfigs, props);
private ModeConfiguration createModeConfiguration() {
- return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance-sharding-db", "localhost:2181", new Properties()), true);
+ return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance-sharding-db", "localhost:2181", new Properties()));
}
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.cn.md
index f047baaf000..0d7f0013a36 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.cn.md
@@ -8,7 +8,6 @@ weight = 1
```properties
spring.shardingsphere.mode.type= # 运行模式类型。可选配置：Standalone、Cluster
spring.shardingsphere.mode.repository= # 持久化仓库配置。
-spring.shardingsphere.mode.overwrite= # 是否使用本地配置覆盖持久化配置
```
### 单机模式
@@ -17,7 +16,6 @@ spring.shardingsphere.mode.overwrite= # 是否使用本地配置覆盖持久化
spring.shardingsphere.mode.type=Standalone
spring.shardingsphere.mode.repository.type= # 持久化仓库类型
spring.shardingsphere.mode.repository.props.<key>= # 持久化仓库所需属性
-spring.shardingsphere.mode.overwrite= # 是否使用本地配置覆盖持久化配置
```
### 集群模式 (推荐)
@@ -28,13 +26,13 @@ spring.shardingsphere.mode.repository.type= # 持久化仓库类型
spring.shardingsphere.mode.repository.props.namespace= # 注册中心命名空间
spring.shardingsphere.mode.repository.props.server-lists= # 注册中心连接地址
spring.shardingsphere.mode.repository.props.<key>= # 持久化仓库所需属性
-spring.shardingsphere.mode.overwrite= # 是否使用本地配置覆盖持久化配置
```
## 注意事项
1. 生产环境建议使用集群模式部署。
1. 集群模式部署推荐使用 `ZooKeeper` 注册中心。
+1. `ZooKeeper` 存在配置信息时，则以 `ZooKeeper` 中的配置为准。
## 操作步骤
@@ -56,9 +54,7 @@ spring.shardingsphere.mode.overwrite= # 是否使用本地配置覆盖持久化
```properties
spring.shardingsphere.mode.type=Standalone
-spring.shardingsphere.mode.repository.type=File
-spring.shardingsphere.mode.repository.props.path=.shardingsphere
-spring.shardingsphere.mode.overwrite=false
+spring.shardingsphere.mode.repository.type=JDBC
```
### 集群模式 (推荐)
@@ -70,7 +66,6 @@ spring.shardingsphere.mode.repository.props.namespace=governance
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
spring.shardingsphere.mode.repository.props.retryIntervalMilliseconds=500
spring.shardingsphere.mode.repository.props.timeToLiveSeconds=60
-spring.shardingsphere.mode.overwrite=false
```
## 相关参考
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.en.md
index ab856d7ff17..953755ae426 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/mode.en.md
@@ -9,7 +9,6 @@ weight = 1
mode (?): # Default value is Standalone
type: # Type of mode configuration. Values could be: Standalone or Cluster
repository (?): # Persist repository configuration
- overwrite: # Whether overwrite persistent configuration with local configuration
```
### Standalone Mode
@@ -22,7 +21,6 @@ mode:
props: # Properties of persist repository
foo_key: foo_value
bar_key: bar_value
- overwrite: # Whether overwrite persistent configuration with local configuration
```
### Cluster Mode (recommended)
@@ -37,13 +35,13 @@ mode:
server-lists: # Server lists of registry center
foo_key: foo_value
bar_key: bar_value
- overwrite: # Whether overwrite persistent configuration with local configuration
```
## Notes
1. Cluster mode deployment is recommended for production environment.
-1. The 'ZooKeeper' registry center is recommended for cluster mode deployment.
+1. The `ZooKeeper` registry center is recommended for cluster mode deployment.
+1. If there is configuration information in the `ZooKeeper`, please refer to the config information there.
## Sample
@@ -53,8 +51,7 @@ mode:
mode:
type: Standalone
repository:
- type: H2
- overwrite: false
+ type: JDBC
```
### Cluster Mode (recommended)
@@ -69,7 +66,6 @@ mode:
server-lists: localhost:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
- overwrite: false
```
## Related References
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.cn.md
index 9c46fb263c5..5a38b0aee66 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.cn.md
@@ -84,8 +84,7 @@ spring.shardingsphere.rules.sharding.auditors.<sharding-audit-algorithm-name>.pr
```properties
spring.shardingsphere.mode.type=Standalone
-spring.shardingsphere.mode.repository.type=File
-spring.shardingsphere.mode.overwrite=true
+spring.shardingsphere.mode.repository.type=JDBC
spring.shardingsphere.datasource.names=ds-0,ds-1
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.en.md
index 3311671f138..77c3ee3f023 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/sharding.en.md
@@ -84,8 +84,7 @@ Please refer to [Built-in Sharding Algorithm List](/en/user-manual/common-config
```properties
spring.shardingsphere.mode.type=Standalone
-spring.shardingsphere.mode.repository.type=File
-spring.shardingsphere.mode.overwrite=true
+spring.shardingsphere.mode.repository.type=JDBC
spring.shardingsphere.datasource.names=ds-0,ds-1
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md
index 67b56212af9..4d0cc5c356d 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.cn.md
@@ -39,6 +39,7 @@ weight = 1
1. 生产环境建议使用集群模式部署。
1. 集群模式部署推荐使用 `ZooKeeper` 注册中心。
+1. `ZooKeeper` 存在配置信息时，则以 `ZooKeeper` 中的配置为准。
## 操作步骤
@@ -70,14 +71,11 @@ weight = 1
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/mode-repository/standalone
http://shardingsphere.apache.org/schema/shardingsphere/mode-repository/standalone/repository.xsd">
- <standalone:repository id="standaloneRepository" type="File">
- <props>
- <prop key="path">.shardingsphere</prop>
- </props>
+ <standalone:repository id="standaloneRepository" type="JDBC">
</standalone:repository>
<shardingsphere:data-source id="ds" database-name="foo_db" data-source-names="..." rule-refs="..." >
- <shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" overwrite="false" />
+ <shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" />
</shardingsphere:data-source>
</beans>
```
@@ -104,7 +102,7 @@ weight = 1
</cluster:repository>
<shardingsphere:data-source id="ds" database-name="foo_db" data-source-names="..." rule-refs="...">
- <shardingsphere:mode type="Cluster" repository-ref="clusterRepository" overwrite="false" />
+ <shardingsphere:mode type="Cluster" repository-ref="clusterRepository" />
</shardingsphere:data-source>
</beans>
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md
index 5661cbfc879..36dbc8c5f7f 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/mode.en.md
@@ -37,7 +37,8 @@ Namespace：[http://shardingsphere.apache.org/schema/shardingsphere/mode-reposit
## Tips:
1. For production environments, it is recommended to use cluster mode deployment.
-1. For cluster mode deployment, it is recommended to use `ZooKeeper` registry.
+1. The `ZooKeeper` registry center is recommended for cluster mode deployment.
+1. If there is configuration information in the `ZooKeeper`, please refer to the config information there.
## Operating Procedures
@@ -69,14 +70,11 @@ Introduce MAVEN dependency
http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
http://shardingsphere.apache.org/schema/shardingsphere/mode-repository/standalone
http://shardingsphere.apache.org/schema/shardingsphere/mode-repository/standalone/repository.xsd">
- <standalone:repository id="standaloneRepository" type="File">
- <props>
- <prop key="path">.shardingsphere</prop>
- </props>
+ <standalone:repository id="standaloneRepository" type="JDBC">
</standalone:repository>
<shardingsphere:data-source id="ds" database-name="foo_db" data-source-names="..." rule-refs="..." >
- <shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" overwrite="false" />
+ <shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" />
</shardingsphere:data-source>
</beans>
```
@@ -103,7 +101,7 @@ Introduce MAVEN dependency
</cluster:repository>
<shardingsphere:data-source id="ds" database-name="foo_db" data-source-names="..." rule-refs="...">
- <shardingsphere:mode type="Cluster" repository-ref="clusterRepository" overwrite="false" />
+ <shardingsphere:mode type="Cluster" repository-ref="clusterRepository" />
</shardingsphere:data-source>
</beans>
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.cn.md
index dc8c2f82101..3dbd441f5e5 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.cn.md
@@ -9,7 +9,6 @@ weight = 1
mode (?): # 不配置则默认单机模式
type: # 运行模式类型。可选配置：Standalone、Cluster
repository (?): # 久化仓库配置
- overwrite: # 是否使用本地配置覆盖持久化配置
```
### 单机模式
@@ -22,7 +21,6 @@ mode:
props: # 持久化仓库所需属性
foo_key: foo_value
bar_key: bar_value
- overwrite: # 是否使用本地配置覆盖持久化配置
```
### 集群模式 (推荐)
@@ -37,13 +35,13 @@ mode:
server-lists: # 注册中心连接地址
foo_key: foo_value
bar_key: bar_value
- overwrite: # 是否使用本地配置覆盖持久化配置
```
## 注意事项
1. 生产环境建议使用集群模式部署。
1. 集群模式部署推荐使用 `ZooKeeper` 注册中心。
+1. `ZooKeeper` 存在配置信息时，则以 `ZooKeeper` 中的配置为准。
## 配置示例
@@ -53,8 +51,7 @@ mode:
mode:
type: Standalone
repository:
- type: File
- overwrite: false
+ type: JDBC
```
### 集群模式 (推荐)
@@ -69,7 +66,6 @@ mode:
server-lists: localhost:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
- overwrite: false
```
## 相关参考
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.en.md
index 6efd64e3b12..c3306bd2d64 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/mode.en.md
@@ -9,7 +9,6 @@ weight = 1
mode (?): # Default value is Standalone
type: # Type of mode configuration. Values could be: Standalone, Cluster
repository (?): # Persist repository configuration
- overwrite: # Whether overwrite persistent configuration with local configuration
```
### Standalone Mode
@@ -22,7 +21,6 @@ mode:
props: # Properties of persist repository
foo_key: foo_value
bar_key: bar_value
- overwrite: # Whether overwrite persistent configuration with local configuration
```
### Cluster Mode (recommended)
@@ -37,13 +35,13 @@ mode:
server-lists: # Server lists of registry center
foo_key: foo_value
bar_key: bar_value
- overwrite: # Whether overwrite persistent configuration with local configuration
```
## Notes
1. Cluster mode deployment is recommended for production environment.
-1. The 'ZooKeeper' registry center is recommended for cluster mode deployment.
+1. The `ZooKeeper` registry center is recommended for cluster mode deployment.
+1. If there is configuration information in the `ZooKeeper`, please refer to the config information there.
## Sample
@@ -53,8 +51,7 @@ mode:
mode:
type: Standalone
repository:
- type: File
- overwrite: false
+ type: JDBC
```
### Cluster Mode (recommended)
@@ -69,7 +66,6 @@ mode:
server-lists: localhost:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
- overwrite: false
```
## Related References
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md
index 608fae31268..0346843cc09 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.cn.md
@@ -46,7 +46,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
```
4. 引入 JDBC 驱动。
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md
index 296a440d37d..aec7f7d7322 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/migration/build.en.md
@@ -46,7 +46,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
```
4. Introduce JDBC driver.
diff --git a/examples/docker/shardingsphere-proxy/sharding/conf/server.yaml b/examples/docker/shardingsphere-proxy/sharding/conf/server.yaml
index e9de9bb1fe4..ea1673c69c7 100644
--- a/examples/docker/shardingsphere-proxy/sharding/conf/server.yaml
+++ b/examples/docker/shardingsphere-proxy/sharding/conf/server.yaml
@@ -28,7 +28,6 @@
# props:
# namespace: governance_ds
# server-lists: localhost:2181
-# overwrite: false
rules:
- !AUTHORITY
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
index f7aaf21e1f0..4cee956e912 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/Configuration.ftl
@@ -91,13 +91,13 @@ public final class Configuration {
private static ModeConfiguration createModeConfiguration() {
<#if mode=="cluster-zookeeper">
- return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance-sharding-data-source", "localhost:2181", new Properties()), true);
+ return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance-sharding-data-source", "localhost:2181", new Properties()));
</#if>
<#if mode=="cluster-etcd">
- return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("etcd", "governance-sharding-data-source", "localhost:2379", new Properties()), true);
+ return new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("etcd", "governance-sharding-data-source", "localhost:2379", new Properties()));
</#if>
<#if mode=="standalone">
- return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("JDBC", new Properties()), true);
+ return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("JDBC", new Properties()));
</#if>
}
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-etcd.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-etcd.ftl
index 7fd5356459e..9ee8f03a6a0 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-etcd.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-etcd.ftl
@@ -19,4 +19,3 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=etcd
spring.shardingsphere.mode.repository.props.namespace=generator_demo
spring.shardingsphere.mode.repository.props.server-lists=localhost:2379
-spring.shardingsphere.mode.overwrite=false
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-zookeeper.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-zookeeper.ftl
index 41d0864b84f..6ed0621ec16 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-zookeeper.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/cluster-zookeeper.ftl
@@ -19,4 +19,3 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=generator_demo
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=false
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/standalone.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/standalone.ftl
index 30a7bd0d649..d3bbbb7bfb5 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/standalone.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-boot-starter/standalone.ftl
@@ -18,4 +18,3 @@
spring.shardingsphere.mode.type=Standalone
spring.shardingsphere.mode.repository.type=JDBC
spring.shardingsphere.mode.repository.props.path=demo
-spring.shardingsphere.mode.overwrite=false
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/cluster.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/cluster.ftl
index 3acc5c2f83d..619634ce4c1 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/cluster.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/cluster.ftl
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<shardingsphere:mode type="Cluster" repository-ref="clusterRepository" overwrite="true" />
+<shardingsphere:mode type="Cluster" repository-ref="clusterRepository" />
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/config/standalone.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/config/standalone.ftl
index 9e5f8bf3a5b..4c601b5ccec 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/config/standalone.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/config/standalone.ftl
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
- <standalone:repository id="standaloneRepository" type="JDBC" />
+<standalone:repository id="standaloneRepository" type="JDBC" />
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/standalone.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/standalone.ftl
index 47a5e646e50..b932a0b459c 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/standalone.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/mode/spring-namespace/standalone.ftl
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
- <shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" overwrite="true" />
+<shardingsphere:mode type="Standalone" repository-ref="standaloneRepository" />
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-etcd.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-etcd.ftl
index e97cd98f145..43a4341b1fe 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-etcd.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-etcd.ftl
@@ -22,4 +22,3 @@ mode:
props:
namespace: demo_yaml
server-lists: localhost:2379
- overwrite: false
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-zookeeper.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-zookeeper.ftl
index 6ffda9ca8fa..dc3b41f6e31 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-zookeeper.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/cluster-zookeeper.ftl
@@ -22,4 +22,3 @@ mode:
props:
namespace: demo_yaml
server-lists: localhost:2181
- overwrite: false
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/standalone.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/standalone.ftl
index 373f6cab075..0f5d55003b4 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/standalone.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/proxy/mode/standalone.ftl
@@ -18,5 +18,4 @@
mode:
type: Standalone
repository:
- type: H2
- overwrite: false
+ type: JDBC
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java
index 0effb52a2d0..ee8701a7c91 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java
@@ -89,7 +89,7 @@ public final class ClusterModeRawJavaConfigurationExample {
}
private static ModeConfiguration getModeConfiguration(final ShardingType shardingType, final String repositoryType) {
- return ClusterModeConfigurationUtil.getRepositoryConfiguration(!loadConfigFromRegCenter, shardingType, repositoryType);
+ return ClusterModeConfigurationUtil.getRepositoryConfiguration(shardingType, repositoryType);
}
private static ExampleService getExampleService(final DataSource dataSource) {
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/config/ClusterModeConfigurationUtil.java b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/config/ClusterModeConfigurationUtil.java
index a562e3240e2..9eac6b6c76d 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/config/ClusterModeConfigurationUtil.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/config/ClusterModeConfigurationUtil.java
@@ -33,7 +33,7 @@ public final class ClusterModeConfigurationUtil {
private static final String ETCD_CONNECTION_STRING = "http://localhost:2379";
- public static ModeConfiguration getRepositoryConfiguration(final boolean overwrite, final ShardingType shardingType, final String repositoryType) {
+ public static ModeConfiguration getRepositoryConfiguration(final ShardingType shardingType, final String repositoryType) {
Properties props = new Properties();
String repositoryConnection;
switch (repositoryType) {
@@ -53,16 +53,16 @@ public final class ClusterModeConfigurationUtil {
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
clusterRepositoryConfig = new ClusterPersistRepositoryConfiguration(repositoryType, "governance-sharding-data-source", repositoryConnection, props);
- return new ModeConfiguration("Cluster", clusterRepositoryConfig, overwrite);
+ return new ModeConfiguration("Cluster", clusterRepositoryConfig);
case READWRITE_SPLITTING:
clusterRepositoryConfig = new ClusterPersistRepositoryConfiguration(repositoryType, "governance-readwrite-splitting-data-source", repositoryConnection, props);
- return new ModeConfiguration("Cluster", clusterRepositoryConfig, overwrite);
+ return new ModeConfiguration("Cluster", clusterRepositoryConfig);
case ENCRYPT:
clusterRepositoryConfig = new ClusterPersistRepositoryConfiguration(repositoryType, "governance-encrypt-data-source", repositoryConnection, props);
- return new ModeConfiguration("Cluster", clusterRepositoryConfig, overwrite);
+ return new ModeConfiguration("Cluster", clusterRepositoryConfig);
case SHADOW:
clusterRepositoryConfig = new ClusterPersistRepositoryConfiguration(repositoryType, "governance-shadow-data-source", repositoryConnection, props);
- return new ModeConfiguration("Cluster", clusterRepositoryConfig, overwrite);
+ return new ModeConfiguration("Cluster", clusterRepositoryConfig);
default:
throw new UnsupportedOperationException(shardingType.toString());
}
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
index 7947d19fd20..cac131df3cb 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
@@ -22,4 +22,3 @@ mode:
props:
namespace: demo_yaml_ds_encrypt
server-lists: localhost:2181
- overwrite: false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/readwrite-splitting.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/readwrite-splitting.yaml
index fa694eab208..290ff73554a 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/readwrite-splitting.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/readwrite-splitting.yaml
@@ -22,4 +22,3 @@ mode:
props:
namespace: demo_yaml_readwrite_ds
server-lists: localhost:2181
- overwrite: false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
index 3799fff7f41..f45e4b94475 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
@@ -22,4 +22,3 @@ mode:
props:
namespace: demo_yaml_ds_shadow
server-lists: localhost:2181
- overwrite: false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
index 832e5a7460d..54e20b701ad 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
@@ -24,4 +24,3 @@ mode:
props:
namespace: demo_yaml_ds_sharding
server-lists: localhost:2181
- overwrite: false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
index cfe313141f9..19675a7f99b 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
@@ -22,7 +22,6 @@ mode:
props:
namespace: demo_yaml_ds_encrypt
server-lists: localhost:2181
- overwrite: true
dataSources:
uinque_ds:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/readwrite-splitting.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/readwrite-splitting.yaml
index 7217851945b..d0c3644db8c 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/readwrite-splitting.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/readwrite-splitting.yaml
@@ -22,7 +22,6 @@ mode:
props:
namespace: demo_yaml_readwrite_ds
server-lists: localhost:2181
- overwrite: true
dataSources:
write_ds:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
index 843ff056b35..f202e5174ae 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
@@ -22,7 +22,6 @@ mode:
props:
namespace: demo_yaml_ds_shadow
server-lists: localhost:2181
- overwrite: true
dataSources:
ds:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
index cf0733ab6d5..a7c615779d9 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
@@ -24,7 +24,6 @@ mode:
props:
namespace: demo_yaml_ds_sharding
server-lists: localhost:2181
- overwrite: true
dataSources:
ds_0:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-encrypt.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
index ef7d3467c0c..5f488b35611 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
@@ -19,4 +19,3 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_ds_encrypt
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties
index 3a19dd8d73d..0d48c2cdedc 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-readwrite-splitting.properties
@@ -19,4 +19,3 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_readwrite_ds
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-shadow.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-shadow.properties
index 5135ae0359b..f29f5e8dca8 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-shadow.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-shadow.properties
@@ -19,4 +19,3 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_ds_shadow
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
index 587d5039550..ee0a64a6b93 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
@@ -21,4 +21,3 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_ds_sharding
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=false
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-encrypt.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-encrypt.properties
index 106ebde30d2..91d43ce0d61 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-encrypt.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-encrypt.properties
@@ -19,7 +19,6 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_ds_encrypt
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=true
spring.shardingsphere.datasource.name=ds-encrypt
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties
index a82cdd43c4d..af8c781ef36 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-readwrite-splitting.properties
@@ -19,7 +19,6 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_readwrite_ds
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=true
spring.shardingsphere.datasource.names=write-ds,read-ds-0,read-ds-1
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-shadow.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-shadow.properties
index 2bf8e7a8c10..439d9da298a 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-shadow.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-shadow.properties
@@ -19,7 +19,6 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_ds_shadow
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=true
spring.shardingsphere.datasource.name=ds,shadow-ds
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
index ce53607e9d7..25517fb5951 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
@@ -21,7 +21,6 @@ spring.shardingsphere.mode.type=Cluster
spring.shardingsphere.mode.repository.type=ZooKeeper
spring.shardingsphere.mode.repository.props.namespace=demo_spring_boot_ds_sharding
spring.shardingsphere.mode.repository.props.server-lists=localhost:2181
-spring.shardingsphere.mode.overwrite=true
spring.shardingsphere.datasource.names=ds-0,ds-1
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-jpa-example/src/main/resources/application-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-jpa-example/src/main/resources [...]
index 77eb3224d35..ffca2dffcfb 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-jpa-example/src/main/resources/application-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-jpa-example/src/main/resources/application-sharding-databases-tables.properties
@@ -16,8 +16,7 @@
#
spring.shardingsphere.mode.type=Standalone
-spring.shardingsphere.mode.repository.type=File
-spring.shardingsphere.mode.overwrite=true
+spring.shardingsphere.mode.repository.type=JDBC
spring.shardingsphere.datasource.names=ds-0,ds-1
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/r [...]
index 8777ffba11e..0c83e9814f7 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties
@@ -16,8 +16,7 @@
#
spring.shardingsphere.mode.type=Standalone
-spring.shardingsphere.mode.repository.type=File
-spring.shardingsphere.mode.overwrite=true
+spring.shardingsphere.mode.repository.type=JDBC
spring.shardingsphere.datasource.names=ds-0,ds-1
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources [...]
index 17e4b0e8052..fb213c1ee75 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties
@@ -16,8 +16,7 @@
#
spring.shardingsphere.mode.type=Standalone
-spring.shardingsphere.mode.repository.type=File
-spring.shardingsphere.mode.overwrite=true
+spring.shardingsphere.mode.repository.type=H2
spring.shardingsphere.datasource.names=ds-0,ds-1
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java
index 5d2acf4e802..80a4f4a94a4 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/sharding/raw/jdbc/config/ShardingDatabasesConfigurationPrecise.java
@@ -56,7 +56,7 @@ public final class ShardingDatabasesConfigurationPrecise implements ExampleConfi
}
private ModeConfiguration createModeConfiguration() {
- return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties()), true);
+ return new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties()));
}
private ShardingTableRuleConfiguration getOrderTableRuleConfiguration() {
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
index 7fb78dd018d..f3a7b57f5e8 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-raw-jdbc-example/src/main/resources/META-INF/sharding-databases.yaml
@@ -18,8 +18,7 @@
mode:
type: Standalone
repository:
- type: H2
- overwrite: true
+ type: JDBC
dataSources:
ds_0:
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties
index 37697996ba0..5d1c5b73e7e 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/application-sharding-databases-tables.properties
@@ -16,8 +16,7 @@
#
spring.shardingsphere.mode.type=Standalone
-spring.shardingsphere.mode.repository.type=File
-spring.shardingsphere.mode.overwrite=true
+spring.shardingsphere.mode.repository.type=JDBC
spring.shardingsphere.datasource.names=ds-0,ds-1
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
index 82844779540..d12f8d2b358 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
@@ -33,7 +33,6 @@
# timeToLiveSeconds: 60
# maxRetries: 3
# operationTimeoutMilliseconds: 500
-# overwrite: false
rules:
- !AUTHORITY
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml
index f17f613c4b3..47052b48a60 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml
@@ -33,7 +33,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
rules:
- !AUTHORITY
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
index 5ce01af787b..04240424995 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
@@ -33,7 +33,6 @@
# timeToLiveSeconds: 60
# maxRetries: 3
# operationTimeoutMilliseconds: 500
-# overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java
index 08bc9cc32a4..5a65234bd24 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java
@@ -42,7 +42,7 @@ public final class ProxyInfoCollectorTest extends ProxyContextRestorer {
public void assertCollect() {
MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
InstanceContext instanceContext = new InstanceContext(
- new ComputeNodeInstance(mock(InstanceMetaData.class)), new StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null, false), mock(LockContext.class),
+ new ComputeNodeInstance(mock(InstanceMetaData.class)), new StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null), mock(LockContext.class),
new EventBusContext(), mock(ScheduleContext.class));
ProxyContext.init(new ContextManager(metaDataContexts, instanceContext));
assertFalse(new ProxyInfoCollector().collect().isEmpty());
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java
index ab2fcfc7aca..807596b140e 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootServiceTest.java
@@ -55,7 +55,7 @@ public final class PrometheusPluginBootServiceTest extends ProxyContextRestorer
public void assertStart() throws IOException {
MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
InstanceContext instanceContext = new InstanceContext(
- new ComputeNodeInstance(mock(InstanceMetaData.class)), new StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null, false), mock(LockContext.class),
+ new ComputeNodeInstance(mock(InstanceMetaData.class)), new StandaloneWorkerIdGenerator(), new ModeConfiguration("Standalone", null), mock(LockContext.class),
new EventBusContext(), mock(ScheduleContext.class));
ProxyContext.init(new ContextManager(metaDataContexts, instanceContext));
PROMETHEUS_PLUGIN_BOOT_SERVICE.start(new PluginConfiguration("localhost", 8090, "", createProperties()));
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java
index f411f467142..e22ac683338 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/route/DatabaseDiscoverySQLRouterTest.java
@@ -75,7 +75,7 @@ public final class DatabaseDiscoverySQLRouterTest {
@Before
public void setUp() {
- ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class), false));
+ ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class)));
DatabaseDiscoveryDataSourceRuleConfiguration dataSourceConfig = new DatabaseDiscoveryDataSourceRuleConfiguration(
DATA_SOURCE_NAME, Collections.singletonList(PRIMARY_DATA_SOURCE), "", "CORE.FIXTURE");
AlgorithmConfiguration algorithmConfig = new AlgorithmConfiguration("CORE.FIXTURE", new Properties());
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
index f554320f30f..467c123df5b 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRuleTest.java
@@ -52,7 +52,7 @@ public final class DatabaseDiscoveryRuleTest {
@BeforeClass
public static void setUp() {
- ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class), false));
+ ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class)));
}
@Test
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java
index af68db02e24..e5e1f567403 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest.java
@@ -45,7 +45,7 @@ public final class AlgorithmProvidedDatabaseDiscoveryRuleBuilderTest {
@SuppressWarnings({"rawtypes", "unchecked"})
@Test
public void assertBuild() {
- ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class), false));
+ ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class)));
AlgorithmProvidedDatabaseDiscoveryRuleConfiguration algorithmProvidedRuleConfig = new AlgorithmProvidedDatabaseDiscoveryRuleConfiguration(
Collections.singletonList(new DatabaseDiscoveryDataSourceRuleConfiguration("name", Collections.singletonList("name"), "", "discoveryTypeName")),
Collections.singletonMap("ha_heartbeat", new DatabaseDiscoveryHeartBeatConfiguration(new Properties())),
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java
index 7daebbb3f89..0f3ad679d2c 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilderTest.java
@@ -45,7 +45,7 @@ public final class DatabaseDiscoveryRuleBuilderTest {
@SuppressWarnings({"rawtypes", "unchecked"})
@Test
public void assertBuild() {
- ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class), false));
+ ScheduleContextFactory.newInstance(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class)));
DatabaseDiscoveryRuleConfiguration config = new DatabaseDiscoveryRuleConfiguration(
Collections.singleton(new DatabaseDiscoveryDataSourceRuleConfiguration("name", Collections.singletonList("name"), "", "CORE.FIXTURE")),
Collections.singletonMap("ha_heartbeat", new DatabaseDiscoveryHeartBeatConfiguration(new Properties())),
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java
index c9fac89238a..b92d249b7c1 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithmTest.java
@@ -208,7 +208,7 @@ public final class SnowflakeKeyGenerateAlgorithmTest {
public void assertSetWorkerIdFailureWhenNegative() {
SnowflakeKeyGenerateAlgorithm algorithm = (SnowflakeKeyGenerateAlgorithm) KeyGenerateAlgorithmFactory.newInstance(new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
InstanceContext instanceContext = new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), new WorkerIdGeneratorFixture(-1L),
- new ModeConfiguration("Standalone", null, false), mock(LockContext.class), new EventBusContext(), mock(ScheduleContext.class));
+ new ModeConfiguration("Standalone", null), mock(LockContext.class), new EventBusContext(), mock(ScheduleContext.class));
algorithm.setInstanceContext(instanceContext);
algorithm.generateKey();
}
@@ -224,7 +224,7 @@ public final class SnowflakeKeyGenerateAlgorithmTest {
public void assertSetWorkerIdFailureWhenOutOfRange() {
SnowflakeKeyGenerateAlgorithm algorithm = (SnowflakeKeyGenerateAlgorithm) KeyGenerateAlgorithmFactory.newInstance(new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
InstanceContext instanceContext = new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), new WorkerIdGeneratorFixture(Long.MIN_VALUE),
- new ModeConfiguration("Standalone", null, false), mock(LockContext.class), new EventBusContext(), mock(ScheduleContext.class));
+ new ModeConfiguration("Standalone", null), mock(LockContext.class), new EventBusContext(), mock(ScheduleContext.class));
algorithm.setInstanceContext(instanceContext);
algorithm.generateKey();
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithmTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithmTest.java
index 82d93da291e..ae41c79edf7 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithmTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-plugin/shardingsphere-sharding-cosid/src/test/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithmTest.java
@@ -61,7 +61,7 @@ public final class CosIdSnowflakeKeyGenerateAlgorithmTest {
CosIdSnowflakeKeyGenerateAlgorithm algorithm = (CosIdSnowflakeKeyGenerateAlgorithm) KeyGenerateAlgorithmFactory.newInstance(
new AlgorithmConfiguration("COSID_SNOWFLAKE", new Properties()));
algorithm.setInstanceContext(new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), new WorkerIdGeneratorFixture(FIXTURE_WORKER_ID),
- new ModeConfiguration("Standalone", null, false), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
+ new ModeConfiguration("Standalone", null), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
long firstActualKey = (Long) algorithm.generateKey();
long secondActualKey = (Long) algorithm.generateKey();
SnowflakeIdState firstActualState = snowflakeIdStateParser.parse(firstActualKey);
@@ -77,7 +77,7 @@ public final class CosIdSnowflakeKeyGenerateAlgorithmTest {
public void assertGenerateKeyModUniformity() {
CosIdSnowflakeKeyGenerateAlgorithm algorithm = (CosIdSnowflakeKeyGenerateAlgorithm) KeyGenerateAlgorithmFactory.newInstance(new AlgorithmConfiguration("COSID_SNOWFLAKE", new Properties()));
algorithm.setInstanceContext(new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), new WorkerIdGeneratorFixture(FIXTURE_WORKER_ID),
- new ModeConfiguration("Standalone", null, false), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
+ new ModeConfiguration("Standalone", null), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
int divisor = 4;
int total = 99999;
int avg = total / divisor;
@@ -121,7 +121,7 @@ public final class CosIdSnowflakeKeyGenerateAlgorithmTest {
CosIdSnowflakeKeyGenerateAlgorithm algorithm = (CosIdSnowflakeKeyGenerateAlgorithm) KeyGenerateAlgorithmFactory.newInstance(
new AlgorithmConfiguration("COSID_SNOWFLAKE", props));
algorithm.setInstanceContext(new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)),
- new WorkerIdGeneratorFixture(FIXTURE_WORKER_ID), new ModeConfiguration("Standalone", null, false),
+ new WorkerIdGeneratorFixture(FIXTURE_WORKER_ID), new ModeConfiguration("Standalone", null),
mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
Comparable<?> actualKey = algorithm.generateKey();
assertThat(actualKey, instanceOf(String.class));
@@ -143,7 +143,7 @@ public final class CosIdSnowflakeKeyGenerateAlgorithmTest {
CosIdSnowflakeKeyGenerateAlgorithm algorithm = (CosIdSnowflakeKeyGenerateAlgorithm) KeyGenerateAlgorithmFactory.newInstance(
new AlgorithmConfiguration("COSID_SNOWFLAKE", new Properties()));
algorithm.setInstanceContext(new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), new WorkerIdGeneratorFixture(-1),
- new ModeConfiguration("Standalone", null, false), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
+ new ModeConfiguration("Standalone", null), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
algorithm.generateKey();
}
@@ -152,7 +152,7 @@ public final class CosIdSnowflakeKeyGenerateAlgorithmTest {
CosIdSnowflakeKeyGenerateAlgorithm algorithm = (CosIdSnowflakeKeyGenerateAlgorithm) KeyGenerateAlgorithmFactory.newInstance(
new AlgorithmConfiguration("COSID_SNOWFLAKE", new Properties()));
algorithm.setInstanceContext(new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), new WorkerIdGeneratorFixture(1024),
- new ModeConfiguration("Standalone", null, false), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
+ new ModeConfiguration("Standalone", null), mock(LockContext.class), eventBusContext, mock(ScheduleContext.class)));
algorithm.generateKey();
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/mode/ModeConfiguration.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/mode/ModeConfiguration.java
index 265b915ee06..4d985f6aef9 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/mode/ModeConfiguration.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/mode/ModeConfiguration.java
@@ -30,6 +30,4 @@ public final class ModeConfiguration {
private final String type;
private final PersistRepositoryConfiguration repository;
-
- private final boolean overwrite;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/mode/YamlModeConfiguration.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/mode/YamlModeConfiguration.java
index 82eec738843..9e075f86336 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/mode/YamlModeConfiguration.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/mode/YamlModeConfiguration.java
@@ -31,6 +31,4 @@ public final class YamlModeConfiguration implements YamlConfiguration {
private String type;
private YamlPersistRepositoryConfiguration repository;
-
- private boolean overwrite;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapper.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapper.java
index 0b65415922e..ea80d324777 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapper.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapper.java
@@ -35,16 +35,15 @@ public final class YamlModeConfigurationSwapper implements YamlConfigurationSwap
YamlPersistRepositoryConfigurationSwapper<PersistRepositoryConfiguration> swapper = YamlPersistRepositoryConfigurationSwapperFactory.getInstance(data.getType());
result.setRepository(swapper.swapToYamlConfiguration(data.getRepository()));
}
- result.setOverwrite(data.isOverwrite());
return result;
}
@Override
public ModeConfiguration swapToObject(final YamlModeConfiguration yamlConfig) {
if (null == yamlConfig.getRepository()) {
- return new ModeConfiguration(yamlConfig.getType(), null, yamlConfig.isOverwrite());
+ return new ModeConfiguration(yamlConfig.getType(), null);
}
YamlPersistRepositoryConfigurationSwapper<PersistRepositoryConfiguration> swapper = YamlPersistRepositoryConfigurationSwapperFactory.getInstance(yamlConfig.getType());
- return new ModeConfiguration(yamlConfig.getType(), swapper.swapToObject(yamlConfig.getRepository()), yamlConfig.isOverwrite());
+ return new ModeConfiguration(yamlConfig.getType(), swapper.swapToObject(yamlConfig.getRepository()));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/instance/InstanceContextTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/instance/InstanceContextTest.java
index ecf20e5d227..1f5433c7dee 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/instance/InstanceContextTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/instance/InstanceContextTest.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
public final class InstanceContextTest {
- private final ModeConfiguration modeConfig = new ModeConfiguration("Standalone", null, false);
+ private final ModeConfiguration modeConfig = new ModeConfiguration("Standalone", null);
private final LockContext lockContext = mock(LockContext.class);
@@ -126,7 +126,7 @@ public final class InstanceContextTest {
lockContext, eventBusContext, mock(ScheduleContext.class));
assertFalse(context.isCluster());
InstanceContext clusterContext = new InstanceContext(new ComputeNodeInstance(mock(InstanceMetaData.class)), new WorkerIdGeneratorFixture(Long.MIN_VALUE),
- new ModeConfiguration("Cluster", null, false), lockContext, eventBusContext, mock(ScheduleContext.class));
+ new ModeConfiguration("Cluster", null), lockContext, eventBusContext, mock(ScheduleContext.class));
assertTrue(clusterContext.isCluster());
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
index 76cf3ac063a..a9ccc13c6a3 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.infra.metadata.database;
-import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.MutableDataNodeRule;
@@ -41,8 +40,6 @@ import static org.mockito.Mockito.mock;
public final class ShardingSphereDatabaseTest {
- private final ModeConfiguration modeConfig = new ModeConfiguration("Standalone", null, false);
-
@Test
public void assertIsComplete() {
ShardingSphereResource resource = new ShardingSphereResource("sharding_db", Collections.singletonMap("ds", new MockedDataSource()));
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java
index 2b38eb2eef6..7e195067caf 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilderTest.java
@@ -68,7 +68,7 @@ public final class GlobalRulesBuilderTest {
private InstanceContext buildInstanceContext() {
ComputeNodeInstance computeNodeInstance = new ComputeNodeInstance(new JDBCInstanceMetaData(UUID.randomUUID().toString()));
- ModeConfiguration modeConfig = new ModeConfiguration("Standalone", null, false);
+ ModeConfiguration modeConfig = new ModeConfiguration("Standalone", null);
return new InstanceContext(computeNodeInstance, createWorkerIdGenerator(), modeConfig, mock(LockContext.class), new EventBusContext(), mock(ScheduleContext.class));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapperTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapperTest.java
index 5486f6cec48..01b6dc6b418 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapperTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/mode/YamlModeConfigurationSwapperTest.java
@@ -22,9 +22,7 @@ import org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlModeConfigurati
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
public final class YamlModeConfigurationSwapperTest {
@@ -34,18 +32,15 @@ public final class YamlModeConfigurationSwapperTest {
@Test
public void swapToYamlConfiguration() {
- YamlModeConfiguration actual = swapper.swapToYamlConfiguration(new ModeConfiguration("TEST_TYPE", null, true));
+ YamlModeConfiguration actual = swapper.swapToYamlConfiguration(new ModeConfiguration("TEST_TYPE", null));
assertThat(actual.getType(), is(TEST_TYPE));
- assertTrue(actual.isOverwrite());
}
@Test
public void swapToObject() {
YamlModeConfiguration yamlConfig = new YamlModeConfiguration();
yamlConfig.setType(TEST_TYPE);
- yamlConfig.setOverwrite(false);
ModeConfiguration actual = swapper.swapToObject(yamlConfig);
assertThat(actual.getType(), is(TEST_TYPE));
- assertFalse(actual.isOverwrite());
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
index b0a2006ebd5..cd1b4fec509 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/api/ShardingSphereDataSourceFactoryTest.java
@@ -38,36 +38,36 @@ public final class ShardingSphereDataSourceFactoryTest {
@Test
public void assertCreateDataSourceWithModeConfiguration() throws SQLException {
- assertDataSource(ShardingSphereDataSourceFactory.createDataSource(new ModeConfiguration("Standalone", null, false)), DefaultDatabase.LOGIC_NAME);
+ assertDataSource(ShardingSphereDataSourceFactory.createDataSource(new ModeConfiguration("Standalone", null)), DefaultDatabase.LOGIC_NAME);
}
@Test
public void assertCreateDataSourceWithDatabaseNameAndModeConfiguration() throws SQLException {
- assertDataSource(ShardingSphereDataSourceFactory.createDataSource("test_db", new ModeConfiguration("Standalone", null, false), new HashMap<>(), null, null), "test_db");
+ assertDataSource(ShardingSphereDataSourceFactory.createDataSource("test_db", new ModeConfiguration("Standalone", null), new HashMap<>(), null, null), "test_db");
}
@Test
public void assertCreateDataSourceWithAllParametersForMultipleDataSourcesWithDefaultDatabaseName() throws SQLException {
assertDataSource(ShardingSphereDataSourceFactory.createDataSource(
- new ModeConfiguration("Standalone", null, false), new HashMap<>(), new LinkedList<>(), new Properties()), DefaultDatabase.LOGIC_NAME);
+ new ModeConfiguration("Standalone", null), new HashMap<>(), new LinkedList<>(), new Properties()), DefaultDatabase.LOGIC_NAME);
}
@Test
public void assertCreateDataSourceWithAllParametersForMultipleDataSources() throws SQLException {
assertDataSource(ShardingSphereDataSourceFactory.createDataSource(
- "test_db", new ModeConfiguration("Standalone", null, false), new HashMap<>(), new LinkedList<>(), new Properties()), "test_db");
+ "test_db", new ModeConfiguration("Standalone", null), new HashMap<>(), new LinkedList<>(), new Properties()), "test_db");
}
@Test
public void assertCreateDataSourceWithAllParametersForSingleDataSourceWithDefaultDatabaseName() throws SQLException {
assertDataSource(ShardingSphereDataSourceFactory.createDataSource(
- new ModeConfiguration("Standalone", null, false), new MockedDataSource(), new LinkedList<>(), new Properties()), DefaultDatabase.LOGIC_NAME);
+ new ModeConfiguration("Standalone", null), new MockedDataSource(), new LinkedList<>(), new Properties()), DefaultDatabase.LOGIC_NAME);
}
@Test
public void assertCreateDataSourceWithAllParametersForSingleDataSource() throws SQLException {
assertDataSource(ShardingSphereDataSourceFactory.createDataSource("test_db",
- new ModeConfiguration("Standalone", null, false), new MockedDataSource(), new LinkedList<>(), new Properties()), "test_db");
+ new ModeConfiguration("Standalone", null), new MockedDataSource(), new LinkedList<>(), new Properties()), "test_db");
}
@Test
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 740e57dbd4a..65072fc2ee5 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -54,11 +54,6 @@
"type": "java.util.Properties",
"sourceType": "org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlPersistRepositoryConfiguration"
},
- {
- "name": "spring.shardingsphere.mode.overwrite",
- "type": "java.lang.Boolean",
- "sourceType": "org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlModeConfiguration"
- },
{
"name": "spring.shardingsphere.datasource.names",
"type": "java.lang.String",
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/DataSourceBeanDefinitionParser.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/DataSourceBeanDefinitionParser.java
index d64c3b1b357..b9e0688ed7f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/DataSourceBeanDefinitionParser.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/DataSourceBeanDefinitionParser.java
@@ -78,7 +78,6 @@ public final class DataSourceBeanDefinitionParser extends AbstractBeanDefinition
private void addDefaultModeConfiguration(final BeanDefinitionBuilder factory) {
factory.addConstructorArgValue("Standalone");
factory.addConstructorArgValue(null);
- factory.addConstructorArgValue(true);
}
private void addConfiguredModeConfiguration(final BeanDefinitionBuilder factory, final Element modeElement) {
@@ -88,7 +87,6 @@ public final class DataSourceBeanDefinitionParser extends AbstractBeanDefinition
} else {
factory.addConstructorArgReference(modeElement.getAttribute(ModeBeanDefinitionTag.REPOSITORY_REF_ATTRIBUTE));
}
- factory.addConstructorArgValue(modeElement.getAttribute(ModeBeanDefinitionTag.OVERWRITE_ATTRIBUTE));
}
private Map<String, RuntimeBeanReference> parseDataSources(final Element element) {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/mode/ModeBeanDefinitionTag.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/mode/ModeBeanDefinitionTag.java
index 7238133fc64..830a12a4d3c 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/mode/ModeBeanDefinitionTag.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/mode/ModeBeanDefinitionTag.java
@@ -31,6 +31,4 @@ public final class ModeBeanDefinitionTag {
public static final String TYPE_ATTRIBUTE = "type";
public static final String REPOSITORY_REF_ATTRIBUTE = "repository-ref";
-
- public static final String OVERWRITE_ATTRIBUTE = "overwrite";
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd
index 189316777c1..40a04f808d3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd
@@ -41,7 +41,6 @@
<xsd:complexType>
<xsd:attribute name="type" type="xsd:string" use="required" />
<xsd:attribute name="repository-ref" type="xsd:string" />
- <xsd:attribute name="overwrite" type="xsd:string" default="false" />
</xsd:complexType>
</xsd:element>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/spring/standalone-application-context.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/spring/standalone-application-context.xml
index ff2b2b541bc..7438c43068f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/spring/standalone-application-context.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/spring/standalone-application-context.xml
@@ -38,7 +38,7 @@
<standalone:repository id="fileRepository" type="JDBC" />
<shardingsphere:data-source id="dataSource" data-source-names="ds_0_write,ds_0_read_0,ds_0_read_1,ds_1_write,ds_1_read_0,ds_1_read_1" rule-refs="shardingRule, readWriteSplittingRule, encryptRule, sqlParseRule">
- <shardingsphere:mode type="Standalone" repository-ref="fileRepository" overwrite="true" />
+ <shardingsphere:mode type="Standalone" repository-ref="fileRepository" />
<props>
<prop key="sql-show">false</prop>
<prop key="kernel-executor-size">${kernel-executor-size}</prop>
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java
index 896b0b1ec55..b1246663a83 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameter.java
@@ -67,6 +67,6 @@ public final class ContextManagerBuilderParameter {
* @return mode configuration
*/
public ModeConfiguration getModeConfiguration() {
- return null == modeConfig ? new ModeConfiguration("Standalone", null, true) : modeConfig;
+ return null == modeConfig ? new ModeConfiguration("Standalone", null) : modeConfig;
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
index 03bad5b9c5b..20a01ca56ea 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
@@ -75,12 +75,11 @@ public final class MetaDataPersistService {
* @param databaseConfigs database configurations
* @param globalRuleConfigs global rule configurations
* @param props properties
- * @param isOverwrite whether overwrite registry center's configuration if existed
*/
public void persistConfigurations(final Map<String, ? extends DatabaseConfiguration> databaseConfigs,
- final Collection<RuleConfiguration> globalRuleConfigs, final Properties props, final boolean isOverwrite) {
- globalRuleService.persist(globalRuleConfigs, isOverwrite);
- propsService.persist(props, isOverwrite);
+ final Collection<RuleConfiguration> globalRuleConfigs, final Properties props) {
+ globalRuleService.conditionalPersist(globalRuleConfigs);
+ propsService.conditionalPersist(props);
for (Entry<String, ? extends DatabaseConfiguration> entry : databaseConfigs.entrySet()) {
String databaseName = entry.getKey();
Map<String, DataSourceProperties> dataSourcePropertiesMap = getDataSourcePropertiesMap(entry.getValue().getDataSources());
@@ -88,8 +87,8 @@ public final class MetaDataPersistService {
if (dataSourcePropertiesMap.isEmpty() && ruleConfigurations.isEmpty()) {
databaseMetaDataService.addDatabase(databaseName);
} else {
- dataSourceService.persist(databaseName, getDataSourcePropertiesMap(entry.getValue().getDataSources()), isOverwrite);
- databaseRulePersistService.persist(databaseName, entry.getValue().getRuleConfigurations(), isOverwrite);
+ dataSourceService.conditionalPersist(databaseName, getDataSourcePropertiesMap(entry.getValue().getDataSources()));
+ databaseRulePersistService.conditionalPersist(databaseName, entry.getValue().getRuleConfigurations());
}
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java
index beb9191c673..1e1a39bc3e6 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistService.java
@@ -41,8 +41,8 @@ public final class DataSourcePersistService implements DatabaseBasedPersistServi
private final PersistRepository repository;
@Override
- public void persist(final String databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap, final boolean isOverwrite) {
- if (!dataSourcePropsMap.isEmpty() && (isOverwrite || !isExisted(databaseName))) {
+ public void conditionalPersist(final String databaseName, final Map<String, DataSourceProperties> dataSourcePropsMap) {
+ if (!dataSourcePropsMap.isEmpty() && !isExisted(databaseName)) {
persist(databaseName, dataSourcePropsMap);
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseBasedPersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseBasedPersistService.java
index c2b4cba3251..e14c536144f 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseBasedPersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseBasedPersistService.java
@@ -25,13 +25,12 @@ package org.apache.shardingsphere.mode.metadata.persist.service.config.database;
public interface DatabaseBasedPersistService<T> {
/**
- * Persist configurations.
+ * Conditional persist configurations.
*
* @param databaseName database name
* @param configs configurations
- * @param isOverwrite is overwrite
*/
- void persist(String databaseName, T configs, boolean isOverwrite);
+ void conditionalPersist(String databaseName, T configs);
/**
* Persist configurations.
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
index c828a7ea549..fba1c9839b0 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DatabaseRulePersistService.java
@@ -40,8 +40,8 @@ public final class DatabaseRulePersistService implements DatabaseBasedPersistSer
private final PersistRepository repository;
@Override
- public void persist(final String databaseName, final Collection<RuleConfiguration> configs, final boolean isOverwrite) {
- if (!configs.isEmpty() && (isOverwrite || !isExisted(databaseName))) {
+ public void conditionalPersist(final String databaseName, final Collection<RuleConfiguration> configs) {
+ if (!configs.isEmpty() && !isExisted(databaseName)) {
persist(databaseName, configs);
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalPersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalPersistService.java
index cbbd5cb3d19..eafabefe271 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalPersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalPersistService.java
@@ -24,13 +24,19 @@ package org.apache.shardingsphere.mode.metadata.persist.service.config.global;
*/
public interface GlobalPersistService<T> {
+ /**
+ * Conditional persist configurations.
+ *
+ * @param globalRuleConfigs configurations
+ */
+ void conditionalPersist(T globalRuleConfigs);
+
/**
* Persist configurations.
*
* @param globalRuleConfigs configurations
- * @param isOverwrite is overwrite
*/
- void persist(T globalRuleConfigs, boolean isOverwrite);
+ void persist(T globalRuleConfigs);
/**
* Load configurations.
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistService.java
index 27bf49ad15b..9987d18d42b 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/GlobalRulePersistService.java
@@ -40,12 +40,17 @@ public final class GlobalRulePersistService implements GlobalPersistService<Coll
private final PersistRepository repository;
@Override
- public void persist(final Collection<RuleConfiguration> globalRuleConfigs, final boolean isOverwrite) {
- if (!globalRuleConfigs.isEmpty() && (isOverwrite || !isExisted())) {
- repository.persist(GlobalNode.getGlobalRuleNode(), YamlEngine.marshal(new YamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(globalRuleConfigs)));
+ public void conditionalPersist(final Collection<RuleConfiguration> globalRuleConfigs) {
+ if (!globalRuleConfigs.isEmpty() && !isExisted()) {
+ persist(globalRuleConfigs);
}
}
+ @Override
+ public void persist(final Collection<RuleConfiguration> globalRuleConfigs) {
+ repository.persist(GlobalNode.getGlobalRuleNode(), YamlEngine.marshal(new YamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(globalRuleConfigs)));
+ }
+
@Override
@SuppressWarnings("unchecked")
public Collection<RuleConfiguration> load() {
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistService.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistService.java
index 720221c7a8c..a041bd87550 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistService.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/service/config/global/PropertiesPersistService.java
@@ -34,12 +34,17 @@ public final class PropertiesPersistService implements GlobalPersistService<Prop
private final PersistRepository repository;
@Override
- public void persist(final Properties props, final boolean isOverwrite) {
- if (!props.isEmpty() && (isOverwrite || !isExisted())) {
- repository.persist(GlobalNode.getPropsPath(), YamlEngine.marshal(props));
+ public void conditionalPersist(final Properties props) {
+ if (!props.isEmpty() && !isExisted()) {
+ persist(props);
}
}
+ @Override
+ public void persist(final Properties props) {
+ repository.persist(GlobalNode.getPropsPath(), YamlEngine.marshal(props));
+ }
+
private boolean isExisted() {
return !Strings.isNullOrEmpty(repository.get(GlobalNode.getPropsPath()));
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderFactoryTest.java b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderFactoryTest.java
index 708a35ddcfc..166c9f0ec23 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderFactoryTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderFactoryTest.java
@@ -28,7 +28,7 @@ public final class ContextManagerBuilderFactoryTest {
@Test
public void assertGetInstanceWithModeConfiguration() {
- assertThat(ContextManagerBuilderFactory.getInstance(new ModeConfiguration("FIXTURE", null, true)), instanceOf(ContextManagerBuilderFixture.class));
+ assertThat(ContextManagerBuilderFactory.getInstance(new ModeConfiguration("FIXTURE", null)), instanceOf(ContextManagerBuilderFixture.class));
}
@Test
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
index c2a412544ac..fc2eb974e6b 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
@@ -87,15 +87,13 @@ public final class ContextManagerBuilderParameterTest {
ContextManagerBuilderParameter parameter = new ContextManagerBuilderParameter(null, Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null, false);
assertThat(parameter.getModeConfiguration().getType(), is("Standalone"));
assertNull(parameter.getModeConfiguration().getRepository());
- assertTrue(parameter.getModeConfiguration().isOverwrite());
}
@Test
public void assertGetModeConfiguration() {
- ModeConfiguration modeConfig = new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class), false);
+ ModeConfiguration modeConfig = new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class));
ContextManagerBuilderParameter parameter = new ContextManagerBuilderParameter(modeConfig, Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null, false);
assertThat(parameter.getModeConfiguration().getType(), is("Cluster"));
assertNotNull(parameter.getModeConfiguration().getRepository());
- assertFalse(parameter.getModeConfiguration().isOverwrite());
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index 6e7da6b3cd1..f8f27f6ab1a 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -91,17 +91,17 @@ public final class MetaDataPersistServiceTest {
}
@Test
- public void assertPersistConfigurations() {
+ public void assertConditionalPersistConfigurations() {
Map<String, DataSource> dataSourceMap = createDataSourceMap();
Collection<RuleConfiguration> ruleConfigs = createRuleConfigurations();
Collection<RuleConfiguration> globalRuleConfigs = createGlobalRuleConfigurations();
Properties props = createProperties();
metaDataPersistService.persistConfigurations(
- Collections.singletonMap("foo_db", new DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs)), globalRuleConfigs, props, false);
- verify(dataSourceService).persist("foo_db", createDataSourcePropertiesMap(dataSourceMap), false);
- verify(databaseRulePersistService).persist("foo_db", ruleConfigs, false);
- verify(globalRuleService).persist(globalRuleConfigs, false);
- verify(propsService).persist(props, false);
+ Collections.singletonMap("foo_db", new DataSourceProvidedDatabaseConfiguration(dataSourceMap, ruleConfigs)), globalRuleConfigs, props);
+ verify(dataSourceService).conditionalPersist("foo_db", createDataSourcePropertiesMap(dataSourceMap));
+ verify(databaseRulePersistService).conditionalPersist("foo_db", ruleConfigs);
+ verify(globalRuleService).conditionalPersist(globalRuleConfigs);
+ verify(propsService).conditionalPersist(props);
}
private Map<String, DataSourceProperties> createDataSourcePropertiesMap(final Map<String, DataSource> dataSourceMap) {
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 92130de8835..d3faa5230d5 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -95,7 +95,7 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter parameter) {
if (!parameter.isEmpty()) {
- persistService.persistConfigurations(parameter.getDatabaseConfigs(), parameter.getGlobalRuleConfigs(), parameter.getProps(), parameter.getModeConfiguration().isOverwrite());
+ persistService.persistConfigurations(parameter.getDatabaseConfigs(), parameter.getGlobalRuleConfigs(), parameter.getProps());
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
index 9439666937c..4c87bbb9b45 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
@@ -140,7 +140,7 @@ public final class ClusterContextManagerCoordinatorTest {
}
private ContextManagerBuilderParameter createContextManagerBuilderParameter() {
- ModeConfiguration modeConfig = new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("FIXTURE", "", "", new Properties()), false);
+ ModeConfiguration modeConfig = new ModeConfiguration("Cluster", new ClusterPersistRepositoryConfiguration("FIXTURE", "", "", new Properties()));
InstanceMetaData instanceMetaData = new ProxyInstanceMetaData("foo_instance_id", 3307);
return new ContextManagerBuilderParameter(modeConfig, Collections.emptyMap(), Collections.emptyList(), new Properties(), Collections.emptyList(), instanceMetaData, false);
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 827b1a8a3cd..f73853b2141 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -66,7 +66,7 @@ public final class StandaloneContextManagerBuilder implements ContextManagerBuil
private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter parameter) {
if (!parameter.isEmpty()) {
- persistService.persistConfigurations(parameter.getDatabaseConfigs(), parameter.getGlobalRuleConfigs(), parameter.getProps(), parameter.getModeConfiguration().isOverwrite());
+ persistService.persistConfigurations(parameter.getDatabaseConfigs(), parameter.getGlobalRuleConfigs(), parameter.getProps());
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
index b2dda058e73..289a05f5709 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilderTextTest.java
@@ -54,7 +54,7 @@ public final class StandaloneContextManagerBuilderTextTest {
}
private ContextManagerBuilderParameter createContextManagerBuilderParameter() {
- ModeConfiguration modeConfig = new ModeConfiguration("Standalone", null, true);
+ ModeConfiguration modeConfig = new ModeConfiguration("Standalone", null);
Map<String, DatabaseConfiguration> databaseConfigs = Collections.singletonMap(
"foo_db", new DataSourceProvidedDatabaseConfiguration(Collections.singletonMap("foo_ds", new MockedDataSource()), Collections.singleton(mock(RuleConfiguration.class))));
Collection<RuleConfiguration> globalRuleConfigs = Collections.singleton(mock(RuleConfiguration.class));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
index 70c90ea59cc..34ed8b39984 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
@@ -48,6 +48,6 @@ public final class UpdatableGlobalRuleRALBackendHandler implements ProxyBackendH
private void persistNewRuleConfigurations() {
MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
- metaDataContexts.getPersistService().getGlobalRuleService().persist(metaDataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations(), true);
+ metaDataContexts.getPersistService().getGlobalRuleService().persist(metaDataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations());
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandler.java
index 8498b3db2fc..d9474bdaed6 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandler.java
@@ -41,11 +41,9 @@ public final class ShowModeInfoHandler extends QueryableRALBackendHandler<ShowMo
private static final String PROPS = "props";
- private static final String OVERWRITE = "overwrite";
-
@Override
protected Collection<String> getColumnNames() {
- return Arrays.asList(TYPE, REPOSITORY, PROPS, OVERWRITE);
+ return Arrays.asList(TYPE, REPOSITORY, PROPS);
}
@Override
@@ -55,7 +53,6 @@ public final class ShowModeInfoHandler extends QueryableRALBackendHandler<ShowMo
String modeType = instanceContext.getModeConfiguration().getType();
String repositoryType = null == repositoryConfig ? "" : repositoryConfig.getType();
String props = null == repositoryConfig || null == repositoryConfig.getProps() ? "" : new Gson().toJson(repositoryConfig.getProps());
- String overwrite = String.valueOf(instanceContext.getModeConfiguration().isOverwrite());
- return Collections.singleton(new LocalDataQueryResultRow(modeType, repositoryType, props, overwrite));
+ return Collections.singleton(new LocalDataQueryResultRow(modeType, repositoryType, props));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetVariableHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetVariableHandler.java
index 51c97454871..0b1024c1a52 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetVariableHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetVariableHandler.java
@@ -69,7 +69,7 @@ public final class SetVariableHandler extends UpdatableRALBackendHandler<SetVari
contextManager.alterProperties(props);
MetaDataPersistService persistService = metaDataContexts.getPersistService();
if (null != persistService.getPropsService()) {
- persistService.getPropsService().persist(props, true);
+ persistService.getPropsService().persist(props);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceInfoHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceInfoHandlerTest.java
index 2cc7402b7b9..2e87aa40f12 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceInfoHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceInfoHandlerTest.java
@@ -65,7 +65,7 @@ public final class ShowInstanceInfoHandlerTest extends ProxyContextRestorer {
InstanceContext result = mock(InstanceContext.class, RETURNS_DEEP_STUBS);
when(result.getInstance().getMetaData()).thenReturn(new ProxyInstanceMetaData("127.0.0.1@3309", "127.0.0.1@3309"));
when(result.getInstance().getState()).thenReturn(new StateContext());
- when(result.getModeConfiguration()).thenReturn(new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties()), true));
+ when(result.getModeConfiguration()).thenReturn(new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties())));
when(result.getInstance().getWorkerId()).thenReturn(0L);
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandlerTest.java
index a9df22aeaf0..e415d8a218a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowInstanceListHandlerTest.java
@@ -89,14 +89,14 @@ public final class ShowInstanceListHandlerTest extends ProxyContextRestorer {
InstanceContext result = mock(InstanceContext.class, RETURNS_DEEP_STUBS);
when(result.getInstance().getMetaData()).thenReturn(new ProxyInstanceMetaData("127.0.0.1@3308", "127.0.0.1@3308"));
when(result.getInstance().getState()).thenReturn(new StateContext());
- when(result.getModeConfiguration()).thenReturn(new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties()), true));
+ when(result.getModeConfiguration()).thenReturn(new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("H2", new Properties())));
when(result.getInstance().getWorkerId()).thenReturn(0L);
return result;
}
private InstanceContext createClusterInstanceContext() {
InstanceContext result = mock(InstanceContext.class, RETURNS_DEEP_STUBS);
- when(result.getModeConfiguration()).thenReturn(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class), true));
+ when(result.getModeConfiguration()).thenReturn(new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class)));
ComputeNodeInstance computeNodeInstance = mock(ComputeNodeInstance.class, RETURNS_DEEP_STUBS);
when(computeNodeInstance.getMetaData()).thenReturn(new ProxyInstanceMetaData("127.0.0.1@3309", "127.0.0.1@3309"));
when(computeNodeInstance.getState()).thenReturn(new StateContext());
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandlerTest.java
index a3f106c5ce3..d7963d89679 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowModeInfoHandlerTest.java
@@ -49,18 +49,17 @@ public final class ShowModeInfoHandlerTest extends ProxyContextRestorer {
handler.execute();
handler.next();
List<Object> data = handler.getRowData().getData();
- assertThat(data.size(), is(4));
+ assertThat(data.size(), is(3));
assertThat(data.get(0), is("Cluster"));
assertThat(data.get(1), is("ZooKeeper"));
assertThat(data.get(2), is("{\"key\":\"value1,value2\"}"));
- assertThat(data.get(3), is(Boolean.FALSE.toString()));
}
private InstanceContext createInstanceContext() {
InstanceContext result = mock(InstanceContext.class, RETURNS_DEEP_STUBS);
when(result.getInstance().getMetaData().getId()).thenReturn("127.0.0.1@3309");
when(result.getModeConfiguration()).thenReturn(new ModeConfiguration("Cluster",
- new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance_ds", "127.0.0.1:2181", createProperties("key", "value1,value2")), false));
+ new ClusterPersistRepositoryConfiguration("ZooKeeper", "governance_ds", "127.0.0.1:2181", createProperties("key", "value1,value2"))));
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/config_loader/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/config_loader/server.yaml
index c446d78ad5a..4243e801ceb 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/config_loader/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/config_loader/server.yaml
@@ -22,7 +22,6 @@ mode:
props:
namespace: governance_ds
server-lists: localhost:2181
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/swap/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/swap/server.yaml
index 8886e6272b8..a9060642a8a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/swap/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/resources/conf/swap/server.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
index d58bdef2f2d..7a01ffdf96f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
@@ -32,7 +32,6 @@
# timeToLiveSeconds: 60
# maxRetries: 3
# operationTimeoutMilliseconds: 500
-# overwrite: false
#
#rules:
# - !AUTHORITY
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
index 96abf354b95..2087cbf702e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
index af66e799b8f..a39a5975854 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
index 60c6da64dac..4068e5f76da 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
@@ -59,4 +59,3 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
index 8bce0dff6a3..ef90e660097 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
@@ -59,4 +59,3 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index 6537f398811..4c398c79b58 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -99,4 +99,3 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index bdd88c48fad..1a2026c3c19 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -97,4 +97,3 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
index 73440510fb2..214a83e429e 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
rules:
- !SHARDING
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
index 24b50b4e9b9..ae854850575 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
rules:
- !SHARDING
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
index b5fa286b518..d2b62ec87c0 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
@@ -135,4 +135,3 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
index fd532f8a92f..ff16535e360 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
@@ -137,4 +137,3 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
index 923594e3f90..8848aaedd33 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
@@ -56,4 +56,3 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
index b11d2e7810f..8b6a2bdecf7 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
rules:
- !SHARDING
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
index fddd760798c..22760c9f3f2 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- overwrite: true
rules:
- !SHARDING
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/unit/sharding.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/unit/sharding.yaml
index 1dd789bd36e..10c53988b2d 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/unit/sharding.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/unit/sharding.yaml
@@ -22,7 +22,6 @@ mode:
props:
namespace: test_name
server-lists: localhost:3181
- overwrite: true
dataSources:
write_ds:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
index f261adec2be..e23795cce56 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
@@ -95,7 +95,6 @@ public final class ShardingSphereJdbcContainer implements EmbeddedITContainer, A
repositoryConfig.getProps().setProperty("retryIntervalMilliseconds", "500");
repositoryConfig.getProps().setProperty("maxRetries", "3");
result.setRepository(repositoryConfig);
- result.setOverwrite(false);
return result;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/resources/env/scenario/mysql_ha/proxy/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/resources/env/scenario/mysql_ha/proxy/server.yaml
index 37f430b0ba6..e039c5f7639 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/resources/env/scenario/mysql_ha/proxy/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/resources/env/scenario/mysql_ha/proxy/server.yaml
@@ -26,7 +26,6 @@ mode:
operationTimeoutMilliseconds: 500
retryIntervalMilliseconds: 500
maxRetries: 3
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-5.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-5.yaml
index 75e49c591b5..cda2d5bde9e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-5.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-5.yaml
@@ -26,7 +26,6 @@ mode:
operationTimeoutMilliseconds: 500
retryIntervalMilliseconds: 500
maxRetries: 3
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-8.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-8.yaml
index 90503e9d7af..e856bd692b7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-8.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/server-8.yaml
@@ -26,7 +26,6 @@ mode:
operationTimeoutMilliseconds: 500
retryIntervalMilliseconds: 500
maxRetries: 3
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml
index f831140adf5..0c3eb23b4b1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: true
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml
index e9379d6292c..4963f555bea 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: true
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-showprocesslist/src/test/resources/env/common/cluster/proxy/conf/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-showprocesslist/src/test/resources/env/common/cluster/proxy/conf/server.yaml
index a546a74b179..428d9dd5c0d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-showprocesslist/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-showprocesslist/src/test/resources/env/common/cluster/proxy/conf/server.yaml
@@ -26,7 +26,6 @@ mode:
operationTimeoutMilliseconds: 500
retryIntervalMilliseconds: 500
maxRetries: 3
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml
index a546a74b179..428d9dd5c0d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/cluster/proxy/conf/server.yaml
@@ -26,7 +26,6 @@ mode:
operationTimeoutMilliseconds: 500
retryIntervalMilliseconds: 500
maxRetries: 3
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml
index e22e7714824..8040acd9af3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/common/standalone/proxy/conf/server.yaml
@@ -26,7 +26,6 @@
# operationTimeoutMilliseconds: 500
# retryIntervalMilliseconds: 500
# maxRetries: 3
-# overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/mysql/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/mysql/server.yaml
index 37f430b0ba6..e039c5f7639 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/mysql/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/mysql/server.yaml
@@ -26,7 +26,6 @@ mode:
operationTimeoutMilliseconds: 500
retryIntervalMilliseconds: 500
maxRetries: 3
- overwrite: false
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml
index 7483222f380..f13a6e8d53d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: true
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml
index c5074264321..94e721de594 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml
@@ -26,7 +26,6 @@ mode:
timeToLiveSeconds: 60
maxRetries: 3
operationTimeoutMilliseconds: 500
- overwrite: true
rules:
- !AUTHORITY
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java
index 37b2d098257..f16cc040140 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java
@@ -95,7 +95,7 @@ public final class PipelineContextUtil {
}
private static ModeConfiguration createModeConfig() {
- return new ModeConfiguration("Cluster", PERSIST_REPOSITORY_CONFIG, true);
+ return new ModeConfiguration("Cluster", PERSIST_REPOSITORY_CONFIG);
}
private static void mockContextManager() {