You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/02/03 17:02:17 UTC
[shardingsphere] branch master updated: Fix test case:
ShowDatabasesExecutorTest (#9305)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 99cdd84 Fix test case: ShowDatabasesExecutorTest (#9305)
99cdd84 is described below
commit 99cdd84826eb28cd3fe1e86ac22aa1a3ece8e5be
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Feb 4 01:01:43 2021 +0800
Fix test case: ShowDatabasesExecutorTest (#9305)
---
.../infra/context/metadata/impl/StandardMetaDataContexts.java | 6 +++---
.../text/admin/mysql/executor/ShowDatabasesExecutorTest.java | 7 +++----
.../backend/text/admin/mysql/executor/ShowTablesExecutorTest.java | 3 +--
.../backend/text/admin/mysql/executor/UseDatabaseExecutorTest.java | 3 +--
.../text/data/impl/SchemaAssignedDatabaseBackendHandlerTest.java | 3 +--
.../backend/text/data/impl/UnicastDatabaseBackendHandlerTest.java | 3 +--
6 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
index 8533b18..e77433b 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
@@ -32,9 +32,9 @@ import org.apache.shardingsphere.infra.optimize.context.CalciteContextFactory;
import org.apache.shardingsphere.infra.state.StateContext;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
/**
* Standard meta data contexts.
@@ -57,12 +57,12 @@ public final class StandardMetaDataContexts implements MetaDataContexts {
private final StateContext stateContext;
public StandardMetaDataContexts() {
- this(new ConcurrentHashMap<>(), null, new DefaultAuthentication(), new ConfigurationProperties(new Properties()));
+ this(new LinkedHashMap<>(), null, new DefaultAuthentication(), new ConfigurationProperties(new Properties()));
}
public StandardMetaDataContexts(final Map<String, ShardingSphereMetaData> metaDataMap,
final ExecutorEngine executorEngine, final Authentication authentication, final ConfigurationProperties props) {
- this.metaDataMap = new ConcurrentHashMap<>(metaDataMap);
+ this.metaDataMap = new LinkedHashMap<>(metaDataMap);
this.executorEngine = executorEngine;
calciteContextFactory = new CalciteContextFactory(metaDataMap);
this.authentication = AuthenticationEngine.findSPIAuthentication().orElse(authentication);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowDatabasesExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowDatabasesExecutorTest.java
index 8d48429..6c4538a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowDatabasesExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowDatabasesExecutorTest.java
@@ -37,7 +37,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.sql.SQLException;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
@@ -64,7 +64,7 @@ public final class ShowDatabasesExecutorTest {
}
private Map<String, ShardingSphereMetaData> getMetaDataMap() {
- Map<String, ShardingSphereMetaData> result = new HashMap<>(10);
+ Map<String, ShardingSphereMetaData> result = new LinkedHashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
when(metaData.getResource().getDatabaseType()).thenReturn(new MySQLDatabaseType());
@@ -76,8 +76,7 @@ public final class ShowDatabasesExecutorTest {
private DefaultAuthentication getAuthentication() {
DefaultAuthentication result = new DefaultAuthentication();
- result.getAuthentication().put(new ShardingSphereUser("root", "root", ""),
- new ShardingSpherePrivilege());
+ result.getAuthentication().put(new ShardingSphereUser("root", "root", ""), new ShardingSpherePrivilege());
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowTablesExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowTablesExecutorTest.java
index 4205d54..0464622 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowTablesExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowTablesExecutorTest.java
@@ -71,8 +71,7 @@ public final class ShowTablesExecutorTest {
private DefaultAuthentication getAuthentication() {
DefaultAuthentication result = new DefaultAuthentication();
- result.getAuthentication().put(new ShardingSphereUser("root", "root", ""),
- new ShardingSpherePrivilege());
+ result.getAuthentication().put(new ShardingSphereUser("root", "root", ""), new ShardingSpherePrivilege());
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/UseDatabaseExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/UseDatabaseExecutorTest.java
index 8ada5d3..4850e2a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/UseDatabaseExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/UseDatabaseExecutorTest.java
@@ -75,8 +75,7 @@ public final class UseDatabaseExecutorTest {
private DefaultAuthentication getAuthentication() {
DefaultAuthentication result = new DefaultAuthentication();
- result.getAuthentication().put(new ShardingSphereUser("root", "root", ""),
- new ShardingSpherePrivilege());
+ result.getAuthentication().put(new ShardingSphereUser("root", "root", ""), new ShardingSpherePrivilege());
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/SchemaAssignedDatabaseBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/SchemaAssignedDatabaseBackendHandlerTest.java
index 3b936bf..daf4ba3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/SchemaAssignedDatabaseBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/SchemaAssignedDatabaseBackendHandlerTest.java
@@ -108,8 +108,7 @@ public final class SchemaAssignedDatabaseBackendHandlerTest {
private DefaultAuthentication getAuthentication() {
DefaultAuthentication result = new DefaultAuthentication();
- result.getAuthentication().put(new ShardingSphereUser("root", "root", ""),
- new ShardingSpherePrivilege());
+ result.getAuthentication().put(new ShardingSphereUser("root", "root", ""), new ShardingSpherePrivilege());
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/UnicastDatabaseBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/UnicastDatabaseBackendHandlerTest.java
index b18a309..e42674a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/UnicastDatabaseBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/UnicastDatabaseBackendHandlerTest.java
@@ -98,8 +98,7 @@ public final class UnicastDatabaseBackendHandlerTest {
private DefaultAuthentication getAuthentication() {
DefaultAuthentication result = new DefaultAuthentication();
- result.getAuthentication().put(new ShardingSphereUser("root", "root", ""),
- new ShardingSpherePrivilege());
+ result.getAuthentication().put(new ShardingSphereUser("root", "root", ""), new ShardingSpherePrivilege());
return result;
}