This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 b9da36e Rename DataSourceMetaDatas to DataSourcesMetaData (#7680)
b9da36e is described below
commit b9da36ef0ee9c5f62fc8d6409e237caf215db9af
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Oct 1 21:25:15 2020 +0800
Rename DataSourceMetaDatas to DataSourcesMetaData (#7680)
---
.../EncryptSQLRewriterParameterizedTest.java | 4 ++--
.../parameterized/MixSQLRewriterParameterizedTest.java | 4 ++--
.../ShardingSQLRewriterParameterizedTest.java | 4 ++--
.../route/engine/type/ShardingRouteEngineFactory.java | 2 +-
.../ShardingInstanceBroadcastRoutingEngine.java | 6 +++---
.../ShardingInstanceBroadcastRoutingEngineTest.java | 8 ++++----
.../engine/type/standard/AbstractSQLRouteTest.java | 6 +++---
.../context/schema/GovernanceSchemaContexts.java | 2 +-
.../infra/metadata/ShardingSphereMetaData.java | 4 ++--
...taSourceMetaDatas.java => DataSourcesMetaData.java} | 6 +++---
...MetaDatasTest.java => DataSourcesMetaDataTest.java} | 18 +++++++++---------
.../infra/context/schema/SchemaContextsBuilder.java | 4 ++--
.../executor/sql/context/ExecutionContextBuilder.java | 2 +-
.../infra/executor/sql/context/SQLRuntimeContext.java | 2 +-
.../sql/context/ExecutionContextBuilderTest.java | 16 ++++++++--------
.../metadata/ShardingSphereDatabaseMetaData.java | 4 ++--
.../driver/executor/batch/BatchExecutionUnitTest.java | 2 +-
.../backend/response/query/QueryHeaderBuilderTest.java | 8 ++++----
.../sctl/hint/ShardingCTLHintBackendHandlerTest.java | 4 ++--
19 files changed, 53 insertions(+), 53 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
index 3cc8135..f9aaa98 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.encrypt.rewrite.parameterized;
import com.google.common.base.Preconditions;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rewrite.SQLRewriteEntry;
@@ -101,6 +101,6 @@ public final class EncryptSQLRewriterParameterizedTest
extends AbstractSQLRewrit
RuleSchemaMetaData ruleSchemaMetaData = mock(RuleSchemaMetaData.class);
when(ruleSchemaMetaData.getConfiguredSchemaMetaData()).thenReturn(schemaMetaData);
when(ruleSchemaMetaData.getSchemaMetaData()).thenReturn(schemaMetaData);
- return new ShardingSphereMetaData("sharding_db",
mock(DataSourceMetaDatas.class), ruleSchemaMetaData);
+ return new ShardingSphereMetaData("sharding_db",
mock(DataSourcesMetaData.class), ruleSchemaMetaData);
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
index ccbac07..021f360 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.sharding.rewrite.parameterized;
import com.google.common.base.Preconditions;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rewrite.SQLRewriteEntry;
@@ -121,7 +121,7 @@ public final class MixSQLRewriterParameterizedTest extends
AbstractSQLRewriterPa
RuleSchemaMetaData ruleSchemaMetaData = mock(RuleSchemaMetaData.class);
when(ruleSchemaMetaData.getConfiguredSchemaMetaData()).thenReturn(schemaMetaData);
when(ruleSchemaMetaData.getSchemaMetaData()).thenReturn(schemaMetaData);
- return new ShardingSphereMetaData("sharding_db",
mock(DataSourceMetaDatas.class), ruleSchemaMetaData);
+ return new ShardingSphereMetaData("sharding_db",
mock(DataSourcesMetaData.class), ruleSchemaMetaData);
}
private Map<String, ColumnMetaData> createColumnMetaDataMap() {
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
index b13cf4d..5249726 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.sharding.rewrite.parameterized;
import com.google.common.base.Preconditions;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rewrite.SQLRewriteEntry;
@@ -116,7 +116,7 @@ public final class ShardingSQLRewriterParameterizedTest
extends AbstractSQLRewri
RuleSchemaMetaData ruleSchemaMetaData = mock(RuleSchemaMetaData.class);
when(ruleSchemaMetaData.getConfiguredSchemaMetaData()).thenReturn(schemaMetaData);
when(ruleSchemaMetaData.getSchemaMetaData()).thenReturn(schemaMetaData);
- return new ShardingSphereMetaData("sharding_db",
mock(DataSourceMetaDatas.class), ruleSchemaMetaData);
+ return new ShardingSphereMetaData("sharding_db",
mock(DataSourcesMetaData.class), ruleSchemaMetaData);
}
private Map<String, ColumnMetaData> createColumnMetaDataMap() {
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
index a1d5708..6fc5c52 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
@@ -113,7 +113,7 @@ public final class ShardingRouteEngineFactory {
private static ShardingRouteEngine getDCLRoutingEngine(final
SQLStatementContext sqlStatementContext, final ShardingSphereMetaData metaData)
{
return isDCLForSingleTable(sqlStatementContext)
? new
ShardingTableBroadcastRoutingEngine(metaData.getRuleSchemaMetaData().getConfiguredSchemaMetaData(),
sqlStatementContext)
- : new
ShardingInstanceBroadcastRoutingEngine(metaData.getDataSourceMetaDatas());
+ : new
ShardingInstanceBroadcastRoutingEngine(metaData.getDataSourcesMetaData());
}
private static boolean isDCLForSingleTable(final SQLStatementContext
sqlStatementContext) {
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngine.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngine.java
index 0f179e8..61312ff 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngine.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngine.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.route.engine.type.broadcast;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
@@ -33,12 +33,12 @@ import java.util.Collections;
@RequiredArgsConstructor
public final class ShardingInstanceBroadcastRoutingEngine implements
ShardingRouteEngine {
- private final DataSourceMetaDatas dataSourceMetaDatas;
+ private final DataSourcesMetaData dataSourcesMetaData;
@Override
public void route(final RouteContext routeContext, final ShardingRule
shardingRule) {
for (String each : shardingRule.getDataSourceNames()) {
- if
(dataSourceMetaDatas.getAllInstanceDataSourceNames().contains(each)) {
+ if
(dataSourcesMetaData.getAllInstanceDataSourceNames().contains(each)) {
routeContext.getRouteUnits().add(new RouteUnit(new
RouteMapper(each, each), Collections.emptyList()));
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngineTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngineTest.java
index c814621..f339372 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngineTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngineTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.route.engine.type.broadcast;
import com.google.common.collect.Lists;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.Before;
@@ -42,15 +42,15 @@ public final class
ShardingInstanceBroadcastRoutingEngineTest {
private ShardingRule shardingRule;
@Mock
- private DataSourceMetaDatas dataSourceMetaDatas;
+ private DataSourcesMetaData dataSourcesMetaData;
private ShardingInstanceBroadcastRoutingEngine
shardingInstanceBroadcastRoutingEngine;
@Before
public void setUp() {
when(shardingRule.getDataSourceNames()).thenReturn(Collections.singletonList(DATASOURCE_NAME));
-
when(dataSourceMetaDatas.getAllInstanceDataSourceNames()).thenReturn(Lists.newArrayList(DATASOURCE_NAME));
- shardingInstanceBroadcastRoutingEngine = new
ShardingInstanceBroadcastRoutingEngine(dataSourceMetaDatas);
+
when(dataSourcesMetaData.getAllInstanceDataSourceNames()).thenReturn(Lists.newArrayList(DATASOURCE_NAME));
+ shardingInstanceBroadcastRoutingEngine = new
ShardingInstanceBroadcastRoutingEngine(dataSourcesMetaData);
}
@Test
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index efed5d7..6e7b96b 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.config.DatabaseAccessConfiguration;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.DatabaseTypes;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
@@ -65,7 +65,7 @@ public abstract class AbstractSQLRouteTest extends
AbstractRoutingEngineTest {
return result;
}
- private DataSourceMetaDatas buildDataSourceMetas() {
+ private DataSourcesMetaData buildDataSourceMetas() {
Map<String, DatabaseAccessConfiguration> dataSourceInfoMap = new
HashMap<>(3, 1);
DatabaseAccessConfiguration mainDatabaseAccessConfig = new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test");
DatabaseAccessConfiguration databaseAccessConfiguration0 = new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test");
@@ -73,7 +73,7 @@ public abstract class AbstractSQLRouteTest extends
AbstractRoutingEngineTest {
dataSourceInfoMap.put("main", mainDatabaseAccessConfig);
dataSourceInfoMap.put("ds_0", databaseAccessConfiguration0);
dataSourceInfoMap.put("ds_1", databaseAccessConfiguration1);
- return new
DataSourceMetaDatas(DatabaseTypes.getActualDatabaseType("MySQL"),
dataSourceInfoMap);
+ return new
DataSourcesMetaData(DatabaseTypes.getActualDatabaseType("MySQL"),
dataSourceInfoMap);
}
private RuleSchemaMetaData buildRuleSchemaMetaData() {
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
index 5790cbc..8448609 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java
@@ -299,7 +299,7 @@ public final class GovernanceSchemaContexts implements
SchemaContexts {
}
private ShardingSphereSchema getChangedShardingSphereSchema(final
ShardingSphereSchema oldShardingSphereSchema, final RuleSchemaMetaData
newRuleSchemaMetaData, final String schemaName) {
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData(schemaName,
oldShardingSphereSchema.getMetaData().getDataSourceMetaDatas(),
newRuleSchemaMetaData);
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData(schemaName,
oldShardingSphereSchema.getMetaData().getDataSourcesMetaData(),
newRuleSchemaMetaData);
return new ShardingSphereSchema(schemaName,
oldShardingSphereSchema.getConfigurations(),
oldShardingSphereSchema.getRules(), oldShardingSphereSchema.getDataSources(),
metaData);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
index 7081065..3f0dc65 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.metadata;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
/**
@@ -31,7 +31,7 @@ public final class ShardingSphereMetaData {
private final String schemaName;
- private final DataSourceMetaDatas dataSourceMetaDatas;
+ private final DataSourcesMetaData dataSourcesMetaData;
private final RuleSchemaMetaData ruleSchemaMetaData;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetaDatas.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaData.java
similarity index 96%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetaDatas.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaData.java
index e517065..0e9989e 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetaDatas.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaData.java
@@ -30,13 +30,13 @@ import java.util.Objects;
import java.util.stream.Collectors;
/**
- * Data source meta datas.
+ * Data sources meta data.
*/
-public final class DataSourceMetaDatas {
+public final class DataSourcesMetaData {
private final Map<String, DataSourceMetaData> dataSourceMetaDataMap;
- public DataSourceMetaDatas(final DatabaseType databaseType, final
Map<String, DatabaseAccessConfiguration> databaseAccessConfigMap) {
+ public DataSourcesMetaData(final DatabaseType databaseType, final
Map<String, DatabaseAccessConfiguration> databaseAccessConfigMap) {
dataSourceMetaDataMap = getDataSourceMetaDataMap(databaseType,
databaseAccessConfigMap);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetaDatasTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaDataTest.java
similarity index 83%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetaDatasTest.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaDataTest.java
index 77e5d9a..9e68f80 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetaDatasTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaDataTest.java
@@ -31,15 +31,15 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class DataSourceMetaDatasTest {
+public final class DataSourcesMetaDataTest {
@Test
public void
assertGetAllInstanceDataSourceNamesForShardingRuleByDifferentDataSource() {
Map<String, DatabaseAccessConfiguration>
databaseAccessConfigurationMap = new HashMap<>(2, 1);
databaseAccessConfigurationMap.put("ds_0", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test"));
databaseAccessConfigurationMap.put("ds_1", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3307/db_1", "test"));
- DataSourceMetaDatas dataSourceMetaDatas = new
DataSourceMetaDatas(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
- Collection<String> allInstanceDataSourceNames =
dataSourceMetaDatas.getAllInstanceDataSourceNames();
+ DataSourcesMetaData dataSourcesMetaData = new
DataSourcesMetaData(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
+ Collection<String> allInstanceDataSourceNames =
dataSourcesMetaData.getAllInstanceDataSourceNames();
assertNotNull(allInstanceDataSourceNames);
assertThat(allInstanceDataSourceNames.size(), is(2));
assertTrue(allInstanceDataSourceNames.contains("ds_0") &&
allInstanceDataSourceNames.contains("ds_1"));
@@ -50,8 +50,8 @@ public final class DataSourceMetaDatasTest {
Map<String, DatabaseAccessConfiguration>
databaseAccessConfigurationMap = new HashMap<>(2, 1);
databaseAccessConfigurationMap.put("ds_0", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test"));
databaseAccessConfigurationMap.put("ds_1", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test"));
- DataSourceMetaDatas dataSourceMetaDatas = new
DataSourceMetaDatas(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
- Collection<String> allInstanceDataSourceNames =
dataSourceMetaDatas.getAllInstanceDataSourceNames();
+ DataSourcesMetaData dataSourcesMetaData = new
DataSourcesMetaData(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
+ Collection<String> allInstanceDataSourceNames =
dataSourcesMetaData.getAllInstanceDataSourceNames();
assertNotNull(allInstanceDataSourceNames);
assertThat(allInstanceDataSourceNames.size(), is(1));
assertTrue(allInstanceDataSourceNames.contains("ds_0") ||
allInstanceDataSourceNames.contains("ds_1"));
@@ -62,8 +62,8 @@ public final class DataSourceMetaDatasTest {
Map<String, DatabaseAccessConfiguration>
databaseAccessConfigurationMap = new HashMap<>(2, 1);
databaseAccessConfigurationMap.put("ds_0", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test"));
databaseAccessConfigurationMap.put("ds_1", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test"));
- DataSourceMetaDatas dataSourceMetaDatas = new
DataSourceMetaDatas(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
-
assertThat(dataSourceMetaDatas.getDataSourceMetaData("ds_0").getCatalog(),
is("db_0"));
+ DataSourcesMetaData dataSourcesMetaData = new
DataSourcesMetaData(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
+
assertThat(dataSourcesMetaData.getDataSourceMetaData("ds_0").getCatalog(),
is("db_0"));
}
@Test
@@ -71,7 +71,7 @@ public final class DataSourceMetaDatasTest {
Map<String, DatabaseAccessConfiguration>
databaseAccessConfigurationMap = new HashMap<>(2, 1);
databaseAccessConfigurationMap.put("ds_0", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test"));
databaseAccessConfigurationMap.put("ds_1", new
DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test"));
- DataSourceMetaDatas dataSourceMetaDatas = new
DataSourceMetaDatas(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
-
assertNull(dataSourceMetaDatas.getDataSourceMetaData("ds_0").getSchema());
+ DataSourcesMetaData dataSourcesMetaData = new
DataSourcesMetaData(DatabaseTypes.getActualDatabaseType("MySQL"),
databaseAccessConfigurationMap);
+
assertNull(dataSourcesMetaData.getDataSourceMetaData("ds_0").getSchema());
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/schema/SchemaContextsBuilder.java
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/schema/SchemaContextsBuilder.java
index 3c458e8..a93bc1d 100644
---
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/schema/SchemaContextsBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/schema/SchemaContextsBuilder.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypes;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorKernel;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import
org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaDataLoader;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
@@ -121,7 +121,7 @@ public final class SchemaContextsBuilder {
private ShardingSphereMetaData createMetaData(final String schemaName,
final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> rules) throws SQLException {
long start = System.currentTimeMillis();
- DataSourceMetaDatas dataSourceMetas = new
DataSourceMetaDatas(databaseType,
getDatabaseAccessConfigurationMap(dataSourceMap));
+ DataSourcesMetaData dataSourceMetas = new
DataSourcesMetaData(databaseType,
getDatabaseAccessConfigurationMap(dataSourceMap));
RuleSchemaMetaData ruleSchemaMetaData = new
RuleSchemaMetaDataLoader(rules).load(databaseType, dataSourceMap, props);
ShardingSphereMetaData result = new ShardingSphereMetaData(schemaName,
dataSourceMetas, ruleSchemaMetaData);
log.info("Load meta data for schema {} finished, cost {}
milliseconds.", schemaName, System.currentTimeMillis() - start);
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilder.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilder.java
index 101a6bc..afa31b9 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilder.java
@@ -59,7 +59,7 @@ public final class ExecutionContextBuilder {
}
private static Collection<ExecutionUnit> build(final
ShardingSphereMetaData metaData, final GenericSQLRewriteResult
sqlRewriteResult, final SQLStatementContext<?> sqlStatementContext) {
- String dataSourceName =
metaData.getDataSourceMetaDatas().getAllInstanceDataSourceNames().iterator().next();
+ String dataSourceName =
metaData.getDataSourcesMetaData().getAllInstanceDataSourceNames().iterator().next();
return Collections.singletonList(new ExecutionUnit(dataSourceName,
new SQLUnit(sqlRewriteResult.getSqlRewriteUnit().getSql(),
sqlRewriteResult.getSqlRewriteUnit().getParameters(),
getSQLRuntimeContext(metaData, sqlStatementContext))));
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLRuntimeContext.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLRuntimeContext.java
index 3952748..6727481 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLRuntimeContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLRuntimeContext.java
@@ -39,7 +39,7 @@ public final class SQLRuntimeContext {
private final List<String> actualTables;
- private final List<PrimaryKeyMetaData> primaryKeyMetaDatas;
+ private final List<PrimaryKeyMetaData> primaryKeysMetaData;
@Setter
private boolean readOnly;
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
index 69c72c4..7c43380 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.executor.sql.context;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import
org.apache.shardingsphere.infra.rewrite.engine.result.GenericSQLRewriteResult;
import
org.apache.shardingsphere.infra.rewrite.engine.result.RouteSQLRewriteResult;
@@ -52,10 +52,10 @@ public final class ExecutionContextBuilderTest {
String sql = "sql";
List<Object> parameters = Collections.singletonList("parameter");
GenericSQLRewriteResult genericSQLRewriteResult = new
GenericSQLRewriteResult(new SQLRewriteUnit(sql, parameters));
- DataSourceMetaDatas dataSourceMetaDatas =
mock(DataSourceMetaDatas.class);
+ DataSourcesMetaData dataSourcesMetaData =
mock(DataSourcesMetaData.class);
String firstDataSourceName = "firstDataSourceName";
-
when(dataSourceMetaDatas.getAllInstanceDataSourceNames()).thenReturn(Arrays.asList(firstDataSourceName,
"lastDataSourceName"));
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData("sharding_db", dataSourceMetaDatas,
buildRuleSchemaMetaData());
+
when(dataSourcesMetaData.getAllInstanceDataSourceNames()).thenReturn(Arrays.asList(firstDataSourceName,
"lastDataSourceName"));
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData("sharding_db", dataSourcesMetaData,
buildRuleSchemaMetaData());
Collection<ExecutionUnit> actual =
ExecutionContextBuilder.build(metaData, genericSQLRewriteResult,
mock(SQLStatementContext.class));
Collection<ExecutionUnit> expected = Collections.singletonList(new
ExecutionUnit(firstDataSourceName, new SQLUnit(sql, parameters)));
assertThat(actual, is(expected));
@@ -70,7 +70,7 @@ public final class ExecutionContextBuilderTest {
Map<RouteUnit, SQLRewriteUnit> sqlRewriteUnits = new HashMap<>(2, 1);
sqlRewriteUnits.put(routeUnit1, sqlRewriteUnit1);
sqlRewriteUnits.put(routeUnit2, sqlRewriteUnit2);
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData("sharding_db", mock(DataSourceMetaDatas.class),
buildRuleSchemaMetaData());
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData("sharding_db", mock(DataSourcesMetaData.class),
buildRuleSchemaMetaData());
Collection<ExecutionUnit> actual =
ExecutionContextBuilder.build(metaData, new
RouteSQLRewriteResult(sqlRewriteUnits), mock(SQLStatementContext.class));
ExecutionUnit expectedUnit1 = new ExecutionUnit("actualName1", new
SQLUnit("sql1", Collections.singletonList("parameter1")));
ExecutionUnit expectedUnit2 = new ExecutionUnit("actualName2", new
SQLUnit("sql2", Collections.singletonList("parameter2")));
@@ -78,7 +78,7 @@ public final class ExecutionContextBuilderTest {
expected.add(expectedUnit1);
expected.add(expectedUnit2);
assertThat(actual, is(expected));
-
assertThat(actual.iterator().next().getSqlUnit().getSqlRuntimeContext().getPrimaryKeyMetaDatas().size(),
is(1));
+
assertThat(actual.iterator().next().getSqlUnit().getSqlRuntimeContext().getPrimaryKeysMetaData().size(),
is(1));
}
@Test
@@ -88,13 +88,13 @@ public final class ExecutionContextBuilderTest {
Map<RouteUnit, SQLRewriteUnit> sqlRewriteUnits = new HashMap<>(2, 1);
sqlRewriteUnits.put(routeUnit2, sqlRewriteUnit2);
RuleSchemaMetaData ruleSchemaMetaData =
buildRuleSchemaMetaDataWithoutPrimaryKey();
- ShardingSphereMetaData metaData = new
ShardingSphereMetaData("sharding_db", mock(DataSourceMetaDatas.class),
ruleSchemaMetaData);
+ ShardingSphereMetaData metaData = new
ShardingSphereMetaData("sharding_db", mock(DataSourcesMetaData.class),
ruleSchemaMetaData);
Collection<ExecutionUnit> actual =
ExecutionContextBuilder.build(metaData, new
RouteSQLRewriteResult(sqlRewriteUnits), mock(SQLStatementContext.class));
ExecutionUnit expectedUnit2 = new ExecutionUnit("actualName2", new
SQLUnit("sql2", Collections.singletonList("parameter2")));
Collection<ExecutionUnit> expected = new LinkedHashSet<>(1, 1);
expected.add(expectedUnit2);
assertThat(actual, is(expected));
-
assertThat(actual.iterator().next().getSqlUnit().getSqlRuntimeContext().getPrimaryKeyMetaDatas().size(),
is(0));
+
assertThat(actual.iterator().next().getSqlUnit().getSqlRuntimeContext().getPrimaryKeysMetaData().size(),
is(0));
}
private RuleSchemaMetaData buildRuleSchemaMetaDataWithoutPrimaryKey() {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
index 98bd29e..b980c27 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
@@ -232,11 +232,11 @@ public final class ShardingSphereDatabaseMetaData extends
AdaptedDatabaseMetaDat
}
private String getActualCatalog(final String catalog) {
- return null != catalog && catalog.contains(DefaultSchema.LOGIC_NAME) ?
shardingSphereMetaData.getDataSourceMetaDatas().getDataSourceMetaData(getDataSourceName()).getCatalog()
: catalog;
+ return null != catalog && catalog.contains(DefaultSchema.LOGIC_NAME) ?
shardingSphereMetaData.getDataSourcesMetaData().getDataSourceMetaData(getDataSourceName()).getCatalog()
: catalog;
}
private String getActualSchema(final String schema) {
- return null != schema && schema.contains(DefaultSchema.LOGIC_NAME) ?
shardingSphereMetaData.getDataSourceMetaDatas().getDataSourceMetaData(getDataSourceName()).getSchema()
: schema;
+ return null != schema && schema.contains(DefaultSchema.LOGIC_NAME) ?
shardingSphereMetaData.getDataSourcesMetaData().getDataSourceMetaData(getDataSourceName()).getSchema()
: schema;
}
private String getDataSourceName() {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnitTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnitTest.java
index 58c9697..a3e1195 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnitTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnitTest.java
@@ -60,7 +60,7 @@ public final class BatchExecutionUnitTest {
BatchExecutionUnit actual = new BatchExecutionUnit(executionUnit);
assertThat(actual.toString(),
is(String.format("BatchExecutionUnit(executionUnit=ExecutionUnit"
+ "(dataSourceName=%s, sqlUnit=SQLUnit(sql=%s,
parameters=[%d], "
- + "sqlRuntimeContext=SQLRuntimeContext(schemaName=%s,
logicTables=[], actualTables=[], primaryKeyMetaDatas=[], readOnly=false))), "
+ + "sqlRuntimeContext=SQLRuntimeContext(schemaName=%s,
logicTables=[], actualTables=[], primaryKeysMetaData=[], readOnly=false))), "
+ "jdbcAndActualAddBatchCallTimesMap={},
actualCallAddBatchTimes=0)", DATA_SOURCE_NAME, SQL, 1, "null")));
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilderTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilderTest.java
index 066c5d2..73d994e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilderTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/query/QueryHeaderBuilderTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import
org.apache.shardingsphere.infra.executor.sql.raw.execute.result.query.QueryHeader;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import
org.apache.shardingsphere.sql.parser.binder.metadata.column.ColumnMetaData;
@@ -136,9 +136,9 @@ public final class QueryHeaderBuilderTest {
RuleSchemaMetaData ruleSchemaMetaData = mock(RuleSchemaMetaData.class);
when(ruleSchemaMetaData.getConfiguredSchemaMetaData()).thenReturn(schemaMetaData);
when(metaData.getRuleSchemaMetaData()).thenReturn(ruleSchemaMetaData);
- DataSourceMetaDatas dataSourceMetaDatas =
mock(DataSourceMetaDatas.class);
-
when(dataSourceMetaDatas.getDataSourceMetaData("ds_0")).thenReturn(mock(DataSourceMetaData.class));
-
when(metaData.getDataSourceMetaDatas()).thenReturn(dataSourceMetaDatas);
+ DataSourcesMetaData dataSourcesMetaData =
mock(DataSourcesMetaData.class);
+
when(dataSourcesMetaData.getDataSourceMetaData("ds_0")).thenReturn(mock(DataSourceMetaData.class));
+
when(metaData.getDataSourcesMetaData()).thenReturn(dataSourcesMetaData);
ShardingSphereSchema shardingSphereSchema =
mock(ShardingSphereSchema.class);
when(result.getSchema()).thenReturn(shardingSphereSchema);
when(shardingSphereSchema.getMetaData()).thenReturn(metaData);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
index c214c48..0e70150 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.infra.context.schema.impl.StandardSchemaContext
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.hint.HintManager;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.datasource.DataSourceMetaDatas;
+import org.apache.shardingsphere.infra.metadata.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData;
import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -207,7 +207,7 @@ public final class ShardingCTLHintBackendHandlerTest {
private Map<String, SchemaContext> getSchemaContextMap() {
ShardingSphereSchema shardingSphereSchema =
mock(ShardingSphereSchema.class);
- when(shardingSphereSchema.getMetaData()).thenReturn(new
ShardingSphereMetaData("sharding_db", mock(DataSourceMetaDatas.class),
+ when(shardingSphereSchema.getMetaData()).thenReturn(new
ShardingSphereMetaData("sharding_db", mock(DataSourcesMetaData.class),
new RuleSchemaMetaData(new
SchemaMetaData(ImmutableMap.of("user", mock(TableMetaData.class))),
Collections.emptyMap())));
when(shardingSphereSchema.isComplete()).thenReturn(true);
SchemaContext result = new SchemaContext(shardingSphereSchema, null);
