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 092d16a0ea0 Rename databaseMap to databases (#17991)
092d16a0ea0 is described below
commit 092d16a0ea0e28ec46506e2f72179a07d60c22f7
Author: Liang Zhang <[email protected]>
AuthorDate: Fri May 27 13:56:38 2022 +0800
Rename databaseMap to databases (#17991)
---
.../engine/type/standard/AbstractSQLRouteTest.java | 4 ++--
.../infra/binder/SQLStatementContextFactory.java | 18 ++++++++--------
.../statement/dml/InsertStatementContext.java | 22 ++++++++++----------
.../statement/dml/SelectStatementContext.java | 14 ++++++-------
.../select/pagination/PaginationContextTest.java | 8 ++++----
.../statement/SQLStatementContextFactoryTest.java | 8 ++++----
.../rule/builder/global/GlobalRuleBuilder.java | 4 ++--
.../rule/builder/global/GlobalRulesBuilder.java | 6 +++---
.../builder/fixture/FixtureGlobalRuleBuilder.java | 2 +-
.../infra/executor/check/SQLCheckEngine.java | 6 +++---
.../infra/executor/check/SQLChecker.java | 4 ++--
.../executor/check/fixture/SQLCheckerFixture.java | 2 +-
.../federation/executor/FederationContext.java | 2 +-
.../table/FilterableTableScanExecutor.java | 8 ++++----
.../optimizer/context/OptimizerContextFactory.java | 8 ++++----
.../parser/OptimizerParserContextFactory.java | 6 +++---
.../optimizer/metadata/FederationMetaData.java | 8 ++++----
.../driver/state/DriverStateContextTest.java | 6 +++---
.../authority/spi/AuthorityProviderAlgorithm.java | 4 ++--
.../authority/checker/AuthorityChecker.java | 2 +-
.../natived/NativeAuthorityProviderAlgorithm.java | 4 ++--
...SchemaPermittedPrivilegesProviderAlgorithm.java | 2 +-
.../AllPermittedPrivilegesProviderAlgorithm.java | 2 +-
.../authority/rule/AuthorityRule.java | 10 ++++-----
.../rule/builder/AuthorityRuleBuilder.java | 4 ++--
.../authority/checker/AuthorityCheckerTest.java | 4 ++--
.../parser/rule/builder/SQLParserRuleBuilder.java | 2 +-
.../rule/builder/SQLTranslatorRuleBuilder.java | 2 +-
.../traffic/rule/builder/TrafficRuleBuilder.java | 2 +-
.../context/TransactionContextsBuilder.java | 8 ++++----
.../rule/builder/TransactionRuleBuilder.java | 2 +-
.../mode/manager/ContextManager.java | 12 +++++------
.../mode/metadata/MetaDataContextsBuilder.java | 18 ++++++++--------
.../mode/manager/ContextManagerTest.java | 4 ++--
.../ClusterContextManagerCoordinatorTest.java | 4 ++--
.../DatabaseCommunicationEngineFactoryTest.java | 4 ++--
.../jdbc/JDBCDatabaseCommunicationEngineTest.java | 4 ++--
.../jdbc/connection/JDBCBackendConnectionTest.java | 4 ++--
.../jdbc/datasource/JDBCBackendDataSourceTest.java | 4 ++--
.../proxy/backend/context/ProxyContextTest.java | 24 +++++++++++-----------
.../DatabaseAdminQueryBackendHandlerTest.java | 4 ++--
.../DatabaseOperateBackendHandlerFactoryTest.java | 4 ++--
.../executor/ShowCreateDatabaseExecutorTest.java | 6 +++---
.../mysql/executor/ShowDatabasesExecutorTest.java | 4 ++--
.../executor/ShowFunctionStatusExecutorTest.java | 6 +++---
.../executor/ShowProcedureStatusExecutorTest.java | 6 +++---
.../mysql/executor/ShowTablesExecutorTest.java | 6 +++---
.../mysql/executor/fixture/SQLCheckerFixture.java | 2 +-
.../information/SelectInformationExecutorTest.java | 20 +++++++++---------
.../executor/SelectDatabaseExecutorTest.java | 8 ++++----
.../executor/SelectTableExecutorTest.java | 4 ++--
.../impl/BroadcastDatabaseBackendHandlerTest.java | 4 ++--
.../SchemaAssignedDatabaseBackendHandlerTest.java | 4 ++--
.../impl/UnicastDatabaseBackendHandlerTest.java | 4 ++--
.../distsql/DistSQLBackendHandlerFactoryTest.java | 4 ++--
.../updatable/SetVariableBackendHandlerTest.java | 4 ++--
.../FrontDatabaseProtocolTypeFactoryTest.java | 6 +++---
.../prepare/MySQLComStmtPrepareExecutor.java | 4 ++--
.../frontend/mysql/MySQLFrontendEngineTest.java | 4 ++--
.../MySQLAuthenticationHandlerTest.java | 4 ++--
.../OpenGaussAuthenticationHandlerTest.java | 4 ++--
.../PostgreSQLAuthenticationHandlerTest.java | 4 ++--
.../AbstractSQLRewriterParameterizedTest.java | 6 +++---
63 files changed, 192 insertions(+), 192 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index a45f79ccc02..dcd2b46b2e9 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -67,8 +67,8 @@ public abstract class AbstractSQLRouteTest extends
AbstractRoutingEngineTest {
ShardingSphereResource resource = mock(ShardingSphereResource.class,
RETURNS_DEEP_STUBS);
when(resource.getDatabaseType()).thenReturn(new MySQLDatabaseType());
ShardingSphereDatabase database = new
ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
DatabaseTypeFactory.getInstance("MySQL"), resource, ruleMetaData, schemas);
- Map<String, ShardingSphereDatabase> databaseMap =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database);
- SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(databaseMap, parameters,
sqlStatementParserEngine.parse(sql, false), DefaultDatabase.LOGIC_NAME);
+ Map<String, ShardingSphereDatabase> databases =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database);
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(databases, parameters,
sqlStatementParserEngine.parse(sql, false), DefaultDatabase.LOGIC_NAME);
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, sql, parameters);
return new SQLRouteEngine(Arrays.asList(shardingRule,
singleTableRule), props).route(logicSQL, database);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java
index 80df4733694..efe71e2106d 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java
@@ -109,28 +109,28 @@ public final class SQLStatementContextFactory {
/**
* Create SQL statement context.
*
- * @param databaseMap database map
+ * @param databases databases
* @param sqlStatement SQL statement
* @param defaultDatabaseName default database name
* @return SQL statement context
*/
- public static SQLStatementContext<?> newInstance(final Map<String,
ShardingSphereDatabase> databaseMap, final SQLStatement sqlStatement, final
String defaultDatabaseName) {
- return newInstance(databaseMap, Collections.emptyList(), sqlStatement,
defaultDatabaseName);
+ public static SQLStatementContext<?> newInstance(final Map<String,
ShardingSphereDatabase> databases, final SQLStatement sqlStatement, final
String defaultDatabaseName) {
+ return newInstance(databases, Collections.emptyList(), sqlStatement,
defaultDatabaseName);
}
/**
* Create SQL statement context.
*
- * @param databaseMap database map
+ * @param databases databases
* @param parameters SQL parameters
* @param sqlStatement SQL statement
* @param defaultDatabaseName default database name
* @return SQL statement context
*/
- public static SQLStatementContext<?> newInstance(final Map<String,
ShardingSphereDatabase> databaseMap,
+ public static SQLStatementContext<?> newInstance(final Map<String,
ShardingSphereDatabase> databases,
final List<Object>
parameters, final SQLStatement sqlStatement, final String defaultDatabaseName) {
if (sqlStatement instanceof DMLStatement) {
- return getDMLStatementContext(databaseMap, parameters,
(DMLStatement) sqlStatement, defaultDatabaseName);
+ return getDMLStatementContext(databases, parameters,
(DMLStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof DDLStatement) {
return getDDLStatementContext((DDLStatement) sqlStatement);
@@ -144,10 +144,10 @@ public final class SQLStatementContextFactory {
return new CommonSQLStatementContext<>(sqlStatement);
}
- private static SQLStatementContext<?> getDMLStatementContext(final
Map<String, ShardingSphereDatabase> databaseMap,
+ private static SQLStatementContext<?> getDMLStatementContext(final
Map<String, ShardingSphereDatabase> databases,
final
List<Object> parameters, final DMLStatement sqlStatement, final String
defaultDatabaseName) {
if (sqlStatement instanceof SelectStatement) {
- return new SelectStatementContext(databaseMap, parameters,
(SelectStatement) sqlStatement, defaultDatabaseName);
+ return new SelectStatementContext(databases, parameters,
(SelectStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof UpdateStatement) {
return new UpdateStatementContext((UpdateStatement) sqlStatement);
@@ -156,7 +156,7 @@ public final class SQLStatementContextFactory {
return new DeleteStatementContext((DeleteStatement) sqlStatement);
}
if (sqlStatement instanceof InsertStatement) {
- return new InsertStatementContext(databaseMap, parameters,
(InsertStatement) sqlStatement, defaultDatabaseName);
+ return new InsertStatementContext(databases, parameters,
(InsertStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof CallStatement) {
return new CallStatementContext((CallStatement) sqlStatement);
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java
index ac0c17d5312..8b7658cb3ef 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java
@@ -63,7 +63,7 @@ public final class InsertStatementContext extends
CommonSQLStatementContext<Inse
private final List<String> columnNames;
- private final Map<String, ShardingSphereDatabase> databaseMap;
+ private final Map<String, ShardingSphereDatabase> databases;
private final String defaultDatabaseName;
@@ -79,26 +79,26 @@ public final class InsertStatementContext extends
CommonSQLStatementContext<Inse
private GeneratedKeyContext generatedKeyContext;
- public InsertStatementContext(final Map<String, ShardingSphereDatabase>
databaseMap, final List<Object> parameters, final InsertStatement sqlStatement,
final String defaultDatabaseName) {
+ public InsertStatementContext(final Map<String, ShardingSphereDatabase>
databases, final List<Object> parameters, final InsertStatement sqlStatement,
final String defaultDatabaseName) {
super(sqlStatement);
- this.databaseMap = databaseMap;
+ this.databases = databases;
this.defaultDatabaseName = defaultDatabaseName;
insertColumnNames = getInsertColumnNames();
valueExpressions = getAllValueExpressions(sqlStatement);
AtomicInteger parametersOffset = new AtomicInteger(0);
insertValueContexts = getInsertValueContexts(parameters,
parametersOffset, valueExpressions);
- insertSelectContext = getInsertSelectContext(databaseMap, parameters,
parametersOffset, defaultDatabaseName).orElse(null);
+ insertSelectContext = getInsertSelectContext(databases, parameters,
parametersOffset, defaultDatabaseName).orElse(null);
onDuplicateKeyUpdateValueContext =
getOnDuplicateKeyUpdateValueContext(parameters, parametersOffset).orElse(null);
tablesContext = new TablesContext(getAllSimpleTableSegments(),
getDatabaseType());
- ShardingSphereSchema schema = getSchema(databaseMap,
defaultDatabaseName);
+ ShardingSphereSchema schema = getSchema(databases,
defaultDatabaseName);
columnNames = useDefaultColumns() ?
schema.getAllColumnNames(sqlStatement.getTable().getTableName().getIdentifier().getValue())
: insertColumnNames;
generatedKeyContext = new GeneratedKeyContextEngine(sqlStatement,
schema)
.createGenerateKeyContext(insertColumnNames,
getAllValueExpressions(sqlStatement), parameters).orElse(null);
}
- private ShardingSphereSchema getSchema(final Map<String,
ShardingSphereDatabase> databaseMap, final String defaultDatabaseName) {
+ private ShardingSphereSchema getSchema(final Map<String,
ShardingSphereDatabase> databases, final String defaultDatabaseName) {
String databaseName =
tablesContext.getDatabaseName().orElse(defaultDatabaseName);
- ShardingSphereDatabase database = databaseMap.get(databaseName);
+ ShardingSphereDatabase database = databases.get(databaseName);
if (null == database) {
throw new DatabaseNotExistedException(databaseName);
}
@@ -123,13 +123,13 @@ public final class InsertStatementContext extends
CommonSQLStatementContext<Inse
return result;
}
- private Optional<InsertSelectContext> getInsertSelectContext(final
Map<String, ShardingSphereDatabase> databaseMap, final List<Object> parameters,
+ private Optional<InsertSelectContext> getInsertSelectContext(final
Map<String, ShardingSphereDatabase> databases, final List<Object> parameters,
final
AtomicInteger parametersOffset, final String defaultDatabaseName) {
if (!getSqlStatement().getInsertSelect().isPresent()) {
return Optional.empty();
}
SubquerySegment insertSelectSegment =
getSqlStatement().getInsertSelect().get();
- SelectStatementContext selectStatementContext = new
SelectStatementContext(databaseMap, parameters,
insertSelectSegment.getSelect(), defaultDatabaseName);
+ SelectStatementContext selectStatementContext = new
SelectStatementContext(databases, parameters, insertSelectSegment.getSelect(),
defaultDatabaseName);
InsertSelectContext insertSelectContext = new
InsertSelectContext(selectStatementContext, parameters, parametersOffset.get());
parametersOffset.addAndGet(insertSelectContext.getParameterCount());
return Optional.of(insertSelectContext);
@@ -272,9 +272,9 @@ public final class InsertStatementContext extends
CommonSQLStatementContext<Inse
public void setUpParameters(final List<Object> parameters) {
AtomicInteger parametersOffset = new AtomicInteger(0);
insertValueContexts = getInsertValueContexts(parameters,
parametersOffset, valueExpressions);
- insertSelectContext = getInsertSelectContext(databaseMap, parameters,
parametersOffset, defaultDatabaseName).orElse(null);
+ insertSelectContext = getInsertSelectContext(databases, parameters,
parametersOffset, defaultDatabaseName).orElse(null);
onDuplicateKeyUpdateValueContext =
getOnDuplicateKeyUpdateValueContext(parameters, parametersOffset).orElse(null);
- ShardingSphereSchema schema = getSchema(databaseMap,
defaultDatabaseName);
+ ShardingSphereSchema schema = getSchema(databases,
defaultDatabaseName);
generatedKeyContext = new GeneratedKeyContextEngine(getSqlStatement(),
schema).createGenerateKeyContext(insertColumnNames, valueExpressions,
parameters).orElse(null);
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
index 0af5bd970b9..26f65d385d9 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
@@ -102,33 +102,33 @@ public final class SelectStatementContext extends
CommonSQLStatementContext<Sele
private PaginationContext paginationContext;
- public SelectStatementContext(final Map<String, ShardingSphereDatabase>
databaseMap, final List<Object> parameters, final SelectStatement sqlStatement,
final String defaultDatabaseName) {
+ public SelectStatementContext(final Map<String, ShardingSphereDatabase>
databases, final List<Object> parameters, final SelectStatement sqlStatement,
final String defaultDatabaseName) {
super(sqlStatement);
extractWhereSegments(whereSegments, sqlStatement);
ColumnExtractor.extractColumnSegments(columnSegments, whereSegments);
- subqueryContexts = createSubqueryContexts(databaseMap, parameters,
defaultDatabaseName);
+ subqueryContexts = createSubqueryContexts(databases, parameters,
defaultDatabaseName);
tablesContext = new TablesContext(getAllTableSegments(),
subqueryContexts, getDatabaseType());
String databaseName =
tablesContext.getDatabaseName().orElse(defaultDatabaseName);
groupByContext = new
GroupByContextEngine().createGroupByContext(sqlStatement);
orderByContext = new
OrderByContextEngine().createOrderBy(sqlStatement, groupByContext);
- projectionsContext = new ProjectionsContextEngine(databaseName,
getSchemas(databaseMap, databaseName), getDatabaseType())
+ projectionsContext = new ProjectionsContextEngine(databaseName,
getSchemas(databases, databaseName), getDatabaseType())
.createProjectionsContext(getSqlStatement().getFrom(),
getSqlStatement().getProjections(), groupByContext, orderByContext);
paginationContext = new
PaginationContextEngine().createPaginationContext(sqlStatement,
projectionsContext, parameters, whereSegments);
}
- private Map<Integer, SelectStatementContext> createSubqueryContexts(final
Map<String, ShardingSphereDatabase> databaseMap, final List<Object> parameters,
final String defaultDatabaseName) {
+ private Map<Integer, SelectStatementContext> createSubqueryContexts(final
Map<String, ShardingSphereDatabase> databases, final List<Object> parameters,
final String defaultDatabaseName) {
Collection<SubquerySegment> subquerySegments =
SubqueryExtractUtil.getSubquerySegments(getSqlStatement());
Map<Integer, SelectStatementContext> result = new
HashMap<>(subquerySegments.size(), 1);
for (SubquerySegment each : subquerySegments) {
- SelectStatementContext subqueryContext = new
SelectStatementContext(databaseMap, parameters, each.getSelect(),
defaultDatabaseName);
+ SelectStatementContext subqueryContext = new
SelectStatementContext(databases, parameters, each.getSelect(),
defaultDatabaseName);
subqueryContext.setSubqueryType(each.getSubqueryType());
result.put(each.getStartIndex(), subqueryContext);
}
return result;
}
- private Map<String, ShardingSphereSchema> getSchemas(final Map<String,
ShardingSphereDatabase> databaseMap, final String databaseName) {
- ShardingSphereDatabase database = databaseMap.get(databaseName);
+ private Map<String, ShardingSphereSchema> getSchemas(final Map<String,
ShardingSphereDatabase> databases, final String databaseName) {
+ ShardingSphereDatabase database = databases.get(databaseName);
if (null == database) {
if (tablesContext.getTables().isEmpty()) {
return Collections.emptyMap();
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java
index 18c4d43d65d..56e8be015ad 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContextTest.java
@@ -161,8 +161,8 @@ public final class PaginationContextTest {
private void getRevisedRowCount(final SelectStatement selectStatement) {
selectStatement.setProjections(new ProjectionsSegment(0, 0));
- Map<String, ShardingSphereDatabase> databaseMap =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME,
mock(ShardingSphereDatabase.class));
- SelectStatementContext selectStatementContext = new
SelectStatementContext(databaseMap, Collections.emptyList(), selectStatement,
DefaultDatabase.LOGIC_NAME);
+ Map<String, ShardingSphereDatabase> databases =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME,
mock(ShardingSphereDatabase.class));
+ SelectStatementContext selectStatementContext = new
SelectStatementContext(databases, Collections.emptyList(), selectStatement,
DefaultDatabase.LOGIC_NAME);
assertThat(new PaginationContext(getOffsetSegment(),
getRowCountSegment(),
getParameters()).getRevisedRowCount(selectStatementContext), is(50L));
}
@@ -195,8 +195,8 @@ public final class PaginationContextTest {
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setGroupBy(new GroupBySegment(0, 0,
Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1,
OrderDirection.ASC, OrderDirection.DESC))));
selectStatement.setOrderBy(new OrderBySegment(0, 0,
Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1,
OrderDirection.DESC, OrderDirection.DESC))));
- Map<String, ShardingSphereDatabase> databaseMap =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME,
mock(ShardingSphereDatabase.class));
- SelectStatementContext selectStatementContext = new
SelectStatementContext(databaseMap, Collections.emptyList(), selectStatement,
DefaultDatabase.LOGIC_NAME);
+ Map<String, ShardingSphereDatabase> databases =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME,
mock(ShardingSphereDatabase.class));
+ SelectStatementContext selectStatementContext = new
SelectStatementContext(databases, Collections.emptyList(), selectStatement,
DefaultDatabase.LOGIC_NAME);
assertThat(new PaginationContext(getOffsetSegment(),
getRowCountSegment(),
getParameters()).getRevisedRowCount(selectStatementContext), is((long)
Integer.MAX_VALUE));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java
index 82cd76b64e9..314af66c768 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/SQLStatementContextFactoryTest.java
@@ -59,7 +59,7 @@ public final class SQLStatementContextFactoryTest {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setLimit(new LimitSegment(0, 10, null, null));
selectStatement.setProjections(projectionsSegment);
- SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mockDatabaseMap(),
Collections.emptyList(), selectStatement, DefaultDatabase.LOGIC_NAME);
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mockDatabases(),
Collections.emptyList(), selectStatement, DefaultDatabase.LOGIC_NAME);
assertThat(sqlStatementContext,
instanceOf(SelectStatementContext.class));
}
@@ -96,17 +96,17 @@ public final class SQLStatementContextFactoryTest {
private void
assertSQLStatementContextCreatedWhenSQLStatementInstanceOfInsertStatement(final
InsertStatement insertStatement) {
insertStatement.setTable(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("tbl"))));
- SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mockDatabaseMap(),
Collections.emptyList(), insertStatement, DefaultDatabase.LOGIC_NAME);
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mockDatabases(),
Collections.emptyList(), insertStatement, DefaultDatabase.LOGIC_NAME);
assertThat(sqlStatementContext,
instanceOf(InsertStatementContext.class));
}
@Test
public void
assertSQLStatementContextCreatedWhenSQLStatementNotInstanceOfSelectStatementAndInsertStatement()
{
- SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mockDatabaseMap(),
Collections.emptyList(), mock(MySQLStatement.class),
DefaultDatabase.LOGIC_NAME);
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(mockDatabases(),
Collections.emptyList(), mock(MySQLStatement.class),
DefaultDatabase.LOGIC_NAME);
assertThat(sqlStatementContext,
instanceOf(CommonSQLStatementContext.class));
}
- private Map<String, ShardingSphereDatabase> mockDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> mockDatabases() {
return Collections.singletonMap(DefaultDatabase.LOGIC_NAME,
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
index 59432b5a870..9df43625f44 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRuleBuilder.java
@@ -37,8 +37,8 @@ public interface GlobalRuleBuilder<T extends
RuleConfiguration> extends RuleBuil
* Build global rule.
*
* @param ruleConfig rule configuration
- * @param databaseMap database map
+ * @param databases databases
* @return global rule
*/
- GlobalRule build(T ruleConfig, Map<String, ShardingSphereDatabase>
databaseMap);
+ GlobalRule build(T ruleConfig, Map<String, ShardingSphereDatabase>
databases);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
index 9f19f27f153..9375708c2e5 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/global/GlobalRulesBuilder.java
@@ -40,14 +40,14 @@ public final class GlobalRulesBuilder {
* Build rules.
*
* @param globalRuleConfigs global rule configurations
- * @param databaseMap database map
+ * @param databases databases
* @return built rules
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- public static Collection<ShardingSphereRule> buildRules(final
Collection<RuleConfiguration> globalRuleConfigs, final Map<String,
ShardingSphereDatabase> databaseMap) {
+ public static Collection<ShardingSphereRule> buildRules(final
Collection<RuleConfiguration> globalRuleConfigs, final Map<String,
ShardingSphereDatabase> databases) {
Collection<ShardingSphereRule> result = new LinkedList<>();
for (Entry<RuleConfiguration, GlobalRuleBuilder> entry :
getRuleBuilderMap(globalRuleConfigs).entrySet()) {
- result.add(entry.getValue().build(entry.getKey(), databaseMap));
+ result.add(entry.getValue().build(entry.getKey(), databases));
}
return result;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRuleBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRuleBuilder.java
index 7067159ec80..2c39869cee2 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRuleBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureGlobalRuleBuilder.java
@@ -25,7 +25,7 @@ import java.util.Map;
public final class FixtureGlobalRuleBuilder implements
GlobalRuleBuilder<FixtureGlobalRuleConfiguration> {
@Override
- public FixtureGlobalRule build(final FixtureGlobalRuleConfiguration
ruleConfig, final Map<String, ShardingSphereDatabase> databaseMap) {
+ public FixtureGlobalRule build(final FixtureGlobalRuleConfiguration
ruleConfig, final Map<String, ShardingSphereDatabase> databases) {
return new FixtureGlobalRule();
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
index 614cc893983..970ec417a34 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
@@ -62,14 +62,14 @@ public final class SQLCheckEngine {
* @param parameters SQL parameters
* @param rules rules
* @param currentDatabase current database
- * @param databaseMap database map
+ * @param databases databases
* @param grantee grantee
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public static void check(final SQLStatement sqlStatement, final
List<Object> parameters, final Collection<ShardingSphereRule> rules,
- final String currentDatabase, final Map<String,
ShardingSphereDatabase> databaseMap, final Grantee grantee) {
+ final String currentDatabase, final Map<String,
ShardingSphereDatabase> databases, final Grantee grantee) {
for (Entry<ShardingSphereRule, SQLChecker> entry :
SQLCheckerFactory.getInstance(rules).entrySet()) {
- SQLCheckResult checkResult = entry.getValue().check(sqlStatement,
parameters, grantee, currentDatabase, databaseMap, entry.getKey());
+ SQLCheckResult checkResult = entry.getValue().check(sqlStatement,
parameters, grantee, currentDatabase, databases, entry.getKey());
if (!checkResult.isPassed()) {
throw new SQLCheckException(checkResult.getErrorMessage());
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java
index b3e45fb43a9..59adbcd320d 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java
@@ -51,11 +51,11 @@ public interface SQLChecker<T extends ShardingSphereRule>
extends OrderedSPI<T>
* @param parameters SQL parameters
* @param grantee grantee
* @param currentDatabase current database
- * @param databaseMap database map
+ * @param databases databases
* @param rule rule
* @return SQL check result
*/
- SQLCheckResult check(SQLStatement sqlStatement, List<Object> parameters,
Grantee grantee, String currentDatabase, Map<String, ShardingSphereDatabase>
databaseMap, T rule);
+ SQLCheckResult check(SQLStatement sqlStatement, List<Object> parameters,
Grantee grantee, String currentDatabase, Map<String, ShardingSphereDatabase>
databases, T rule);
/**
* Check User.
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java
index 93905741675..a0f69011770 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java
@@ -37,7 +37,7 @@ public final class SQLCheckerFixture implements
SQLChecker<FixtureRule> {
@Override
public SQLCheckResult check(final SQLStatement sqlStatement, final
List<Object> parameters, final Grantee grantee, final String currentDatabase,
- final Map<String, ShardingSphereDatabase>
databaseMap, final FixtureRule rule) {
+ final Map<String, ShardingSphereDatabase>
databases, final FixtureRule rule) {
return null;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationContext.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationContext.java
index dc4da4e1cc0..ecf81b3fa5b 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/FederationContext.java
@@ -40,5 +40,5 @@ public final class FederationContext {
private final LogicSQL logicSQL;
- private final Map<String, ShardingSphereDatabase> databaseMap;
+ private final Map<String, ShardingSphereDatabase> databases;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
index f1e7232a570..cc38d865386 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
@@ -137,8 +137,8 @@ public final class FilterableTableScanExecutor {
SqlString sqlString = createSQLString(tableMetaData, scanContext,
databaseType);
// TODO replace sql parse with sql convert
FederationContext federationContext =
executorContext.getFederationContext();
- LogicSQL logicSQL = createLogicSQL(federationContext.getDatabaseMap(),
sqlString, databaseType);
- ShardingSphereDatabase database =
federationContext.getDatabaseMap().get(databaseName);
+ LogicSQL logicSQL = createLogicSQL(federationContext.getDatabases(),
sqlString, databaseType);
+ ShardingSphereDatabase database =
federationContext.getDatabases().get(databaseName);
ExecutionContext context = new
KernelProcessor().generateExecutionContext(logicSQL, database,
executorContext.getProps());
if (federationContext.isPreview() ||
databaseType.getSystemSchemas().contains(schemaName)) {
federationContext.getExecutionUnits().addAll(context.getExecutionUnits());
@@ -253,13 +253,13 @@ public final class FilterableTableScanExecutor {
};
}
- private LogicSQL createLogicSQL(final Map<String, ShardingSphereDatabase>
databaseMap, final SqlString sqlString, final DatabaseType databaseType) {
+ private LogicSQL createLogicSQL(final Map<String, ShardingSphereDatabase>
databases, final SqlString sqlString, final DatabaseType databaseType) {
String sql = sqlString.getSql().replace("\n", " ");
SQLStatement sqlStatement = new
SQLStatementParserEngine(databaseType.getType(),
optimizerContext.getSqlParserRule().getSqlStatementCache(),
optimizerContext.getSqlParserRule().getParseTreeCache(),
optimizerContext.getSqlParserRule().isSqlCommentParseEnabled()).parse(sql,
false);
List<Object> parameters =
getParameters(sqlString.getDynamicParameters());
- SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(databaseMap, parameters, sqlStatement,
executorContext.getDatabaseName());
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(databases, parameters, sqlStatement,
executorContext.getDatabaseName());
return new LogicSQL(sqlStatementContext, sql, parameters);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextFactory.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextFactory.java
index 2021d5f1a88..47f8a7cc7bc 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextFactory.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/OptimizerContextFactory.java
@@ -39,13 +39,13 @@ public final class OptimizerContextFactory {
/**
* Create optimize context.
*
- * @param databaseMap database map
+ * @param databases databases
* @param globalRuleMetaData global rule meta data
* @return created optimizer context
*/
- public static OptimizerContext create(final Map<String,
ShardingSphereDatabase> databaseMap, final ShardingSphereRuleMetaData
globalRuleMetaData) {
- FederationMetaData federationMetaData = new
FederationMetaData(databaseMap);
- Map<String, OptimizerParserContext> parserContexts =
OptimizerParserContextFactory.create(databaseMap);
+ public static OptimizerContext create(final Map<String,
ShardingSphereDatabase> databases, final ShardingSphereRuleMetaData
globalRuleMetaData) {
+ FederationMetaData federationMetaData = new
FederationMetaData(databases);
+ Map<String, OptimizerParserContext> parserContexts =
OptimizerParserContextFactory.create(databases);
Map<String, OptimizerPlannerContext> plannerContexts =
OptimizerPlannerContextFactory.create(federationMetaData);
SQLParserRule sqlParserRule =
globalRuleMetaData.findSingleRule(SQLParserRule.class).orElse(null);
return new OptimizerContext(sqlParserRule, federationMetaData,
parserContexts, plannerContexts);
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java
index 9d48eecf033..c8021a3f8bd 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java
@@ -39,12 +39,12 @@ public final class OptimizerParserContextFactory {
/**
* Create optimizer parser context map.
*
- * @param databaseMap database map
+ * @param databases databases
* @return created optimizer parser context map
*/
- public static Map<String, OptimizerParserContext> create(final Map<String,
ShardingSphereDatabase> databaseMap) {
+ public static Map<String, OptimizerParserContext> create(final Map<String,
ShardingSphereDatabase> databases) {
Map<String, OptimizerParserContext> result = new HashMap<>();
- for (Entry<String, ShardingSphereDatabase> entry :
databaseMap.entrySet()) {
+ for (Entry<String, ShardingSphereDatabase> entry :
databases.entrySet()) {
DatabaseType databaseType = entry.getValue().getProtocolType();
result.put(entry.getKey(), new
OptimizerParserContext(databaseType, createSQLDialectProperties(databaseType)));
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationMetaData.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationMetaData.java
index 69250306773..329568779bc 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationMetaData.java
@@ -32,10 +32,10 @@ public final class FederationMetaData {
private final Map<String, FederationDatabaseMetaData> databases;
- public FederationMetaData(final Map<String, ShardingSphereDatabase>
databaseMap) {
- databases = new LinkedHashMap<>(databaseMap.size(), 1);
- for (Entry<String, ShardingSphereDatabase> entry :
databaseMap.entrySet()) {
- databases.put(entry.getKey().toLowerCase(), new
FederationDatabaseMetaData(entry.getKey(), entry.getValue().getSchemas()));
+ public FederationMetaData(final Map<String, ShardingSphereDatabase>
databases) {
+ this.databases = new LinkedHashMap<>(databases.size(), 1);
+ for (Entry<String, ShardingSphereDatabase> entry :
databases.entrySet()) {
+ this.databases.put(entry.getKey().toLowerCase(), new
FederationDatabaseMetaData(entry.getKey(), entry.getValue().getSchemas()));
}
}
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
index c825103a2e0..80539f1a606 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
@@ -54,13 +54,13 @@ public final class DriverStateContextTest {
@Before
public void setUp() {
- Map<String, ShardingSphereDatabase> databaseMap = mockDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = mockDatabases();
when(contextManager.getMetaDataContexts()).thenReturn(new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), mock(ConfigurationProperties.class)),
mock(OptimizerContext.class)));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), mock(ConfigurationProperties.class)),
mock(OptimizerContext.class)));
when(contextManager.getInstanceContext().getInstance().getState()).thenReturn(new
StateContext());
}
- private Map<String, ShardingSphereDatabase> mockDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> mockDatabases() {
Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
Answers.RETURNS_DEEP_STUBS);
when(database.getResource().getDatabaseType()).thenReturn(new
MySQLDatabaseType());
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java
index e29e2ad1a72..62f695ad697 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java
@@ -33,9 +33,9 @@ public interface AuthorityProviderAlgorithm extends
ShardingSphereAlgorithm {
/**
* Build authority registry.
*
- * @param databaseMap database map
+ * @param databases databases
* @param users users
* @return built authority registry
*/
- AuthorityRegistry buildAuthorityRegistry(Map<String,
ShardingSphereDatabase> databaseMap, Collection<ShardingSphereUser> users);
+ AuthorityRegistry buildAuthorityRegistry(Map<String,
ShardingSphereDatabase> databases, Collection<ShardingSphereUser> users);
}
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
index 8dea180c9ee..689c1d07b0c 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
@@ -65,7 +65,7 @@ public final class AuthorityChecker implements
SQLChecker<AuthorityRule> {
@Override
public SQLCheckResult check(final SQLStatement sqlStatement, final
List<Object> parameters, final Grantee grantee,
- final String currentDatabase, final
Map<String, ShardingSphereDatabase> databaseMap, final AuthorityRule
authorityRule) {
+ final String currentDatabase, final
Map<String, ShardingSphereDatabase> databases, final AuthorityRule
authorityRule) {
if (null == grantee) {
return new SQLCheckResult(true, "");
}
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
index d87c0ecc1f7..18763d5035b 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
@@ -47,8 +47,8 @@ public final class NativeAuthorityProviderAlgorithm
implements AuthorityProvider
}
@Override
- public AuthorityRegistry buildAuthorityRegistry(final Map<String,
ShardingSphereDatabase> databaseMap, final Collection<ShardingSphereUser>
users) {
- return new
UserPrivilegeMapAuthorityRegistry(StoragePrivilegeBuilder.build(new
LinkedList<>(databaseMap.values()), users));
+ public AuthorityRegistry buildAuthorityRegistry(final Map<String,
ShardingSphereDatabase> databases, final Collection<ShardingSphereUser> users) {
+ return new
UserPrivilegeMapAuthorityRegistry(StoragePrivilegeBuilder.build(new
LinkedList<>(databases.values()), users));
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPermittedPrivilegesProviderAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPermittedPrivilegesProviderAlgorithm.java
index 4808d2c0172..f57c8c4c688 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPermittedPrivilegesProviderAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPermittedPrivilegesProviderAlgorithm.java
@@ -46,7 +46,7 @@ public final class SchemaPermittedPrivilegesProviderAlgorithm
implements Authori
}
@Override
- public AuthorityRegistry buildAuthorityRegistry(final Map<String,
ShardingSphereDatabase> databaseMap, final Collection<ShardingSphereUser>
users) {
+ public AuthorityRegistry buildAuthorityRegistry(final Map<String,
ShardingSphereDatabase> databases, final Collection<ShardingSphereUser> users) {
return new
UserPrivilegeMapAuthorityRegistry(SchemaPrivilegeBuilder.build(users, props));
}
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
index 6a6aef1e57b..4c0bdcd28dc 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
@@ -43,7 +43,7 @@ public final class AllPermittedPrivilegesProviderAlgorithm
implements AuthorityP
}
@Override
- public AuthorityRegistry buildAuthorityRegistry(final Map<String,
ShardingSphereDatabase> databaseMap, final Collection<ShardingSphereUser>
users) {
+ public AuthorityRegistry buildAuthorityRegistry(final Map<String,
ShardingSphereDatabase> databases, final Collection<ShardingSphereUser> users) {
return new AllPermittedAuthorityRegistry();
}
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
index 82969433144..ad23f701698 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
@@ -42,10 +42,10 @@ public final class AuthorityRule implements GlobalRule {
private volatile AuthorityRegistry authorityRegistry;
- public AuthorityRule(final AuthorityRuleConfiguration config, final
Map<String, ShardingSphereDatabase> databaseMap) {
+ public AuthorityRule(final AuthorityRuleConfiguration config, final
Map<String, ShardingSphereDatabase> databases) {
users = config.getUsers();
provider =
AuthorityProviderAlgorithmFactory.newInstance(config.getProvider());
- authorityRegistry = provider.buildAuthorityRegistry(databaseMap,
config.getUsers());
+ authorityRegistry = provider.buildAuthorityRegistry(databases,
config.getUsers());
}
/**
@@ -70,11 +70,11 @@ public final class AuthorityRule implements GlobalRule {
/**
* Refresh authority.
*
- * @param databaseMap database map
+ * @param databases databases
* @param users users
*/
- public synchronized void refresh(final Map<String, ShardingSphereDatabase>
databaseMap, final Collection<ShardingSphereUser> users) {
- authorityRegistry = provider.buildAuthorityRegistry(databaseMap,
users);
+ public synchronized void refresh(final Map<String, ShardingSphereDatabase>
databases, final Collection<ShardingSphereUser> users) {
+ authorityRegistry = provider.buildAuthorityRegistry(databases, users);
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
index 027bb894722..c36b0541fc9 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
@@ -31,8 +31,8 @@ import java.util.Map;
public final class AuthorityRuleBuilder implements
GlobalRuleBuilder<AuthorityRuleConfiguration> {
@Override
- public AuthorityRule build(final AuthorityRuleConfiguration ruleConfig,
final Map<String, ShardingSphereDatabase> databaseMap) {
- return new AuthorityRule(ruleConfig, databaseMap);
+ public AuthorityRule build(final AuthorityRuleConfiguration ruleConfig,
final Map<String, ShardingSphereDatabase> databases) {
+ return new AuthorityRule(ruleConfig, databases);
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
index 521876b5544..5ffc8e4c01c 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
@@ -75,7 +75,7 @@ public final class AuthorityCheckerTest {
ShardingSphereUser root = new ShardingSphereUser("root", "",
"localhost");
users.add(root);
AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(users, new
ShardingSphereAlgorithmConfiguration("NATIVE", new Properties()));
- AuthorityRule rule = new AuthorityRule(ruleConfig,
createDatabaseMap(users));
+ AuthorityRule rule = new AuthorityRule(ruleConfig,
createDatabases(users));
SQLChecker<AuthorityRule> sqlChecker =
SQLCheckerFactory.getInstance(Collections.singleton(rule)).get(rule);
assertTrue(sqlChecker.check("db0", new Grantee("root", "localhost"),
rule));
assertFalse(sqlChecker.check("db1", new Grantee("root", "localhost"),
rule));
@@ -113,7 +113,7 @@ public final class AuthorityCheckerTest {
assertTrue(sqlChecker.check(createTableStatement,
Collections.emptyList(), new Grantee("root", "localhost"), "db0",
Collections.emptyMap(), rule).isPassed());
}
- private Map<String, ShardingSphereDatabase> createDatabaseMap(final
Collection<ShardingSphereUser> users) throws SQLException {
+ private Map<String, ShardingSphereDatabase> createDatabases(final
Collection<ShardingSphereUser> users) throws SQLException {
when(database.getName()).thenReturn("db0");
DataSource dataSource = mockDataSourceForPrivileges(users);
when(database.getResource().getAllInstanceDataSources()).thenReturn(Collections.singletonList(dataSource));
diff --git
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
index ae2d1088229..fc8ab601bf6 100644
---
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilder.java
@@ -31,7 +31,7 @@ import java.util.Map;
public final class SQLParserRuleBuilder implements
GlobalRuleBuilder<SQLParserRuleConfiguration> {
@Override
- public SQLParserRule build(final SQLParserRuleConfiguration ruleConfig,
final Map<String, ShardingSphereDatabase> databaseMap) {
+ public SQLParserRule build(final SQLParserRuleConfiguration ruleConfig,
final Map<String, ShardingSphereDatabase> databases) {
return new SQLParserRule(ruleConfig);
}
diff --git
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/builder/SQLTranslatorRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/builder/SQLTranslatorRuleBuilder.java
index 6ac64deca4f..b3814adb4e4 100644
---
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/builder/SQLTranslatorRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/builder/SQLTranslatorRuleBuilder.java
@@ -31,7 +31,7 @@ import java.util.Map;
public final class SQLTranslatorRuleBuilder implements
GlobalRuleBuilder<SQLTranslatorRuleConfiguration> {
@Override
- public SQLTranslatorRule build(final SQLTranslatorRuleConfiguration
ruleConfig, final Map<String, ShardingSphereDatabase> databaseMap) {
+ public SQLTranslatorRule build(final SQLTranslatorRuleConfiguration
ruleConfig, final Map<String, ShardingSphereDatabase> databases) {
return new SQLTranslatorRule(ruleConfig);
}
diff --git
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/rule/builder/TrafficRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/rule/builder/TrafficRuleBuilder.java
index 7be95f23572..eb2b952215e 100644
---
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/rule/builder/TrafficRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/rule/builder/TrafficRuleBuilder.java
@@ -32,7 +32,7 @@ import java.util.Map;
public final class TrafficRuleBuilder implements
GlobalRuleBuilder<TrafficRuleConfiguration> {
@Override
- public GlobalRule build(final TrafficRuleConfiguration ruleConfig, final
Map<String, ShardingSphereDatabase> databaseMap) {
+ public GlobalRule build(final TrafficRuleConfiguration ruleConfig, final
Map<String, ShardingSphereDatabase> databases) {
return new TrafficRule(ruleConfig);
}
diff --git
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContextsBuilder.java
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContextsBuilder.java
index 4aa37b7b330..3e93a1e301c 100644
---
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContextsBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContextsBuilder.java
@@ -36,7 +36,7 @@ import java.util.Optional;
@RequiredArgsConstructor
public final class TransactionContextsBuilder {
- private final Map<String, ShardingSphereDatabase> databaseMap;
+ private final Map<String, ShardingSphereDatabase> databases;
private final Collection<ShardingSphereRule> globalRules;
@@ -46,11 +46,11 @@ public final class TransactionContextsBuilder {
* @return transaction contexts
*/
public TransactionContexts build() {
- Map<String, ShardingSphereTransactionManagerEngine> engines = new
HashMap<>(databaseMap.keySet().size(), 1);
+ Map<String, ShardingSphereTransactionManagerEngine> engines = new
HashMap<>(databases.keySet().size(), 1);
TransactionRule transactionRule = getTransactionRule();
- for (String each : databaseMap.keySet()) {
+ for (String each : databases.keySet()) {
ShardingSphereTransactionManagerEngine engine = new
ShardingSphereTransactionManagerEngine();
- ShardingSphereResource resource =
databaseMap.get(each).getResource();
+ ShardingSphereResource resource =
databases.get(each).getResource();
engine.init(resource.getDatabaseType(), resource.getDataSources(),
transactionRule);
engines.put(each, engine);
}
diff --git
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
index 6682ff13ccf..b8efcffc498 100644
---
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/TransactionRuleBuilder.java
@@ -31,7 +31,7 @@ import java.util.Map;
public final class TransactionRuleBuilder implements
GlobalRuleBuilder<TransactionRuleConfiguration> {
@Override
- public TransactionRule build(final TransactionRuleConfiguration
ruleConfig, final Map<String, ShardingSphereDatabase> databaseMap) {
+ public TransactionRule build(final TransactionRuleConfiguration
ruleConfig, final Map<String, ShardingSphereDatabase> databases) {
return new TransactionRule(ruleConfig);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 5707c9acdf9..5f2b13ed69c 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -173,13 +173,13 @@ public final class ContextManager implements
AutoCloseable {
public void alterSchemas(final String databaseName, final Map<String,
ShardingSphereSchema> schemas) {
ShardingSphereDatabase alteredMetaData = new
ShardingSphereDatabase(databaseName,
metaDataContexts.getMetaData().getDatabases().get(databaseName).getProtocolType(),
metaDataContexts.getMetaData().getDatabases().get(databaseName).getResource(),
metaDataContexts.getMetaData().getDatabases().get(databaseName).getRuleMetaData(),
schemas);
- Map<String, ShardingSphereDatabase> alteredDatabaseMap = new
HashMap<>(metaDataContexts.getMetaData().getDatabases());
- alteredDatabaseMap.put(databaseName, alteredMetaData);
+ Map<String, ShardingSphereDatabase> alteredDatabases = new
HashMap<>(metaDataContexts.getMetaData().getDatabases());
+ alteredDatabases.put(databaseName, alteredMetaData);
FederationDatabaseMetaData alteredDatabaseMetaData = new
FederationDatabaseMetaData(databaseName, schemas);
metaDataContexts.getOptimizerContext().getFederationMetaData().getDatabases().put(databaseName,
alteredDatabaseMetaData);
metaDataContexts.getOptimizerContext().getPlannerContexts().put(databaseName,
OptimizerPlannerContextFactory.create(alteredDatabaseMetaData));
renewMetaDataContexts(
- rebuildMetaDataContexts(new
ShardingSphereMetaData(alteredDatabaseMap,
metaDataContexts.getMetaData().getGlobalRuleMetaData(),
metaDataContexts.getMetaData().getProps())));
+ rebuildMetaDataContexts(new
ShardingSphereMetaData(alteredDatabases,
metaDataContexts.getMetaData().getGlobalRuleMetaData(),
metaDataContexts.getMetaData().getProps())));
}
/**
@@ -528,10 +528,10 @@ public final class ContextManager implements
AutoCloseable {
private void refreshMetaDataContext(final String databaseName, final
MetaDataContexts changedMetaDataContext, final Map<String,
DataSourceProperties> dataSourcePropsMap) {
metaDataContexts.getOptimizerContext().getFederationMetaData().getDatabases().putAll(changedMetaDataContext.getOptimizerContext().getFederationMetaData().getDatabases());
- Map<String, ShardingSphereDatabase> databaseMap = new
HashMap<>(metaDataContexts.getMetaData().getDatabases());
-
databaseMap.putAll(changedMetaDataContext.getMetaData().getDatabases());
+ Map<String, ShardingSphereDatabase> databases = new
HashMap<>(metaDataContexts.getMetaData().getDatabases());
+ databases.putAll(changedMetaDataContext.getMetaData().getDatabases());
Collection<DataSource> pendingClosedDataSources =
getPendingClosedDataSources(databaseName, dataSourcePropsMap);
- renewMetaDataContexts(rebuildMetaDataContexts(new
ShardingSphereMetaData(databaseMap,
metaDataContexts.getMetaData().getGlobalRuleMetaData(),
metaDataContexts.getMetaData().getProps())));
+ renewMetaDataContexts(rebuildMetaDataContexts(new
ShardingSphereMetaData(databases,
metaDataContexts.getMetaData().getGlobalRuleMetaData(),
metaDataContexts.getMetaData().getProps())));
renewTransactionContext(databaseName,
metaDataContexts.getMetaData().getDatabases().get(databaseName).getResource());
closeDataSources(databaseName, pendingClosedDataSources);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
index f6163f8bb2c..57bc1c2380c 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
@@ -58,20 +58,20 @@ public final class MetaDataContextsBuilder {
public MetaDataContexts build(final MetaDataPersistService
metaDataPersistService) throws SQLException {
DatabaseType protocolType =
DatabaseTypeEngine.getProtocolType(databaseConfigMap, props);
DatabaseType storageType =
DatabaseTypeEngine.getStorageType(databaseConfigMap);
- Map<String, ShardingSphereDatabase> databaseMap =
getDatabaseMap(protocolType, storageType);
- ShardingSphereRuleMetaData globalMetaData = new
ShardingSphereRuleMetaData(globalRuleConfigs,
GlobalRulesBuilder.buildRules(globalRuleConfigs, databaseMap));
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databaseMap, globalMetaData, props);
- return new MetaDataContexts(metaDataPersistService, metaData,
OptimizerContextFactory.create(databaseMap, globalMetaData));
+ Map<String, ShardingSphereDatabase> databases =
getDatabases(protocolType, storageType);
+ ShardingSphereRuleMetaData globalMetaData = new
ShardingSphereRuleMetaData(globalRuleConfigs,
GlobalRulesBuilder.buildRules(globalRuleConfigs, databases));
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databases, globalMetaData, props);
+ return new MetaDataContexts(metaDataPersistService, metaData,
OptimizerContextFactory.create(databases, globalMetaData));
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
+ private Map<String, ShardingSphereDatabase> getDatabases(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
Map<String, ShardingSphereDatabase> result = new
HashMap<>(databaseConfigMap.size() +
protocolType.getSystemDatabaseSchemaMap().size(), 1);
- result.putAll(getGenericDatabaseMap(protocolType, storageType));
- result.putAll(getSystemDatabaseMap(protocolType));
+ result.putAll(getGenericDatabases(protocolType, storageType));
+ result.putAll(getSystemDatabases(protocolType));
return result;
}
- private Map<String, ShardingSphereDatabase> getGenericDatabaseMap(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
+ private Map<String, ShardingSphereDatabase> getGenericDatabases(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
Map<String, ShardingSphereDatabase> result = new
HashMap<>(databaseConfigMap.size(), 1);
for (Entry<String, DatabaseConfiguration> entry :
databaseConfigMap.entrySet()) {
String databaseName = entry.getKey();
@@ -82,7 +82,7 @@ public final class MetaDataContextsBuilder {
return result;
}
- private Map<String, ShardingSphereDatabase> getSystemDatabaseMap(final
DatabaseType protocolType) throws SQLException {
+ private Map<String, ShardingSphereDatabase> getSystemDatabases(final
DatabaseType protocolType) throws SQLException {
Map<String, ShardingSphereDatabase> result = new
HashMap<>(protocolType.getSystemDatabaseSchemaMap().size(), 1);
for (String each : protocolType.getSystemDatabaseSchemaMap().keySet())
{
if (!databaseConfigMap.containsKey(each) ||
databaseConfigMap.get(each).getDataSources().isEmpty()) {
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 37b5e9346d1..3d8b6d27d43 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -171,8 +171,8 @@ public final class ContextManagerTest {
@Test
public void assertAlterResource() throws SQLException {
- Map<String, ShardingSphereDatabase> originalDatabaseMap = new
HashMap<>(Collections.singletonMap("foo_db", createOriginalDatabaseMetaData()));
-
when(metaDataContexts.getMetaData().getDatabases()).thenReturn(originalDatabaseMap);
+ Map<String, ShardingSphereDatabase> originalDatabases = new
HashMap<>(Collections.singletonMap("foo_db", createOriginalDatabaseMetaData()));
+
when(metaDataContexts.getMetaData().getDatabases()).thenReturn(originalDatabases);
contextManager.alterResource("foo_db",
Collections.singletonMap("bar_ds", new
DataSourceProperties(MockedDataSource.class.getName(), createProperties("test",
"test"))));
assertAlteredDataSource((MockedDataSource)
contextManager.getMetaDataContexts().getMetaData().getDatabases().get("foo_db").getResource().getDataSources().get("bar_ds"));
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
index 8394125d578..7a44a11fa12 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
@@ -139,12 +139,12 @@ public final class ClusterContextManagerCoordinatorTest {
.globalRuleConfigs(Collections.emptyList()).props(new
Properties()).instanceDefinition(new InstanceDefinition(InstanceType.PROXY,
3307)).build());
assertTrue(contextManager.getMetaDataContexts().getPersistService().isPresent());
contextManager.renewMetaDataContexts(new
MetaDataContexts(contextManager.getMetaDataContexts().getPersistService().get(),
- new ShardingSphereMetaData(createDatabaseMap(),
globalRuleMetaData, new ConfigurationProperties(new Properties())),
createOptimizerContext()));
+ new ShardingSphereMetaData(createDatabases(),
globalRuleMetaData, new ConfigurationProperties(new Properties())),
createOptimizerContext()));
contextManager.renewTransactionContexts(mock(TransactionContexts.class,
RETURNS_DEEP_STUBS));
coordinator = new
ClusterContextManagerCoordinator(metaDataPersistService, contextManager, new
RegistryCenter(mock(ClusterPersistRepository.class)));
}
- private Map<String, ShardingSphereDatabase> createDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> createDatabases() {
when(database.getName()).thenReturn("db");
ShardingSphereResource resource = mock(ShardingSphereResource.class);
when(resource.getDatabaseType()).thenReturn(new MySQLDatabaseType());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
index ff22274cfdf..c6afc732b3f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineFactoryTest.java
@@ -48,13 +48,13 @@ public final class DatabaseCommunicationEngineFactoryTest
extends ProxyContextRe
@Before
public void setUp() throws IllegalAccessException, NoSuchFieldException {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class, RETURNS_DEEP_STUBS));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class, RETURNS_DEEP_STUBS));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResource().getDatabaseType()).thenReturn(new
H2DatabaseType());
when(result.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java
index 8900db46928..06df0196d57 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngineTest.java
@@ -97,14 +97,14 @@ public final class JDBCDatabaseCommunicationEngineTest
extends ProxyContextResto
public void setUp() {
when(backendConnection.getConnectionSession().getDatabaseName()).thenReturn("db");
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(mockDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())),
+ new ShardingSphereMetaData(mockDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())),
mock(OptimizerContext.class, RETURNS_DEEP_STUBS));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> mockDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> mockDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResource().getDatabaseType()).thenReturn(new
H2DatabaseType());
when(result.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
index 344fc5fd3cb..6523e087601 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java
@@ -105,7 +105,7 @@ public final class JDBCBackendConnectionTest extends
ProxyContextRestorer {
private void setContextManager() {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(createDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(createDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
TransactionContexts transactionContexts = createTransactionContexts();
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
@@ -113,7 +113,7 @@ public final class JDBCBackendConnectionTest extends
ProxyContextRestorer {
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> createDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> createDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
String name = String.format(SCHEMA_PATTERN, i);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
index d2b79e88322..cd0757064f8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
@@ -68,7 +68,7 @@ public final class JDBCBackendDataSourceTest extends
ProxyContextRestorer {
public void setUp() {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(createDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(createDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
TransactionContexts transactionContexts = createTransactionContexts();
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
@@ -76,7 +76,7 @@ public final class JDBCBackendDataSourceTest extends
ProxyContextRestorer {
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> createDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> createDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getName()).thenReturn("schema");
when(result.getResource().getDatabaseType()).thenReturn(new
H2DatabaseType());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
index 38fae1d9f61..e62df58ab2f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -62,10 +62,10 @@ public final class ProxyContextTest extends
ProxyContextRestorer {
@Test
public void assertDatabaseExists() {
- Map<String, ShardingSphereDatabase> databaseMap = mockDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = mockDatabases();
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
assertTrue(ProxyContext.getInstance().databaseExists("db"));
@@ -84,10 +84,10 @@ public final class ProxyContextTest extends
ProxyContextRestorer {
@Test(expected = NoDatabaseSelectedException.class)
public void assertGetDatabaseWhenNotExisted() {
- Map<String, ShardingSphereDatabase> databaseMap = mockDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = mockDatabases();
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
ProxyContext.getInstance().getDatabase("db1");
@@ -95,27 +95,27 @@ public final class ProxyContextTest extends
ProxyContextRestorer {
@Test
public void assertGetDatabase() {
- Map<String, ShardingSphereDatabase> databaseMap = mockDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = mockDatabases();
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
- assertThat(databaseMap.get("db"),
is(ProxyContext.getInstance().getDatabase("db")));
+ assertThat(databases.get("db"),
is(ProxyContext.getInstance().getDatabase("db")));
}
@Test
public void assertGetAllDatabaseNames() {
- Map<String, ShardingSphereDatabase> databaseMap = createDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = createDatabases();
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
- assertThat(new
LinkedHashSet<>(ProxyContext.getInstance().getAllDatabaseNames()),
is(databaseMap.keySet()));
+ assertThat(new
LinkedHashSet<>(ProxyContext.getInstance().getAllDatabaseNames()),
is(databases.keySet()));
}
- private Map<String, ShardingSphereDatabase> createDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> createDatabases() {
Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(10,
1);
for (int i = 0; i < 10; i++) {
result.put(String.format(SCHEMA_PATTERN, i),
mock(ShardingSphereDatabase.class));
@@ -123,7 +123,7 @@ public final class ProxyContextTest extends
ProxyContextRestorer {
return result;
}
- private Map<String, ShardingSphereDatabase> mockDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> mockDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResource().getDatabaseType()).thenReturn(new
H2DatabaseType());
return Collections.singletonMap("db", result);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandlerTest.java
index 5105708702c..9fa873e7dc8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseAdminQueryBackendHandlerTest.java
@@ -66,7 +66,7 @@ public final class DatabaseAdminQueryBackendHandlerTest
extends ProxyContextRest
@Before
public void before() {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
ContextManager contextManager = new ContextManager(metaDataContexts,
mock(TransactionContexts.class), mock(InstanceContext.class));
ProxyContext.init(contextManager);
when(connectionSession.getDatabaseName()).thenReturn("db");
@@ -77,7 +77,7 @@ public final class DatabaseAdminQueryBackendHandlerTest
extends ProxyContextRest
handler = new DatabaseAdminQueryBackendHandler(connectionSession,
executor);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getName()).thenReturn("db");
when(result.getResource().getDatabaseType()).thenReturn(new
MySQLDatabaseType());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseOperateBackendHandlerFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseOperateBackendHandlerFactoryTest.java
index f9f0945a874..f4467535d89 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseOperateBackendHandlerFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/DatabaseOperateBackendHandlerFactoryTest.java
@@ -72,7 +72,7 @@ public final class DatabaseOperateBackendHandlerFactoryTest
extends ProxyContext
@Before
public void setUp() {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDatabaseName()).thenReturn("db");
@@ -133,7 +133,7 @@ public final class DatabaseOperateBackendHandlerFactoryTest
extends ProxyContext
}
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResource().getDatabaseType()).thenReturn(new
MySQLDatabaseType());
when(result.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java
index 161e1d55a84..cfa51ceea25 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowCreateDatabaseExecutorTest.java
@@ -51,15 +51,15 @@ public final class ShowCreateDatabaseExecutorTest extends
ProxyContextRestorer {
@Before
public void setUp() {
- Map<String, ShardingSphereDatabase> databaseMap = getDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = getDatabases();
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
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 20e84fe31ed..5af857f7c20 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
@@ -59,12 +59,12 @@ public final class ShowDatabasesExecutorTest extends
ProxyContextRestorer {
showDatabasesExecutor = new ShowDatabasesExecutor(new
MySQLShowDatabasesStatement());
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(10,
1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowFunctionStatusExecutorTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowFunctionStatusExecutorTest.java
index f821a19ced3..1206a6087bc 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowFunctionStatusExecutorTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowFunctionStatusExecutorTest.java
@@ -54,15 +54,15 @@ public final class ShowFunctionStatusExecutorTest extends
ProxyContextRestorer {
@Before
public void setUp() {
showFunctionStatusExecutor = new ShowFunctionStatusExecutor(new
MySQLShowFunctionStatusStatement());
- Map<String, ShardingSphereDatabase> databaseMap = getDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = getDatabases();
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcedureStatusExecutorTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcedureStatusExecutorTest.java
index 4d9ce05ab7a..514838583e8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcedureStatusExecutorTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcedureStatusExecutorTest.java
@@ -51,15 +51,15 @@ public final class ShowProcedureStatusExecutorTest extends
ProxyContextRestorer
@Before
public void setUp() {
- Map<String, ShardingSphereDatabase> databaseMap = getDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = getDatabases();
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
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 5870bc28ca5..82c3f3023e3 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
@@ -59,15 +59,15 @@ public final class ShowTablesExecutorTest extends
ProxyContextRestorer {
@Before
public void setUp() {
- Map<String, ShardingSphereDatabase> databaseMap = getDatabaseMap();
+ Map<String, ShardingSphereDatabase> databases = getDatabases();
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(databaseMap,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(databases,
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, TableMetaData> tables = new HashMap<>(4, 1);
tables.put("t_account", new TableMetaData("t_account",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
tables.put("t_account_bak", new TableMetaData("t_account_bak",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/fixture/SQLCheckerFixture.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/fixture/SQLCheckerFixture.java
index b8751c3d93b..44a2ee085fc 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/fixture/SQLCheckerFixture.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/fixture/SQLCheckerFixture.java
@@ -40,7 +40,7 @@ public final class SQLCheckerFixture implements
SQLChecker<AuthorityRule> {
@Override
public SQLCheckResult check(final SQLStatement sqlStatement, final
List<Object> parameters, final Grantee grantee,
- final String currentDatabase, final
Map<String, ShardingSphereDatabase> databaseMap, final AuthorityRule
authorityRule) {
+ final String currentDatabase, final
Map<String, ShardingSphereDatabase> databases, final AuthorityRule
authorityRule) {
return new SQLCheckResult(true, "");
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
index 5a9b651d89e..29a93a2c5bf 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
@@ -85,9 +85,9 @@ public final class SelectInformationExecutorTest extends
ProxyContextRestorer {
expectedResultSetMap.put("SCHEMA_NAME", "foo_ds");
expectedResultSetMap.put("DEFAULT_CHARACTER_SET_NAME",
"utf8mb4_0900_ai_ci");
expectedResultSetMap.put("DEFAULT_COLLATION_NAME", "utf8mb4");
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
- databaseMap.put("sharding_db", createDatabase(expectedResultSetMap));
- databaseMap.put("database_without_authority",
createEmptyDatabase("database_without_authority"));
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ databases.put("sharding_db", createDatabase(expectedResultSetMap));
+ databases.put("database_without_authority",
createEmptyDatabase("database_without_authority"));
String sql = "SELECT SCHEMA_NAME, DEFAULT_CHARACTER_SET_NAME,
DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA";
SelectInformationSchemataExecutor executor = new
SelectInformationSchemataExecutor((SelectStatement)
sqlParserRule.getSQLParserEngine("MySQL").parse(sql, false), sql);
executor.execute(connectionSession);
@@ -107,8 +107,8 @@ public final class SelectInformationExecutorTest extends
ProxyContextRestorer {
@Test
public void assertSelectSchemataInSchemaWithoutDataSourceExecute() throws
SQLException {
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
- databaseMap.put("empty_db", createEmptyDatabase("empty_db"));
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ databases.put("empty_db", createEmptyDatabase("empty_db"));
String sql = "SELECT SCHEMA_NAME, DEFAULT_CHARACTER_SET_NAME,
DEFAULT_COLLATION_NAME, DEFAULT_ENCRYPTION FROM information_schema.SCHEMATA";
SelectInformationSchemataExecutor executor = new
SelectInformationSchemataExecutor((SelectStatement)
sqlParserRule.getSQLParserEngine("MySQL").parse(sql, false), sql);
executor.execute(connectionSession);
@@ -134,9 +134,9 @@ public final class SelectInformationExecutorTest extends
ProxyContextRestorer {
Map<String, String> expectedResultSetMap = new HashMap<>();
expectedResultSetMap.put("sn", "foo_ds");
expectedResultSetMap.put("DEFAULT_CHARACTER_SET_NAME", "utf8mb4");
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
- databaseMap.put("foo_ds", createDatabase(expectedResultSetMap));
- databaseMap.put("empty_db", createEmptyDatabase("empty_db"));
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ databases.put("foo_ds", createDatabase(expectedResultSetMap));
+ databases.put("empty_db", createEmptyDatabase("empty_db"));
String sql = "SELECT SCHEMA_NAME AS sn, DEFAULT_CHARACTER_SET_NAME
FROM information_schema.SCHEMATA";
DefaultDatabaseMetadataExecutor executor = new
DefaultDatabaseMetadataExecutor(sql);
executor.execute(connectionSession);
@@ -146,8 +146,8 @@ public final class SelectInformationExecutorTest extends
ProxyContextRestorer {
@Test
public void assertDefaultExecute() throws SQLException {
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
- databaseMap.put("sharding_db",
createDatabase(Collections.singletonMap("support_ndb", "0")));
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ databases.put("sharding_db",
createDatabase(Collections.singletonMap("support_ndb", "0")));
String sql = "SELECT COUNT(*) AS support_ndb FROM
information_schema.ENGINES WHERE Engine = 'ndbcluster'";
DefaultDatabaseMetadataExecutor executor = new
DefaultDatabaseMetadataExecutor(sql);
executor.execute(connectionSession);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java
index 0ade995e900..68f959c2fab 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java
@@ -95,14 +95,14 @@ public final class SelectDatabaseExecutorTest extends
ProxyContextRestorer {
}
private void addShardingDatabase() throws SQLException {
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
- databaseMap.put("sharding_db", new
ShardingSphereDatabase("sharding_db", new PostgreSQLDatabaseType(),
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ databases.put("sharding_db", new ShardingSphereDatabase("sharding_db",
new PostgreSQLDatabaseType(),
new ShardingSphereResource(Collections.singletonMap("foo_ds",
new MockedDataSource(mockConnection()))),
mock(ShardingSphereRuleMetaData.class), Collections.emptyMap()));
}
private void addEmptyDatabase() {
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
- databaseMap.put("empty_db", new ShardingSphereDatabase("empty_db", new
PostgreSQLDatabaseType(),
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ databases.put("empty_db", new ShardingSphereDatabase("empty_db", new
PostgreSQLDatabaseType(),
new ShardingSphereResource(Collections.emptyMap()), new
ShardingSphereRuleMetaData(Collections.emptyList(), Collections.emptyList()),
Collections.emptyMap()));
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectTableExecutorTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectTableExecutorTest.java
index f0889a39afb..c90cf0a7ca8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectTableExecutorTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectTableExecutorTest.java
@@ -68,8 +68,8 @@ public final class SelectTableExecutorTest extends
ProxyContextRestorer {
@Test
public void assertSelectSchemataExecute() throws SQLException {
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
- databaseMap.put("public", createDatabase());
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ databases.put("public", createDatabase());
String sql = "SELECT c.oid, n.nspname AS schemaname, c.relname AS
tablename from pg_tablespace";
SelectTableExecutor selectSchemataExecutor = new
SelectTableExecutor(sql);
selectSchemataExecutor.execute(mock(ConnectionSession.class));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/BroadcastDatabaseBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/BroadcastDatabaseBackendHandlerTest.java
index d5dd3152db7..6f46fd38fb7 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/BroadcastDatabaseBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/impl/BroadcastDatabaseBackendHandlerTest.java
@@ -76,7 +76,7 @@ public final class BroadcastDatabaseBackendHandlerTest {
public void setUp() {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDatabaseName()).thenReturn(String.format(DATABASE_PATTERN,
0));
@@ -94,7 +94,7 @@ public final class BroadcastDatabaseBackendHandlerTest {
verify(databaseCommunicationEngine, times(10)).execute();
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
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 3bcce417a9e..cb8bff153af 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
@@ -82,7 +82,7 @@ public final class SchemaAssignedDatabaseBackendHandlerTest
extends ProxyContext
public void setUp() throws IllegalAccessException, NoSuchFieldException,
SQLException {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDatabaseName()).thenReturn(String.format(DATABASE_PATTERN,
0));
@@ -94,7 +94,7 @@ public final class SchemaAssignedDatabaseBackendHandlerTest
extends ProxyContext
setBackendHandlerFactory(schemaAssignedDatabaseBackendHandler);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
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 3fbb4b9342b..7eb2f19ddd2 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
@@ -80,7 +80,7 @@ public final class UnicastDatabaseBackendHandlerTest extends
ProxyContextRestore
public void setUp() {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDefaultDatabaseName()).thenReturn(String.format(DATABASE_PATTERN,
0));
@@ -89,7 +89,7 @@ public final class UnicastDatabaseBackendHandlerTest extends
ProxyContextRestore
setBackendHandlerFactory(unicastDatabaseBackendHandler);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactoryTest.java
index 6582cf31e5b..4fbf2e7de56 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/DistSQLBackendHandlerFactoryTest.java
@@ -89,14 +89,14 @@ public final class DistSQLBackendHandlerFactoryTest extends
ProxyContextRestorer
@Before
public void setUp() throws IllegalAccessException, NoSuchFieldException {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDatabaseName()).thenReturn("db");
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResource().getDatabaseType()).thenReturn(new
MySQLDatabaseType());
return Collections.singletonMap("db", result);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableBackendHandlerTest.java
index dc924ec84bd..f85be58284e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/SetVariableBackendHandlerTest.java
@@ -67,14 +67,14 @@ public final class SetVariableBackendHandlerTest extends
ProxyContextRestorer {
@Before
public void setUp() {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(createDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new
ConfigurationProperties(createProperties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(createDatabases(),
mock(ShardingSphereRuleMetaData.class), new
ConfigurationProperties(createProperties())), mock(OptimizerContext.class));
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
connectionSession = new
ConnectionSession(mock(MySQLDatabaseType.class), TransactionType.LOCAL, new
DefaultAttributeMap());
}
- private Map<String, ShardingSphereDatabase> createDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> createDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
index 1d686129498..aff13bd7420 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java
@@ -62,7 +62,7 @@ public final class FrontDatabaseProtocolTypeFactoryTest
extends ProxyContextRest
@Test
public void
assertGetDatabaseTypeInstanceOfMySQLDatabaseTypeFromMetaDataContextsSchemaName()
{
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(mockDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(mockDatabases(),
mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
ProxyContext.init(new ContextManager(metaDataContexts,
mock(TransactionContexts.class), mock(InstanceContext.class)));
assertFalse(metaDataContexts.getMetaData().getDatabases().isEmpty());
String configuredDatabaseType =
metaDataContexts.getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
@@ -76,7 +76,7 @@ public final class FrontDatabaseProtocolTypeFactoryTest
extends ProxyContextRest
@Test
public void
assertGetDatabaseTypeOfPostgreSQLDatabaseTypeFromMetaDataContextsProps() {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(mockDatabaseMap(),
mock(ShardingSphereRuleMetaData.class), new
ConfigurationProperties(createProperties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(mockDatabases(),
mock(ShardingSphereRuleMetaData.class), new
ConfigurationProperties(createProperties())), mock(OptimizerContext.class));
ProxyContext.init(new ContextManager(metaDataContexts,
mock(TransactionContexts.class), mock(InstanceContext.class)));
assertFalse(metaDataContexts.getMetaData().getDatabases().isEmpty());
String configuredDatabaseType =
metaDataContexts.getMetaData().getProps().getValue(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE);
@@ -94,7 +94,7 @@ public final class FrontDatabaseProtocolTypeFactoryTest
extends ProxyContextRest
return result;
}
- private Map<String, ShardingSphereDatabase> mockDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> mockDatabases() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResource().getDatabaseType()).thenReturn(new
MySQLDatabaseType());
return Collections.singletonMap(DefaultDatabase.LOGIC_NAME, result);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
index f0ef1efb2fd..a131bcb5ee5 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
@@ -92,9 +92,9 @@ public final class MySQLComStmtPrepareExecutor implements
CommandExecutor {
private int getProjectionCount(final SQLStatement sqlStatement) {
if (sqlStatement instanceof SelectStatement) {
- Map<String, ShardingSphereDatabase> databaseMap =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
+ Map<String, ShardingSphereDatabase> databases =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabases();
String databaseName = connectionSession.getDatabaseName();
- SelectStatementContext sqlStatementContext =
(SelectStatementContext) SQLStatementContextFactory.newInstance(databaseMap,
sqlStatement, databaseName);
+ SelectStatementContext sqlStatementContext =
(SelectStatementContext) SQLStatementContextFactory.newInstance(databases,
sqlStatement, databaseName);
return
sqlStatementContext.getProjectionsContext().getExpandProjections().size();
}
return 0;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
index 2a8bc58eb2f..8ed1be98d3e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
@@ -174,10 +174,10 @@ public final class MySQLFrontendEngineTest extends
ProxyContextRestorer {
private MetaDataContexts getMetaDataContexts(final ShardingSphereUser
user) {
return new MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())),
mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())),
mock(OptimizerContext.class));
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
index 910cf3845dc..09c269f5a75 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
@@ -138,10 +138,10 @@ public final class MySQLAuthenticationHandlerTest extends
ProxyContextRestorer {
private MetaDataContexts getMetaDataContexts(final ShardingSphereUser
user, final boolean isNeedSuper) throws NoSuchFieldException,
IllegalAccessException {
return new MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
buildGlobalRuleMetaData(user, isNeedSuper), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
buildGlobalRuleMetaData(user, isNeedSuper), new ConfigurationProperties(new
Properties())), mock(OptimizerContext.class));
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
index 807ff3630d0..0194b7816cf 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
@@ -124,14 +124,14 @@ public final class OpenGaussAuthenticationHandlerTest
extends ProxyContextRestor
private MetaDataContexts getMetaDataContexts(final ShardingSphereUser
user) {
return new MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())),
mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())),
mock(OptimizerContext.class));
}
private ByteBuf createByteBuf(final int initialCapacity, final int
maxCapacity) {
return new UnpooledHeapByteBuf(UnpooledByteBufAllocator.DEFAULT,
initialCapacity, maxCapacity);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
index 9cdd1996482..5730684f718 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
@@ -137,14 +137,14 @@ public final class PostgreSQLAuthenticationHandlerTest
extends ProxyContextResto
private MetaDataContexts getMetaDataContexts(final ShardingSphereUser
user) {
return new MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabaseMap(),
buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())),
mock(OptimizerContext.class));
+ new ShardingSphereMetaData(getDatabases(),
buildGlobalRuleMetaData(user), new ConfigurationProperties(new Properties())),
mock(OptimizerContext.class));
}
private ByteBuf createByteBuf(final int initialCapacity, final int
maxCapacity) {
return new UnpooledHeapByteBuf(UnpooledByteBufAllocator.DEFAULT,
initialCapacity, maxCapacity);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap() {
+ private Map<String, ShardingSphereDatabase> getDatabases() {
Map<String, ShardingSphereDatabase> result = new HashMap<>(10, 1);
for (int i = 0; i < 10; i++) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
diff --git
a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
index 05686331762..2b92f46381e 100644
---
a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
+++
b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
@@ -108,11 +108,11 @@ public abstract class
AbstractSQLRewriterParameterizedTest {
mockRules(databaseRules, schemaName);
databaseRules.add(sqlParserRule);
ShardingSphereDatabase database = new
ShardingSphereDatabase(schemaName, databaseType, resource, new
ShardingSphereRuleMetaData(Collections.emptyList(), databaseRules), schemas);
- Map<String, ShardingSphereDatabase> databaseMap = new HashMap<>(2, 1);
- databaseMap.put(schemaName, database);
+ Map<String, ShardingSphereDatabase> databases = new HashMap<>(2, 1);
+ databases.put(schemaName, database);
SQLStatementParserEngine sqlStatementParserEngine = new
SQLStatementParserEngine(getTestParameters().getDatabaseType(),
sqlParserRule.getSqlStatementCache(),
sqlParserRule.getParseTreeCache(), sqlParserRule.isSqlCommentParseEnabled());
- SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(databaseMap,
+ SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(databases,
sqlStatementParserEngine.parse(getTestParameters().getInputSQL(), false),
schemaName);
if (sqlStatementContext instanceof ParameterAware) {
((ParameterAware)
sqlStatementContext).setUpParameters(getTestParameters().getInputParameters());
