This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 ff9ac642cd3 Revise #19359 & Delete useless configuration key (#19397)
ff9ac642cd3 is described below
commit ff9ac642cd30ffcd35e5a6dfca7bd5b8a90737c7
Author: zhaojinchao <[email protected]>
AuthorDate: Thu Jul 21 07:42:26 2022 +0800
Revise #19359 & Delete useless configuration key (#19397)
* Delete useless configuration key
* Fix ci
---
.../src/main/resources/server/server.yaml | 1 -
.../shardingsphere/infra/config/props/ConfigurationPropertyKey.java | 5 -----
.../dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml | 2 +-
.../mysql/show_databases.xml | 2 +-
.../cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml | 4 ++--
5 files changed, 4 insertions(+), 10 deletions(-)
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 4d57fd301e9..1a2a2c5b9f8 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
@@ -55,7 +55,6 @@ props:
proxy-hint-enabled: true
sql-show: false
check-table-metadata-enabled: false
- lock-wait-timeout-milliseconds: 50000 # The maximum time to wait for a lock
show-process-list-enabled: false
# Proxy backend query fetch size. A larger value may increase the memory
usage of ShardingSphere Proxy.
# The default value is -1, which means set the minimum value for different
JDBC drivers.
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
index 9c51733e539..38ab3166d6f 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
@@ -77,11 +77,6 @@ public enum ConfigurationPropertyKey implements
TypedPropertyKey {
*/
SHOW_PROCESS_LIST_ENABLED("show-process-list-enabled",
String.valueOf(Boolean.FALSE), boolean.class, false),
- /**
- * The length of time in milliseconds an SQL waits for a global lock
before giving up.
- */
- LOCK_WAIT_TIMEOUT_MILLISECONDS("lock-wait-timeout-milliseconds",
String.valueOf(50000L), long.class, false),
-
/**
* Proxy backend query fetch size. A larger value may increase the memory
usage of ShardingSphere Proxy.
* The default value is -1, which means set the minimum value for
different JDBC drivers.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
index 9e95dd770e9..7c09a1af6d9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
@@ -20,8 +20,8 @@
<column name="schema_name" />
</metadata>
<row values="dbtbl_with_readwrite_splitting" />
+ <row values="mysql" />
<row values="information_schema" />
<row values="performance_schema" />
- <row values="mysql" />
<row values="sys" />
</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
index 6c82fe5a8ca..8f71dab57ca 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
@@ -20,8 +20,8 @@
<column name="schema_name" />
</metadata>
<row values="dbtbl_with_readwrite_splitting_and_encrypt" />
+ <row values="mysql" />
<row values="information_schema" />
<row values="performance_schema" />
- <row values="mysql" />
<row values="sys" />
</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
index 3a86c6f9fc8..948283ae84a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
@@ -19,9 +19,9 @@
<metadata>
<column name="schema_name" />
</metadata>
- <row values="information_schema" />
- <row values="performance_schema" />
<row values="readwrite_splitting" />
<row values="mysql" />
+ <row values="information_schema" />
+ <row values="performance_schema" />
<row values="sys" />
</dataset>
