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/11/13 13:54:11 UTC
[shardingsphere] branch master updated: Add order for show database result and modify integration test case (#22151)
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 9d94744161f Add order for show database result and modify integration test case (#22151)
9d94744161f is described below
commit 9d94744161fe312dda595851a780b6174d69e4ec
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Sun Nov 13 21:54:03 2022 +0800
Add order for show database result and modify integration test case (#22151)
---
.../backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java | 4 ++--
.../test/resources/cases/dal/dataset/db/mysql/show_databases.xml | 6 +++---
.../dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml | 6 +++---
.../mysql/show_databases.xml | 4 ++--
.../resources/cases/dal/dataset/encrypt/mysql/show_databases.xml | 6 +++---
.../encrypt_and_readwrite_splitting/mysql/show_databases.xml | 6 +++---
.../cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml | 6 +++---
.../cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml | 6 +++---
.../cases/dal/dataset/sharding_governance/mysql/show_databases.xml | 6 +++---
.../test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml | 4 ++--
10 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java
index 65ff20ae9b5..f47397db155 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowDatabasesExecutor.java
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedRe
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminQueryExecutor;
+import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.sql.parser.sql.common.util.SQLUtil;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowDatabasesStatement;
@@ -57,7 +57,7 @@ public final class ShowDatabasesExecutor implements DatabaseAdminQueryExecutor {
}
private Collection<LocalDataQueryResultRow> getDatabaseNames(final ConnectionSession connectionSession) {
- return ProxyContext.getInstance().getAllDatabaseNames().stream()
+ return ProxyContext.getInstance().getAllDatabaseNames().stream().sorted()
.filter(each -> checkLikePattern(each) && SQLCheckEngine.check(each, getRules(each), connectionSession.getGrantee())).map(LocalDataQueryResultRow::new).collect(Collectors.toList());
}
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml
index 13290bc2827..44f9413a53e 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml
@@ -19,10 +19,10 @@
<metadata>
<column name="schema_name" />
</metadata>
+ <row values="db" />
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
<row values="shardingsphere" />
- <row values="mysql" />
- <row values="db" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
index b3ee8fb4c60..821fd87151b 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
@@ -19,10 +19,10 @@
<metadata>
<column name="schema_name" />
</metadata>
+ <row values="dbtbl_with_readwrite_splitting" />
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
- <row values="dbtbl_with_readwrite_splitting" />
<row values="shardingsphere" />
- <row values="mysql" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
index 2e9a88127aa..c7c6cf53d38 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
@@ -21,8 +21,8 @@
</metadata>
<row values="dbtbl_with_readwrite_splitting_and_encrypt" />
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
<row values="shardingsphere" />
- <row values="mysql" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml
index bbc061af811..6851b0f80be 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml
@@ -19,10 +19,10 @@
<metadata>
<column name="schema_name" />
</metadata>
+ <row values="encrypt" />
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
<row values="shardingsphere" />
- <row values="encrypt" />
- <row values="mysql" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml
index c901eabd41c..d3f11bab3db 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml
@@ -19,10 +19,10 @@
<metadata>
<column name="schema_name" />
</metadata>
+ <row values="encrypt_and_readwrite_splitting" />
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="encrypt_and_readwrite_splitting" />
- <row values="sys" />
<row values="shardingsphere" />
- <row values="mysql" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
index bd9b4f4af8f..6d75c8017fa 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
@@ -20,9 +20,9 @@
<column name="schema_name" />
</metadata>
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
- <row values="shardingsphere" />
<row values="readwrite_splitting" />
- <row values="mysql" />
+ <row values="shardingsphere" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
index 769e9393476..48dcbb36fc6 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
@@ -20,9 +20,9 @@
<column name="schema_name" />
</metadata>
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
- <row values="shardingsphere" />
<row values="sharding_and_encrypt" />
- <row values="mysql" />
+ <row values="shardingsphere" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_governance/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_governance/mysql/show_databases.xml
index 2b1af7259c7..1d98c0a4647 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_governance/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/sharding_governance/mysql/show_databases.xml
@@ -20,9 +20,9 @@
<column name="schema_name" />
</metadata>
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
- <row values="shardingsphere" />
<row values="sharding_governance" />
- <row values="mysql" />
+ <row values="shardingsphere" />
+ <row values="sys" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml
index 1ed1262774c..42f436c4cf2 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml
@@ -20,9 +20,9 @@
<column name="schema_name" />
</metadata>
<row values="information_schema" />
+ <row values="mysql" />
<row values="performance_schema" />
- <row values="sys" />
<row values="shardingsphere" />
- <row values="mysql" />
+ <row values="sys" />
<row values="tbl" />
</dataset>