This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 57119174508 Remove useless default zk declaration of test yaml (#36436)
57119174508 is described below
commit 5711917450816de4f0972aa5882fbaa8e9423b33
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 31 22:28:30 2025 +0800
Remove useless default zk declaration of test yaml (#36436)
---
proxy/backend/core/src/test/resources/conf/swap/global.yaml | 4 ----
proxy/bootstrap/src/test/resources/conf/local/global.yaml | 4 ----
proxy/bootstrap/src/test/resources/conf/reg_center/global.yaml | 4 ----
test/e2e/agent/engine/src/test/resources/env/proxy/conf/global.yaml | 4 ----
test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml | 4 ----
.../operation/pipeline/src/test/resources/env/opengauss/global.yaml | 4 ----
.../operation/pipeline/src/test/resources/env/postgresql/global.yaml | 4 ----
.../resources/env/common/cluster/proxy/zookeeper/conf/global.yaml | 4 ----
.../operation/transaction/src/test/resources/env/mysql/global.yaml | 4 ----
.../transaction/src/test/resources/env/opengauss/global.yaml | 4 ----
.../transaction/src/test/resources/env/postgresql/global.yaml | 4 ----
.../resources/env/common/cluster/proxy/conf/zookeeper/global.yaml | 4 ----
.../env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml | 4 ----
.../db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml | 4 ----
.../proxy/mode/cluster/zookeeper/global.yaml | 4 ----
.../proxy/mode/cluster/zookeeper/global.yaml | 4 ----
.../env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml | 4 ----
.../env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml | 4 ----
.../env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml | 4 ----
.../proxy/mode/cluster/mysql/zookeeper/global.yaml | 4 ----
.../proxy/mode/cluster/opengauss/zookeeper/global.yaml | 4 ----
.../proxy/mode/cluster/postgresql/zookeeper/global.yaml | 4 ----
.../sharding_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml | 4 ----
.../test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml | 4 ----
.../src/test/resources/config_sharding_sphere_jdbc_source.yaml | 4 ----
25 files changed, 100 deletions(-)
diff --git a/proxy/backend/core/src/test/resources/conf/swap/global.yaml
b/proxy/backend/core/src/test/resources/conf/swap/global.yaml
index d3c2c1515ab..bc4371047ba 100644
--- a/proxy/backend/core/src/test/resources/conf/swap/global.yaml
+++ b/proxy/backend/core/src/test/resources/conf/swap/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: governance_ds
server-lists: localhost:2181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
authority:
users:
diff --git a/proxy/bootstrap/src/test/resources/conf/local/global.yaml
b/proxy/bootstrap/src/test/resources/conf/local/global.yaml
index de9d310d91c..eeb53206cb8 100644
--- a/proxy/bootstrap/src/test/resources/conf/local/global.yaml
+++ b/proxy/bootstrap/src/test/resources/conf/local/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: governance_ds
server-lists: localhost:2181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
authority:
users:
diff --git a/proxy/bootstrap/src/test/resources/conf/reg_center/global.yaml
b/proxy/bootstrap/src/test/resources/conf/reg_center/global.yaml
index acd8d35210e..5d291c6efa4 100644
--- a/proxy/bootstrap/src/test/resources/conf/reg_center/global.yaml
+++ b/proxy/bootstrap/src/test/resources/conf/reg_center/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: governance_ds
server-lists: localhost:2181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
authority:
users:
diff --git
a/test/e2e/agent/engine/src/test/resources/env/proxy/conf/global.yaml
b/test/e2e/agent/engine/src/test/resources/env/proxy/conf/global.yaml
index 134f10068cc..9e438f806eb 100644
--- a/test/e2e/agent/engine/src/test/resources/env/proxy/conf/global.yaml
+++ b/test/e2e/agent/engine/src/test/resources/env/proxy/conf/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_logging
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
index 8f718a8e61a..b2e671c94c1 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db_mysql
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
index fb134f08a20..0d5a4605861 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db_opengauss
server-lists: zk.host:2181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
authority:
users:
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
index c10d6a573d1..1ed54bd3e4b 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db_postgresql
server-lists: zk.host:2181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
authority:
users:
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
index cf2949959c8..0ae467f7fb3 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
b/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
index 2a3bd2f1565..0875622ebdd 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
+++ b/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db_mysql
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
b/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
index feab98a11a4..1375ab63f68 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db_opengauss
server-lists: zk.host:2181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
authority:
users:
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
b/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
index 271ff08016a..b1459c46041 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db_postgresql
server-lists: zk.host:2181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
index 34e9b99aca0..50fe8af5f38 100644
---
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml
index db5ce2e1258..091f4f05e38 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
index 3e0de8fe8ac..c92d768c255 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/zookeeper/global.yaml
index 34e9b99aca0..50fe8af5f38 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
index 34e9b99aca0..50fe8af5f38 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml
index 198a2e6b239..7d1ed8d2d54 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml
index 199f2a1e8f7..ef44de1a954 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml
@@ -22,10 +22,6 @@
# props:
# namespace: it_db
# server-lists: zk.host:2181
-# timeToLiveSeconds: 60
-# operationTimeoutMilliseconds: 500
-# retryIntervalMilliseconds: 500
-# maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml
index db5ce2e1258..091f4f05e38 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
index d10e4ab4b1d..fc5e09d0984 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_empty_storage_units
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
index dd2c98dd9f9..2deb40d88dd 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_empty_storage_units
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
index 7916add120a..375f27c90ee 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_empty_storage_units
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
index f8841423e8d..2397448d3cf 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml
index db5ce2e1258..091f4f05e38 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml
@@ -22,10 +22,6 @@ mode:
props:
namespace: it_db
server-lists: zk.host:2181
- timeToLiveSeconds: 60
- operationTimeoutMilliseconds: 500
- retryIntervalMilliseconds: 500
- maxRetries: 3
authority:
users:
diff --git
a/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
b/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
index 50d2a9bd541..44fa901054f 100644
---
a/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
+++
b/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
@@ -24,10 +24,6 @@ mode:
props:
namespace: test
server-lists: localhost:3181
- retryIntervalMilliseconds: 500
- timeToLiveSeconds: 60
- maxRetries: 3
- operationTimeoutMilliseconds: 500
props:
system-schema-metadata-assembly-enabled: false
