This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 59d1e64 update (#12271)
59d1e64 is described below
commit 59d1e64bdfefecc9475684b1e344c73b256897d3
Author: zhaojinchao <[email protected]>
AuthorDate: Tue Sep 7 19:33:32 2021 +0800
update (#12271)
---
.../shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml | 2 +-
.../src/test/resources/conf/local/server.yaml | 2 +-
.../src/test/resources/conf/reg_center/server.yaml | 2 +-
.../shardingsphere-proxy-common/src/test/resources/conf/server.yaml | 2 +-
.../src/test/resources/conf/server.yaml | 2 +-
.../configWithReadwriteSplittingDataSourceWithProps.yaml | 2 +-
.../configWithReadwriteSplittingDataSourceWithoutProps.yaml | 2 +-
.../yaml/integrate/sharding/configWithDataSourceWithProps.yaml | 2 +-
.../yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml | 2 +-
.../yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml | 2 +-
.../yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml | 2 +-
.../sharding_readwrite_splitting/configWithDataSourceWithProps.yaml | 2 +-
.../sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml | 2 +-
.../sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml | 2 +-
.../sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml | 2 +-
.../configWithoutDataSourceWithoutProps.yaml | 2 +-
.../src/test/resources/yaml/unit/sharding.yaml | 2 +-
.../src/test/resources/docker/scaling/conf/server.yaml | 2 +-
.../test/resources/docker/sharding_governance/h2/proxy/conf/server.yaml | 2 +-
.../resources/docker/sharding_governance/mysql/proxy/conf/server.yaml | 2 +-
.../docker/sharding_governance/postgresql/proxy/conf/server.yaml | 2 +-
21 files changed, 21 insertions(+), 21 deletions(-)
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 995e76a..741fcaf 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
@@ -35,7 +35,7 @@
# type: ZooKeeper
# props:
# namespace: governance_ds
-# serverLists: localhost:2181
+# server-lists: localhost:2181
# retryIntervalMilliseconds: 500
# timeToLiveSeconds: 60
# maxRetries: 3
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 5fcd6ec..fa16552 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
@@ -21,7 +21,7 @@ mode:
type: GOV_FIXTURE
props:
namespace: governance_ds
- serverLists: localhost:2181
+ server-lists: localhost:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
maxRetries: 3
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 1a63fe3..e60eb25 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
@@ -21,7 +21,7 @@ mode:
type: GOV_FIXTURE
props:
namespace: governance_ds
- serverLists: localhost:2181
+ server-lists: localhost:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
maxRetries: 3
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
index 5bc862e..4bd2b86 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
+++
b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
@@ -21,7 +21,7 @@ mode:
type: ZooKeeper
props:
namespace: governance_ds
- serverLists: localhost:2181
+ server-lists: localhost:2181
overwrite: false
rules:
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/conf/server.yaml
b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/conf/server.yaml
index 6b9311a..1f25db4 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/conf/server.yaml
+++
b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/conf/server.yaml
@@ -26,4 +26,4 @@ mode:
type: ZooKeeper
props:
namespace: governance_ds
- serverLists: localhost:2181
+ server-lists: localhost:2181
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 3ce9ff5..ce19576 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
@@ -53,7 +53,7 @@ mode:
type: GOV_TEST
props:
namespace: test_rw_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 21d4a6f..c215a41 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
@@ -53,7 +53,7 @@ mode:
type: GOV_TEST
props:
namespace: test_rw_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 a8f1b99..d3be026 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
@@ -94,7 +94,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 0830440..709e000 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
@@ -92,7 +92,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 cd00b79..436a368 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
@@ -74,7 +74,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 16e2861..0094b71 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
@@ -76,7 +76,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 eca02bd..afa0df1 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
@@ -128,7 +128,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_ms_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 de7338e..f3b359c 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
@@ -130,7 +130,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_ms_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 1cb9e2a..029c52d 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
@@ -51,7 +51,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_ms_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 5b38ba8..fbc3a5d 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
@@ -88,7 +88,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_ms_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 d810d37..70125e4 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
@@ -91,7 +91,7 @@ mode:
type: GOV_TEST
props:
namespace: test_sharding_ms_registry_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
retryIntervalMilliseconds: 10
timeToLiveSeconds: 10
maxRetries: 10
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 6d4f50e..b66a974 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
@@ -21,7 +21,7 @@ mode:
type: GOV_TEST
props:
namespace: test_name
- serverLists: localhost:3181
+ server-lists: localhost:3181
overwrite: true
dataSources:
diff --git
a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/scaling/conf/server.yaml
b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/scaling/conf/server.yaml
index 6b9311a..1f25db4 100644
---
a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/scaling/conf/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/scaling/conf/server.yaml
@@ -26,4 +26,4 @@ mode:
type: ZooKeeper
props:
namespace: governance_ds
- serverLists: localhost:2181
+ server-lists: localhost:2181
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/h2/proxy/conf/server.yaml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/h2/proxy/conf/server.yaml
index 09ed243..d49ab57 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/h2/proxy/conf/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/h2/proxy/conf/server.yaml
@@ -21,7 +21,7 @@ mode:
type: ZooKeeper
props:
namespace: governance_ds
- serverLists: zk:2181
+ server-lists: zk:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
maxRetries: 3
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/mysql/proxy/conf/server.yaml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/mysql/proxy/conf/server.yaml
index 09ed243..d49ab57 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/mysql/proxy/conf/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/mysql/proxy/conf/server.yaml
@@ -21,7 +21,7 @@ mode:
type: ZooKeeper
props:
namespace: governance_ds
- serverLists: zk:2181
+ server-lists: zk:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
maxRetries: 3
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/proxy/conf/server.yaml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/proxy/conf/server.yaml
index 09ed243..d49ab57 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/proxy/conf/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/sharding_governance/postgresql/proxy/conf/server.yaml
@@ -21,7 +21,7 @@ mode:
type: ZooKeeper
props:
namespace: governance_ds
- serverLists: zk:2181
+ server-lists: zk:2181
retryIntervalMilliseconds: 500
timeToLiveSeconds: 60
maxRetries: 3
